[Scummvm-git-logs] scummvm master -> 4c06cbcf9097200527a1c764f64c3a4ab700534a

sev- sev at scummvm.org
Sun Mar 28 01:34:38 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4c06cbcf90 TOON: Fix flag setting in sys_Cmd_Play_Flux_Anim()


Commit: 4c06cbcf9097200527a1c764f64c3a4ab700534a
    https://github.com/scummvm/scummvm/commit/4c06cbcf9097200527a1c764f64c3a4ab700534a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-03-28T03:34:27+02:00

Commit Message:
TOON: Fix flag setting in sys_Cmd_Play_Flux_Anim()

Changed paths:
    engines/toon/script_func.cpp


diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp
index 311d5dcc05..f544b03e03 100644
--- a/engines/toon/script_func.cpp
+++ b/engines/toon/script_func.cpp
@@ -716,7 +716,7 @@ int32 ScriptFunc::sys_Cmd_Query_Scene_Anim_Loaded(EMCState *state) {
 int32 ScriptFunc::sys_Cmd_Play_Flux_Anim(EMCState *state) {
 	if (!_vm->getFlux()->getFlag()) {
 		_vm->getFlux()->playAnim(stackPos(0), 0, stackPos(1));
-		_vm->getFlux()->setFlag(4);
+		_vm->getFlux()->setFlag(_vm->getFlux()->getFlag() | 4);
 	}
 	return 0;
 }




More information about the Scummvm-git-logs mailing list