mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18329) -Remove: [strgen] Support for {SETX} and {SETXY}. Let it rest in peace as NewGRF relict.

release/1.0
frosch 2009-11-28 20:27:42 +00:00
parent ae97bf029c
commit bf0b72ae9e
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/strgen/strgen.cpp
View File

@ -239,30 +239,6 @@ static void EmitSingleChar(char *buf, int value)
} }
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 /* The plural specifier looks like
* {NUM} {PLURAL -1 passenger passengers} then it picks either passenger/passengers depending on the count in NUM */ * {NUM} {PLURAL -1 passenger passengers} then it picks either passenger/passengers depending on the count in NUM */
@ -1228,11 +1204,7 @@ int CDECL main(int argc, char *argv[])
break; break;
default: default:
if (cs->proc == EmitSetX) { if (cs->proc == EmitGender) {
flags = '1'; // Command needs one parameter
} else if (cs->proc == EmitSetXY) {
flags = '2'; // Command needs two parameters
} else if (cs->proc == EmitGender) {
flags = 'g'; // Command needs number of parameters defined by number of genders flags = 'g'; // Command needs number of parameters defined by number of genders
} else if (cs->proc == EmitPlural) { } else if (cs->proc == EmitPlural) {
flags = 'p'; // Command needs number of parameters defined by plural value flags = 'p'; // Command needs number of parameters defined by plural value

6
src/table/strgen_tables.h
View File

@ -28,17 +28,11 @@ struct CmdStruct {
CmdFlags flags; 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 EmitSingleChar(char *buf, int value);
static void EmitPlural(char *buf, int value); static void EmitPlural(char *buf, int value);
static void EmitGender(char *buf, int value); static void EmitGender(char *buf, int value);
static const CmdStruct _cmd_structs[] = { static const CmdStruct _cmd_structs[] = {
/* Update position */
{"SETX", EmitSetX, SCC_SETX, 0, C_NONE},
{"SETXY", EmitSetXY, SCC_SETXY, 0, C_NONE},
/* Font size */ /* Font size */
{"TINYFONT", EmitSingleChar, SCC_TINYFONT, 0, C_NONE}, {"TINYFONT", EmitSingleChar, SCC_TINYFONT, 0, C_NONE},
{"BIGFONT", EmitSingleChar, SCC_BIGFONT, 0, C_NONE}, {"BIGFONT", EmitSingleChar, SCC_BIGFONT, 0, C_NONE},