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

(svn r909) Small cleanup in vehicle.c, this should fix some warnings on 64bit machines

This commit is contained in:
tron 2004-12-03 14:38:02 +00:00
parent c00258237e
commit 5149373467
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vehicle.c
View File

@ -30,39 +30,42 @@ void VehicleInTheWayErrMsg(Vehicle *v)
static void *EnsureNoVehicleProc(Vehicle *v, void *data) static void *EnsureNoVehicleProc(Vehicle *v, void *data)
{ {
if (v->tile != (TileIndex)(int)data || v->type == VEH_Disaster) if (v->tile != *(const TileIndex*)data || v->type == VEH_Disaster)
return NULL; return NULL;
VehicleInTheWayErrMsg(v); VehicleInTheWayErrMsg(v);
return (void*)1; return v;
} }
bool EnsureNoVehicle(TileIndex tile) bool EnsureNoVehicle(TileIndex tile)
{ {
return VehicleFromPos(tile, (void*)(int)tile, (VehicleFromPosProc*)EnsureNoVehicleProc) == NULL; return VehicleFromPos(tile, &tile, EnsureNoVehicleProc) == NULL;
} }
static void *EnsureNoVehicleProcZ(Vehicle *v, void *data) static void *EnsureNoVehicleProcZ(Vehicle *v, void *data)
{ {
uint32 d = (uint32)data; // max mapsize 4,096*4,096 if shifted 8 bits for byte const TileInfo *ti = data;
// with uint64 max mapsize is 2,6843,5456*2,6843,5456 :D
if (v->tile != (TileIndex)(d >> (sizeof(byte)*8)) || v->z_pos != (byte)d || v->type == VEH_Disaster) if (v->tile != ti->tile || v->z_pos != ti->z || v->type == VEH_Disaster)
return NULL; return NULL;
VehicleInTheWayErrMsg(v); VehicleInTheWayErrMsg(v);
return (void*)1; return v;
} }
bool EnsureNoVehicleZ(TileIndex tile, byte z) bool EnsureNoVehicleZ(TileIndex tile, byte z)
{ {
TileInfo ti; TileInfo ti;
FindLandscapeHeightByTile(&ti, tile); FindLandscapeHeightByTile(&ti, tile);
// needs z correction for slope-type graphics that have the NORTHERN tile lowered // needs z correction for slope-type graphics that have the NORTHERN tile lowered
// 1, 2, 3, 4, 5, 6 and 7 // 1, 2, 3, 4, 5, 6 and 7
if (CORRECT_Z(ti.tileh)) if (CORRECT_Z(ti.tileh))
z += 8; z += 8;
return VehicleFromPos(tile, (void*)((TileIndex)tile << (sizeof(byte)*8) | (byte)z), (VehicleFromPosProc*)EnsureNoVehicleProcZ) == NULL; ti.z = z;
return VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ) == NULL;
} }
Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z) Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z)