diff options
| author | terkhen <terkhen@openttd.org> | 2011-06-12 20:36:33 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2011-06-12 20:36:33 +0000 |
| commit | f1cde00372ccb90b56919a3e647e7a05a7dc672d (patch) | |
| tree | 70e5a0ae137a65fd42ec63a9f6bda35d7b6db89e | |
| parent | 76cd19f84608c134f642bca4e303f4b7370c7017 (diff) | |
| download | openttd-f1cde00372ccb90b56919a3e647e7a05a7dc672d.tar.xz | |
(svn r22561) -Codechange: Remove constness from Object in ResolverObject.
| -rw-r--r-- | src/newgrf_object.cpp | 6 | ||||
| -rw-r--r-- | src/newgrf_object.h | 2 | ||||
| -rw-r--r-- | src/newgrf_spritegroup.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp index a541c77ce..6b19f6d8f 100644 --- a/src/newgrf_object.cpp +++ b/src/newgrf_object.cpp @@ -361,7 +361,7 @@ static const SpriteGroup *GetObjectSpriteGroup(const ObjectSpec *spec, const Obj /** * Returns a resolver object to be used with feature 0F spritegroups. */ -static void NewObjectResolver(ResolverObject *res, const ObjectSpec *spec, const Object *o, TileIndex tile, uint8 view = 0) +static void NewObjectResolver(ResolverObject *res, const ObjectSpec *spec, Object *o, TileIndex tile, uint8 view = 0) { res->GetRandomBits = ObjectGetRandomBits; res->GetTriggers = ObjectGetTriggers; @@ -395,7 +395,7 @@ static void NewObjectResolver(ResolverObject *res, const ObjectSpec *spec, const * @param view The view of the object (only used when o == NULL). * @return The result of the callback. */ -uint16 GetObjectCallback(CallbackID callback, uint32 param1, uint32 param2, const ObjectSpec *spec, const Object *o, TileIndex tile, uint8 view) +uint16 GetObjectCallback(CallbackID callback, uint32 param1, uint32 param2, const ObjectSpec *spec, Object *o, TileIndex tile, uint8 view) { ResolverObject object; NewObjectResolver(&object, spec, o, tile, view); @@ -444,7 +444,7 @@ static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *grou void DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec) { ResolverObject object; - const Object *o = Object::GetByTile(ti->tile); + Object *o = Object::GetByTile(ti->tile); NewObjectResolver(&object, spec, o, ti->tile); const SpriteGroup *group = SpriteGroup::Resolve(GetObjectSpriteGroup(spec, o), &object); diff --git a/src/newgrf_object.h b/src/newgrf_object.h index 5997f8d5a..2065b49d8 100644 --- a/src/newgrf_object.h +++ b/src/newgrf_object.h @@ -95,7 +95,7 @@ typedef NewGRFClass<ObjectSpec, ObjectClassID, OBJECT_CLASS_MAX> ObjectClass; /** Mapping of purchase for objects. */ static const CargoID CT_PURCHASE_OBJECT = 1; -uint16 GetObjectCallback(CallbackID callback, uint32 param1, uint32 param2, const ObjectSpec *spec, const Object *o, TileIndex tile, uint8 view = 0); +uint16 GetObjectCallback(CallbackID callback, uint32 param1, uint32 param2, const ObjectSpec *spec, Object *o, TileIndex tile, uint8 view = 0); void DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec); void DrawNewObjectTileInGUI(int x, int y, const ObjectSpec *spec, uint8 view); diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index c05031cca..2a1b054f6 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -371,7 +371,7 @@ struct ResolverObject { TileIndex tile; ///< Tile for the callback, only valid for airporttile callbacks. } airport; struct { - const struct Object *o; ///< The object the callback is ran for. + struct Object *o; ///< The object the callback is ran for. TileIndex tile; ///< The tile related to the object. uint8 view; ///< The view of the object. } object; |