summaryrefslogtreecommitdiff
path: root/src/strgen
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2007-06-25 13:30:38 +0000
committerpeter1138 <peter1138@openttd.org>2007-06-25 13:30:38 +0000
commiteb6594caa840da0b4d8a16154cc2c0353d3eb238 (patch)
tree2aea1c963774b012ba0a63a2d9573f247003e6a9 /src/strgen
parent0e59b4dc57b52f6c13df258f9d9c6263f53d68dd (diff)
downloadopenttd-eb6594caa840da0b4d8a16154cc2c0353d3eb238.tar.xz
(svn r10323) -Codechange: reference company name, number and player (president) name
by index
Diffstat (limited to 'src/strgen')
-rw-r--r--src/strgen/strgen.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index ebb5ed26b..c1af6bbf0 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -461,11 +461,6 @@ static const CmdStruct _cmd_structs[] = {
{"REV", EmitSingleChar, SCC_REVISION, 0, 0}, // openttd revision string
{"SHORTCARGO", EmitSingleChar, SCC_CARGO_SHORT, 2, 0}, // short cargo description, only ### tons, or ### litres
- // These are special versions of {STRING1}
- // The first string includes the second string.
- {"COMPANY", EmitSingleChar, SCC_STRING1, 2, 0},
- {"PLAYERNAME", EmitSingleChar, SCC_STRING1, 1, 0},
-
{"STRING1", EmitSingleChar, SCC_STRING1, 1, C_CASE}, // included string that consumes ONE argument
{"STRING2", EmitSingleChar, SCC_STRING2, 2, C_CASE}, // included string that consumes TWO arguments
{"STRING3", EmitSingleChar, SCC_STRING3, 3, C_CASE}, // included string that consumes THREE arguments
@@ -506,6 +501,9 @@ static const CmdStruct _cmd_structs[] = {
{"GROUP", EmitSingleChar, SCC_GROUP_NAME, 1, 0},
{"SIGN", EmitSingleChar, SCC_SIGN_NAME, 1, 0},
{"VEHICLE", EmitSingleChar, SCC_VEHICLE_NAME, 1, 0},
+ {"COMPANY", EmitSingleChar, SCC_COMPANY_NAME, 1, 0},
+ {"COMPANYNUM", EmitSingleChar, SCC_COMPANY_NUM, 1, 0},
+ {"PLAYERNAME", EmitSingleChar, SCC_PLAYER_NAME, 1, 0},
// 0x9D is used for the pseudo command SETCASE
// 0x9E is used for case switching