(svn r12335) -Codechange: Don't stuff signed values into a unsigned variable when the variable can just be unsigned...
authorpeter1138
Tue, 04 Mar 2008 12:14:34 +0000
changeset 9166 b37d9f4017e5
parent 9165 765c4f60311c
child 9167 a2b146a9be68
(svn r12335) -Codechange: Don't stuff signed values into a unsigned variable when the variable can just be unsigned...
src/gfx.cpp
src/misc_cmd.cpp
src/openttd.cpp
src/openttd.h
--- a/src/gfx.cpp	Tue Mar 04 12:13:15 2008 +0000
+++ b/src/gfx.cpp	Tue Mar 04 12:14:34 2008 +0000
@@ -37,7 +37,7 @@
 bool _exit_game;
 bool _networking;         ///< are we in networking mode?
 byte _game_mode;
-byte _pause_game;
+int8 _pause_game;
 int _pal_first_dirty;
 int _pal_count_dirty;
 
--- a/src/misc_cmd.cpp	Tue Mar 04 12:13:15 2008 +0000
+++ b/src/misc_cmd.cpp	Tue Mar 04 12:14:34 2008 +0000
@@ -314,11 +314,11 @@
 		_pause_game += (p1 == 0) ? -1 : 1;
 
 		switch (_pause_game) {
-			case (byte)-4:
-			case (byte)-1:
+			case -4:
+			case -1:
 				_pause_game = 0;
 				break;
-			case (byte)-3:
+			case -3:
 				ShowQuery(
 					STR_NEWGRF_UNPAUSE_WARNING_TITLE,
 					STR_NEWGRF_UNPAUSE_WARNING,
--- a/src/openttd.cpp	Tue Mar 04 12:13:15 2008 +0000
+++ b/src/openttd.cpp	Tue Mar 04 12:14:34 2008 +0000
@@ -1399,7 +1399,7 @@
 
 	switch (gcf_res) {
 		case GLC_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break;
-		case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_game = (byte)-1; break;
+		case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_game = -1; break;
 		default: break;
 	}
 
--- a/src/openttd.h	Tue Mar 04 12:13:15 2008 +0000
+++ b/src/openttd.h	Tue Mar 04 12:14:34 2008 +0000
@@ -156,6 +156,6 @@
 
 extern byte _game_mode;
 extern bool _exit_game;
-extern byte _pause_game;
+extern int8 _pause_game;
 
 #endif /* OPENTTD_H */