mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22561) -Codechange: Remove constness from Object in ResolverObject.

This commit is contained in:
terkhen 2011-06-12 20:36:33 +00:00
parent 76cd19f846
commit f1cde00372
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_object.cpp
View File

@ -361,7 +361,7 @@ static const SpriteGroup *GetObjectSpriteGroup(const ObjectSpec *spec, const Obj
/** /**
* Returns a resolver object to be used with feature 0F spritegroups. * 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->GetRandomBits = ObjectGetRandomBits;
res->GetTriggers = ObjectGetTriggers; 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). * @param view The view of the object (only used when o == NULL).
* @return The result of the callback. * @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; ResolverObject object;
NewObjectResolver(&object, spec, o, tile, view); 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) void DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec)
{ {
ResolverObject object; ResolverObject object;
const Object *o = Object::GetByTile(ti->tile); Object *o = Object::GetByTile(ti->tile);
NewObjectResolver(&object, spec, o, ti->tile); NewObjectResolver(&object, spec, o, ti->tile);
const SpriteGroup *group = SpriteGroup::Resolve(GetObjectSpriteGroup(spec, o), &object); const SpriteGroup *group = SpriteGroup::Resolve(GetObjectSpriteGroup(spec, o), &object);

2
src/newgrf_object.h
View File

@ -95,7 +95,7 @@ typedef NewGRFClass<ObjectSpec, ObjectClassID, OBJECT_CLASS_MAX> ObjectClass;
/** Mapping of purchase for objects. */ /** Mapping of purchase for objects. */
static const CargoID CT_PURCHASE_OBJECT = 1; 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 DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec);
void DrawNewObjectTileInGUI(int x, int y, const ObjectSpec *spec, uint8 view); void DrawNewObjectTileInGUI(int x, int y, const ObjectSpec *spec, uint8 view);

2
src/newgrf_spritegroup.h
View File

@ -371,7 +371,7 @@ struct ResolverObject {
TileIndex tile; ///< Tile for the callback, only valid for airporttile callbacks. TileIndex tile; ///< Tile for the callback, only valid for airporttile callbacks.
} airport; } airport;
struct { 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. TileIndex tile; ///< The tile related to the object.
uint8 view; ///< The view of the object. uint8 view; ///< The view of the object.
} object; } object;