libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 01:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CRYOMNI3D: Don't abort when there is no transition defined

Browse Source
This commit is contained in:
Le Philousophe 2019-05-13 23:54:19 +02:00 committed by Eugene Sandulenko
parent 2ed2d617c0
commit 6e0e3bb6b1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/cryomni3d/versailles/engine.cpp
View File

@ -966,7 +966,7 @@ void CryOmni3DEngine_Versailles::executeTransition(unsigned int nextPlaceId) {
_nextPlaceId = nextPlaceId;
Common::String animation = transition->animations[animationId];
Common::String animation = animationId == -1u ? "" : transition->animations[animationId];
animation.toUppercase();
debug("Transition animation: %s", animation.c_str());
if (animation.hasPrefix("NOT_FLI")) {
@ -1015,7 +1015,7 @@ void CryOmni3DEngine_Versailles::executeTransition(unsigned int nextPlaceId) {
unsigned int nextNextPlaceId = nextPlace->transitions[transitionNum].dstId;
animationId = determineTransitionAnimation(nextPlaceId, nextNextPlaceId, &transition);
animation = transition->animations[animationId];
animation = animationId == -1u ? "" : transition->animations[animationId];
animation.toUppercase();
if (animation.hasPrefix("NOT_FLI")) {
@ -1074,7 +1074,11 @@ unsigned int CryOmni3DEngine_Versailles::determineTransitionAnimation(unsigned i
error("Invalid dst state");
}
if (animsNum <= 1) {
if (animsNum == 0) {
return -1;
}
if (animsNum == 1) {
return 0;
}