petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check

Browse Source
This commit is contained in:
smatz
2009-06-06 16:54:22 +00:00
parent c90819ff6d
commit 0c10006907
36 changed files with 185 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openttd.cpp
View File

@@ -1119,7 +1119,7 @@ void StateGameLoop()
switch (v->type) {
case VEH_ROAD: {
RoadVehicle *rv = (RoadVehicle *)v;
RoadVehicle *rv = RoadVehicle::From(v);
RoadVehicleCache cache = rv->rcache;
RoadVehUpdateCache(rv);
@@ -1130,7 +1130,7 @@ void StateGameLoop()
case VEH_TRAIN: {
uint length = 0;
Train *t = (Train *)v;
Train *t = Train::From(v);
for (Vehicle *u = t; u != NULL; u = u->Next()) length++;
TrainCache *wagons = MallocT<TrainCache>(length);
@@ -1151,7 +1151,7 @@ void StateGameLoop()
} break;
case VEH_AIRCRAFT: {
Aircraft *a = (Aircraft *)v;
Aircraft *a = Aircraft::From(v);
AircraftCache cache = a->acache;
UpdateAircraftCache(a);