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

athrxx noreply at scummvm.org
Fri Jun 3 12:18:09 UTC 2022


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:
4d37fb08b6 Revert "KYRA: (HOF) - add script var check"


Commit: 4d37fb08b66d34b58c6769f2acd2eea620a8dbc9
    https://github.com/scummvm/scummvm/commit/4d37fb08b66d34b58c6769f2acd2eea620a8dbc9
Author: athrxx (athrxx at scummvm.org)
Date: 2022-06-03T14:17:51+02:00

Commit Message:
Revert "KYRA: (HOF) - add script var check"

This reverts commit 1030283cf44605fa385fa4cb679d58cf6b938dbd.

Giving this some more thought, it seems the safer thing to do. In practive, it shouldn't matter. I haven't encountered a single situation with an emty string...

Changed paths:
    engines/kyra/script/script_hof.cpp


diff --git a/engines/kyra/script/script_hof.cpp b/engines/kyra/script/script_hof.cpp
index acc0bdcb9cb..77ab2df2167 100644
--- a/engines/kyra/script/script_hof.cpp
+++ b/engines/kyra/script/script_hof.cpp
@@ -872,8 +872,7 @@ int KyraEngine_HoF::o2_defineSceneAnim(EMCState *script) {
 	anim.height = stackPos(7);
 	anim.specialSize = stackPos(9);
 	anim.shapeIndex = stackPos(11);
-	if (*stackPosString(12))
-		strcpy(anim.filename, stackPosString(12));
+	strcpy(anim.filename, stackPosString(12));
 
 	if (anim.flags & 0x40) {
 		if (!_sceneAnimMovie[animId]->open(anim.filename, 1, nullptr))




More information about the Scummvm-git-logs mailing list