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

Add event flag for removing invalid RVs during load

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-21 22:01:34 +00:00
parent 675b31887a
commit 53b06a3d04
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/event_logs.cpp
View File

@@ -42,6 +42,7 @@ char *DumpGameEventFlags(GameEventFlags events, char *b, const char *last)
dump('i', GEF_INDUSTRY_CREATE); dump('i', GEF_INDUSTRY_CREATE);
dump('j', GEF_INDUSTRY_DELETE); dump('j', GEF_INDUSTRY_DELETE);
dump('v', GEF_VIRT_TRAIN); dump('v', GEF_VIRT_TRAIN);
dump('r', GEF_RM_INVALID_RV);
return b; return b;
} }

1
src/event_logs.h
View File

@@ -24,6 +24,7 @@ enum GameEventFlags : uint32_t {
GEF_INDUSTRY_CREATE = 1 << 6, ///< (i) An industry has been created (in game) GEF_INDUSTRY_CREATE = 1 << 6, ///< (i) An industry has been created (in game)
GEF_INDUSTRY_DELETE = 1 << 7, ///< (j) An industry has been deleted (in game) GEF_INDUSTRY_DELETE = 1 << 7, ///< (j) An industry has been deleted (in game)
GEF_VIRT_TRAIN = 1 << 8, ///< (v) A virtual train has been created GEF_VIRT_TRAIN = 1 << 8, ///< (v) A virtual train has been created
GEF_RM_INVALID_RV = 1 << 9, ///< (r) Removed uncorrectable road vehicle on load
}; };
DECLARE_ENUM_AS_BIT_SET(GameEventFlags) DECLARE_ENUM_AS_BIT_SET(GameEventFlags)

3
src/sl/vehicle_sl.cpp
View File

@@ -23,6 +23,7 @@
#include "../error.h" #include "../error.h"
#include "../strings_func.h" #include "../strings_func.h"
#include "../economy_base.h" #include "../economy_base.h"
#include "../event_logs.h"
#include "../3rdparty/cpp-btree/btree_map.h" #include "../3rdparty/cpp-btree/btree_map.h"
#include "../core/format.hpp" #include "../core/format.hpp"
@@ -575,6 +576,8 @@ void AfterLoadVehiclesRemoveAnyFoundInvalid()
SetDParam(0, (uint)_load_invalid_vehicles_to_delete.size()); SetDParam(0, (uint)_load_invalid_vehicles_to_delete.size());
ShowErrorMessage(STR_WARNING_LOADGAME_REMOVED_UNCORRECTABLE_VEHICLES, INVALID_STRING_ID, WL_CRITICAL); ShowErrorMessage(STR_WARNING_LOADGAME_REMOVED_UNCORRECTABLE_VEHICLES, INVALID_STRING_ID, WL_CRITICAL);
GroupStatistics::UpdateAfterLoad(); GroupStatistics::UpdateAfterLoad();
RegisterGameEvents(GEF_RM_INVALID_RV);
} }
for (Vehicle *v : _load_invalid_vehicles_to_delete) { for (Vehicle *v : _load_invalid_vehicles_to_delete) {