From 1536c3ae5af34cda0a0fc17b5181f498d2340066 Mon Sep 17 00:00:00 2001 From: truelight Date: Thu, 24 Mar 2005 14:43:40 +0000 Subject: [PATCH] (svn r2044) -Fix: fix that TriggerVehicle is called from the wrong user --- economy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/economy.c b/economy.c index 283bf33868..2d0f17b7bb 100644 --- a/economy.c +++ b/economy.c @@ -1346,8 +1346,6 @@ int LoadUnloadVehicle(Vehicle *v) assert(v->current_order.type == OT_LOADING); v->cur_speed = 0; - old_player = _current_player; - _current_player = v->owner; st = GetStation(last_visited = v->last_station_visited); @@ -1455,6 +1453,9 @@ int LoadUnloadVehicle(Vehicle *v) TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY); } + old_player = _current_player; + _current_player = v->owner; + if (result != 0) { InvalidateWindow(WC_VEHICLE_DETAILS, v->index);