From 5e278b7ec3adfa6f0b65f3cff5769943166bef22 Mon Sep 17 00:00:00 2001 From: bjarni Date: Tue, 8 Nov 2005 23:18:09 +0000 Subject: [PATCH] (svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed due to the FOR_ALL_VEHICLES(), redrawing those windows are slow --- aircraft_cmd.c | 6 ++++-- roadveh_cmd.c | 6 ++++-- ship_cmd.c | 6 ++++-- train_cmd.c | 7 +++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/aircraft_cmd.c b/aircraft_cmd.c index f096b92d4b..4dc24106f9 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -291,7 +291,8 @@ int32 CmdBuildAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2) InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); RebuildVehicleLists(); InvalidateWindow(WC_COMPANY, v->owner); - InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); //updates the replace Aircraft window + if (IsLocalPlayer()) + InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); //updates the replace Aircraft window } return value; @@ -348,7 +349,8 @@ int32 CmdSellAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2) // Invalidate depot InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); DoDeleteAircraft(v); - InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); // updates the replace Aircraft window + if (IsLocalPlayer()) + InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); // updates the replace Aircraft window } return -(int32)v->value; diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 32a2fd25dc..9ed41a694e 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -193,7 +193,8 @@ int32 CmdBuildRoadVeh(int x, int y, uint32 flags, uint32 p1, uint32 p2) InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); RebuildVehicleLists(); InvalidateWindow(WC_COMPANY, v->owner); - InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window + if (IsLocalPlayer()) + InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window } return cost; @@ -263,8 +264,9 @@ int32 CmdSellRoadVeh(int x, int y, uint32 flags, uint32 p1, uint32 p2) DeleteWindowById(WC_VEHICLE_VIEW, v->index); ClearSlot(v, v->u.road.slot); DeleteVehicle(v); + if (IsLocalPlayer()) + InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window } - InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window return -(int32)v->value; } diff --git a/ship_cmd.c b/ship_cmd.c index e0e0990091..887fd70d28 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -921,7 +921,8 @@ int32 CmdBuildShip(int x, int y, uint32 flags, uint32 p1, uint32 p2) InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); RebuildVehicleLists(); InvalidateWindow(WC_COMPANY, v->owner); - InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window + if (IsLocalPlayer()) + InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window } return value; @@ -953,7 +954,8 @@ int32 CmdSellShip(int x, int y, uint32 flags, uint32 p1, uint32 p2) InvalidateWindow(WC_COMPANY, v->owner); DeleteWindowById(WC_VEHICLE_VIEW, v->index); DeleteVehicle(v); - InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window + if (IsLocalPlayer()) + InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window } return -(int32)v->value; diff --git a/train_cmd.c b/train_cmd.c index e5daaf0143..71013483db 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -773,12 +773,13 @@ int32 CmdBuildRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2) InvalidateWindow(WC_VEHICLE_DEPOT, tile); RebuildVehicleLists(); InvalidateWindow(WC_COMPANY, v->owner); + if (IsLocalPlayer()) { + InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); // updates the replace Train window + } } } _cmd_build_rail_veh_score = _railveh_score[p1]; - InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); // updates the replace Train window - return value; } @@ -1128,6 +1129,8 @@ int32 CmdSellRailWagon(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) { if (v == first && first->subtype == TS_Front_Engine) { DeleteWindowById(WC_VEHICLE_VIEW, first->index); + } + if (IsLocalPlayer() && (p1 == 1 || !(RailVehInfo(v->engine_type)->flags & RVI_WAGON))) { InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); } InvalidateWindow(WC_VEHICLE_DEPOT, first->tile);