Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2996) 0xFFFF -> INVALID_STRING_ID

Browse Source
This commit is contained in:
tron 2005-09-28 21:49:55 +00:00
parent 90e33aed22
commit a3703eafb5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge_gui.c
View File

@ -115,7 +115,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, byte bridge_type)
{
uint j = 0;
int32 ret;
uint16 errmsg;
StringID errmsg;
DeleteWindowById(WC_BUILD_BRIDGE, 0);
@ -123,7 +123,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, byte bridge_type)
_bridgedata.start_tile = start;
_bridgedata.end_tile = end;
errmsg = 0xFFFF;
errmsg = INVALID_STRING_ID;
// only query bridge building possibility once, result is the same for all bridges!
// returns CMD_ERROR on failure, and priCe on success

12
texteff.c
View File

@ -236,7 +236,7 @@ void AddTextEffect(StringID msg, int x, int y, uint16 duration)
if (_game_mode == GM_MENU)
return;
for (te = _text_effect_list; te->string_id != 0xFFFF; ) {
for (te = _text_effect_list; te->string_id != INVALID_STRING_ID; ) {
if (++te == endof(_text_effect_list))
return;
}
@ -259,7 +259,7 @@ void AddTextEffect(StringID msg, int x, int y, uint16 duration)
static void MoveTextEffect(TextEffect *te)
{
if (te->duration < 8) {
te->string_id = 0xFFFF;
te->string_id = INVALID_STRING_ID;
} else {
te->duration-=8;
te->y--;
@ -273,7 +273,7 @@ void MoveAllTextEffects(void)
TextEffect *te;
for (te = _text_effect_list; te != endof(_text_effect_list); te++ ) {
if (te->string_id != 0xFFFF)
if (te->string_id != INVALID_STRING_ID)
MoveTextEffect(te);
}
}
@ -283,7 +283,7 @@ void InitTextEffects(void)
TextEffect *te;
for (te = _text_effect_list; te != endof(_text_effect_list); te++ ) {
te->string_id = 0xFFFF;
te->string_id = INVALID_STRING_ID;
}
}
@ -293,7 +293,7 @@ void DrawTextEffects(DrawPixelInfo *dpi)
if (dpi->zoom < 1) {
for (te = _text_effect_list; te != endof(_text_effect_list); te++ ) {
if (te->string_id == 0xFFFF)
if (te->string_id == INVALID_STRING_ID)
continue;
/* intersection? */
@ -306,7 +306,7 @@ void DrawTextEffects(DrawPixelInfo *dpi)
}
} else if (dpi->zoom == 1) {
for (te = _text_effect_list; te != endof(_text_effect_list); te++ ) {
if (te->string_id == 0xFFFF)
if (te->string_id == INVALID_STRING_ID)
continue;
/* intersection? */