Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tracerestrict: Add 0 enum value for TraceRestrictProgramActionsUsedFlags

Browse Source
pull/642/head
Jonathan G Rennison 4 months ago
parent fa1c4f2be5
commit c9422762c0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
src/tracerestrict.cpp
Unescape Escape View File

@ -972,7 +972,7 @@ CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem>
// static to avoid needing to re-alloc/resize on each execution // static to avoid needing to re-alloc/resize on each execution
static std::vector<TraceRestrictCondStackFlags> condstack; static std::vector<TraceRestrictCondStackFlags> condstack;
condstack.clear(); condstack.clear();
actions_used_flags = static_cast<TraceRestrictProgramActionsUsedFlags>(0); actions_used_flags = TRPAUF_NONE;
static std::vector<TraceRestrictSlotID> pbs_res_end_released_slots; static std::vector<TraceRestrictSlotID> pbs_res_end_released_slots;
pbs_res_end_released_slots.clear(); pbs_res_end_released_slots.clear();
@ -2301,7 +2301,7 @@ CommandCost CmdProgramSignalTraceRestrictProgMgmt(TileIndex tile, DoCommandFlag
prog->items = source_prog->items; // copy prog->items = source_prog->items; // copy
prog->Validate(); prog->Validate();
TraceRestrictCheckRefreshSignals(prog, 0, static_cast<TraceRestrictProgramActionsUsedFlags>(0)); TraceRestrictCheckRefreshSignals(prog, 0, TRPAUF_NONE);
} }
break; break;
} }
@ -2337,7 +2337,7 @@ CommandCost CmdProgramSignalTraceRestrictProgMgmt(TileIndex tile, DoCommandFlag
} }
TraceRestrictCreateProgramMapping(self, source_prog); TraceRestrictCreateProgramMapping(self, source_prog);
TraceRestrictCheckRefreshSingleSignal(source_prog, self, static_cast<TraceRestrictProgramActionsUsedFlags>(0)); TraceRestrictCheckRefreshSingleSignal(source_prog, self, TRPAUF_NONE);
break; break;
} }
@ -2361,7 +2361,7 @@ CommandCost CmdProgramSignalTraceRestrictProgMgmt(TileIndex tile, DoCommandFlag
new_prog->items.swap(items); new_prog->items.swap(items);
new_prog->Validate(); new_prog->Validate();
TraceRestrictCheckRefreshSingleSignal(new_prog, self, static_cast<TraceRestrictProgramActionsUsedFlags>(0)); TraceRestrictCheckRefreshSingleSignal(new_prog, self, TRPAUF_NONE);
} }
break; break;
} }

3
src/tracerestrict.h
Unescape Escape View File

@ -455,6 +455,7 @@ DECLARE_ENUM_AS_BIT_SET(TraceRestrictProgramResultFlags)
* Enumeration for TraceRestrictProgram::actions_used_flags * Enumeration for TraceRestrictProgram::actions_used_flags
*/ */
enum TraceRestrictProgramActionsUsedFlags { enum TraceRestrictProgramActionsUsedFlags {
TRPAUF_NONE = 0, ///< No flags set
TRPAUF_PF = 1 << 0, ///< Pathfinder deny or penalty are present TRPAUF_PF = 1 << 0, ///< Pathfinder deny or penalty are present
TRPAUF_RESERVE_THROUGH = 1 << 1, ///< Reserve through action is present TRPAUF_RESERVE_THROUGH = 1 << 1, ///< Reserve through action is present
TRPAUF_LONG_RESERVE = 1 << 2, ///< Long reserve action is present TRPAUF_LONG_RESERVE = 1 << 2, ///< Long reserve action is present
@ -564,7 +565,7 @@ private:
public: public:
TraceRestrictProgram() TraceRestrictProgram()
: refcount(0), actions_used_flags(static_cast<TraceRestrictProgramActionsUsedFlags>(0)) { } : refcount(0), actions_used_flags(TRPAUF_NONE) { }
~TraceRestrictProgram() ~TraceRestrictProgram()
{ {

Write Preview
Loading…
Cancel
Save