Changeset - r13793:5bc10f4fff92
[Not reviewed]
master
0 2 0
frosch - 15 years ago 2009-11-28 20:27:42
frosch@openttd.org
(svn r18329) -Remove: [strgen] Support for {SETX} and {SETXY}. Let it rest in peace as NewGRF relict.
2 files changed with 1 insertions and 35 deletions:
0 comments (0 inline, 0 general)
src/strgen/strgen.cpp
Show inline comments
 
@@ -239,30 +239,6 @@ static void EmitSingleChar(char *buf, in
 
}
 

	
 

	
 
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 @@ int CDECL main(int argc, char *argv[])
 
						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
src/table/strgen_tables.h
Show inline comments
 
@@ -28,17 +28,11 @@ struct CmdStruct {
 
	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},
0 comments (0 inline, 0 general)