Mercurial > hg > openttd

changeset 13803:769b56e78dbe draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r18329) -Remove: [strgen] Support for {SETX} and {SETXY}. Let it rest in peace as NewGRF relict.
author frosch <frosch@openttd.org>
date Sat, 28 Nov 2009 20:27:42 +0000
parents fdc20992a7ec
children d603390e5833
files src/strgen/strgen.cpp src/table/strgen_tables.h
diffstat 2 files changed, 1 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -239,30 +239,6 @@
 }
 
 
-static void EmitSetX(char *buf, int value)
-{
-	char *err;
-	int x = strtol(buf, &err, 0);
-	if (*err != '\0') error("SetX param invalid");
-	PutUtf8(SCC_SETX);
-	PutByte((byte)x);
-}
-
-
-static void EmitSetXY(char *buf, int value)
-{
-	char *err;
-
-	int x = strtol(buf, &err, 0);
-	if (*err != ' ') error("SetXY param invalid");
-	int y = strtol(err + 1, &err, 0);
-	if (*err != 0) error("SetXY param invalid");
-
-	PutUtf8(SCC_SETXY);
-	PutByte((byte)x);
-	PutByte((byte)y);
-}
-
 /* The plural specifier looks like
  * {NUM} {PLURAL -1 passenger passengers} then it picks either passenger/passengers depending on the count in NUM */
 
@@ -1228,11 +1204,7 @@
 						break;
 
 					default:
-						if (cs->proc == EmitSetX) {
-							flags = '1'; // Command needs one parameter
-						} else if (cs->proc == EmitSetXY) {
-							flags = '2'; // Command needs two parameters
-						} else if (cs->proc == EmitGender) {
+						if (cs->proc == EmitGender) {
 							flags = 'g'; // Command needs number of parameters defined by number of genders
 						} else if (cs->proc == EmitPlural) {
 							flags = 'p'; // Command needs number of parameters defined by plural value
--- a/src/table/strgen_tables.h
+++ b/src/table/strgen_tables.h
@@ -28,17 +28,11 @@
 	CmdFlags flags;
 };
 
-static void EmitSetX(char *buf, int value);
-static void EmitSetXY(char *buf, int value);
 static void EmitSingleChar(char *buf, int value);
 static void EmitPlural(char *buf, int value);
 static void EmitGender(char *buf, int value);
 
 static const CmdStruct _cmd_structs[] = {
-	/* Update position */
-	{"SETX",            EmitSetX,       SCC_SETX,               0, C_NONE},
-	{"SETXY",           EmitSetXY,      SCC_SETXY,              0, C_NONE},
-
 	/* Font size */
 	{"TINYFONT",        EmitSingleChar, SCC_TINYFONT,           0, C_NONE},
 	{"BIGFONT",         EmitSingleChar, SCC_BIGFONT,            0, C_NONE},