cpp/openttd-patchpack/source Changeset - r8275:5932486ddd21

Changeset - r8275:5932486ddd21

Parent rev.

Child rev.

[Not reviewed]

master

0 13 0

rubidium - 17 years ago 2008-01-13 21:41:24
rubidium@openttd.org

(svn r11839) -Codechange: move some variables from variables.h to a more logical location.

13 files changed with 29 insertions and 10 deletions:

src/blitter/factory.hpp

src/command.cpp

src/command_func.h

src/driver.cpp

src/music/music_driver.hpp

src/newgrf_industries.cpp

src/newgrf_industrytiles.cpp

src/settings.cpp

src/sound/sound_driver.hpp

src/station.cpp

src/strings.cpp

src/variables.h

src/video/video_driver.hpp

0 comments (0 inline, 0 general)

src/blitter/factory.hpp

➞

Show inline comments

@@ @@ -127,7 +127,9 @@ public: @@
 	/**
 	 * Get the long, human readable, name for the Blitter-class.
 	 */
 	const char *GetName();
 };
 extern char _ini_blitter[32];
 #endif /* BLITTER_FACTORY_HPP */

src/command.cpp

➞

Show inline comments

@@ @@ -21,12 +21,13 @@ @@
 #include "player_func.h"
 #include "player_base.h"
 #include "table/strings.h"
 const char *_cmd_text = NULL;
 StringID _error_message;
 /**
  * Helper macro to define the header of all command handler macros.
+ *
  * This macro create the function header for a given command handler function, as
  * all command handler functions got the parameters from the #CommandProc callback

src/command_func.h

➞

Show inline comments

@@ @@ -74,12 +74,13 @@ void NetworkSend_Command(TileIndex tile, @@
  * This variable contains a string (be specific a pointer of the first
  * char of this string) which will be send with a command. This is
  * used for user input data like names or chat messages.
  */
 extern const char *_cmd_text;
 extern Money _additional_cash_required;
 extern StringID _error_message;
 /**
  * Checks if a integer value belongs to a command.
  */
 bool IsValidCommand(uint32 cmd);
 /**

src/driver.cpp

➞

Show inline comments

@@ @@ -8,15 +8,25 @@ @@
 #include "driver.h"
 #include "sound/sound_driver.hpp"
 #include "music/music_driver.hpp"
 #include "video/video_driver.hpp"
 VideoDriver *_video_driver;
 char _ini_videodriver[32];
 int _num_resolutions;
 uint16 _resolutions[32][2];
 uint16 _cur_resolution[2];
 SoundDriver *_sound_driver;
 char _ini_sounddriver[32];
 MusicDriver *_music_driver;
 VideoDriver *_video_driver;
 char _ini_musicdriver[32];
 char _ini_blitter[32];
 static const char* GetDriverParam(const char* const* parm, const char* name)
+{
 	size_t len;
 	if (parm == NULL) return NULL;

src/music/music_driver.hpp

➞

Show inline comments

@@ @@ -28,8 +28,9 @@ public: @@
 	 * Get the long, human readable, name for the Driver-class.
 	 */
 	const char *GetName();
 };
 extern MusicDriver *_music_driver;
 extern char _ini_musicdriver[32];
 #endif /* MUSIC_MUSIC_DRIVER_HPP */

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -18,12 +18,13 @@ @@
 #include "newgrf_text.h"
 #include "newgrf_town.h"
 #include "window_func.h"
 #include "town.h"
 #include "player_func.h"
 #include "player_base.h"
 #include "command_func.h"
 #include "table/strings.h"
 /* Since the industry IDs defined by the GRF file don't necessarily correlate
  * to those used by the game, the IDs used for overriding old industries must be
  * translated when the idustry spec is set. */

src/newgrf_industrytiles.cpp

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ @@
 #include "industry_map.h"
 #include "clear_map.h"
 #include "sprite.h"
 #include "transparency.h"
 #include "functions.h"
 #include "town.h"
 #include "command_func.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 static uint32 GetGRFParameter(IndustryGfx indtile_id, byte parameter)
+{

src/settings.cpp

➞

Show inline comments

@@ @@ -48,12 +48,16 @@ @@
 #endif
 #include "spritecache.h"
 #include "transparency.h"
 #include "string_func.h"
 #include "gui.h"
 #include "town.h"
 #include "video/video_driver.hpp"
 #include "sound/sound_driver.hpp"
 #include "music/music_driver.hpp"
 #include "blitter/factory.hpp"
 #include "table/strings.h"
 GameOptions _opt;
 GameOptions _opt_newgame;
 GameOptions *_opt_ptr;

src/sound/sound_driver.hpp

➞

Show inline comments

@@ @@ -20,8 +20,9 @@ public: @@
 	 * Get the long, human readable, name for the Driver-class.
 	 */
 	const char *GetName();
 };
 extern SoundDriver *_sound_driver;
 extern char _ini_sounddriver[32];
 #endif /* SOUND_SOUND_DRIVER_HPP */

src/station.cpp

➞

Show inline comments

@@ @@ -27,12 +27,13 @@ @@
 #include "zoom_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "variables.h"
 #include "settings_type.h"
 #include "command_func.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 Station::Station(TileIndex tile)
+{

src/strings.cpp

➞

Show inline comments

@@ @@ -33,12 +33,13 @@ @@
 #include "vehicle_base.h"
 #include "string_func.h"
 #include "player_func.h"
 #include "player_base.h"
 #include "fios.h"
 #include "settings_type.h"
 #include "video/video_driver.hpp"
 #include "table/strings.h"
 #include "table/control_codes.h"
 DynamicLanguages _dynlang;
 char _userstring[128];

src/variables.h

➞

Show inline comments

@@ @@ -76,37 +76,28 @@ VARDEF bool _is_old_ai_player; // curren @@
 VARDEF bool _do_autosave;
 VARDEF int _autosave_ctr;
 VARDEF byte _display_opt;
 VARDEF int _caret_timer;
 VARDEF StringID _error_message;
 VARDEF bool _rightclick_emulate;
 /* IN/OUT parameters to commands */
 VARDEF TileIndex _build_tunnel_endtile;
 VARDEF bool _generating_world;
 /* Used when switching from the intro menu. */
 VARDEF byte _switch_mode;
 VARDEF StringID _switch_mode_errorstr;
 VARDEF char _ini_videodriver[32], _ini_musicdriver[32], _ini_sounddriver[32], _ini_blitter[32];
 VARDEF int _num_resolutions;
 VARDEF uint16 _resolutions[32][2];
 VARDEF uint16 _cur_resolution[2];
 VARDEF char _savegame_format[8];
 VARDEF char *_config_file;
 VARDEF char *_highscore_file;
 VARDEF char *_log_file;
 /* landscape.cpp */
 extern const byte _tileh_to_sprite[32];
 extern bool _draw_bounding_boxes;
 /* misc */

src/video/video_driver.hpp

➞

Show inline comments

@@ @@ -28,8 +28,12 @@ public: @@
 	 * Get the long, human readable, name for the Driver-class.
 	 */
 	const char *GetName();
 };
 extern VideoDriver *_video_driver;
 extern char _ini_videodriver[32];
 extern int _num_resolutions;
 extern uint16 _resolutions[32][2];
 extern uint16 _cur_resolution[2];
 #endif /* VIDEO_VIDEO_DRIVER_HPP */

0 comments (0 inline, 0 general)