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

(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.

Browse Source
This commit is contained in:
frosch
2013-11-24 14:41:19 +00:00
parent 926fb4c6c5
commit 6c63c98d7f
27 changed files with 155 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_cargo.cpp
View File

@@ -50,7 +50,7 @@ CargoResolverObject::CargoResolverObject(const CargoSpec *cs, CallbackID callbac
SpriteID GetCustomCargoSprite(const CargoSpec *cs)
{
CargoResolverObject object(cs);
const SpriteGroup *group = SpriteGroup::Resolve(cs->group, &object);
const SpriteGroup *group = SpriteGroup::Resolve(cs->group, object);
if (group == NULL) return 0;
return group->GetResult();
@@ -60,7 +60,7 @@ SpriteID GetCustomCargoSprite(const CargoSpec *cs)
uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const CargoSpec *cs)
{
CargoResolverObject object(cs, callback, param1, param2);
const SpriteGroup *group = SpriteGroup::Resolve(cs->group, &object);
const SpriteGroup *group = SpriteGroup::Resolve(cs->group, object);
if (group == NULL) return CALLBACK_FAILED;
return group->GetCallbackResult();