summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-05-02 20:44:06 +0000
committerpeter1138 <peter1138@openttd.org>2006-05-02 20:44:06 +0000
commit36a98ba47ea6df093b31a29442649b0d5abac1f9 (patch)
tree13287f232f3c5211e11b890324506bd9494ed49f
parent26f6659ec0d8f7c752d12d45cfbfd25a9da05af4 (diff)
downloadopenttd-36a98ba47ea6df093b31a29442649b0d5abac1f9.tar.xz
(svn r4697) - NewGRF: callback IDs can now be 16 bit values.
-rw-r--r--newgrf_engine.c2
-rw-r--r--newgrf_spritegroup.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/newgrf_engine.c b/newgrf_engine.c
index 519977c94..de61aa01a 100644
--- a/newgrf_engine.c
+++ b/newgrf_engine.c
@@ -765,7 +765,7 @@ bool UsesWagonOverride(const Vehicle* v)
* @param vehicle The vehicle to evaluate the callback for, or NULL if it doesnt exist yet
* @return The value the callback returned, or CALLBACK_FAILED if it failed
*/
-uint16 GetVehicleCallback(byte callback, uint32 param1, uint32 param2, EngineID engine, const Vehicle *v)
+uint16 GetVehicleCallback(uint16 callback, uint32 param1, uint32 param2, EngineID engine, const Vehicle *v)
{
const SpriteGroup *group;
ResolverObject object;
diff --git a/newgrf_spritegroup.h b/newgrf_spritegroup.h
index 4716fcafd..3f3a2ee8d 100644
--- a/newgrf_spritegroup.h
+++ b/newgrf_spritegroup.h
@@ -156,7 +156,7 @@ void InitializeSpriteGroupPool(void);
typedef struct ResolverObject {
- byte callback;
+ uint16 callback;
uint32 callback_param1;
uint32 callback_param2;