cpp/openttd-patchpack/source Changeset - r1840:bb2cac1af441

Changeset - r1840:bb2cac1af441

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

Darkvater - 19 years ago 2005-05-17 20:58:58
darkvater@openttd.org

(svn r2345) - Fix: Don't allow stuff to be renamed to nothing if we don't support it. Only valid ones are signs (delete) and waypoints (rename to default).

5 files changed with 8 insertions and 4 deletions:

engine.c

misc_cmd.c

station_cmd.c

town_cmd.c

vehicle.c

0 comments (0 inline, 0 general)

engine.c

➞

Show inline comments

@@ @@ -887,7 +887,7 @@ int32 CmdRenameEngine(int x, int y, uint @@
+{
 	StringID str;
 	if (!IsEngineIndex(p1)) return CMD_ERROR;
+	if (!IsEngineIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 	str = AllocateNameUnique(_cmd_text, 0);
 	if (str == 0) return CMD_ERROR;

misc_cmd.c

➞

Show inline comments

@@ @@ -129,6 +129,8 @@ int32 CmdChangeCompanyName(int x, int y, @@
 	StringID str;
 	Player *p;
 	if (_cmd_text[0] == '\0') return CMD_ERROR;
 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
@@ @@ -153,6 +155,8 @@ int32 CmdChangePresidentName(int x, int @@
 	StringID str;
 	Player *p;
 	if (_cmd_text[0] == '\0') return CMD_ERROR;
 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;

station_cmd.c

➞

Show inline comments

@@ @@ -2653,7 +2653,7 @@ int32 CmdRenameStation(int x, int y, uin @@
 	StringID str,old_str;
 	Station *st;
 	if (!IsStationIndex(p1)) return CMD_ERROR;
+	if (!IsStationIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 	st = GetStation(p1);
 	if (!IsValidStation(st) || !CheckOwnership(st->owner)) return CMD_ERROR;

town_cmd.c

➞

Show inline comments

@@ @@ -1447,7 +1447,7 @@ int32 CmdRenameTown(int x, int y, uint32 @@
 	StringID str;
 	Town *t;
 	if (!IsTownIndex(p1)) return CMD_ERROR;
+	if (!IsTownIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 	t = GetTown(p1);

vehicle.c

➞

Show inline comments

@@ @@ -1654,7 +1654,7 @@ int32 CmdNameVehicle(int x, int y, uint3 @@
 	Vehicle *v;
 	StringID str;
 	if (!IsVehicleIndex(p1)) return CMD_ERROR;
+	if (!IsVehicleIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 	v = GetVehicle(p1);

0 comments (0 inline, 0 general)