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

(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.

release/0.4.5
tron 2005-05-15 18:50:55 +00:00
parent 6cd410afbb
commit fea5965679
23 changed files with 110 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
aircraft_gui.c
View File

@ -151,11 +151,11 @@ static void NewAircraftWndProc(Window *w, WindowEvent *e)
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, WP(w, buildtrain_d).rename_engine, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_RENAME_ENGINE | CMD_MSG(STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE));
DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE)); }
} break; } break;
case WE_RESIZE: case WE_RESIZE:
@ -410,11 +410,11 @@ do_change_service_int:
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, w->window_number, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_NAME_VEHICLE | CMD_MSG(STR_A031_CAN_T_NAME_AIRCRAFT));
DoCommandP(0, w->window_number, 0, NULL, CMD_NAME_VEHICLE | CMD_MSG(STR_A031_CAN_T_NAME_AIRCRAFT)); }
} break; } break;
} }

20
command.c
View File

@ -7,6 +7,8 @@
#include "player.h" #include "player.h"
#include "network.h" #include "network.h"
const char* _cmd_text = NULL;
#define DEF_COMMAND(yyyy) int32 yyyy(int x, int y, uint32 flags, uint32 p1, uint32 p2) #define DEF_COMMAND(yyyy) int32 yyyy(int x, int y, uint32 flags, uint32 p1, uint32 p2)
DEF_COMMAND(CmdBuildRailroadTrack); DEF_COMMAND(CmdBuildRailroadTrack);
@ -323,7 +325,10 @@ int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc)
CommandProc *proc; CommandProc *proc;
/* Do not even think about executing out-of-bounds tile-commands */ /* Do not even think about executing out-of-bounds tile-commands */
if (TILE_FROM_XY(x,y) > MapSize()) return CMD_ERROR; if (TILE_FROM_XY(x,y) > MapSize()) {
_cmd_text = NULL;
return CMD_ERROR;
}
proc = _command_proc_table[procc].proc; proc = _command_proc_table[procc].proc;
@ -352,6 +357,7 @@ int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc)
if (!(flags & DC_EXEC)) { if (!(flags & DC_EXEC)) {
_docommand_recursive--; _docommand_recursive--;
_cmd_text = NULL;
return res; return res;
} }
} }
@ -363,6 +369,7 @@ int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc)
if (res & 0xFFFF) _error_message = res & 0xFFFF; if (res & 0xFFFF) _error_message = res & 0xFFFF;
error: error:
_docommand_recursive--; _docommand_recursive--;
_cmd_text = NULL;
return CMD_ERROR; return CMD_ERROR;
} }
@ -371,6 +378,7 @@ error:
SubtractMoneyFromPlayer(res); SubtractMoneyFromPlayer(res);
} }
_cmd_text = NULL;
return res; return res;
} }
@ -394,7 +402,10 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
int y = TileY(tile) * 16; int y = TileY(tile) * 16;
/* Do not even think about executing out-of-bounds tile-commands */ /* Do not even think about executing out-of-bounds tile-commands */
if (tile > MapSize()) return false; if (tile > MapSize()) {
_cmd_text = NULL;
return false;
}
assert(_docommand_recursive == 0); assert(_docommand_recursive == 0);
@ -405,6 +416,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
// spectator has no rights. // spectator has no rights.
if (_current_player == OWNER_SPECTATOR) { if (_current_player == OWNER_SPECTATOR) {
ShowErrorMessage(_error_message, _error_message_2, x, y); ShowErrorMessage(_error_message, _error_message_2, x, y);
_cmd_text = NULL;
return false; return false;
} }
@ -446,6 +458,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
} }
_docommand_recursive = 0; _docommand_recursive = 0;
_cmd_text = NULL;
return false; return false;
} }
@ -467,6 +480,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
if (_networking && !(cmd & CMD_NETWORK_COMMAND)) { if (_networking && !(cmd & CMD_NETWORK_COMMAND)) {
NetworkSend_Command(tile, p1, p2, cmd, callback); NetworkSend_Command(tile, p1, p2, cmd, callback);
_docommand_recursive = 0; _docommand_recursive = 0;
_cmd_text = NULL;
return true; return true;
} }
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
@ -505,6 +519,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
_docommand_recursive = 0; _docommand_recursive = 0;
if (callback) callback(true, tile, p1, p2); if (callback) callback(true, tile, p1, p2);
_cmd_text = NULL;
return true; return true;
show_error: show_error:
@ -516,5 +531,6 @@ callb_err:
_docommand_recursive = 0; _docommand_recursive = 0;
if (callback) callback(false, tile, p1, p2); if (callback) callback(false, tile, p1, p2);
_cmd_text = NULL;
return false; return false;
} }

2
command.h
View File

@ -190,6 +190,8 @@ static inline bool CmdFailed(int32 res)
int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc); int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc);
int32 DoCommandByTile(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc); int32 DoCommandByTile(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
extern const char* _cmd_text; // Text, which gets sent with a command
bool IsValidCommand(uint cmd); bool IsValidCommand(uint cmd);
byte GetCommandFlags(uint cmd); byte GetCommandFlags(uint cmd);
int32 GetAvailableMoneyForCommand(void); int32 GetAvailableMoneyForCommand(void);

2
engine.c
View File

@ -889,7 +889,7 @@ int32 CmdRenameEngine(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!IsEngineIndex(p1)) return CMD_ERROR; if (!IsEngineIndex(p1)) return CMD_ERROR;
str = AllocateNameUnique((const char*)_decode_parameters, 0); str = AllocateNameUnique(_cmd_text, 0);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

3
main_gui.c
View File

@ -63,7 +63,8 @@ void HandleOnEditText(WindowEvent *e)
{ {
const char *b = e->edittext.str; const char *b = e->edittext.str;
int id; int id;
memcpy(_decode_parameters, b, 32);
_cmd_text = b;
id = _rename_id; id = _rename_id;

9
misc_cmd.c
View File

@ -129,7 +129,7 @@ int32 CmdChangeCompanyName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str; StringID str;
Player *p; Player *p;
str = AllocateNameUnique((const char*)_decode_parameters, 4); str = AllocateNameUnique(_cmd_text, 4);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
@ -153,7 +153,7 @@ int32 CmdChangePresidentName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str; StringID str;
Player *p; Player *p;
str = AllocateNameUnique((const char*)_decode_parameters, 4); str = AllocateNameUnique(_cmd_text, 4);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
@ -162,7 +162,10 @@ int32 CmdChangePresidentName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
p->president_name_1 = str; p->president_name_1 = str;
if (p->name_1 == STR_SV_UNNAMED) { if (p->name_1 == STR_SV_UNNAMED) {
ttd_strlcat((char*)_decode_parameters, " Transport", sizeof(_decode_parameters)); char buf[80];
snprintf(buf, lengthof(buf), "%s Transport", _cmd_text);
_cmd_text = buf;
DoCommandByTile(0, 0, 0, DC_EXEC, CMD_CHANGE_COMPANY_NAME); DoCommandByTile(0, 0, 0, DC_EXEC, CMD_CHANGE_COMPANY_NAME);
} }
MarkWholeScreenDirty(); MarkWholeScreenDirty();

25
network_client.c
View File

@ -143,13 +143,10 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_COMMAND)(CommandPacket *cp)
// uint32: P1 (free variables used in DoCommand) // uint32: P1 (free variables used in DoCommand)
// uint32: P2 // uint32: P2
// uint32: Tile // uint32: Tile
// uint32: decode_params // string: text
// 10 times the last one (lengthof(cp->dp))
// uint8: CallBackID (see callback_table.c) // uint8: CallBackID (see callback_table.c)
// //
uint i;
char *dparam_char;
Packet *p = NetworkSend_Init(PACKET_CLIENT_COMMAND); Packet *p = NetworkSend_Init(PACKET_CLIENT_COMMAND);
NetworkSend_uint8(p, cp->player); NetworkSend_uint8(p, cp->player);
@ -157,14 +154,7 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_COMMAND)(CommandPacket *cp)
NetworkSend_uint32(p, cp->p1); NetworkSend_uint32(p, cp->p1);
NetworkSend_uint32(p, cp->p2); NetworkSend_uint32(p, cp->p2);
NetworkSend_uint32(p, (uint32)cp->tile); NetworkSend_uint32(p, (uint32)cp->tile);
/* We are going to send them byte by byte, because dparam is misused NetworkSend_string(p, cp->text);
for chars (if it is used), and else we have a BigEndian / LittleEndian
problem.. we should fix the misuse of dparam... -- TrueLight */
dparam_char = (char *)&cp->dp[0];
for (i = 0; i < lengthof(cp->dp) * 4; i++) {
NetworkSend_uint8(p, *dparam_char);
dparam_char++;
}
NetworkSend_uint8(p, cp->callback); NetworkSend_uint8(p, cp->callback);
NetworkSend_Packet(p, MY_CLIENT); NetworkSend_Packet(p, MY_CLIENT);
@ -587,22 +577,13 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_SYNC)
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMMAND) DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMMAND)
{ {
uint i;
char *dparam_char;
CommandPacket *cp = malloc(sizeof(CommandPacket)); CommandPacket *cp = malloc(sizeof(CommandPacket));
cp->player = NetworkRecv_uint8(MY_CLIENT, p); cp->player = NetworkRecv_uint8(MY_CLIENT, p);
cp->cmd = NetworkRecv_uint32(MY_CLIENT, p); cp->cmd = NetworkRecv_uint32(MY_CLIENT, p);
cp->p1 = NetworkRecv_uint32(MY_CLIENT, p); cp->p1 = NetworkRecv_uint32(MY_CLIENT, p);
cp->p2 = NetworkRecv_uint32(MY_CLIENT, p); cp->p2 = NetworkRecv_uint32(MY_CLIENT, p);
cp->tile = NetworkRecv_uint32(MY_CLIENT, p); cp->tile = NetworkRecv_uint32(MY_CLIENT, p);
/* We are going to send them byte by byte, because dparam is misused NetworkRecv_string(MY_CLIENT, p, cp->text, sizeof(cp->text));
for chars (if it is used), and else we have a BigEndian / LittleEndian
problem.. we should fix the misuse of dparam... -- TrueLight */
dparam_char = (char *)&cp->dp[0];
for (i = 0; i < lengthof(cp->dp) * 4; i++) {
*dparam_char = NetworkRecv_uint8(MY_CLIENT, p);
dparam_char++;
}
cp->callback = NetworkRecv_uint8(MY_CLIENT, p); cp->callback = NetworkRecv_uint8(MY_CLIENT, p);
cp->frame = NetworkRecv_uint32(MY_CLIENT, p); cp->frame = NetworkRecv_uint32(MY_CLIENT, p);
cp->next = NULL; cp->next = NULL;

12
network_data.c
View File

@ -5,6 +5,7 @@
// Is the network enabled? // Is the network enabled?
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
#include "string.h"
#include "table/strings.h" #include "table/strings.h"
#include "network_client.h" #include "network_client.h"
#include "command.h" #include "command.h"
@ -394,12 +395,6 @@ void NetworkAddCommandQueue(NetworkClientState *cs, CommandPacket *cp)
} }
} }
// If this fails, make sure you change the following line below:
// 'memcpy(qp->dp, _decode_parameters, 10 * sizeof(uint32));'
// Also, in network_data.h, change the size of CommandPacket->dp!
// (this protection is there to make sure in network.h dp is of the right size!)
assert_compile(sizeof(_decode_parameters) == 20 * sizeof(uint32));
// Prepare a DoCommand to be send over the network // Prepare a DoCommand to be send over the network
void NetworkSend_Command(uint32 tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback) void NetworkSend_Command(uint32 tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback)
{ {
@ -430,8 +425,7 @@ void NetworkSend_Command(uint32 tile, uint32 p1, uint32 p2, uint32 cmd, CommandC
c->frame = 0; // The client can't tell which frame, so just make it 0 c->frame = 0; // The client can't tell which frame, so just make it 0
} }
// Copy the _decode_parameters to dp ttd_strlcpy(c->text, (_cmd_text != NULL) ? _cmd_text : "", lengthof(c->text));
memcpy(c->dp, _decode_parameters, 20 * sizeof(uint32));
if (_network_server) { if (_network_server) {
// If we are the server, we queue the command in our 'special' queue. // If we are the server, we queue the command in our 'special' queue.
@ -471,7 +465,7 @@ void NetworkSend_Command(uint32 tile, uint32 p1, uint32 p2, uint32 cmd, CommandC
void NetworkExecuteCommand(CommandPacket *cp) void NetworkExecuteCommand(CommandPacket *cp)
{ {
_current_player = cp->player; _current_player = cp->player;
memcpy(_decode_parameters, cp->dp, sizeof(cp->dp)); _cmd_text = cp->text;
/* cp->callback is unsigned. so we don't need to do lower bounds checking. */ /* cp->callback is unsigned. so we don't need to do lower bounds checking. */
if (cp->callback > _callback_table_count) { if (cp->callback > _callback_table_count) {
DEBUG(net,0) ("[NET] Received out-of-bounds callback! (%d)", cp->callback); DEBUG(net,0) ("[NET] Received out-of-bounds callback! (%d)", cp->callback);

2
network_data.h
View File

@ -38,7 +38,7 @@ typedef struct CommandPacket {
uint32 p1; /// parameter p1 uint32 p1; /// parameter p1
uint32 p2; /// parameter p2 uint32 p2; /// parameter p2
uint32 tile; /// tile command being executed on ; always make it uint32, so it is bigmap compatible (TileIndex) uint32 tile; /// tile command being executed on ; always make it uint32, so it is bigmap compatible (TileIndex)
uint32 dp[20]; /// _decode_parameters (for sending strings, etc.) char text[80];
uint32 frame; /// the frame in which this packet is executed uint32 frame; /// the frame in which this packet is executed
byte callback; /// any callback function executed upon successful completion of the command byte callback; /// any callback function executed upon successful completion of the command
} CommandPacket; } CommandPacket;

26
network_server.c
View File

@ -458,14 +458,11 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_COMMAND)(NetworkClientState *cs, Com
// uint32: P1 (free variables used in DoCommand) // uint32: P1 (free variables used in DoCommand)
// uint32: P2 // uint32: P2
// uint32: Tile // uint32: Tile
// uint32: decode_params // string: text
// 10 times the last one (lengthof(cp->dp))
// uint8: CallBackID (see callback_table.c) // uint8: CallBackID (see callback_table.c)
// uint32: Frame of execution // uint32: Frame of execution
// //
uint i;
char *dparam_char;
Packet *p = NetworkSend_Init(PACKET_SERVER_COMMAND); Packet *p = NetworkSend_Init(PACKET_SERVER_COMMAND);
NetworkSend_uint8(p, cp->player); NetworkSend_uint8(p, cp->player);
@ -473,14 +470,7 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_COMMAND)(NetworkClientState *cs, Com
NetworkSend_uint32(p, cp->p1); NetworkSend_uint32(p, cp->p1);
NetworkSend_uint32(p, cp->p2); NetworkSend_uint32(p, cp->p2);
NetworkSend_uint32(p, cp->tile); NetworkSend_uint32(p, cp->tile);
/* We are going to send them byte by byte, because dparam is misused NetworkSend_string(p, cp->text);
for chars (if it is used), and else we have a BigEndian / LittleEndian
problem.. we should fix the misuse of dparam... -- TrueLight */
dparam_char = (char *)&cp->dp[0];
for (i = 0; i < lengthof(cp->dp) * 4; i++) {
NetworkSend_uint8(p, *dparam_char);
dparam_char++;
}
NetworkSend_uint8(p, cp->callback); NetworkSend_uint8(p, cp->callback);
NetworkSend_uint32(p, cp->frame); NetworkSend_uint32(p, cp->frame);
@ -806,8 +796,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
{ {
NetworkClientState *new_cs; NetworkClientState *new_cs;
const NetworkClientInfo *ci; const NetworkClientInfo *ci;
char *dparam_char;
uint i;
byte callback; byte callback;
CommandPacket *cp = malloc(sizeof(CommandPacket)); CommandPacket *cp = malloc(sizeof(CommandPacket));
@ -824,15 +812,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
cp->p1 = NetworkRecv_uint32(cs, p); cp->p1 = NetworkRecv_uint32(cs, p);
cp->p2 = NetworkRecv_uint32(cs, p); cp->p2 = NetworkRecv_uint32(cs, p);
cp->tile = NetworkRecv_uint32(cs, p); cp->tile = NetworkRecv_uint32(cs, p);
/** @todo We are going to send dparams byte by byte, because dparam is misused NetworkRecv_string(cs, p, cp->text, lengthof(cp->text));
* for charstrings (if it is used), and else we have a Big/Little Endian
* problem.. we should fix the misuse of dparam... -- TrueLight
*/
dparam_char = (char *)&cp->dp[0];
for (i = 0; i < lengthof(cp->dp) * 4; i++) {
*dparam_char = NetworkRecv_uint8(cs, p);
dparam_char++;
}
callback = NetworkRecv_uint8(cs, p); callback = NetworkRecv_uint8(cs, p);

2
order_cmd.c
View File

@ -758,7 +758,7 @@ void RestoreVehicleOrders(Vehicle *v, BackuppedOrders *bak)
/* If we have a custom name, process that */ /* If we have a custom name, process that */
if (bak->name[0] != 0) { if (bak->name[0] != 0) {
strcpy((char*)_decode_parameters, bak->name); _cmd_text = bak->name;
DoCommandP(0, v->index, 0, NULL, CMD_NAME_VEHICLE); DoCommandP(0, v->index, 0, NULL, CMD_NAME_VEHICLE);
} }

2
player_gui.c
View File

@ -650,7 +650,7 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e)
if (*b == 0 && WP(w,def_d).byte_1 != 2) // empty string is allowed for password if (*b == 0 && WP(w,def_d).byte_1 != 2) // empty string is allowed for password
return; return;
memcpy(_decode_parameters, b, 32); _cmd_text = b;
switch (WP(w,def_d).byte_1) { switch (WP(w,def_d).byte_1) {
case 0: /* Change president name */ case 0: /* Change president name */
DoCommandP(0, w->window_number, 0, NULL, CMD_CHANGE_PRESIDENT_NAME | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT)); DoCommandP(0, w->window_number, 0, NULL, CMD_CHANGE_PRESIDENT_NAME | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT));

22
players.c
View File

@ -691,16 +691,18 @@ int32 CmdPlayerCtrl(int x, int y, uint32 flags, uint32 p1, uint32 p2)
PlayerID player_backup = _local_player; PlayerID player_backup = _local_player;
_network_player_info[p->index].months_empty = 0; _network_player_info[p->index].months_empty = 0;
/* XXX - When a client joins, we automatically set it's name to the player's /* XXX - When a client joins, we automatically set its name to the
* name (for some reason). As it stands now only the server knows the client's * player's name (for some reason). As it stands now only the server
* name, so it needs to send out a "broadcast" to do this. To achieve this we send * knows the client's name, so it needs to send out a "broadcast" to
* a network command. However, it uses _local_player to execute the command as. * do this. To achieve this we send a network command. However, it
* To prevent abuse (eg. only yourself can change your name/company), we 'cheat' * uses _local_player to execute the command as. To prevent abuse
* by impersonation _local_player as the server. Not the best solution; but it * (eg. only yourself can change your name/company), we 'cheat' by
* works. * impersonation _local_player as the server. Not the best solution;
* TODO: Perhaps this could be improved by when the client is ready with joining * but it works.
* to let it send itself the command, and not the server? For example in network_client.c:534? */ * TODO: Perhaps this could be improved by when the client is ready
memcpy(_decode_parameters, ci->client_name, 32); * with joining to let it send itself the command, and not the server?
* For example in network_client.c:534? */
_cmd_text = ci->client_name;
_local_player = ci->client_playas - 1; _local_player = ci->client_playas - 1;
NetworkSend_Command(0, 0, 0, CMD_CHANGE_PRESIDENT_NAME, NULL); NetworkSend_Command(0, 0, 0, CMD_CHANGE_PRESIDENT_NAME, NULL);
_local_player = player_backup; _local_player = player_backup;

20
roadveh_gui.c
View File

@ -159,11 +159,11 @@ do_change_service_int:
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, w->window_number, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_NAME_VEHICLE | CMD_MSG(STR_902D_CAN_T_NAME_ROAD_VEHICLE));
DoCommandP(0, w->window_number, 0, NULL, CMD_NAME_VEHICLE | CMD_MSG(STR_902D_CAN_T_NAME_ROAD_VEHICLE)); }
} break; } break;
} }
@ -441,11 +441,11 @@ static void NewRoadVehWndProc(Window *w, WindowEvent *e)
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, WP(w, buildtrain_d).rename_engine, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_RENAME_ENGINE | CMD_MSG(STR_9037_CAN_T_RENAME_ROAD_VEHICLE));
DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(STR_9037_CAN_T_RENAME_ROAD_VEHICLE)); }
} break; } break;
case WE_RESIZE: { case WE_RESIZE: {

20
ship_gui.c
View File

@ -236,11 +236,11 @@ do_change_service_int:
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, w->window_number, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_NAME_VEHICLE | CMD_MSG(STR_9832_CAN_T_NAME_SHIP));
DoCommandP(0, w->window_number, 0, NULL, CMD_NAME_VEHICLE | CMD_MSG(STR_9832_CAN_T_NAME_SHIP)); }
} break; } break;
} }
@ -378,11 +378,11 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, WP(w, buildtrain_d).rename_engine, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_RENAME_ENGINE | CMD_MSG(STR_9839_CAN_T_RENAME_SHIP_TYPE));
DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(STR_9839_CAN_T_RENAME_SHIP_TYPE)); }
} break; } break;
case WE_RESIZE: case WE_RESIZE:

2
signs.c
View File

@ -142,7 +142,7 @@ int32 CmdRenameSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
* So rename the sign. If it is empty, it has no name, so delete it */ * So rename the sign. If it is empty, it has no name, so delete it */
if (GetDParam(0) != 0) { if (GetDParam(0) != 0) {
/* Create the name */ /* Create the name */
StringID str = AllocateName((const char*)_decode_parameters, 0); StringID str = AllocateName(_cmd_text, 0);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

2
station_cmd.c
View File

@ -2658,7 +2658,7 @@ int32 CmdRenameStation(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!IsValidStation(st) || !CheckOwnership(st->owner)) return CMD_ERROR; if (!IsValidStation(st) || !CheckOwnership(st->owner)) return CMD_ERROR;
str = AllocateNameUnique((const char*)_decode_parameters, 6); str = AllocateNameUnique(_cmd_text, 6);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

13
station_gui.c
View File

@ -503,14 +503,13 @@ static void StationViewWndProc(Window *w, WindowEvent *e)
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
Station *st; if (e->edittext.str[0] != '\0') {
const char *b = e->edittext.str; Station* st = GetStation(w->window_number);
if (*b == 0)
return;
memcpy(_decode_parameters, b, 32);
st = GetStation(w->window_number); _cmd_text = e->edittext.str;
DoCommandP(st->xy, w->window_number, 0, NULL, CMD_RENAME_STATION | CMD_MSG(STR_3031_CAN_T_RENAME_STATION)); DoCommandP(st->xy, w->window_number, 0, NULL,
CMD_RENAME_STATION | CMD_MSG(STR_3031_CAN_T_RENAME_STATION));
}
} break; } break;
case WE_DESTROY: { case WE_DESTROY: {

2
town_cmd.c
View File

@ -1451,7 +1451,7 @@ int32 CmdRenameTown(int x, int y, uint32 flags, uint32 p1, uint32 p2)
t = GetTown(p1); t = GetTown(p1);
str = AllocateNameUnique((const char*)_decode_parameters, 4); str = AllocateNameUnique(_cmd_text, 4);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

10
town_gui.c
View File

@ -276,11 +276,11 @@ static void TownViewWndProc(Window *w, WindowEvent *e)
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, w->window_number, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_RENAME_TOWN | CMD_MSG(STR_2008_CAN_T_RENAME_TOWN));
DoCommandP(0, w->window_number, 0, NULL, CMD_RENAME_TOWN | CMD_MSG(STR_2008_CAN_T_RENAME_TOWN)); }
} break; } break;
} }
} }

21
train_gui.c
View File

@ -219,12 +219,11 @@ static void NewRailVehicleWndProc(Window *w, WindowEvent *e)
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL,
CMD_RENAME_ENGINE | CMD_MSG(STR_886B_CAN_T_RENAME_TRAIN_VEHICLE));
memcpy(_decode_parameters, b, 32); }
DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(STR_886B_CAN_T_RENAME_TRAIN_VEHICLE));
} break; } break;
case WE_RESIZE: { case WE_RESIZE: {
@ -1144,11 +1143,11 @@ do_change_service_int:
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
const char *b = e->edittext.str; if (e->edittext.str[0] != '\0') {
if (*b == 0) _cmd_text = e->edittext.str;
return; DoCommandP(0, w->window_number, 0, NULL,
memcpy(_decode_parameters, b, 32); CMD_NAME_VEHICLE | CMD_MSG(STR_8866_CAN_T_NAME_TRAIN));
DoCommandP(0, w->window_number, 0, NULL, CMD_NAME_VEHICLE | CMD_MSG(STR_8866_CAN_T_NAME_TRAIN)); }
} break; } break;
} }
} }

2
vehicle.c
View File

@ -1660,7 +1660,7 @@ int32 CmdNameVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!CheckOwnership(v->owner)) return CMD_ERROR; if (!CheckOwnership(v->owner)) return CMD_ERROR;
str = AllocateNameUnique((const char*)_decode_parameters, 2); str = AllocateNameUnique(_cmd_text, 2);
if (str == 0) return CMD_ERROR; if (str == 0) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

4
waypoint.c
View File

@ -302,8 +302,8 @@ int32 CmdRenameWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!IsWaypointIndex(p1)) return CMD_ERROR; if (!IsWaypointIndex(p1)) return CMD_ERROR;
if (_decode_parameters[0] != 0) { if (_cmd_text[0] != '\0') {
str = AllocateNameUnique((const char*)_decode_parameters, 0); str = AllocateNameUnique(_cmd_text, 0);
if (str == 0) if (str == 0)
return CMD_ERROR; return CMD_ERROR;