(svn r22918) -Fix: [NewGRF] Properties for feature 0x05 were not zeroed for each NewGRF, thus waterfeatures could glitch when the properties were set by a previous NewGRF and the NewGRF assumed the properties to be unmodified

This commit is contained in:
planetmaker
2011-09-11 09:31:57 +00:00
parent bc52aa11a6
commit 3b70f697e1
3 changed files with 40 additions and 18 deletions

View File

@@ -16,6 +16,27 @@
#include "rail_type.h"
#include "fileio_type.h"
/**
* List of different canal 'features'.
* Each feature gets an entry in the canal spritegroup table
*/
enum CanalFeature {
CF_WATERSLOPE,
CF_LOCKS,
CF_DIKES,
CF_ICON,
CF_DOCKS,
CF_RIVER_SLOPE,
CF_RIVER_EDGE,
CF_END,
};
/** Canal properties local to the NewGRF */
struct CanalProperties {
uint8 callback_mask; ///< Bitmask of canal callbacks that have to be called.
uint8 flags; ///< Flags controlling display.
};
enum GrfLoadingStage {
GLS_FILESCAN,
GLS_SAFETYSCAN,
@@ -104,6 +125,8 @@ struct GRFFile {
RailTypeLabel *railtype_list;
RailType railtype_map[RAILTYPE_END];
CanalProperties canal_local_properties[CF_END]; ///< Canal properties as set by this NewGRF
struct LanguageMap *language_map; ///< Mappings related to the languages.
int traininfo_vehicle_pitch; ///< Vertical offset for draing train images in depot GUI and vehicle details