From 12c86a139193ab88edb998844c2685b569430a57 Mon Sep 17 00:00:00 2001 From: terkhen Date: Tue, 14 Dec 2010 21:28:45 +0000 Subject: (svn r21518) -Codechange: Rename AccelerationCache to GroundVehicleCache. --- src/openttd.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/openttd.cpp') diff --git a/src/openttd.cpp b/src/openttd.cpp index 8b4e01363..54d0ac3c1 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -1141,11 +1141,11 @@ static void CheckCaches() uint length = 0; for (const Vehicle *u = v; u != NULL; u = u->Next()) length++; - NewGRFCache *grf_cache = CallocT(length); - VehicleCache *veh_cache = CallocT(length); - AccelerationCache *acc_cache = CallocT(length); - TrainCache *tra_cache = CallocT(length); - RoadVehicleCache *roa_cache = CallocT(length); + NewGRFCache *grf_cache = CallocT(length); + VehicleCache *veh_cache = CallocT(length); + GroundVehicleCache *gro_cache = CallocT(length); + TrainCache *tra_cache = CallocT(length); + RoadVehicleCache *roa_cache = CallocT(length); length = 0; for (const Vehicle *u = v; u != NULL; u = u->Next()) { @@ -1154,11 +1154,11 @@ static void CheckCaches() veh_cache[length] = u->vcache; switch (u->type) { case VEH_TRAIN: - acc_cache[length] = Train::From(u)->acc_cache; + gro_cache[length] = Train::From(u)->gcache; tra_cache[length] = Train::From(u)->tcache; break; case VEH_ROAD: - acc_cache[length] = RoadVehicle::From(u)->acc_cache; + gro_cache[length] = RoadVehicle::From(u)->gcache; roa_cache[length] = RoadVehicle::From(u)->rcache; break; default: @@ -1186,16 +1186,16 @@ static void CheckCaches() } switch (u->type) { case VEH_TRAIN: - if (memcmp(&acc_cache[length], &Train::From(u)->acc_cache, sizeof(AccelerationCache)) != 0) { - DEBUG(desync, 2, "train acceleration cache mismatch: vehicle %i, company %i, unit number %i, wagon %i", v->index, (int)v->owner, v->unitnumber, length); + if (memcmp(&gro_cache[length], &Train::From(u)->gcache, sizeof(GroundVehicleCache)) != 0) { + DEBUG(desync, 2, "train ground vehicle cache mismatch: vehicle %i, company %i, unit number %i, wagon %i", v->index, (int)v->owner, v->unitnumber, length); } if (memcmp(&tra_cache[length], &Train::From(u)->tcache, sizeof(TrainCache)) != 0) { DEBUG(desync, 2, "train cache mismatch: vehicle %i, company %i, unit number %i, wagon %i", v->index, (int)v->owner, v->unitnumber, length); } break; case VEH_ROAD: - if (memcmp(&acc_cache[length], &RoadVehicle::From(u)->acc_cache, sizeof(AccelerationCache)) != 0) { - DEBUG(desync, 2, "road vehicle acceleration cache mismatch: vehicle %i, company %i, unit number %i, wagon %i", v->index, (int)v->owner, v->unitnumber, length); + if (memcmp(&gro_cache[length], &RoadVehicle::From(u)->gcache, sizeof(GroundVehicleCache)) != 0) { + DEBUG(desync, 2, "road vehicle ground vehicle cache mismatch: vehicle %i, company %i, unit number %i, wagon %i", v->index, (int)v->owner, v->unitnumber, length); } if (memcmp(&roa_cache[length], &RoadVehicle::From(u)->rcache, sizeof(RoadVehicleCache)) != 0) { DEBUG(desync, 2, "road vehicle cache mismatch: vehicle %i, company %i, unit number %i, wagon %i", v->index, (int)v->owner, v->unitnumber, length); @@ -1209,7 +1209,7 @@ static void CheckCaches() free(grf_cache); free(veh_cache); - free(acc_cache); + free(gro_cache); free(tra_cache); free(roa_cache); } -- cgit v1.2.3-54-g00ecf