From c7d57379fbdda52590cddb83240934da6b5e8b21 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 14 May 2007 16:07:05 +0000 Subject: (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. --- src/vehicle.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/vehicle.cpp') diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 9048d3bd0..0b7916d29 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -659,8 +659,6 @@ static VehicleTickProc* _vehicle_tick_procs[] = { void CallVehicleTicks() { - Vehicle *v; - #ifdef ENABLE_NETWORK /* hotfix for desync problem: * for MP games invalidate the YAPF cache every tick to keep it exactly the same on the server and all clients */ @@ -671,6 +669,10 @@ void CallVehicleTicks() _first_veh_in_depot_list = NULL; // now we are sure it's initialized at the start of each tick + Station *st; + FOR_ALL_STATIONS(st) LoadUnloadStation(st); + + Vehicle *v; FOR_ALL_VEHICLES(v) { _vehicle_tick_procs[v->type](v); @@ -2933,17 +2935,8 @@ void Vehicle::HandleLoading(bool mode) { switch (this->current_order.type) { case OT_LOADING: { - /* Not the first call for this tick */ - if (mode) return; - - /* We have not waited enough time till the next round of loading/unloading */ - if (--this->load_unload_time_rem) return; - - /* Load/unload the vehicle; when it actually did something - * we do not leave the station. */ - LoadUnloadVehicle(this); - - if (!HASBIT(this->vehicle_flags, VF_LOADING_FINISHED)) return; + /* Not the first call for this tick, or still loading */ + if (mode || !HASBIT(this->vehicle_flags, VF_LOADING_FINISHED)) return; this->PlayLeaveStationSound(); -- cgit v1.2.3-70-g09d2