cpp/openttd-patchpack/source Changeset - r2982:cf402ad65f64

Changeset - r2982:cf402ad65f64

Parent rev.

Child rev.

[Not reviewed]

master

0 3 1

peter1138 - 19 years ago 2006-02-05 19:46:20
peter1138@openttd.org

(svn r3557) - NewGRF: move callback enums to a new file as more than just engines will use them

4 files changed with 42 insertions and 31 deletions:

newgrf_callbacks.h

newgrf_engine.c

newgrf_engine.h

train_cmd.c

0 comments (0 inline, 0 general)

newgrf_callbacks.h

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 #ifndef NEWGRF_CALLBACKS_H
 #define NEWGRF_CALLBACKS_H
 /** @file newgrf_callbacks.h
  */
 // This enum lists the implemented callbacks
 // Use as argument for the GetCallBackResult function (see comments there)
 enum CallbackID {
 	// Powered wagons, if the result is lower as 0x40 then the wagon is powered
 	// TODO: interpret the rest of the result, aka "visual effects"
 	CBID_WAGON_POWER = 0x10,
 	// Vehicle length, returns the amount of 1/8's the vehicle is shorter
 	// only for train vehicles
 	CBID_VEH_LENGTH = 0x11,
 	// Refit capacity, the passed vehicle needs to have its ->cargo_type set to
 	// the cargo we are refitting to, returns the new cargo capacity
 	CBID_REFIT_CAP = 0x15,
 	CBID_ARTIC_ENGINE = 0x16,
 };
 // bit positions for rvi->callbackmask, indicates which callbacks are used by an engine
 // (some callbacks are always used, and dont appear here)
 enum CallbackMask {
 	CBM_WAGON_POWER = 0,
 	CBM_VEH_LENGTH = 1,
 	CBM_REFIT_CAP = 3,
 	CBM_ARTIC_ENGINE = 4,
 };
 enum {
 	CALLBACK_FAILED = 0xFFFF
 };
 #endif /* NEWGRF_CALLBACKS_H */

newgrf_engine.c

➞

Show inline comments

@@ @@ -4,12 +4,13 @@ @@
 #include "openttd.h"
 #include "debug.h"
 #include "functions.h"
 #include "string.h"
 #include "strings.h"
 #include "engine.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_engine.h"
 #include "sprite.h"
 #include "variables.h"
 #include "train.h"
 // TODO: We don't support cargo-specific wagon overrides. Pretty exotic... ;-) --pasky

newgrf_engine.h

➞

Show inline comments

@@ @@ -3,43 +3,12 @@ @@
 #ifndef NEWGRF_ENGINE_H
 #define NEWGRF_ENGINE_H
 /** @file newgrf_engine.h
  */
 // This enum lists the implemented callbacks
 // Use as argument for the GetCallBackResult function (see comments there)
 enum CallbackID {
 	// Powered wagons, if the result is lower as 0x40 then the wagon is powered
 	// TODO: interpret the rest of the result, aka "visual effects"
 	CBID_WAGON_POWER = 0x10,
 	// Vehicle length, returns the amount of 1/8's the vehicle is shorter
 	// only for train vehicles
 	CBID_VEH_LENGTH = 0x11,
 	// Refit capacity, the passed vehicle needs to have its ->cargo_type set to
 	// the cargo we are refitting to, returns the new cargo capacity
 	CBID_REFIT_CAP = 0x15,
 	CBID_ARTIC_ENGINE = 0x16,
 };
 // bit positions for rvi->callbackmask, indicates which callbacks are used by an engine
 // (some callbacks are always used, and dont appear here)
 enum CallbackMask {
 	CBM_WAGON_POWER = 0,
 	CBM_VEH_LENGTH = 1,
 	CBM_REFIT_CAP = 3,
 	CBM_ARTIC_ENGINE = 4,
 };
 enum {
 	CALLBACK_FAILED = 0xFFFF
 };
 VARDEF const uint32 _default_refitmasks[NUM_VEHICLE_TYPES];
 VARDEF const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO];
 VARDEF const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE];
 VARDEF const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID];
 VARDEF const uint32 cargo_classes[16];

train_cmd.c

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ @@
 #include "player.h"
 #include "sound.h"
 #include "depot.h"
 #include "waypoint.h"
 #include "vehicle_gui.h"
 #include "train.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_engine.h"
 static bool TrainCheckIfLineEnds(Vehicle *v);
 static void TrainController(Vehicle *v);
 static const byte _vehicle_initial_x_fract[4] = {10,8,4,8};

0 comments (0 inline, 0 general)