mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-12 17:19:09 +00:00
Code Issues Activity

Cleanup: Fix typos and other review corrections

Browse Source
This commit is contained in:
James Ross
2023-12-22 14:11:12 +00:00
parent 96b63852aa
commit 51924e9376
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english.txt
View File

@@ -4486,7 +4486,7 @@ STR_ORDERS_STOP_SHARING_BUTTON :{BLACK}Stop sha
STR_ORDERS_STOP_SHARING_TOOLTIP :{BLACK}Stop sharing the order list. Ctrl+Click additionally deletes all orders for this vehicle
STR_ORDERS_AUTOMATIC_SEPARATION :{BLACK}Automatic separation
STR_ORDERS_AUTOMATIC_SEPARATION_TOOLTIP :{BLACK}Automatically separate all vehicles sharing this order
STR_ORDERS_AUTOMATIC_SEPARATION_TOOLTIP :{BLACK}Automatically separate all vehicles sharing these orders
STR_ORDERS_GO_TO_BUTTON :{BLACK}Go To
STR_ORDER_GO_TO_NEAREST_DEPOT :Go to nearest depot

2
src/order_cmd.cpp
View File

@@ -1470,7 +1470,7 @@ static bool CheckAircraftOrderDistance(const Aircraft *v_new, const Vehicle *v_o
/**
* Enable or disable automatic separation for a vehicle's order list
* @param flags operation to perform
* @param veh vehicle who's order list is being modified
* @param veh vehicle whose order list is being modified
* @param enabled value indicating whether to enable (true) or disable (false) automatic separation
* @return the cost of this operation or an error
*/

2
src/saveload/saveload.h
View File

@@ -331,7 +331,6 @@ enum SaveLoadVersion : uint16_t {
SLV_CUSTOM_SUBSIDY_DURATION, ///< 292 PR#9081 Configurable subsidy duration.
SLV_SAVELOAD_LIST_LENGTH, ///< 293 PR#9374 Consistency in list length with SL_STRUCT / SL_STRUCTLIST / SL_DEQUE / SL_REFLIST.
SLV_RIFF_TO_ARRAY, ///< 294 PR#9375 Changed many CH_RIFF chunks to CH_ARRAY chunks.
SLV_AUTOMATIC_SEPARATION, ///< 295 PR#8342 Allow automatically separating vehicles in shared orders.
SLV_TABLE_CHUNKS, ///< 295 PR#9322 Introduction of CH_TABLE and CH_SPARSE_TABLE.
SLV_SCRIPT_INT64, ///< 296 PR#9415 SQInteger is 64bit but was saved as 32bit.
@@ -367,6 +366,7 @@ enum SaveLoadVersion : uint16_t {
SLV_TIMETABLE_START_TICKS, ///< 321 PR#11468 Convert timetable start from a date to ticks.
SLV_TIMETABLE_START_TICKS_FIX, ///< 322 PR#11557 Fix for missing convert timetable start from a date to ticks.
SLV_TIMETABLE_TICKS_TYPE, ///< 323 PR#11435 Convert timetable current order time to ticks.
SLV_AUTOMATIC_SEPARATION, ///< 324 PR#8342 Allow automatically separating vehicles in shared orders.
SL_MAX_VERSION, ///< Highest possible saveload version
};

4
src/vehicle.cpp
View File

@@ -2371,7 +2371,7 @@ void Vehicle::HandleLoading(bool mode)
* it is ready to depart)
*/
bool Vehicle::IsWaitingForAutomaticSeparation() const {
TimerGameTick::Ticks now = TimerGameCalendar::date.base() * Ticks::DAY_TICKS + TimerGameCalendar::date_fract;
TimerGameTick::Ticks now = (TimerGameCalendar::date.base() * Ticks::DAY_TICKS) + TimerGameCalendar::date_fract;
return this->AutomaticSeparationIsEnabled() && this->first_order_last_departure > now;
};
@@ -2421,7 +2421,7 @@ void Vehicle::UpdateAutomaticSeparation()
/* A stopped vehicle is not included; it might be stopped by player or parked in a depot */
if (!(v->vehstatus & VS_STOPPED)) {
vehicles++;
/* Count vehicles queing for the first manual order but not currently in the station */
/* Count vehicles queuing for the first manual order but not currently in the station */
if (v != this && v->cur_speed == 0 && v->cur_implicit_order_index == first_manual_order && !v->current_order.IsType(OT_LOADING)) {
vehicles_queuing++;
}