cpp/openttd-patchpack/source Changeset - r15515:db92a54a178e

Changeset - r15515:db92a54a178e

Parent rev.

Child rev.

[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:

src/disaster_cmd.cpp

src/saveload/misc_sl.cpp

src/saveload/oldloader_sl.cpp

src/tree_cmd.cpp

src/variables.h

0 comments (0 inline, 0 general)

src/disaster_cmd.cpp

➞

Show inline comments

@@ @@ -45,12 +45,15 @@ @@
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"
 #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,
 	ST_SMALL_UFO,
 	ST_SMALL_UFO_SHADOW,
 	ST_AIRPLANE,

src/saveload/misc_sl.cpp

➞

Show inline comments

@@ @@ -23,12 +23,14 @@ @@
 #include "../core/random_func.hpp"
 #include "../fios.h"
 #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;
 int _saved_scrollpos_y;
 ZoomLevelByte _saved_scrollpos_zoom;

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -1549,12 +1549,14 @@ static bool LoadTTDPatchExtraChunks(Load @@
+	}
 	return !ls->failed;
+}
 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 ),
 	OCL_VAR ( OC_FILE_U16 | OC_VAR_U32, 1, &_date ),
 	OCL_VAR ( OC_UINT16,   1, &_date_fract ),
 	OCL_NULL( 600 ),            ///< TextEffects

src/tree_cmd.cpp

➞

Show inline comments

@@ @@ -49,12 +49,14 @@ enum TreePlacer { @@
 enum ExtraTreePlacement {
 	ETP_NONE,       ///< Place trees on no tiles
 	ETP_RAINFOREST, ///< Place trees only on rainforest 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
  * This is true for clear ground without farms or rocks.
+ *
  * @param tile the tile of interest

src/variables.h

➞

Show inline comments

@@ @@ -16,18 +16,12 @@ @@
 #define VARDEF extern
 #endif
 /* 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;
 VARDEF uint32 _realtime_tick;
 VARDEF byte _display_opt;

0 comments (0 inline, 0 general)