Mercurial > hg > openttd

changeset 1840:0a9d98d0c20c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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).
author Darkvater <Darkvater@openttd.org>
date Tue, 17 May 2005 20:58:58 +0000
parents 0543ca650f6c
children 002ec056cc99
files engine.c misc_cmd.c station_cmd.c town_cmd.c vehicle.c
diffstat 5 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/engine.c
+++ b/engine.c
@@ -887,7 +887,7 @@
 {
 	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;
--- a/misc_cmd.c
+++ b/misc_cmd.c
@@ -129,6 +129,8 @@
 	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 @@
 	StringID str;
 	Player *p;
 
+	if (_cmd_text[0] == '\0') return CMD_ERROR;
+
 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
 
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -2653,7 +2653,7 @@
 	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;
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -1447,7 +1447,7 @@
 	StringID str;
 	Town *t;
 
-	if (!IsTownIndex(p1)) return CMD_ERROR;
+	if (!IsTownIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	t = GetTown(p1);
 
--- a/vehicle.c
+++ b/vehicle.c
@@ -1654,7 +1654,7 @@
 	Vehicle *v;
 	StringID str;
 
-	if (!IsVehicleIndex(p1)) return CMD_ERROR;
+	if (!IsVehicleIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	v = GetVehicle(p1);