Mercurial > hg > openttd
changeset 4862:8c82a934382c draft
(svn r6788) - Codechange: Add and use a function to test if a string ID is a custom name.
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Mon, 16 Oct 2006 10:26:22 +0000 |
| parents | 0ef4079c5b2a |
| children | 7b78e791925f |
| files | functions.h misc.c order_cmd.c vehicle.c |
| diffstat | 4 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/functions.h +++ b/functions.h @@ -138,6 +138,7 @@ void InitializeLandscapeVariables(bool only_constants); /* misc.c */ +bool IsCustomName(StringID id); void DeleteName(StringID id); char *GetName(int id, char *buff);
--- a/misc.c +++ b/misc.c @@ -150,9 +150,14 @@ ResetObjectToPlace(); } +bool IsCustomName(StringID id) +{ + return GB(id, 11, 5) == 15; +} + void DeleteName(StringID id) { - if ((id & 0xF800) == 0x7800) { + if (IsCustomName(id)) { memset(_name_array[id & 0x1FF], 0, sizeof(_name_array[id & 0x1FF])); } }
--- a/order_cmd.c +++ b/order_cmd.c @@ -823,7 +823,7 @@ bak->service_interval = v->service_interval; /* Safe custom string, if any */ - if ((v->string_id & 0xF800) != 0x7800) { + if (!IsCustomName(v->string_id)) { bak->name[0] = '\0'; } else { GetName(v->string_id & 0x7FF, bak->name);
--- a/vehicle.c +++ b/vehicle.c @@ -2073,7 +2073,7 @@ MoveVehicleCargo(new_v->type == VEH_Train ? GetFirstVehicleInChain(new_v) : new_v, old_v); // Get the name of the old vehicle if it has a custom name. - if ((old_v->string_id & 0xF800) != 0x7800) { + if (!IsCustomName(old_v->string_id)) { vehicle_name[0] = '\0'; } else { GetName(old_v->string_id & 0x7FF, vehicle_name);