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

(svn r10380) -Fix (r10364): when checking for unique names, only check vehicles that can have names, and skip inactive players.

This commit is contained in:
peter1138 2007-06-28 19:14:29 +00:00
parent 42f0593b82
commit b3c3171c1e
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc_cmd.cpp
View File

@ -201,6 +201,7 @@ static bool IsUniqueCompanyName(const char *name)
char buf[512]; char buf[512];
FOR_ALL_PLAYERS(p) { FOR_ALL_PLAYERS(p) {
if (!p->is_active) continue;
SetDParam(0, p->index); SetDParam(0, p->index);
GetString(buf, STR_COMPANY_NAME, lastof(buf)); GetString(buf, STR_COMPANY_NAME, lastof(buf));
if (strcmp(buf, name) == 0) return false; if (strcmp(buf, name) == 0) return false;
@ -245,6 +246,7 @@ static bool IsUniquePresidentName(const char *name)
char buf[512]; char buf[512];
FOR_ALL_PLAYERS(p) { FOR_ALL_PLAYERS(p) {
if (!p->is_active) continue;
SetDParam(0, p->index); SetDParam(0, p->index);
GetString(buf, STR_PLAYER_NAME, lastof(buf)); GetString(buf, STR_PLAYER_NAME, lastof(buf));
if (strcmp(buf, name) == 0) return false; if (strcmp(buf, name) == 0) return false;

17
src/vehicle.cpp
View File

@ -2405,17 +2405,26 @@ static bool IsUniqueVehicleName(const char *name)
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
switch (v->type) { switch (v->type) {
case VEH_TRAIN: case VEH_TRAIN:
if (!IsTrainEngine(v)) continue;
break;
case VEH_ROAD: case VEH_ROAD:
break;
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
if (!IsNormalAircraft(v)) continue;
break;
case VEH_SHIP: case VEH_SHIP:
SetDParam(0, v->index);
GetString(buf, STR_VEHICLE_NAME, lastof(buf));
if (strcmp(buf, name) == 0) return false;
break; break;
default: default:
break; continue;
} }
SetDParam(0, v->index);
GetString(buf, STR_VEHICLE_NAME, lastof(buf));
if (strcmp(buf, name) == 0) return false;
} }
return true; return true;