Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

TBTR: Add sanity check assertions

Browse Source
This commit is contained in:
Jonathan G Rennison 2018-01-29 18:47:31 +00:00
parent 40c99956ed
commit 233b0f8e9e
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tbtr_template_gui_create.cpp
View File

@ -188,6 +188,9 @@ public:
}
virtual_train = train;
if (virtual_train != NULL) {
assert(HasBit(virtual_train->subtype, GVSF_VIRTUAL));
}
UpdateButtonState();
}
@ -542,6 +545,7 @@ public:
void RearrangeVirtualTrain()
{
virtual_train = virtual_train->First();
assert(HasBit(virtual_train->subtype, GVSF_VIRTUAL));
}

3
src/train_cmd.cpp
View File

@ -1211,6 +1211,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
src = src->GetFirstEnginePart();
if (dst != NULL) {
dst = dst->GetFirstEnginePart();
assert(HasBit(dst->subtype, GVSF_VIRTUAL) == HasBit(src->subtype, GVSF_VIRTUAL));
}
/* don't move the same vehicle.. */
@ -1218,9 +1219,11 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
/* locate the head of the two chains */
Train *src_head = src->First();
assert(HasBit(src_head->subtype, GVSF_VIRTUAL) == HasBit(src->subtype, GVSF_VIRTUAL));
Train *dst_head;
if (dst != NULL) {
dst_head = dst->First();
assert(HasBit(dst_head->subtype, GVSF_VIRTUAL) == HasBit(dst->subtype, GVSF_VIRTUAL));
if (dst_head->tile != src_head->tile) return CMD_ERROR;
/* Now deal with articulated part of destination wagon */
dst = dst->GetLastEnginePart();

2
src/vehicle.cpp
View File

@ -1072,6 +1072,8 @@ void CallVehicleTicks()
for (TemplateReplacementMap::iterator it = _vehicles_to_templatereplace.Begin(); it != _vehicles_to_templatereplace.End(); it++) {
Train *t = it->first;
assert(!_vehicles_to_autoreplace.Contains(t));
/* Store the position of the effect as the vehicle pointer will become invalid later */
int x = t->x_pos;
int y = t->y_pos;