summaryrefslogtreecommitdiff
path: root/strings.c
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2005-01-06 22:31:58 +0000
committertruelight <truelight@openttd.org>2005-01-06 22:31:58 +0000
commitb450603437d1eae96e109058ab1c59b86be8a216 (patch)
tree254702245ba43d006f4823111d0c2c592fb701ca /strings.c
parent3845670c7847f468387c8513889dfb1db4e303d4 (diff)
downloadopenttd-b450603437d1eae96e109058ab1c59b86be8a216.tar.xz
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
(in prepare of dynamic arrays): - DEREF_XXX is changed into GetXXX - All direct call are directed via GetXXX - struct Industry has now an index-field - ENUM'd some stuff - Replaced home built loops with FOR_ALL_XXX - Added _stations_size, _vehicles_size, ... which gives the length of the array (which will be dynamic in the near future) - Changed lengtof(XXX) to _XXX_size (e.g. _stations_size) - Removed all endof(XXX) (because mostly it was part of a FOR_ALL_XXX) - Made the sort-functions of all 4 dynamic - Made all 4 Initialize functions more of the same - Some minor tab-fixing and stuff (tnx to Tron for proof-reading my 100kb patch ;)) Note for all: please do NOT directly call _stations, _vehicles, _towns and _industries, but use the right wrapper to access them. Thank you. Ps: please also do not use 'v++', where v is of type Vehicle *.
Diffstat (limited to 'strings.c')
-rw-r--r--strings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings.c b/strings.c
index ec3a8ea98..ea2c8b345 100644
--- a/strings.c
+++ b/strings.c
@@ -432,7 +432,7 @@ static byte *DecodeString(byte *buff, const byte *str)
case 0x9A: { // {STATION}
Station *st;
InjectDparam(1);
- st = DEREF_STATION(GetDParam(1));
+ st = GetStation(GetDParam(1));
if (!st->xy) { // station doesn't exist anymore
buff = GetString(buff, STR_UNKNOWN_DESTINATION);
break;
@@ -444,7 +444,7 @@ static byte *DecodeString(byte *buff, const byte *str)
}
case 0x9B: { // {TOWN}
Town *t;
- t = DEREF_TOWN(GetDParam(0));
+ t = GetTown(GetDParam(0));
assert(t->xy);
SetDParam(0, t->townnameparts);
buff = GetString(buff, t->townnametype);