Changeset - r15515:db92a54a178e
[Not reviewed]
master
0 5 0
rubidium - 14 years ago 2010-07-19 15:51:06
rubidium@openttd.org
(svn r20184) -Codechange: make _trees_tick_ctr and _disaster_delay not use VARDEF and put them in a more logical location
5 files changed with 9 insertions and 6 deletions:
0 comments (0 inline, 0 general)
src/disaster_cmd.cpp
Show inline comments
 
@@ -48,6 +48,9 @@
 
#include "table/strings.h"
 
#include "table/sprites.h"
 

	
 
/** Delay counter for considering the next disaster. */
 
uint16 _disaster_delay;
 

	
 
enum DisasterSubType {
 
	ST_ZEPPELINER,
 
	ST_ZEPPELINER_SHADOW,
src/saveload/misc_sl.cpp
Show inline comments
 
@@ -26,6 +26,8 @@
 
#include "saveload.h"
 

	
 
extern TileIndex _cur_tileloop_tile;
 
extern uint16 _disaster_delay;
 
extern byte _trees_tick_ctr;
 

	
 
/* Keep track of current game position */
 
int _saved_scrollpos_x;
src/saveload/oldloader_sl.cpp
Show inline comments
 
@@ -1552,6 +1552,8 @@ static bool LoadTTDPatchExtraChunks(Load
 
}
 

	
 
extern TileIndex _cur_tileloop_tile;
 
extern uint16 _disaster_delay;
 
extern byte _trees_tick_ctr;
 
static const OldChunks main_chunk[] = {
 
	OCL_ASSERT( OC_TTD, 0 ),
 
	OCL_ASSERT( OC_TTO, 0 ),
src/tree_cmd.cpp
Show inline comments
 
@@ -52,6 +52,8 @@ enum ExtraTreePlacement {
 
	ETP_ALL,        ///< Place trees on all tiles
 
};
 

	
 
/** Determines when to consider building more trees. */
 
byte _trees_tick_ctr;
 

	
 
/**
 
 * Tests if a tile can be converted to MP_TREES
src/variables.h
Show inline comments
 
@@ -19,12 +19,6 @@
 
/* Amount of game ticks */
 
VARDEF uint16 _tick_counter;
 

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

	
 
/* Determines how often to run the tree loop */
 
VARDEF byte _trees_tick_ctr;
 

	
 
/* NOSAVE: Used in palette animations only, not really important. */
 
VARDEF int _palette_animation_counter;
 

	
0 comments (0 inline, 0 general)