petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r1833) byte -> char transition: the rest

Browse Source
This commit is contained in:
tron
2005-02-06 22:25:27 +00:00
parent 27dc506a03
commit eed181245d
18 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
news_gui.c
View File

@@ -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)];