(svn r6788) - Codechange: Add and use a function to test if a string ID is a custom name.
--- a/functions.h Sun Oct 15 23:48:34 2006 +0000
+++ b/functions.h Mon Oct 16 10:26:22 2006 +0000
@@ -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 Sun Oct 15 23:48:34 2006 +0000
+++ b/misc.c Mon Oct 16 10:26:22 2006 +0000
@@ -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 Sun Oct 15 23:48:34 2006 +0000
+++ b/order_cmd.c Mon Oct 16 10:26:22 2006 +0000
@@ -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 Sun Oct 15 23:48:34 2006 +0000
+++ b/vehicle.c Mon Oct 16 10:26:22 2006 +0000
@@ -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);