GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into
lp:widelands.
Commit message:
Do not enqueue idle task when ship is sinking.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1766957 in widelands: "Sinking ship is shortly displayed completely"
https://bugs.launchpad.net/widelands/+bug/1766957
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746
I have not reproduced the original bug, but this should theoretically fix it.
So, this needs testing.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into
lp:widelands.
=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc 2018-07-08 15:16:16 +0000
+++ src/logic/map_objects/tribes/ship.cc 2018-08-25 14:20:16 +0000
@@ -697,13 +697,15 @@
}
FALLS_THROUGH;
case ShipStates::kExpeditionWaiting:
- case ShipStates::kExpeditionPortspaceFound:
- case ShipStates::kSinkRequest:
- case ShipStates::kSinkAnimation: {
+ case ShipStates::kExpeditionPortspaceFound: {
// wait for input
start_task_idle(game, descr().main_animation(), 1500);
return;
}
+ FALLS_THROUGH;
+ case ShipStates::kSinkRequest:
+ case ShipStates::kSinkAnimation:
+ break;
}
NEVER_HERE();
}
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
