summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-02-01 19:53:17 +0000
committertron <tron@openttd.org>2006-02-01 19:53:17 +0000
commitb197b9422f5d5a3c5944c422d177956e8563ef2e (patch)
tree72bc2cd501c6edd86ab40cc1bce06b8d7f3d7565
parent41dda81b298110966132f2ebc7200ddf3d0945ae (diff)
downloadopenttd-b197b9422f5d5a3c5944c422d177956e8563ef2e.tar.xz
(svn r3516) Fix embarrassing bug in r3514
-rw-r--r--strings.c2
-rw-r--r--tree_cmd.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/strings.c b/strings.c
index e28ec25dd..b68cd99dc 100644
--- a/strings.c
+++ b/strings.c
@@ -500,8 +500,8 @@ static char *FormatString(char *buff, const char *str, const int32 *argv, uint c
break;
case 0x81: // {STRINL}
+ buff = GetStringWithArgs(buff, READ_LE_UINT16(str), argv);
str += 2;
- buff = GetStringWithArgs(buff, READ_LE_UINT16(str-2), argv);
break;
case 0x82: // {DATE_LONG}
buff = FormatYmdString(buff, GetInt32(&argv));
diff --git a/tree_cmd.c b/tree_cmd.c
index ca84a57e8..8fbf4a670 100644
--- a/tree_cmd.c
+++ b/tree_cmd.c
@@ -581,9 +581,9 @@ void OnTick_Trees(void)
int m2;
switch (ct) {
- case CL_GRASS: m2 = 0;
- case CL_ROUGH: m2 = 0x10;
- default: m2 = (GetClearDensity(tile) << 6) | 0x20;
+ case CL_GRASS: m2 = 0; break;
+ case CL_ROUGH: m2 = 0x10; break;
+ default: m2 = (GetClearDensity(tile) << 6) | 0x20; break;
}
ModifyTile(tile,