gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20184) -Codechange: make _trees_tick_ctr and _disaster_delay not use VARDEF and put them in a more logical location

Browse Source
This commit is contained in:
rubidium 2010-07-19 15:51:06 +00:00
parent 45213e5708
commit 3bb544e54d
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/disaster_cmd.cpp
View File

@ -48,6 +48,9 @@
#include "table/strings.h" #include "table/strings.h"
#include "table/sprites.h" #include "table/sprites.h"
/** Delay counter for considering the next disaster. */
uint16 _disaster_delay;
enum DisasterSubType { enum DisasterSubType {
ST_ZEPPELINER, ST_ZEPPELINER,
ST_ZEPPELINER_SHADOW, ST_ZEPPELINER_SHADOW,

2
src/saveload/misc_sl.cpp
View File

@ -26,6 +26,8 @@
#include "saveload.h" #include "saveload.h"
extern TileIndex _cur_tileloop_tile; extern TileIndex _cur_tileloop_tile;
extern uint16 _disaster_delay;
extern byte _trees_tick_ctr;
/* Keep track of current game position */ /* Keep track of current game position */
int _saved_scrollpos_x; int _saved_scrollpos_x;

2
src/saveload/oldloader_sl.cpp
View File

@ -1552,6 +1552,8 @@ static bool LoadTTDPatchExtraChunks(LoadgameState *ls, int num)
} }
extern TileIndex _cur_tileloop_tile; extern TileIndex _cur_tileloop_tile;
extern uint16 _disaster_delay;
extern byte _trees_tick_ctr;
static const OldChunks main_chunk[] = { static const OldChunks main_chunk[] = {
OCL_ASSERT( OC_TTD, 0 ), OCL_ASSERT( OC_TTD, 0 ),
OCL_ASSERT( OC_TTO, 0 ), OCL_ASSERT( OC_TTO, 0 ),

2
src/tree_cmd.cpp
View File

@ -52,6 +52,8 @@ enum ExtraTreePlacement {
ETP_ALL, ///< Place trees on all tiles 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 * Tests if a tile can be converted to MP_TREES

6
src/variables.h
View File

@ -19,12 +19,6 @@
/* Amount of game ticks */ /* Amount of game ticks */
VARDEF uint16 _tick_counter; 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. */ /* NOSAVE: Used in palette animations only, not really important. */
VARDEF int _palette_animation_counter; VARDEF int _palette_animation_counter;