mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 9121ff0569 into e8d25d68b9

This commit is contained in:
SamuXarick 2024-04-25 20:00:44 +02:00 committed by GitHub
parent e8d25d68b9 9121ff0569
commit f23b8ba293
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/order_cmd.cpp
View File

@ -2181,9 +2181,23 @@ bool ProcessOrders(Vehicle *v)
}
/* If it is unchanged, keep it. */
if (order->Equals(v->current_order) && (v->type == VEH_AIRCRAFT || v->dest_tile != 0) &&
(v->type != VEH_SHIP || !order->IsType(OT_GOTO_STATION) || Station::Get(order->GetDestination())->ship_station.tile != INVALID_TILE)) {
return false;
if (order->Equals(v->current_order) && (v->type == VEH_AIRCRAFT || v->dest_tile != 0)) {
if (v->type != VEH_SHIP) {
return false;
} else {
switch (order->GetType()) {
case OT_GOTO_STATION:
if (Station::Get(order->GetDestination())->ship_station.tile != INVALID_TILE) return false;
break;
case OT_GOTO_WAYPOINT:
if (Waypoint::Get(order->GetDestination())->xy == v->dest_tile) return false;
break;
default:
return false;
}
}
}
/* Otherwise set it, and determine the destination tile. */

11
src/waypoint_cmd.cpp
View File

@ -22,6 +22,7 @@
#include "window_func.h"
#include "timer/timer_game_calendar.h"
#include "vehicle_func.h"
#include "ship.h"
#include "string_func.h"
#include "company_func.h"
#include "newgrf_station.h"
@ -318,8 +319,14 @@ CommandCost CmdBuildBuoy(DoCommandFlag flags, TileIndex tile)
if (wp == nullptr) {
wp = new Waypoint(tile);
} else {
/* Move existing (recently deleted) buoy to the new location */
wp->xy = tile;
if (wp->xy != tile) {
/* Move existing (recently deleted) buoy to the new location. */
wp->xy = tile;
for (Ship *v : Ship::Iterate()) {
if (!v->current_order.IsType(OT_GOTO_WAYPOINT) || v->current_order.GetDestination() != wp->index) continue;
v->SetDestTile(wp->xy);
}
}
InvalidateWindowData(WC_WAYPOINT_VIEW, wp->index);
}
wp->rect.BeforeAddTile(tile, StationRect::ADD_TRY);