dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r22569) -Feature: [NewGRF] Persistent storage for towns.

Browse Source
This commit is contained in:
terkhen
2011-06-12 20:50:03 +00:00
parent 7ffc8c0173
commit a619ad3789
8 changed files with 126 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/newgrf_object.cpp
View File

@@ -224,7 +224,7 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt
if (object->scope == VSG_SCOPE_PARENT) {
/* Pass the request on to the town of the object */
return TownGetVariable(variable, parameter, available, (o == NULL) ? ClosestTownFromTile(tile, UINT_MAX) : o->town);
return TownGetVariable(variable, parameter, available, (o == NULL) ? ClosestTownFromTile(tile, UINT_MAX) : o->town, object->grffile);
}
/* We get the town from the object, or we calculate the closest
@@ -358,6 +358,22 @@ static const SpriteGroup *GetObjectSpriteGroup(const ObjectSpec *spec, const Obj
}
/**
* Store a value into the persistent storage of the object's parent.
* @param object Object that we want to query.
* @param pos Position in the persistent storage to use.
* @param value Value to store.
*/
void ObjectStorePSA(ResolverObject *object, uint pos, int32 value)
{
/* Objects have no persistent storage. */
Object *o = object->u.object.o;
if (object->scope != VSG_SCOPE_PARENT || o == NULL) return;
/* Pass the request on to the town of the object */
TownStorePSA(o->town, object->grffile, pos, value);
}
/**
* Returns a resolver object to be used with feature 0F spritegroups.
*/
@@ -368,6 +384,7 @@ static void NewObjectResolver(ResolverObject *res, const ObjectSpec *spec, Objec
res->SetTriggers = ObjectSetTriggers;
res->GetVariable = ObjectGetVariable;
res->ResolveReal = ObjectResolveReal;
res->StorePSA = ObjectStorePSA;
res->u.object.o = o;
res->u.object.tile = tile;