author | rubidium |
Wed, 16 May 2007 08:20:37 +0000 | |
changeset 7126 | 1e7994aa1767 |
parent 7042 | d841fb0d8e9a |
child 7139 | 4ae3ab180d05 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
3 |
/** @file command.cpp */ |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1877
diff
changeset
|
6 |
#include "openttd.h" |
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
467
diff
changeset
|
7 |
#include "table/strings.h" |
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
8 |
#include "functions.h" |
6949
72d11a1e1e60
(svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist.
maedhros
parents:
6940
diff
changeset
|
9 |
#include "landscape.h" |
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
652
diff
changeset
|
10 |
#include "map.h" |
0 | 11 |
#include "gui.h" |
12 |
#include "command.h" |
|
13 |
#include "player.h" |
|
5720
cc0ceeafaa55
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5067
diff
changeset
|
14 |
#include "network/network.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
1980
diff
changeset
|
15 |
#include "variables.h" |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4000
diff
changeset
|
16 |
#include "genworld.h" |
0 | 17 |
|
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
18 |
const char* _cmd_text = NULL; |
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
19 |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
20 |
#define DEF_COMMAND(yyyy) int32 yyyy(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 21 |
|
22 |
DEF_COMMAND(CmdBuildRailroadTrack); |
|
23 |
DEF_COMMAND(CmdRemoveRailroadTrack); |
|
24 |
DEF_COMMAND(CmdBuildSingleRail); |
|
25 |
DEF_COMMAND(CmdRemoveSingleRail); |
|
26 |
||
27 |
DEF_COMMAND(CmdLandscapeClear); |
|
28 |
||
29 |
DEF_COMMAND(CmdBuildBridge); |
|
30 |
||
31 |
DEF_COMMAND(CmdBuildRailroadStation); |
|
32 |
DEF_COMMAND(CmdRemoveFromRailroadStation); |
|
33 |
DEF_COMMAND(CmdConvertRail); |
|
34 |
||
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1217
diff
changeset
|
35 |
DEF_COMMAND(CmdBuildSingleSignal); |
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1217
diff
changeset
|
36 |
DEF_COMMAND(CmdRemoveSingleSignal); |
0 | 37 |
|
38 |
DEF_COMMAND(CmdTerraformLand); |
|
39 |
||
40 |
DEF_COMMAND(CmdPurchaseLandArea); |
|
41 |
DEF_COMMAND(CmdSellLandArea); |
|
42 |
||
43 |
DEF_COMMAND(CmdBuildTunnel); |
|
44 |
||
45 |
DEF_COMMAND(CmdBuildTrainDepot); |
|
395
4c990f33dab7
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
215
diff
changeset
|
46 |
DEF_COMMAND(CmdBuildTrainWaypoint); |
4c990f33dab7
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
215
diff
changeset
|
47 |
DEF_COMMAND(CmdRenameWaypoint); |
4c990f33dab7
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
215
diff
changeset
|
48 |
DEF_COMMAND(CmdRemoveTrainWaypoint); |
0 | 49 |
|
1217
ab9f02a224ab
(svn r1721) -Feature: It is now possible to build multiple road stations (up to 8) on
celestar
parents:
1093
diff
changeset
|
50 |
DEF_COMMAND(CmdBuildRoadStop); |
6338
0fb4f452873c
(svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p.
rubidium
parents:
5838
diff
changeset
|
51 |
DEF_COMMAND(CmdRemoveRoadStop); |
0 | 52 |
|
53 |
DEF_COMMAND(CmdBuildLongRoad); |
|
54 |
DEF_COMMAND(CmdRemoveLongRoad); |
|
55 |
DEF_COMMAND(CmdBuildRoad); |
|
56 |
DEF_COMMAND(CmdRemoveRoad); |
|
57 |
||
58 |
DEF_COMMAND(CmdBuildRoadDepot); |
|
59 |
||
60 |
DEF_COMMAND(CmdBuildAirport); |
|
61 |
||
62 |
DEF_COMMAND(CmdBuildDock); |
|
63 |
||
64 |
DEF_COMMAND(CmdBuildShipDepot); |
|
65 |
||
66 |
DEF_COMMAND(CmdBuildBuoy); |
|
67 |
||
68 |
DEF_COMMAND(CmdPlantTree); |
|
69 |
||
70 |
DEF_COMMAND(CmdBuildRailVehicle); |
|
71 |
DEF_COMMAND(CmdMoveRailVehicle); |
|
72 |
||
73 |
DEF_COMMAND(CmdStartStopTrain); |
|
74 |
||
75 |
DEF_COMMAND(CmdSellRailWagon); |
|
76 |
||
1794
44f9deff97ed
(svn r2298) - CodeChange: removed CmdAbuses: CmdSetTownNameType(), CmdStartNewGame(), CmdCreateScenario(), CmdSetNewLandscapeType() and CmdGenRandomNewGame().
Darkvater
parents:
1786
diff
changeset
|
77 |
DEF_COMMAND(CmdSendTrainToDepot); |
0 | 78 |
DEF_COMMAND(CmdForceTrainProceed); |
79 |
DEF_COMMAND(CmdReverseTrainDirection); |
|
80 |
||
81 |
DEF_COMMAND(CmdModifyOrder); |
|
82 |
DEF_COMMAND(CmdSkipOrder); |
|
83 |
DEF_COMMAND(CmdDeleteOrder); |
|
84 |
DEF_COMMAND(CmdInsertOrder); |
|
2819
710436dd4288
(svn r3367) Unify the 4 distinct CMD_CHANGE_{AIRCRAFT,ROADVEH,SHIP,TRAIN}_SERVICE_INT commands into one CMD_CHANGE_SERVICE_INT command.
tron
parents:
2809
diff
changeset
|
85 |
DEF_COMMAND(CmdChangeServiceInt); |
0 | 86 |
DEF_COMMAND(CmdRestoreOrderIndex); |
87 |
||
88 |
DEF_COMMAND(CmdBuildIndustry); |
|
89 |
||
90 |
DEF_COMMAND(CmdBuildCompanyHQ); |
|
91 |
DEF_COMMAND(CmdSetPlayerFace); |
|
92 |
DEF_COMMAND(CmdSetPlayerColor); |
|
93 |
||
94 |
DEF_COMMAND(CmdIncreaseLoan); |
|
95 |
DEF_COMMAND(CmdDecreaseLoan); |
|
96 |
||
97 |
DEF_COMMAND(CmdWantEnginePreview); |
|
98 |
||
99 |
DEF_COMMAND(CmdNameVehicle); |
|
100 |
DEF_COMMAND(CmdRenameEngine); |
|
101 |
||
102 |
DEF_COMMAND(CmdChangeCompanyName); |
|
103 |
DEF_COMMAND(CmdChangePresidentName); |
|
104 |
||
105 |
DEF_COMMAND(CmdRenameStation); |
|
106 |
||
107 |
DEF_COMMAND(CmdSellAircraft); |
|
108 |
DEF_COMMAND(CmdStartStopAircraft); |
|
109 |
DEF_COMMAND(CmdBuildAircraft); |
|
110 |
DEF_COMMAND(CmdSendAircraftToHangar); |
|
111 |
DEF_COMMAND(CmdRefitAircraft); |
|
112 |
||
113 |
DEF_COMMAND(CmdPlaceSign); |
|
114 |
DEF_COMMAND(CmdRenameSign); |
|
115 |
||
116 |
DEF_COMMAND(CmdBuildRoadVeh); |
|
117 |
DEF_COMMAND(CmdStartStopRoadVeh); |
|
118 |
DEF_COMMAND(CmdSellRoadVeh); |
|
119 |
DEF_COMMAND(CmdSendRoadVehToDepot); |
|
120 |
DEF_COMMAND(CmdTurnRoadVeh); |
|
3990
d3d23f3bcd34
(svn r5191) - NewGRF: add cargo refit support for road vehicles
peter1138
parents:
3491
diff
changeset
|
121 |
DEF_COMMAND(CmdRefitRoadVeh); |
0 | 122 |
|
123 |
DEF_COMMAND(CmdPause); |
|
124 |
||
125 |
DEF_COMMAND(CmdBuyShareInCompany); |
|
126 |
DEF_COMMAND(CmdSellShareInCompany); |
|
127 |
DEF_COMMAND(CmdBuyCompany); |
|
128 |
||
129 |
DEF_COMMAND(CmdBuildTown); |
|
130 |
||
131 |
DEF_COMMAND(CmdRenameTown); |
|
132 |
DEF_COMMAND(CmdDoTownAction); |
|
133 |
||
134 |
DEF_COMMAND(CmdSetRoadDriveSide); |
|
135 |
||
136 |
DEF_COMMAND(CmdChangeDifficultyLevel); |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
137 |
DEF_COMMAND(CmdChangePatchSetting); |
0 | 138 |
|
139 |
DEF_COMMAND(CmdStartStopShip); |
|
140 |
DEF_COMMAND(CmdSellShip); |
|
141 |
DEF_COMMAND(CmdBuildShip); |
|
142 |
DEF_COMMAND(CmdSendShipToDepot); |
|
143 |
DEF_COMMAND(CmdRefitShip); |
|
144 |
||
4712
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4662
diff
changeset
|
145 |
DEF_COMMAND(CmdOrderRefit); |
0 | 146 |
DEF_COMMAND(CmdCloneOrder); |
147 |
||
148 |
DEF_COMMAND(CmdClearArea); |
|
149 |
||
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
150 |
DEF_COMMAND(CmdGiveMoney); |
0 | 151 |
DEF_COMMAND(CmdMoneyCheat); |
152 |
DEF_COMMAND(CmdBuildCanal); |
|
147
d0c8100d18cf
(svn r148) -Feature: Company HQ can now be moved somewhere else (cost 1% of company value). Water floods HQ.
darkvater
parents:
58
diff
changeset
|
153 |
DEF_COMMAND(CmdBuildLock); |
0 | 154 |
|
155 |
DEF_COMMAND(CmdPlayerCtrl); |
|
156 |
||
157 |
DEF_COMMAND(CmdLevelLand); |
|
158 |
||
159 |
DEF_COMMAND(CmdRefitRailVehicle); |
|
160 |
||
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1217
diff
changeset
|
161 |
DEF_COMMAND(CmdBuildSignalTrack); |
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1217
diff
changeset
|
162 |
DEF_COMMAND(CmdRemoveSignalTrack); |
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
0
diff
changeset
|
163 |
|
4661
59492734db06
(svn r6544) - Codechange: Rename CmdReplaceVehicle to CmdSetAutoReplace, to reflect what it does.
peter1138
parents:
4659
diff
changeset
|
164 |
DEF_COMMAND(CmdSetAutoReplace); |
812
79c99885ad00
(svn r1283) -Add: AutoRenew is now a client-side patch instead of a game-side patch
truelight
parents:
679
diff
changeset
|
165 |
|
2244 | 166 |
DEF_COMMAND(CmdCloneVehicle); |
4640
cabffc571e55
(svn r6515) -Feature: added "start all" and "stop all" buttons to the depot windows
bjarni
parents:
4300
diff
changeset
|
167 |
DEF_COMMAND(CmdMassStartStopVehicle); |
4659
2f99f35d5813
(svn r6542) -Feature: [depot window] added a "sell all vehicles in depot" button
bjarni
parents:
4640
diff
changeset
|
168 |
DEF_COMMAND(CmdDepotSellAllVehicles); |
4662
a20121e5442b
(svn r6552) -Feature: [depot window] added a "autoreplace all vehicles in depot" button
bjarni
parents:
4661
diff
changeset
|
169 |
DEF_COMMAND(CmdDepotMassAutoReplace); |
2244 | 170 |
|
0 | 171 |
/* The master command table */ |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
172 |
static const Command _command_proc_table[] = { |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
173 |
{CmdBuildRailroadTrack, 0}, /* 0 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
174 |
{CmdRemoveRailroadTrack, 0}, /* 1 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
175 |
{CmdBuildSingleRail, 0}, /* 2 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
176 |
{CmdRemoveSingleRail, 0}, /* 3 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
177 |
{CmdLandscapeClear, 0}, /* 4 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
178 |
{CmdBuildBridge, 0}, /* 5 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
179 |
{CmdBuildRailroadStation, 0}, /* 6 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
180 |
{CmdBuildTrainDepot, 0}, /* 7 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
181 |
{CmdBuildSingleSignal, 0}, /* 8 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
182 |
{CmdRemoveSingleSignal, 0}, /* 9 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
183 |
{CmdTerraformLand, 0}, /* 10 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
184 |
{CmdPurchaseLandArea, 0}, /* 11 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
185 |
{CmdSellLandArea, 0}, /* 12 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
186 |
{CmdBuildTunnel, 0}, /* 13 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
187 |
{CmdRemoveFromRailroadStation, 0}, /* 14 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
188 |
{CmdConvertRail, 0}, /* 15 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
189 |
{CmdBuildTrainWaypoint, 0}, /* 16 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
190 |
{CmdRenameWaypoint, 0}, /* 17 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
191 |
{CmdRemoveTrainWaypoint, 0}, /* 18 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
192 |
{NULL, 0}, /* 19 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
193 |
{NULL, 0}, /* 20 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
194 |
{CmdBuildRoadStop, 0}, /* 21 */ |
6338
0fb4f452873c
(svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p.
rubidium
parents:
5838
diff
changeset
|
195 |
{CmdRemoveRoadStop, 0}, /* 22 */ |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
196 |
{CmdBuildLongRoad, 0}, /* 23 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
197 |
{CmdRemoveLongRoad, 0}, /* 24 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
198 |
{CmdBuildRoad, 0}, /* 25 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
199 |
{CmdRemoveRoad, 0}, /* 26 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
200 |
{CmdBuildRoadDepot, 0}, /* 27 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
201 |
{NULL, 0}, /* 28 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
202 |
{CmdBuildAirport, 0}, /* 29 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
203 |
{CmdBuildDock, 0}, /* 30 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
204 |
{CmdBuildShipDepot, 0}, /* 31 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
205 |
{CmdBuildBuoy, 0}, /* 32 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
206 |
{CmdPlantTree, 0}, /* 33 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
207 |
{CmdBuildRailVehicle, 0}, /* 34 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
208 |
{CmdMoveRailVehicle, 0}, /* 35 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
209 |
{CmdStartStopTrain, 0}, /* 36 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
210 |
{NULL, 0}, /* 37 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
211 |
{CmdSellRailWagon, 0}, /* 38 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
212 |
{CmdSendTrainToDepot, 0}, /* 39 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
213 |
{CmdForceTrainProceed, 0}, /* 40 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
214 |
{CmdReverseTrainDirection, 0}, /* 41 */ |
147
d0c8100d18cf
(svn r148) -Feature: Company HQ can now be moved somewhere else (cost 1% of company value). Water floods HQ.
darkvater
parents:
58
diff
changeset
|
215 |
|
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
216 |
{CmdModifyOrder, 0}, /* 42 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
217 |
{CmdSkipOrder, 0}, /* 43 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
218 |
{CmdDeleteOrder, 0}, /* 44 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
219 |
{CmdInsertOrder, 0}, /* 45 */ |
0 | 220 |
|
2819
710436dd4288
(svn r3367) Unify the 4 distinct CMD_CHANGE_{AIRCRAFT,ROADVEH,SHIP,TRAIN}_SERVICE_INT commands into one CMD_CHANGE_SERVICE_INT command.
tron
parents:
2809
diff
changeset
|
221 |
{CmdChangeServiceInt, 0}, /* 46 */ |
147
d0c8100d18cf
(svn r148) -Feature: Company HQ can now be moved somewhere else (cost 1% of company value). Water floods HQ.
darkvater
parents:
58
diff
changeset
|
222 |
|
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
223 |
{CmdBuildIndustry, 0}, /* 47 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
224 |
{CmdBuildCompanyHQ, 0}, /* 48 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
225 |
{CmdSetPlayerFace, 0}, /* 49 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
226 |
{CmdSetPlayerColor, 0}, /* 50 */ |
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1794
diff
changeset
|
227 |
|
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
228 |
{CmdIncreaseLoan, 0}, /* 51 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
229 |
{CmdDecreaseLoan, 0}, /* 52 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
230 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
231 |
{CmdWantEnginePreview, 0}, /* 53 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
232 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
233 |
{CmdNameVehicle, 0}, /* 54 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
234 |
{CmdRenameEngine, 0}, /* 55 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
235 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
236 |
{CmdChangeCompanyName, 0}, /* 56 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
237 |
{CmdChangePresidentName, 0}, /* 57 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
238 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
239 |
{CmdRenameStation, 0}, /* 58 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
240 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
241 |
{CmdSellAircraft, 0}, /* 59 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
242 |
{CmdStartStopAircraft, 0}, /* 60 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
243 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
244 |
{CmdBuildAircraft, 0}, /* 61 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
245 |
{CmdSendAircraftToHangar, 0}, /* 62 */ |
2819
710436dd4288
(svn r3367) Unify the 4 distinct CMD_CHANGE_{AIRCRAFT,ROADVEH,SHIP,TRAIN}_SERVICE_INT commands into one CMD_CHANGE_SERVICE_INT command.
tron
parents:
2809
diff
changeset
|
246 |
{NULL, 0}, /* 63 */ |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
247 |
{CmdRefitAircraft, 0}, /* 64 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
248 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
249 |
{CmdPlaceSign, 0}, /* 65 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
250 |
{CmdRenameSign, 0}, /* 66 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
251 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
252 |
{CmdBuildRoadVeh, 0}, /* 67 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
253 |
{CmdStartStopRoadVeh, 0}, /* 68 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
254 |
{CmdSellRoadVeh, 0}, /* 69 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
255 |
{CmdSendRoadVehToDepot, 0}, /* 70 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
256 |
{CmdTurnRoadVeh, 0}, /* 71 */ |
3990
d3d23f3bcd34
(svn r5191) - NewGRF: add cargo refit support for road vehicles
peter1138
parents:
3491
diff
changeset
|
257 |
{CmdRefitRoadVeh, 0}, /* 72 */ |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
258 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
259 |
{CmdPause, CMD_SERVER}, /* 73 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
260 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
261 |
{CmdBuyShareInCompany, 0}, /* 74 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
262 |
{CmdSellShareInCompany, 0}, /* 75 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
263 |
{CmdBuyCompany, 0}, /* 76 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
264 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
265 |
{CmdBuildTown, CMD_OFFLINE}, /* 77 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
266 |
{NULL, 0}, /* 78 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
267 |
{NULL, 0}, /* 79 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
268 |
{CmdRenameTown, CMD_SERVER}, /* 80 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
269 |
{CmdDoTownAction, 0}, /* 81 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
270 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
271 |
{CmdSetRoadDriveSide, CMD_SERVER}, /* 82 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
272 |
{NULL, 0}, /* 83 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
273 |
{NULL, 0}, /* 84 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
274 |
{CmdChangeDifficultyLevel, CMD_SERVER}, /* 85 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
275 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
276 |
{CmdStartStopShip, 0}, /* 86 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
277 |
{CmdSellShip, 0}, /* 87 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
278 |
{CmdBuildShip, 0}, /* 88 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
279 |
{CmdSendShipToDepot, 0}, /* 89 */ |
2819
710436dd4288
(svn r3367) Unify the 4 distinct CMD_CHANGE_{AIRCRAFT,ROADVEH,SHIP,TRAIN}_SERVICE_INT commands into one CMD_CHANGE_SERVICE_INT command.
tron
parents:
2809
diff
changeset
|
280 |
{NULL, 0}, /* 90 */ |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
281 |
{CmdRefitShip, 0}, /* 91 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
282 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
283 |
{NULL, 0}, /* 92 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
284 |
{NULL, 0}, /* 93 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
285 |
{NULL, 0}, /* 94 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
286 |
{NULL, 0}, /* 95 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
287 |
{NULL, 0}, /* 96 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
288 |
{NULL, 0}, /* 97 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
289 |
|
4712
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4662
diff
changeset
|
290 |
{CmdOrderRefit, 0}, /* 98 */ |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
291 |
{CmdCloneOrder, 0}, /* 99 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
292 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
293 |
{CmdClearArea, 0}, /* 100 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
294 |
{NULL, 0}, /* 101 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
295 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
296 |
{CmdMoneyCheat, CMD_OFFLINE}, /* 102 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
297 |
{CmdBuildCanal, 0}, /* 103 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
298 |
{CmdPlayerCtrl, 0}, /* 104 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
299 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
300 |
{CmdLevelLand, 0}, /* 105 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
301 |
|
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
302 |
{CmdRefitRailVehicle, 0}, /* 106 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
303 |
{CmdRestoreOrderIndex, 0}, /* 107 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
304 |
{CmdBuildLock, 0}, /* 108 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
305 |
{NULL, 0}, /* 109 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
306 |
{CmdBuildSignalTrack, 0}, /* 110 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
307 |
{CmdRemoveSignalTrack, 0}, /* 111 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
308 |
{NULL, 0}, /* 112 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
309 |
{CmdGiveMoney, 0}, /* 113 */ |
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
310 |
{CmdChangePatchSetting, CMD_SERVER}, /* 114 */ |
4661
59492734db06
(svn r6544) - Codechange: Rename CmdReplaceVehicle to CmdSetAutoReplace, to reflect what it does.
peter1138
parents:
4659
diff
changeset
|
311 |
{CmdSetAutoReplace, 0}, /* 115 */ |
3991
df878528218e
(svn r5192) - Stylechange: fix bjarni's tabs-instead-of-spaces alignment
peter1138
parents:
3990
diff
changeset
|
312 |
{CmdCloneVehicle, 0}, /* 116 */ |
4640
cabffc571e55
(svn r6515) -Feature: added "start all" and "stop all" buttons to the depot windows
bjarni
parents:
4300
diff
changeset
|
313 |
{CmdMassStartStopVehicle, 0}, /* 117 */ |
4659
2f99f35d5813
(svn r6542) -Feature: [depot window] added a "sell all vehicles in depot" button
bjarni
parents:
4640
diff
changeset
|
314 |
{CmdDepotSellAllVehicles, 0}, /* 118 */ |
4662
a20121e5442b
(svn r6552) -Feature: [depot window] added a "autoreplace all vehicles in depot" button
bjarni
parents:
4661
diff
changeset
|
315 |
{CmdDepotMassAutoReplace, 0}, /* 119 */ |
0 | 316 |
}; |
317 |
||
903
f860c7234167
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
889
diff
changeset
|
318 |
/* This function range-checks a cmd, and checks if the cmd is not NULL */ |
959
b031d88c76f3
(svn r1451) Fix some of the signed/unsigned comparison warnings
tron
parents:
926
diff
changeset
|
319 |
bool IsValidCommand(uint cmd) |
903
f860c7234167
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
889
diff
changeset
|
320 |
{ |
2645
964bd8fe3ce2
(svn r3187) Simplify overly complicated ifs, especially if (foo) return false; else return true; is confusing
tron
parents:
2425
diff
changeset
|
321 |
cmd &= 0xFF; |
903
f860c7234167
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
889
diff
changeset
|
322 |
|
2645
964bd8fe3ce2
(svn r3187) Simplify overly complicated ifs, especially if (foo) return false; else return true; is confusing
tron
parents:
2425
diff
changeset
|
323 |
return |
964bd8fe3ce2
(svn r3187) Simplify overly complicated ifs, especially if (foo) return false; else return true; is confusing
tron
parents:
2425
diff
changeset
|
324 |
cmd < lengthof(_command_proc_table) && |
964bd8fe3ce2
(svn r3187) Simplify overly complicated ifs, especially if (foo) return false; else return true; is confusing
tron
parents:
2425
diff
changeset
|
325 |
_command_proc_table[cmd].proc != NULL; |
903
f860c7234167
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
889
diff
changeset
|
326 |
} |
f860c7234167
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
889
diff
changeset
|
327 |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
328 |
byte GetCommandFlags(uint cmd) |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
329 |
{ |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
330 |
return _command_proc_table[cmd & 0xFF].flags; |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
331 |
} |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
332 |
|
0 | 333 |
|
2304
f3309898aeb0
(svn r2828) Only command.c needs to know about _docommand_recursive, so make it static. Tell me if there's a problem, because i removed it from network_server.c, but afaict it should be ok
tron
parents:
2244
diff
changeset
|
334 |
static int _docommand_recursive; |
f3309898aeb0
(svn r2828) Only command.c needs to know about _docommand_recursive, so make it static. Tell me if there's a problem, because i removed it from network_server.c, but afaict it should be ok
tron
parents:
2244
diff
changeset
|
335 |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
336 |
int32 DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc) |
0 | 337 |
{ |
338 |
int32 res; |
|
339 |
CommandProc *proc; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
340 |
|
1776
fa776997bba2
(svn r2280) - Fix: Check if the passed tile to DoCommand is within the current mapsize
Darkvater
parents:
1728
diff
changeset
|
341 |
/* Do not even think about executing out-of-bounds tile-commands */ |
7126
1e7994aa1767
(svn r9855) -Fix: [FS#779] do not perform any commands on MP_VOID tiles.
rubidium
parents:
7042
diff
changeset
|
342 |
if (tile >= MapSize() || IsTileType(tile, MP_VOID)) { |
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
343 |
_cmd_text = NULL; |
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
344 |
return CMD_ERROR; |
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
345 |
} |
1776
fa776997bba2
(svn r2280) - Fix: Check if the passed tile to DoCommand is within the current mapsize
Darkvater
parents:
1728
diff
changeset
|
346 |
|
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
347 |
proc = _command_proc_table[procc].proc; |
0 | 348 |
|
2749
46aba09ca365
(svn r3294) - Fix: use INVALID_STRING_ID instead of -1.
Darkvater
parents:
2715
diff
changeset
|
349 |
if (_docommand_recursive == 0) _error_message = INVALID_STRING_ID; |
0 | 350 |
|
351 |
_docommand_recursive++; |
|
352 |
||
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
353 |
/* only execute the test call if it's toplevel, or we're not execing. */ |
0 | 354 |
if (_docommand_recursive == 1 || !(flags & DC_EXEC) || (flags & DC_FORCETEST) ) { |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
355 |
res = proc(tile, flags & ~DC_EXEC, p1, p2); |
1691
fcd9fefaed02
(svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed.
tron
parents:
1623
diff
changeset
|
356 |
if (CmdFailed(res)) { |
0 | 357 |
if (res & 0xFFFF) _error_message = res & 0xFFFF; |
358 |
goto error; |
|
359 |
} |
|
360 |
||
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
361 |
if (_docommand_recursive == 1 && |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
362 |
!(flags & DC_QUERY_COST) && |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
363 |
res != 0 && |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
364 |
!CheckPlayerHasMoney(res)) { |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
365 |
goto error; |
0 | 366 |
} |
367 |
||
368 |
if (!(flags & DC_EXEC)) { |
|
369 |
_docommand_recursive--; |
|
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
370 |
_cmd_text = NULL; |
0 | 371 |
return res; |
372 |
} |
|
373 |
} |
|
374 |
||
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
842
diff
changeset
|
375 |
/* Execute the command here. All cost-relevant functions set the expenses type |
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
842
diff
changeset
|
376 |
* themselves with "SET_EXPENSES_TYPE(...);" at the beginning of the function */ |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
377 |
res = proc(tile, flags, p1, p2); |
1691
fcd9fefaed02
(svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed.
tron
parents:
1623
diff
changeset
|
378 |
if (CmdFailed(res)) { |
0 | 379 |
if (res & 0xFFFF) _error_message = res & 0xFFFF; |
380 |
error: |
|
381 |
_docommand_recursive--; |
|
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
382 |
_cmd_text = NULL; |
0 | 383 |
return CMD_ERROR; |
384 |
} |
|
385 |
||
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
386 |
/* if toplevel, subtract the money. */ |
0 | 387 |
if (--_docommand_recursive == 0) { |
388 |
SubtractMoneyFromPlayer(res); |
|
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
389 |
/* XXX - Old AI hack which doesn't use DoCommandDP; update last build coord of player */ |
4850
b4e9be22945f
(svn r6776) -Codechange: Use IsValidPlayer() function to determine of a PlayerID is an
Darkvater
parents:
4848
diff
changeset
|
390 |
if (tile != 0 && IsValidPlayer(_current_player)) { |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
391 |
GetPlayer(_current_player)->last_build_coordinate = tile; |
2772
96e47991fd1d
(svn r3319) - Fix (regression): "Unnamed Competitors". A result of revision r3224 which allowed AI's for multiplayer. Old AI's didn't function correctly anymore. The update of last-built tile is moved back, but to a slightly different place so it is only executed when the command is actually successfully executed. This code shouldn't be neccessary, but alas, the old AI doesn't use DoCommandDP() functions.
Darkvater
parents:
2767
diff
changeset
|
392 |
} |
0 | 393 |
} |
394 |
||
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
395 |
_cmd_text = NULL; |
0 | 396 |
return res; |
397 |
} |
|
398 |
||
6573 | 399 |
int32 GetAvailableMoneyForCommand() |
0 | 400 |
{ |
1794
44f9deff97ed
(svn r2298) - CodeChange: removed CmdAbuses: CmdSetTownNameType(), CmdStartNewGame(), CmdCreateScenario(), CmdSetNewLandscapeType() and CmdGenRandomNewGame().
Darkvater
parents:
1786
diff
changeset
|
401 |
PlayerID pid = _current_player; |
4850
b4e9be22945f
(svn r6776) -Codechange: Use IsValidPlayer() function to determine of a PlayerID is an
Darkvater
parents:
4848
diff
changeset
|
402 |
if (!IsValidPlayer(pid)) return 0x7FFFFFFF; // max int |
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1891
diff
changeset
|
403 |
return GetPlayer(pid)->player_money; |
0 | 404 |
} |
405 |
||
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
406 |
/* toplevel network safe docommand function for the current player. must not be called recursively. |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
407 |
* the callback is called when the command succeeded or failed. */ |
0 | 408 |
bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, uint32 cmd) |
409 |
{ |
|
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6949
diff
changeset
|
410 |
int32 res = 0, res2; |
0 | 411 |
CommandProc *proc; |
412 |
uint32 flags; |
|
413 |
bool notest; |
|
3182
0f1161388ea1
(svn r3827) Remove the global variable _error_message_2, it's only used as local variable
tron
parents:
2820
diff
changeset
|
414 |
StringID error_part1; |
0 | 415 |
|
3421
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3182
diff
changeset
|
416 |
int x = TileX(tile) * TILE_SIZE; |
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3182
diff
changeset
|
417 |
int y = TileY(tile) * TILE_SIZE; |
0 | 418 |
|
1776
fa776997bba2
(svn r2280) - Fix: Check if the passed tile to DoCommand is within the current mapsize
Darkvater
parents:
1728
diff
changeset
|
419 |
/* Do not even think about executing out-of-bounds tile-commands */ |
7126
1e7994aa1767
(svn r9855) -Fix: [FS#779] do not perform any commands on MP_VOID tiles.
rubidium
parents:
7042
diff
changeset
|
420 |
if (tile >= MapSize() || IsTileType(tile, MP_VOID)) { |
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
421 |
_cmd_text = NULL; |
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
422 |
return false; |
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
423 |
} |
1776
fa776997bba2
(svn r2280) - Fix: Check if the passed tile to DoCommand is within the current mapsize
Darkvater
parents:
1728
diff
changeset
|
424 |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
425 |
assert(_docommand_recursive == 0); |
0 | 426 |
|
427 |
_error_message = INVALID_STRING_ID; |
|
3182
0f1161388ea1
(svn r3827) Remove the global variable _error_message_2, it's only used as local variable
tron
parents:
2820
diff
changeset
|
428 |
error_part1 = GB(cmd, 16, 16); |
0 | 429 |
_additional_cash_required = 0; |
430 |
||
5067
870dfdcef898
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4850
diff
changeset
|
431 |
/** Spectator has no rights except for the (dedicated) server which |
870dfdcef898
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4850
diff
changeset
|
432 |
* is/can be a spectator but as the server it can do anything */ |
870dfdcef898
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4850
diff
changeset
|
433 |
if (_current_player == PLAYER_SPECTATOR && !_network_server) { |
3182
0f1161388ea1
(svn r3827) Remove the global variable _error_message_2, it's only used as local variable
tron
parents:
2820
diff
changeset
|
434 |
ShowErrorMessage(_error_message, error_part1, x, y); |
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
435 |
_cmd_text = NULL; |
0 | 436 |
return false; |
437 |
} |
|
438 |
||
439 |
flags = 0; |
|
440 |
if (cmd & CMD_AUTO) flags |= DC_AUTO; |
|
441 |
if (cmd & CMD_NO_WATER) flags |= DC_NO_WATER; |
|
442 |
||
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
443 |
/* get pointer to command handler */ |
0 | 444 |
assert((cmd & 0xFF) < lengthof(_command_proc_table)); |
1804
7810fc0aa941
(svn r2308) - Fix: enforce server-only and/or offline commands by giving them flags in the process table. This also fixes bug "[ 1190944 ] Many commands not checked for security"
Darkvater
parents:
1802
diff
changeset
|
445 |
proc = _command_proc_table[cmd & 0xFF].proc; |
1877
e7318705dd04
(svn r2383) - Fix: Monkey-testing turned up some command crashes.
Darkvater
parents:
1838
diff
changeset
|
446 |
if (proc == NULL) { |
e7318705dd04
(svn r2383) - Fix: Monkey-testing turned up some command crashes.
Darkvater
parents:
1838
diff
changeset
|
447 |
_cmd_text = NULL; |
e7318705dd04
(svn r2383) - Fix: Monkey-testing turned up some command crashes.
Darkvater
parents:
1838
diff
changeset
|
448 |
return false; |
e7318705dd04
(svn r2383) - Fix: Monkey-testing turned up some command crashes.
Darkvater
parents:
1838
diff
changeset
|
449 |
} |
0 | 450 |
|
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
451 |
/* Some commands have a different output in dryrun than the realrun |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
452 |
* e.g.: if you demolish a whole town, the dryrun would say okay. |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
453 |
* but by really destroying, your rating drops and at a certain point |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
454 |
* it will fail. so res and res2 are different |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
455 |
* CMD_REMOVE_ROAD: This command has special local authority |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
456 |
* restrictions which may cause the test run to fail (the previous |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
457 |
* road fragments still stay there and the town won't let you |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
458 |
* disconnect the road system), but the exec will succeed and this |
7042
d841fb0d8e9a
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6987
diff
changeset
|
459 |
* fact will trigger an assertion failure. --pasky |
d841fb0d8e9a
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6987
diff
changeset
|
460 |
* CMD_CLONE_VEHICLE: Both building new vehicles and refitting them can be |
d841fb0d8e9a
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6987
diff
changeset
|
461 |
* influenced by newgrf callbacks, which makes it impossible to accurately |
d841fb0d8e9a
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6987
diff
changeset
|
462 |
* estimate the cost of cloning a vehicle. */ |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
463 |
notest = |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
464 |
(cmd & 0xFF) == CMD_CLEAR_AREA || |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
465 |
(cmd & 0xFF) == CMD_CONVERT_RAIL || |
0 | 466 |
(cmd & 0xFF) == CMD_LEVEL_LAND || |
1701
e46ac9ca353e
(svn r2205) - Fixup of revision 2200, not twice CMD_REMOVE_LONG_ROAD :p. Thanks TrueLight.
Darkvater
parents:
1696
diff
changeset
|
467 |
(cmd & 0xFF) == CMD_REMOVE_ROAD || |
7042
d841fb0d8e9a
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6987
diff
changeset
|
468 |
(cmd & 0xFF) == CMD_REMOVE_LONG_ROAD || |
d841fb0d8e9a
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6987
diff
changeset
|
469 |
(cmd & 0xFF) == CMD_CLONE_VEHICLE; |
0 | 470 |
|
471 |
_docommand_recursive = 1; |
|
472 |
||
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
473 |
/* cost estimation only? */ |
5831
de5f05e20ae9
(svn r8027) -Fix (FS#486) If a pause command is issues, it will now pause the game even if shift is pressed instead of giving a cost estimate of 0. This fixes a problem where the server does not pause_on_join when the player on the interactive server has the shift button pressed. (Thanks to pvz for the report and the fix)
celestar
parents:
5726
diff
changeset
|
474 |
if (!IsGeneratingWorld() && |
de5f05e20ae9
(svn r8027) -Fix (FS#486) If a pause command is issues, it will now pause the game even if shift is pressed instead of giving a cost estimate of 0. This fixes a problem where the server does not pause_on_join when the player on the interactive server has the shift button pressed. (Thanks to pvz for the report and the fix)
celestar
parents:
5726
diff
changeset
|
475 |
_shift_pressed && |
de5f05e20ae9
(svn r8027) -Fix (FS#486) If a pause command is issues, it will now pause the game even if shift is pressed instead of giving a cost estimate of 0. This fixes a problem where the server does not pause_on_join when the player on the interactive server has the shift button pressed. (Thanks to pvz for the report and the fix)
celestar
parents:
5726
diff
changeset
|
476 |
IsLocalPlayer() && |
de5f05e20ae9
(svn r8027) -Fix (FS#486) If a pause command is issues, it will now pause the game even if shift is pressed instead of giving a cost estimate of 0. This fixes a problem where the server does not pause_on_join when the player on the interactive server has the shift button pressed. (Thanks to pvz for the report and the fix)
celestar
parents:
5726
diff
changeset
|
477 |
!(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR)) && |
de5f05e20ae9
(svn r8027) -Fix (FS#486) If a pause command is issues, it will now pause the game even if shift is pressed instead of giving a cost estimate of 0. This fixes a problem where the server does not pause_on_join when the player on the interactive server has the shift button pressed. (Thanks to pvz for the report and the fix)
celestar
parents:
5726
diff
changeset
|
478 |
(cmd & 0xFF) != CMD_PAUSE) { |
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
479 |
/* estimate the cost. */ |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
480 |
res = proc(tile, flags, p1, p2); |
1691
fcd9fefaed02
(svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed.
tron
parents:
1623
diff
changeset
|
481 |
if (CmdFailed(res)) { |
0 | 482 |
if (res & 0xFFFF) _error_message = res & 0xFFFF; |
3182
0f1161388ea1
(svn r3827) Remove the global variable _error_message_2, it's only used as local variable
tron
parents:
2820
diff
changeset
|
483 |
ShowErrorMessage(_error_message, error_part1, x, y); |
0 | 484 |
} else { |
485 |
ShowEstimatedCostOrIncome(res, x, y); |
|
486 |
} |
|
487 |
||
488 |
_docommand_recursive = 0; |
|
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
489 |
_cmd_text = NULL; |
0 | 490 |
return false; |
491 |
} |
|
492 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
493 |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
494 |
if (!((cmd & CMD_NO_TEST_IF_IN_NETWORK) && _networking)) { |
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
495 |
/* first test if the command can be executed. */ |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
496 |
res = proc(tile, flags, p1, p2); |
1691
fcd9fefaed02
(svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed.
tron
parents:
1623
diff
changeset
|
497 |
if (CmdFailed(res)) { |
0 | 498 |
if (res & 0xFFFF) _error_message = res & 0xFFFF; |
499 |
goto show_error; |
|
500 |
} |
|
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
501 |
/* no money? Only check if notest is off */ |
2767 | 502 |
if (!notest && res != 0 && !CheckPlayerHasMoney(res)) goto show_error; |
0 | 503 |
} |
504 |
||
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
505 |
#ifdef ENABLE_NETWORK |
1838
522076c550c0
(svn r2343) - Fix (regression): dedicated server caused desyncs with its commands, because the player sent over the network is OWNER_SPECTATOR as well, which on clients cannot execute anything. So *hack*hack* it into temporarily player 0.
Darkvater
parents:
1834
diff
changeset
|
506 |
/** If we are in network, and the command is not from the network |
522076c550c0
(svn r2343) - Fix (regression): dedicated server caused desyncs with its commands, because the player sent over the network is OWNER_SPECTATOR as well, which on clients cannot execute anything. So *hack*hack* it into temporarily player 0.
Darkvater
parents:
1834
diff
changeset
|
507 |
* send it to the command-queue and abort execution |
522076c550c0
(svn r2343) - Fix (regression): dedicated server caused desyncs with its commands, because the player sent over the network is OWNER_SPECTATOR as well, which on clients cannot execute anything. So *hack*hack* it into temporarily player 0.
Darkvater
parents:
1834
diff
changeset
|
508 |
* If we are a dedicated server temporarily switch local player, otherwise |
522076c550c0
(svn r2343) - Fix (regression): dedicated server caused desyncs with its commands, because the player sent over the network is OWNER_SPECTATOR as well, which on clients cannot execute anything. So *hack*hack* it into temporarily player 0.
Darkvater
parents:
1834
diff
changeset
|
509 |
* the other parties won't be able to execute our command and will desync. |
5067
870dfdcef898
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4850
diff
changeset
|
510 |
* We also need to do this if the server's company has gone bankrupt |
870dfdcef898
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4850
diff
changeset
|
511 |
* @todo Rewrite (dedicated) server to something more than a dirty hack! |
1838
522076c550c0
(svn r2343) - Fix (regression): dedicated server caused desyncs with its commands, because the player sent over the network is OWNER_SPECTATOR as well, which on clients cannot execute anything. So *hack*hack* it into temporarily player 0.
Darkvater
parents:
1834
diff
changeset
|
512 |
*/ |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
513 |
if (_networking && !(cmd & CMD_NETWORK_COMMAND)) { |
5067
870dfdcef898
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4850
diff
changeset
|
514 |
PlayerID pbck = _local_player; |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
515 |
if (_network_dedicated || (_network_server && pbck == PLAYER_SPECTATOR)) _local_player = PLAYER_FIRST; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
516 |
NetworkSend_Command(tile, p1, p2, cmd, callback); |
5067
870dfdcef898
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4850
diff
changeset
|
517 |
if (_network_dedicated || (_network_server && pbck == PLAYER_SPECTATOR)) _local_player = pbck; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
518 |
_docommand_recursive = 0; |
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
519 |
_cmd_text = NULL; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
520 |
return true; |
0 | 521 |
} |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
522 |
#endif /* ENABLE_NETWORK */ |
0 | 523 |
|
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
524 |
/* update last build coordinate of player. */ |
4850
b4e9be22945f
(svn r6776) -Codechange: Use IsValidPlayer() function to determine of a PlayerID is an
Darkvater
parents:
4848
diff
changeset
|
525 |
if (tile != 0 && IsValidPlayer(_current_player)) { |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
526 |
GetPlayer(_current_player)->last_build_coordinate = tile; |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
527 |
} |
0 | 528 |
|
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
842
diff
changeset
|
529 |
/* Actually try and execute the command. If no cost-type is given |
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
842
diff
changeset
|
530 |
* use the construction one */ |
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
842
diff
changeset
|
531 |
_yearly_expenses_type = EXPENSES_CONSTRUCTION; |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
532 |
res2 = proc(tile, flags | DC_EXEC, p1, p2); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
533 |
|
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
534 |
/* If notest is on, it means the result of the test can be different than |
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
535 |
* the real command.. so ignore the test */ |
652
0f553238c98a
(svn r1085) -Fix: [Network] [ 1084834 ] If IF_IN_NETWORK flag was on, an error
truelight
parents:
601
diff
changeset
|
536 |
if (!notest && !((cmd & CMD_NO_TEST_IF_IN_NETWORK) && _networking)) { |
0 | 537 |
assert(res == res2); // sanity check |
538 |
} else { |
|
1702
6402cfbb9772
(svn r2206) - Regression Fix: slight typo of res2 into res, this also fixes recent bug "[ 1183396 ] Train can't find depot, it gives money in Multiplayer"
Darkvater
parents:
1701
diff
changeset
|
539 |
if (CmdFailed(res2)) { |
0 | 540 |
if (res2 & 0xFFFF) _error_message = res2 & 0xFFFF; |
541 |
goto show_error; |
|
542 |
} |
|
543 |
} |
|
544 |
||
545 |
SubtractMoneyFromPlayer(res2); |
|
546 |
||
2425
99e1e8430a28
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
Darkvater
parents:
2304
diff
changeset
|
547 |
if (IsLocalPlayer() && _game_mode != GM_EDITOR) { |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3991
diff
changeset
|
548 |
if (res2 != 0) ShowCostOrIncomeAnimation(x, y, GetSlopeZ(x, y), res2); |
0 | 549 |
if (_additional_cash_required) { |
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
550 |
SetDParam(0, _additional_cash_required); |
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6949
diff
changeset
|
551 |
ShowErrorMessage(STR_0003_NOT_ENOUGH_CASH_REQUIRES, error_part1, x, y); |
0 | 552 |
if (res2 == 0) goto callb_err; |
553 |
} |
|
554 |
} |
|
555 |
||
556 |
_docommand_recursive = 0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
557 |
|
0 | 558 |
if (callback) callback(true, tile, p1, p2); |
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
559 |
_cmd_text = NULL; |
0 | 560 |
return true; |
561 |
||
562 |
show_error: |
|
6449
e520244dc71e
(svn r8859) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6338
diff
changeset
|
563 |
/* show error message if the command fails? */ |
3182
0f1161388ea1
(svn r3827) Remove the global variable _error_message_2, it's only used as local variable
tron
parents:
2820
diff
changeset
|
564 |
if (IsLocalPlayer() && error_part1 != 0) { |
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6949
diff
changeset
|
565 |
ShowErrorMessage(_error_message, error_part1, x, y); |
3182
0f1161388ea1
(svn r3827) Remove the global variable _error_message_2, it's only used as local variable
tron
parents:
2820
diff
changeset
|
566 |
} |
0 | 567 |
|
568 |
callb_err: |
|
569 |
_docommand_recursive = 0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
570 |
|
0 | 571 |
if (callback) callback(false, tile, p1, p2); |
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1804
diff
changeset
|
572 |
_cmd_text = NULL; |
0 | 573 |
return false; |
574 |
} |