src/misc_cmd.cpp
branchcustombridgeheads
changeset 5650 aefc131bf5ce
parent 5649 55c8267c933f
child 6235 5077e6ed3788
child 6516 ee6d057b9850
--- a/src/misc_cmd.cpp	Thu Jan 11 13:41:16 2007 +0000
+++ b/src/misc_cmd.cpp	Mon Jan 15 20:14:06 2007 +0000
@@ -40,7 +40,7 @@
 {
 	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 @@
 	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 @@
 	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;
 	}