From 9832a691fe1db29d9564c4fbea0c057faa1e030c Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 25 Mar 2005 14:19:33 +0000 Subject: (svn r2060) Clean up some string construction and remove now unused macro --- station_gui.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'station_gui.c') diff --git a/station_gui.c b/station_gui.c index b98afe617..c28861cdc 100644 --- a/station_gui.c +++ b/station_gui.c @@ -398,18 +398,16 @@ static void DrawStationViewWindow(Window *w) } while (pos > -5 && ++i != 12); if (IsWindowOfPrototype(w, _station_view_widgets)) { - char *b; + char *b = _userstring; - b = _userstring; b = InlineString(b, STR_000C_ACCEPTS); - for(i=0; i!=NUM_CARGO; i++) { - if ((b - _userstring) + 5 > USERSTRING_LEN - 1) - break; + for (i = 0; i != NUM_CARGO; i++) { + if (b >= endof(_userstring) - 5 - 1) break; if (st->goods[i].waiting_acceptance & 0x8000) { b = InlineString(b, _cargoc.names_s[i]); - WRITE_LE_UINT16(b, 0x202C); - b += 2; + *b++ = ','; + *b++ = ' '; } } @@ -417,7 +415,7 @@ static void DrawStationViewWindow(Window *w) b = InlineString(b, STR_00D0_NOTHING); *b++ = '\0'; } else { - b[-2] = 0; + b[-2] = '\0'; } DrawStringMultiLine(2, 67, STR_SPEC_USERSTRING, 245); -- cgit v1.2.3-70-g09d2