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

(svn r6759) -Codechange: Remove the brainheaded usage of STR_JUST_STRING to pass a StringID

Browse Source
This commit is contained in:
Darkvater 2006-10-12 15:38:37 +00:00
parent f2fd789cc6
commit bc20a1539a
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
train_gui.c
View File

@ -132,18 +132,16 @@ static int CDECL TrainEngineNameSorter(const void *a, const void *b)
{ {
const EngineID va = *(const EngineID*)a; const EngineID va = *(const EngineID*)a;
const EngineID vb = *(const EngineID*)b; const EngineID vb = *(const EngineID*)b;
char buf1[64] = "\0"; char buf1[64];
int r; int r;
SetDParam(0, GetCustomEngineName(va)); GetString(buf1, GetCustomEngineName(va));
GetString(buf1, STR_JUST_STRING);
if (vb != _last_engine) { if (vb != _last_engine) {
_last_engine = vb; _last_engine = vb;
_bufcache[0] = '\0'; _bufcache[0] = '\0';
SetDParam(0, GetCustomEngineName(vb)); GetString(_bufcache, GetCustomEngineName(vb));
GetString(_bufcache, STR_JUST_STRING);
} }
r = strcmp(buf1, _bufcache); // sort by name r = strcmp(buf1, _bufcache); // sort by name

8
vehicle_gui.c
View File

@ -516,17 +516,13 @@ static int CDECL VehicleNameSorter(const void *a, const void *b)
char buf1[64] = "\0"; char buf1[64] = "\0";
int r; int r;
if (va->string_id != _internal_name_sorter_id) { if (va->string_id != _internal_name_sorter_id) GetString(buf1, va->string_id);
SetDParam(0, va->string_id);
GetString(buf1, STR_JUST_STRING);
}
if (vb != _last_vehicle) { if (vb != _last_vehicle) {
_last_vehicle = vb; _last_vehicle = vb;
_bufcache[0] = '\0'; _bufcache[0] = '\0';
if (vb->string_id != _internal_name_sorter_id) { if (vb->string_id != _internal_name_sorter_id) {
SetDParam(0, vb->string_id); GetString(_bufcache, vb->string_id);
GetString(_bufcache, STR_JUST_STRING);
} }
} }