summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-08-28 22:26:25 +0000
committerrubidium <rubidium@openttd.org>2010-08-28 22:26:25 +0000
commitdd0a8a573d9fd9a277f6e07642eaeac2e0d1a82e (patch)
tree5b998dcb53746ccd6d26329d460e5be6b439e513
parent00415213f30139ccfd1c2f7a3d9c0d15381f5c22 (diff)
downloadopenttd-dd0a8a573d9fd9a277f6e07642eaeac2e0d1a82e.tar.xz
(svn r20676) -Codechange: it's not needed to supply two almost identical vars
-rw-r--r--src/newgrf_object.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp
index 3fca86dda..f6b2768c9 100644
--- a/src/newgrf_object.cpp
+++ b/src/newgrf_object.cpp
@@ -236,7 +236,6 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt
case 0x61:
case 0x62:
case 0x64:
- case 0x65:
break;
/* Allow these, but find the closest town. */
@@ -310,11 +309,8 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt
tile = GetNearbyTile(parameter, tile);
return (IsTileType(tile, MP_OBJECT) && Object::GetByTile(tile) == o) ? GetObjectAnimationCounter(tile) : 0;
- /* Distance of nearest object of given type */
- case 0x64: return GetClosestObject(tile, GetObjectType(tile), o);
-
/* Count of object, distance of closest instance */
- case 0x65: return GetCountAndDistanceOfClosestInstance(parameter, object->grffile->grfid, tile, o);
+ case 0x64: return GetCountAndDistanceOfClosestInstance(parameter, object->grffile->grfid, tile, o);
}
DEBUG(grf, 1, "Unhandled object property 0x%X", variable);