diff options
| author | tron <tron@openttd.org> | 2005-02-06 22:25:27 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-02-06 22:25:27 +0000 |
| commit | 257e97c09a5445c339118c3269cd3bd39151c65c (patch) | |
| tree | f2cd6e89c719cd0e1e1f5f36d8b3e1bcb804079f /news_gui.c | |
| parent | 6984d6cd31d3ceb270a7caa75c4ed757788eb50b (diff) | |
| download | openttd-257e97c09a5445c339118c3269cd3bd39151c65c.tar.xz | |
(svn r1833) byte -> char transition: the rest
Diffstat (limited to 'news_gui.c')
| -rw-r--r-- | news_gui.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/news_gui.c b/news_gui.c index b8931a36c..81a811c95 100644 --- a/news_gui.c +++ b/news_gui.c @@ -503,10 +503,11 @@ static byte getNews(byte i) } // cut string after len pixels -static void GetNewsString(NewsItem *ni, byte *buffer, uint max) +static void GetNewsString(NewsItem *ni, char *buffer, uint max) { StringID str; - byte *s, *d; + const char *s; + char *d; uint len = 0; if (ni->display_mode == 3) { @@ -537,8 +538,8 @@ static void GetNewsString(NewsItem *ni, byte *buffer, uint max) } else if (*s == '\r') { d[0] = d[1] = d[2] = d[3] = ' '; d += 4; - } else if (*s >= ' ' && (*s < 0x88 || *s >= 0x99)) { - len += _stringwidth_table[*s - 32]; + } else if ((byte)*s >= ' ' && ((byte)*s < 0x88 || (byte)*s >= 0x99)) { + len += _stringwidth_table[(byte)*s - 32]; *d++ = *s; } } @@ -549,7 +550,6 @@ static void MessageHistoryWndProc(Window *w, WindowEvent *e) { switch (e->event) { case WE_PAINT: { - byte buffer[256]; int y = 19; byte p, show; NewsItem *ni; @@ -560,6 +560,8 @@ static void MessageHistoryWndProc(Window *w, WindowEvent *e) show = min(_total_news, w->vscroll.cap); for (p = w->vscroll.pos; p < w->vscroll.pos + show; p++) { + char buffer[256]; + // get news in correct order ni = &_news_items[getNews(p)]; |