summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-22 22:44:56 +0000
committerrubidium <rubidium@openttd.org>2009-07-22 22:44:56 +0000
commit9980af289835021ef605f9f452d1f289145c6314 (patch)
tree9323d8321200ad88360bed0848859f31ba8143b4 /src/saveload
parent2962d8f0fc12699e2e952128c8f85b297c79e6b8 (diff)
downloadopenttd-9980af289835021ef605f9f452d1f289145c6314.tar.xz
(svn r16921) -Codechange: make it more clear what strings are related to road vehicles; only ROAD isn't always enough. Also unify the way of writing it.
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/oldloader_sl.cpp12
-rw-r--r--src/saveload/strings_sl.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index 0702a170e..086d16d58 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -1347,12 +1347,12 @@ bool LoadOldVehicle(LoadgameState *ls, int num)
switch (_old_string_id) {
case 0x0000: break; // empty (invalid vehicles)
- case 0x0006: _old_string_id = STR_SV_EMPTY; break; // empty (special vehicles)
- case 0x8495: _old_string_id = STR_SV_TRAIN_NAME; break; // "Train X"
- case 0x8842: _old_string_id = STR_SV_ROADVEH_NAME; break; // "Road Vehicle X"
- case 0x8C3B: _old_string_id = STR_SV_SHIP_NAME; break; // "Ship X"
- case 0x9047: _old_string_id = STR_SV_AIRCRAFT_NAME; break; // "Aircraft X"
- default: _old_string_id += 0x2A00; break; // custom name
+ case 0x0006: _old_string_id = STR_SV_EMPTY; break; // empty (special vehicles)
+ case 0x8495: _old_string_id = STR_SV_TRAIN_NAME; break; // "Train X"
+ case 0x8842: _old_string_id = STR_SV_ROAD_VEHICLE_NAME; break; // "Road Vehicle X"
+ case 0x8C3B: _old_string_id = STR_SV_SHIP_NAME; break; // "Ship X"
+ case 0x9047: _old_string_id = STR_SV_AIRCRAFT_NAME; break; // "Aircraft X"
+ default: _old_string_id += 0x2A00; break; // custom name
}
_old_vehicle_names[_current_vehicle_id] = _old_string_id;
diff --git a/src/saveload/strings_sl.cpp b/src/saveload/strings_sl.cpp
index c39a036c9..5b1a40604 100644
--- a/src/saveload/strings_sl.cpp
+++ b/src/saveload/strings_sl.cpp
@@ -23,7 +23,7 @@ StringID RemapOldStringID(StringID s)
case 0x70E4: return SPECSTR_PLAYERNAME_ENGLISH;
case 0x70E9: return SPECSTR_PLAYERNAME_ENGLISH;
case 0x8864: return STR_SV_TRAIN_NAME;
- case 0x902B: return STR_SV_ROADVEH_NAME;
+ case 0x902B: return STR_SV_ROAD_VEHICLE_NAME;
case 0x9830: return STR_SV_SHIP_NAME;
case 0xA02F: return STR_SV_AIRCRAFT_NAME;