(svn r2044) -Fix: fix that TriggerVehicle is called from the wrong user

20 years ago · fd77153960
parent 813e84bf9e
commit fd77153960
1 changed files with 3 additions and 2 deletions
--- 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);