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

Add game event for TBTR replacement attempt

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-05-19 18:38:02 +01:00
parent 2740537632
commit 5b7d1f7f80
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openttd.cpp
View File

@@ -1730,5 +1730,6 @@ char *DumpGameEventFlags(GameEventFlags events, char *b, const char *last)
dump('d', GEF_COMPANY_DELETE); dump('d', GEF_COMPANY_DELETE);
dump('m', GEF_COMPANY_MERGE); dump('m', GEF_COMPANY_MERGE);
dump('n', GEF_RELOAD_NEWGRF); dump('n', GEF_RELOAD_NEWGRF);
dump('t', GEF_TBTR_REPLACEMENT);
return b; return b;
} }

1
src/openttd.h
View File

@@ -91,6 +91,7 @@ enum GameEventFlags : uint32 {
GEF_COMPANY_DELETE = 1 << 0, ///< (d) A company has been deleted GEF_COMPANY_DELETE = 1 << 0, ///< (d) A company has been deleted
GEF_COMPANY_MERGE = 1 << 1, ///< (m) A company has been bought by another GEF_COMPANY_MERGE = 1 << 1, ///< (m) A company has been bought by another
GEF_RELOAD_NEWGRF = 1 << 2, ///< (n) ReloadNewGRFData() has been called GEF_RELOAD_NEWGRF = 1 << 2, ///< (n) ReloadNewGRFData() has been called
GEF_TBTR_REPLACEMENT = 1 << 3, ///< (t) CMD_TEMPLATE_REPLACE_VEHICLE has been called
}; };
DECLARE_ENUM_AS_BIT_SET(GameEventFlags) DECLARE_ENUM_AS_BIT_SET(GameEventFlags)

2
src/vehicle.cpp
View File

@@ -1379,6 +1379,8 @@ void CallVehicleTicks()
bool leaveDepot = it->second; bool leaveDepot = it->second;
_vehicles_to_autoreplace.erase(it); _vehicles_to_autoreplace.erase(it);
RegisterGameEvents(GEF_TBTR_REPLACEMENT);
/* Store the position of the effect as the vehicle pointer will become invalid later */ /* Store the position of the effect as the vehicle pointer will become invalid later */
int x = t->x_pos; int x = t->x_pos;
int y = t->y_pos; int y = t->y_pos;