Changeset - r8973:bd926d7578a7
[Not reviewed]
master
0 13 0
rubidium - 17 years ago 2008-04-18 10:16:51
rubidium@openttd.org
(svn r12765) -Codechange: move some stuff out of variables.h that required including other headers in variables.h.
13 files changed with 14 insertions and 10 deletions:
0 comments (0 inline, 0 general)
src/landscape.cpp
Show inline comments
 
@@ -610,6 +610,7 @@ CommandCost CmdClearArea(TileIndex tile,
 
}
 

	
 

	
 
TileIndex _cur_tileloop_tile;
 
#define TILELOOP_BITS 4
 
#define TILELOOP_SIZE (1 << TILELOOP_BITS)
 
#define TILELOOP_ASSERTMASK ((TILELOOP_SIZE - 1) + ((TILELOOP_SIZE - 1) << MapLogX()))
src/misc.cpp
Show inline comments
 
@@ -31,6 +31,7 @@
 
#include "table/sprites.h"
 

	
 
char _name_array[512][32];
 
extern TileIndex _cur_tileloop_tile;
 

	
 
void InitializeVehicles();
 
void InitializeWaypoints();
src/misc_gui.cpp
Show inline comments
 
@@ -567,6 +567,7 @@ static void ErrmsgWndProc(Window *w, Win
 

	
 
		case WE_DESTROY:
 
			SetRedErrorSquare(0);
 
			extern StringID _switch_mode_errorstr;
 
			_switch_mode_errorstr = INVALID_STRING_ID;
 
			break;
 

	
src/network/core/tcp.cpp
Show inline comments
 
@@ -75,6 +75,7 @@ NetworkRecvStatus NetworkTCPSocketHandle
 
	if (!_network_server && _networking) {
 
		_switch_mode = SM_MENU;
 
		_networking = false;
 
		extern StringID _switch_mode_errorstr;
 
		_switch_mode_errorstr = STR_NETWORK_ERR_LOSTCONNECTION;
 

	
 
		return NETWORK_RECV_STATUS_CONN_LOST;
src/network/network.cpp
Show inline comments
 
@@ -224,6 +224,7 @@ uint NetworkCalculateLag(const NetworkTC
 
static void NetworkError(StringID error_string)
 
{
 
	_switch_mode = SM_MENU;
 
	extern StringID _switch_mode_errorstr;
 
	_switch_mode_errorstr = error_string;
 
}
 

	
src/network/network_client.cpp
Show inline comments
 
@@ -328,6 +328,7 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLI
 
// **********
 

	
 
extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm, Subdirectory subdir);
 
extern StringID _switch_mode_errorstr;
 

	
 
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_FULL)
 
{
src/oldloader.cpp
Show inline comments
 
@@ -1473,6 +1473,7 @@ static bool LoadTTDPatchExtraChunks(Load
 
	return !ls->failed;
 
}
 

	
 
extern TileIndex _cur_tileloop_tile;
 
static uint32 _old_cur_town_ctr;
 
static const OldChunks main_chunk[] = {
 
	OCL_ASSERT( 0 ),
src/openttd.cpp
Show inline comments
 
@@ -84,6 +84,8 @@
 

	
 
#include "table/strings.h"
 

	
 
StringID _switch_mode_errorstr;
 

	
 
void CallLandscapeTick();
 
void IncreaseDate();
 
void DoPaletteAnimations();
src/rail_gui.cpp
Show inline comments
 
@@ -29,6 +29,7 @@
 
#include "settings_type.h"
 
#include "widgets/dropdown_type.h"
 
#include "widgets/dropdown_func.h"
 
#include "tunnelbridge.h"
 

	
 
#include "bridge_map.h"
 
#include "rail_map.h"
src/road_gui.cpp
Show inline comments
 
@@ -22,6 +22,7 @@
 
#include "sound_func.h"
 
#include "player_func.h"
 
#include "settings_type.h"
 
#include "tunnelbridge.h"
 

	
 
#include "table/sprites.h"
 
#include "table/strings.h"
src/tunnelbridge.h
Show inline comments
 
@@ -6,8 +6,6 @@
 
#define TUNNELBRIDGE_H
 

	
 
#include "tile_type.h"
 
#include "map_func.h"
 
#include "tunnelbridge_map.h"
 

	
 
/**
 
 * Calculates the length of a tunnel or a bridge (without end tiles)
 
@@ -23,4 +21,6 @@ static inline uint GetTunnelBridgeLength
 
	return abs(x2 + y2 - x1 - y1) - 1;
 
}
 

	
 
extern TileIndex _build_tunnel_endtile;
 

	
 
#endif /* TUNNELBRIDGE_H */
src/tunnelbridge_cmd.cpp
Show inline comments
 
@@ -44,6 +44,7 @@
 
#include "table/bridge_land.h"
 

	
 
BridgeSpec _bridge[MAX_BRIDGES];
 
TileIndex _build_tunnel_endtile;
 

	
 
/** Reset the data been eventually changed by the grf loaded. */
 
void ResetBridges()
src/variables.h
Show inline comments
 
@@ -5,18 +5,12 @@
 
#ifndef VARIABLES_H
 
#define VARIABLES_H
 

	
 
#include "tile_type.h"
 
#include "strings_type.h"
 

	
 
/* Amount of game ticks */
 
VARDEF uint16 _tick_counter;
 

	
 
/* Skip aging of cargo? */
 
VARDEF byte _age_cargo_skip_counter;
 

	
 
/* Position in tile loop */
 
VARDEF TileIndex _cur_tileloop_tile;
 

	
 
/* Also save scrollpos_x, scrollpos_y and zoom */
 
VARDEF uint16 _disaster_delay;
 

	
 
@@ -57,12 +51,10 @@ VARDEF int _caret_timer;
 
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 _savegame_format[8];
 

	
0 comments (0 inline, 0 general)