mirror of https://github.com/OpenTTD/OpenTTD
(svn r2340) - Fix (Regression): [ 1203731 ] Signs don't work in multiplayer, unwanted remains of the _decode_parameters to _cmd_text move.
parent
54b7fb0203
commit
a5612ab10a
10
signs.c
10
signs.c
|
@ -136,17 +136,15 @@ int32 CmdPlaceSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
|
||||||
*/
|
*/
|
||||||
int32 CmdRenameSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
|
int32 CmdRenameSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
|
||||||
{
|
{
|
||||||
SignStruct *ss;
|
/* If _cmd_text != 0 means the new text for the sign is non-empty.
|
||||||
|
|
||||||
/* If GetDParam(0) != 0 means the new text for the sign is non-empty.
|
|
||||||
* 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 (_cmd_text != NULL) {
|
||||||
/* Create the name */
|
/* Create the name */
|
||||||
StringID str = AllocateName(_cmd_text, 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) {
|
||||||
ss = GetSign(p1);
|
SignStruct *ss = GetSign(p1);
|
||||||
|
|
||||||
/* Delete the old name */
|
/* Delete the old name */
|
||||||
DeleteName(ss->str);
|
DeleteName(ss->str);
|
||||||
|
@ -166,7 +164,7 @@ int32 CmdRenameSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
|
||||||
}
|
}
|
||||||
} else { /* Delete sign */
|
} else { /* Delete sign */
|
||||||
if (flags & DC_EXEC) {
|
if (flags & DC_EXEC) {
|
||||||
ss = GetSign(p1);
|
SignStruct *ss = GetSign(p1);
|
||||||
|
|
||||||
/* Delete the name */
|
/* Delete the name */
|
||||||
DeleteName(ss->str);
|
DeleteName(ss->str);
|
||||||
|
|
Loading…
Reference in New Issue