dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarAction2: Move cb_result_found to a flags var in AnalyseCallbackOperation

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-06 17:44:47 +01:00
parent f5f48e89dc
commit a9ca89d0f8
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_spritegroup.h
View File

@@ -59,6 +59,12 @@ enum AnalyseCallbackOperationMode {
struct AnalyseCallbackOperationIndustryTileData;
enum AnalyseCallbackOperationResultFlags {
ACORF_NONE = 0,
ACORF_CB_RESULT_FOUND = 1 << 0,
};
DECLARE_ENUM_AS_BIT_SET(AnalyseCallbackOperationResultFlags)
struct AnalyseCallbackOperation {
struct FindCBResultData {
uint16 callback;
@@ -69,8 +75,8 @@ struct AnalyseCallbackOperation {
btree::btree_set<const SpriteGroup *> seen;
AnalyseCallbackOperationMode mode = ACOM_CB_VAR;
SpriteGroupCallbacksUsed callbacks_used = SGCU_NONE;
AnalyseCallbackOperationResultFlags result_flags = ACORF_NONE;
uint64 properties_used = 0;
bool cb_result_found = false;
union {
FindCBResultData cb_result;
AnalyseCallbackOperationIndustryTileData *indtile;