From 2af7bcd326bb71652598c019d2ac5824808d0ce3 Mon Sep 17 00:00:00 2001 From: "p.kosyh" Date: Wed, 4 Nov 2009 18:47:56 +0000 Subject: [PATCH] fix --- src/sdl-instead/graphics.c | 8 ++++---- src/sdl-instead/util.c | 2 +- src/sdl-instead/util.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/sdl-instead/graphics.c b/src/sdl-instead/graphics.c index 6cdb645..1a67e91 100644 --- a/src/sdl-instead/graphics.c +++ b/src/sdl-instead/graphics.c @@ -2462,13 +2462,13 @@ void txt_layout_real_size(layout_t lay, int *pw, int *ph) if (!layout) return; for (line = layout->lines; line; line = line->next) { - if (line->w > w) - w = line->w; - while (!line->num && line->next) line = line->next; - if (line->num && line->y + line->h > h) + if (line->w > w) + w = line->w; + + if (line->num && line->y + line->h > h) h = line->y + line->h; } if (pw) diff --git a/src/sdl-instead/util.c b/src/sdl-instead/util.c index a169b51..90bdb56 100644 --- a/src/sdl-instead/util.c +++ b/src/sdl-instead/util.c @@ -21,7 +21,7 @@ char *getpath(const char *d, const char *n) return p; } -static int is_space(int c) +int is_space(int c) { return (c == ' ' || c == '\t'); } diff --git a/src/sdl-instead/util.h b/src/sdl-instead/util.h index 2648233..793810f 100644 --- a/src/sdl-instead/util.h +++ b/src/sdl-instead/util.h @@ -9,6 +9,7 @@ struct parser { void *p; }; +extern int is_space(int c); extern int parse_ini(const char *path, struct parser *cmd_parser); extern char *getpath(const char *d, const char *n); extern char *strip(char *s);