mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name 

translations now work.
This commit is contained in:
peter1138 2006-04-21 07:06:31 +00:00
parent 3660fab10a
commit ae94d7b26f
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
newgrf.c
View File

@ -1762,8 +1762,7 @@ static void VehicleNewName(byte *buf, int len)
case GSF_ROAD:
case GSF_SHIP:
case GSF_AIRCRAFT:
SetCustomEngineName(id, name);
/*SetCustomEngineName(id, AddGRFString(_cur_grffile->grfid, id, lang, name));*/
SetCustomEngineName(id, AddGRFString(_cur_grffile->grfid, id, lang, name));
break;
#if 0

18
newgrf_engine.c
View File

@ -607,28 +607,24 @@ void TriggerVehicle(Vehicle *veh, VehicleTrigger trigger)
DoTriggerVehicle(veh, trigger, 0, true);
}
static char *_engine_custom_names[TOTAL_NUM_ENGINES];
StringID _engine_custom_names[TOTAL_NUM_ENGINES];
void SetCustomEngineName(EngineID engine, const char *name)
void SetCustomEngineName(EngineID engine, StringID name)
{
_engine_custom_names[engine] = strdup(name);
_engine_custom_names[engine] = name;
}
void UnloadCustomEngineNames(void)
{
char **i;
for (i = _engine_custom_names; i != endof(_engine_custom_names); i++) {
free(*i);
*i = NULL;
EngineID i;
for (i = 0; i < TOTAL_NUM_ENGINES; i++) {
_engine_custom_names[i] = 0;
}
}
StringID GetCustomEngineName(EngineID engine)
{
if (!_engine_custom_names[engine])
return _engine_name_strings[engine];
ttd_strlcpy(_userstring, _engine_custom_names[engine], lengthof(_userstring));
return STR_SPEC_USERSTRING;
return _engine_custom_names[engine] == 0 ? _engine_name_strings[engine] : _engine_custom_names[engine];
}
// Functions for changing the order of vehicle purchase lists

2
newgrf_engine.h
View File

@ -34,7 +34,7 @@ typedef enum VehicleTrigger {
} VehicleTrigger;
void TriggerVehicle(Vehicle *veh, VehicleTrigger trigger);
void SetCustomEngineName(EngineID engine, const char *name);
void SetCustomEngineName(EngineID engine, StringID name);
StringID GetCustomEngineName(EngineID engine);
void UnloadWagonOverrides(void);