Mercurial > hg > openttd

changeset 4835:111a275d3a74 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r6759) -Codechange: Remove the brainheaded usage of STR_JUST_STRING to pass a StringID
author Darkvater <Darkvater@openttd.org>
date Thu, 12 Oct 2006 15:38:37 +0000
parents ffd9acbb2164
children 60e070e09232
files train_gui.c vehicle_gui.c
diffstat 2 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/train_gui.c
+++ b/train_gui.c
@@ -132,18 +132,16 @@
 {
 	const EngineID va = *(const EngineID*)a;
 	const EngineID vb = *(const EngineID*)b;
-	char buf1[64] = "\0";
+	char buf1[64];
 	int r;
 
-	SetDParam(0, GetCustomEngineName(va));
-	GetString(buf1, STR_JUST_STRING);
+	GetString(buf1, GetCustomEngineName(va));
 
 	if (vb != _last_engine) {
 		_last_engine = vb;
 		_bufcache[0] = '\0';
 
-		SetDParam(0, GetCustomEngineName(vb));
-		GetString(_bufcache, STR_JUST_STRING);
+		GetString(_bufcache, GetCustomEngineName(vb));
 	}
 
 	r =  strcmp(buf1, _bufcache); // sort by name
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -516,17 +516,13 @@
 	char buf1[64] = "\0";
 	int r;
 
-	if (va->string_id != _internal_name_sorter_id) {
-		SetDParam(0, va->string_id);
-		GetString(buf1, STR_JUST_STRING);
-	}
+	if (va->string_id != _internal_name_sorter_id) GetString(buf1, va->string_id);
 
 	if (vb != _last_vehicle) {
 		_last_vehicle = vb;
 		_bufcache[0] = '\0';
 		if (vb->string_id != _internal_name_sorter_id) {
-			SetDParam(0, vb->string_id);
-			GetString(_bufcache, STR_JUST_STRING);
+			GetString(_bufcache, vb->string_id);
 		}
 	}