diff options
| -rw-r--r-- | macros.h | 5 | ||||
| -rw-r--r-- | misc_gui.c | 15 | ||||
| -rw-r--r-- | station_gui.c | 14 |
3 files changed, 13 insertions, 21 deletions
@@ -151,9 +151,4 @@ static inline void swap_tile(TileIndex *a, TileIndex *b) { TileIndex t = *a; *a } #endif -static inline void WRITE_LE_UINT16(void *b, uint16 x) { - ((byte*)b)[0] = (byte)x; - ((byte*)b)[1] = (byte)(x >> 8); -} - #endif /* MACROS_H */ diff --git a/misc_gui.c b/misc_gui.c index 0b35bbcc3..ae71ba38e 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -663,18 +663,17 @@ void GuiShowTooltips(StringID string_id) } -static void DrawStationCoverageText(const uint *accepts, int str_x, int str_y, uint mask) +static void DrawStationCoverageText(const AcceptedCargo accepts, + int str_x, int str_y, uint mask) { + char *b = _userstring; int i; - char *b; - b = _userstring; b = InlineString(b, STR_000D_ACCEPTS); - for(i=0; i!=NUM_CARGO; i++,mask>>=1) { - if (accepts[i] >= 8 && (mask&1) ) { - StringID id = _cargoc.names_s[i]; - b = InlineString(b, id); + for (i = 0; i != NUM_CARGO; i++, mask >>= 1) { + if (accepts[i] >= 8 && mask & 1) { + b = InlineString(b, _cargoc.names_s[i]); *b++ = ','; *b++ = ' '; } @@ -684,7 +683,7 @@ static void DrawStationCoverageText(const uint *accepts, int str_x, int str_y, u b = InlineString(b, STR_00D0_NOTHING); *b++ = '\0'; } else { - b[-2] = 0; + b[-2] = '\0'; } DrawStringMultiLine(str_x, str_y, STR_SPEC_USERSTRING, 144); 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); |