mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2060) Clean up some string construction and remove now unused macro

release/0.4.5
tron 2005-03-25 14:19:33 +00:00
parent 6d75cce924
commit 9832a691fe
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
macros.h
View File

@ -151,9 +151,4 @@ static inline void swap_tile(TileIndex *a, TileIndex *b) { TileIndex t = *a; *a
} }
#endif #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 */ #endif /* MACROS_H */

13
misc_gui.c
View File

@ -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; int i;
char *b;
b = _userstring;
b = InlineString(b, STR_000D_ACCEPTS); b = InlineString(b, STR_000D_ACCEPTS);
for (i = 0; i != NUM_CARGO; i++, mask >>= 1) { for (i = 0; i != NUM_CARGO; i++, mask >>= 1) {
if (accepts[i] >= 8 && (mask&1) ) { if (accepts[i] >= 8 && mask & 1) {
StringID id = _cargoc.names_s[i]; b = InlineString(b, _cargoc.names_s[i]);
b = InlineString(b, id);
*b++ = ','; *b++ = ',';
*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 = InlineString(b, STR_00D0_NOTHING);
*b++ = '\0'; *b++ = '\0';
} else { } else {
b[-2] = 0; b[-2] = '\0';
} }
DrawStringMultiLine(str_x, str_y, STR_SPEC_USERSTRING, 144); DrawStringMultiLine(str_x, str_y, STR_SPEC_USERSTRING, 144);

12
station_gui.c
View File

@ -398,18 +398,16 @@ static void DrawStationViewWindow(Window *w)
} while (pos > -5 && ++i != 12); } while (pos > -5 && ++i != 12);
if (IsWindowOfPrototype(w, _station_view_widgets)) { if (IsWindowOfPrototype(w, _station_view_widgets)) {
char *b; char *b = _userstring;
b = _userstring;
b = InlineString(b, STR_000C_ACCEPTS); b = InlineString(b, STR_000C_ACCEPTS);
for (i = 0; i != NUM_CARGO; i++) { for (i = 0; i != NUM_CARGO; i++) {
if ((b - _userstring) + 5 > USERSTRING_LEN - 1) if (b >= endof(_userstring) - 5 - 1) break;
break;
if (st->goods[i].waiting_acceptance & 0x8000) { if (st->goods[i].waiting_acceptance & 0x8000) {
b = InlineString(b, _cargoc.names_s[i]); b = InlineString(b, _cargoc.names_s[i]);
WRITE_LE_UINT16(b, 0x202C); *b++ = ',';
b += 2; *b++ = ' ';
} }
} }
@ -417,7 +415,7 @@ static void DrawStationViewWindow(Window *w)
b = InlineString(b, STR_00D0_NOTHING); b = InlineString(b, STR_00D0_NOTHING);
*b++ = '\0'; *b++ = '\0';
} else { } else {
b[-2] = 0; b[-2] = '\0';
} }
DrawStringMultiLine(2, 67, STR_SPEC_USERSTRING, 245); DrawStringMultiLine(2, 67, STR_SPEC_USERSTRING, 245);