changeset 15988:c242a6fa0af8 draft

(svn r20676) -Codechange: it's not needed to supply two almost identical vars
author rubidium <rubidium@openttd.org>
date Sat, 28 Aug 2010 22:26:25 +0000
parents 4433ecd1dc47
children 5e3c645a5e63
files src/newgrf_object.cpp
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_object.cpp
+++ b/src/newgrf_object.cpp
@@ -236,7 +236,6 @@
 			case 0x61:
 			case 0x62:
 			case 0x64:
-			case 0x65:
 				break;
 
 			/* Allow these, but find the closest town. */
@@ -310,11 +309,8 @@
 			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);