--- a/bridge_gui.c Wed Sep 28 19:35:36 2005 +0000
+++ b/bridge_gui.c Wed Sep 28 21:49:55 2005 +0000
@@ -115,7 +115,7 @@
{
uint j = 0;
int32 ret;
- uint16 errmsg;
+ StringID errmsg;
DeleteWindowById(WC_BUILD_BRIDGE, 0);
@@ -123,7 +123,7 @@
_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
--- a/texteff.c Wed Sep 28 19:35:36 2005 +0000
+++ b/texteff.c Wed Sep 28 21:49:55 2005 +0000
@@ -236,7 +236,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
} 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? */