cpp/openttd-patchpack/source Changeset - r11222:f66b1fc27a15

Changeset - r11222:f66b1fc27a15

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

yexo - 15 years ago 2009-02-25 00:14:46
yexo@openttd.org

(svn r15575) -Codechange: Rename GameModes to GameMode and store _game_mode as GameMode instead of as byte.

6 files changed with 11 insertions and 10 deletions:

src/genworld_gui.cpp

src/gfx.cpp

src/network/network_client.cpp

src/openttd.cpp

src/openttd.h

src/video/dedicated_v.cpp

0 comments (0 inline, 0 general)

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -585,21 +585,21 @@ struct GenerateLandscapeWindow : public @@
 				} else {
 					_settings_newgame.game_creation.land_generator = index;
+				}
 				break;
 			case GLAND_TERRAIN_PULLDOWN: {
-				byte old_gm = _game_mode;
+				GameMode old_gm = _game_mode;
 				_game_mode = GM_MENU;
 				IConsoleSetSetting("difficulty.terrain_type", index);
 				_game_mode = old_gm;
 				break;
+			}
 			case GLAND_WATER_PULLDOWN: {
-				byte old_gm = _game_mode;
+				GameMode old_gm = _game_mode;
 				_game_mode = GM_MENU;
 				IConsoleSetSetting("difficulty.quantity_sea_lakes", index);
 				_game_mode = old_gm;
 				break;
+			}
+		}

src/gfx.cpp

➞

Show inline comments

 /* $Id$ */
 /** @file gfx.cpp Handling of drawing text and other gfx related stuff. */
 #include "stdafx.h"
 #include "openttd.h"
 #include "gfx_func.h"
 #include "variables.h"
 #include "spritecache.h"
 #include "fontcache.h"
 #include "genworld.h"
 #include "zoom_func.h"
@@ @@ -33,13 +34,13 @@ bool _left_button_clicked; ///< Is left @@
 bool _right_button_down;    ///< Is right mouse button pressed?
 bool _right_button_clicked; ///< Is right mouse button clicked?
 DrawPixelInfo _screen;
 bool _screen_disable_anim = false;   ///< Disable palette animation (important for 32bpp-anim blitter during giant screenshot)
 bool _exit_game;
 bool _networking;         ///< are we in networking mode?
-byte _game_mode;
+GameMode _game_mode;
 int8 _pause_game;
 int _pal_first_dirty;
 int _pal_count_dirty;
 Colour _cur_palette[256];
 byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth()

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -331,13 +331,13 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLI @@
 // **********
 // Receiving functions
 //   DEF_CLIENT_RECEIVE_COMMAND has parameter: Packet *p
 // **********
-extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm, Subdirectory subdir);
+extern bool SafeSaveOrLoad(const char *filename, int mode, GameMode newgm, Subdirectory subdir);
 extern StringID _switch_mode_errorstr;
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_FULL)
+{
 	// We try to join a server which is full
 	_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_FULL;

src/openttd.cpp

➞

Show inline comments

@@ @@ -841,15 +841,15 @@ static void StartScenario() @@
  * a previous correct state. In the menu for example load the intro game again.
  * @param filename file to be loaded
  * @param mode mode of loading, either SL_LOAD or SL_OLD_LOAD
  * @param newgm switch to this mode of loading fails due to some unknown error
  * @param subdir default directory to look for filename, set to 0 if not needed
  */
-bool SafeSaveOrLoad(const char *filename, int mode, int newgm, Subdirectory subdir)
+bool SafeSaveOrLoad(const char *filename, int mode, GameMode newgm, Subdirectory subdir)
+{
-	byte ogm = _game_mode;
+	GameMode ogm = _game_mode;
 	_game_mode = newgm;
 	assert(mode == SL_LOAD || mode == SL_OLD_LOAD);
 	switch (SaveOrLoad(filename, mode, subdir)) {
 		case SL_OK: return true;

src/openttd.h

➞

Show inline comments

@@ @@ -2,16 +2,16 @@ @@
 /** @file openttd.h Some generic types. */
 #ifndef OPENTTD_H
 #define OPENTTD_H
-enum GameModes {
+enum GameMode {
 	GM_MENU,
 	GM_NORMAL,
 	GM_EDITOR
+	GM_EDITOR,
 };
 enum SwitchModes {
 	SM_NONE            =  0,
 	SM_NEWGAME         =  1,
 	SM_EDITOR          =  2,
@@ @@ -32,11 +32,11 @@ enum { @@
 	DO_SHOW_SIGNS         = 2,
 	DO_FULL_ANIMATION     = 3,
 	DO_FULL_DETAIL        = 5,
 	DO_WAYPOINTS          = 6,
 };
-extern byte _game_mode;
+extern GameMode _game_mode;
 extern bool _exit_game;
 extern int8 _pause_game;
 #endif /* OPENTTD_H */

src/video/dedicated_v.cpp

➞

Show inline comments

@@ @@ -122,13 +122,13 @@ static void CloseWindowsConsoleThread() @@
 #endif
 static void *_dedicated_video_mem;
-extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm, Subdirectory subdir);
+extern bool SafeSaveOrLoad(const char *filename, int mode, GameMode newgm, Subdirectory subdir);
 extern void SwitchMode(int new_mode);
 static FVideoDriver_Dedicated iFVideoDriver_Dedicated;
 const char *VideoDriver_Dedicated::Start(const char * const *parm)

0 comments (0 inline, 0 general)