From f35ed4bbc2b05f1b83476b60948d64375f77f1b4 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Wed, 10 Jan 2007 18:56:51 +0000
Subject: (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx,
 Smoovius, stillunknown and pv2b.

---
 src/misc_cmd.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/misc_cmd.cpp')

diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 94b675531..9eb9e6647 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -40,7 +40,7 @@ int32 CmdSetPlayerColor(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	Player *p, *pp;
 	byte colour;
-	LiveryScheme scheme = GB(p1, 0, 8);
+	LiveryScheme scheme = (LiveryScheme)GB(p1, 0, 8);
 	byte state = GB(p1, 8, 2);
 
 	if (p2 >= 16) return CMD_ERROR; // max 16 colours
@@ -271,7 +271,7 @@ int32 CmdMoneyCheat(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	if (_networking) return CMD_ERROR;
 #endif
 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
-	return (int32)p1;
+	return -(int32)p1;
 }
 
 /** Transfer funds (money) from one player to another.
@@ -296,7 +296,7 @@ int32 CmdGiveMoney(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	if (flags & DC_EXEC) {
 		/* Add money to player */
 		PlayerID old_cp = _current_player;
-		_current_player = p2;
+		_current_player = (PlayerID)p2;
 		SubtractMoneyFromPlayer(-amount);
 		_current_player = old_cp;
 	}
-- 
cgit v1.2.3-70-g09d2