gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21942) -Codechange: no need to convert GOINGUP/GOINGDOWN flags if they are cleared afterwards during savegame conversion

Browse Source
This commit is contained in:
smatz 2011-02-02 19:22:35 +00:00
parent e846701b3c
commit 54161949d1
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/saveload/afterload.cpp
View File

@ -2242,20 +2242,6 @@ bool AfterLoadGame()
} }
} }
if (IsSavegameVersionBefore(139)) {
Train *t;
FOR_ALL_TRAINS(t) {
/* Copy old GOINGUP / GOINGDOWN flags. */
if (HasBit(t->flags, 1)) {
ClrBit(t->flags, 1);
SetBit(t->gv_flags, GVF_GOINGUP_BIT);
} else if (HasBit(t->flags, 2)) {
ClrBit(t->flags, 2);
SetBit(t->gv_flags, GVF_GOINGDOWN_BIT);
}
}
}
if (IsSavegameVersionBefore(140)) { if (IsSavegameVersionBefore(140)) {
Station *st; Station *st;
FOR_ALL_STATIONS(st) { FOR_ALL_STATIONS(st) {
@ -2470,6 +2456,14 @@ bool AfterLoadGame()
switch (v->type) { switch (v->type) {
case VEH_TRAIN: { case VEH_TRAIN: {
Train *t = Train::From(v); Train *t = Train::From(v);
/* Clear old GOINGUP / GOINGDOWN flags.
* It was changed in savegame version 139, but savegame
* version 158 doesn't use these bits, so it doesn't hurt
* to clear them unconditionally. */
ClrBit(t->flags, 1);
ClrBit(t->flags, 2);
/* Clear both bits first. */ /* Clear both bits first. */
ClrBit(t->gv_flags, GVF_GOINGUP_BIT); ClrBit(t->gv_flags, GVF_GOINGUP_BIT);
ClrBit(t->gv_flags, GVF_GOINGDOWN_BIT); ClrBit(t->gv_flags, GVF_GOINGDOWN_BIT);