[Scummvm-git-logs] scummvm master -> 3f36b6a259f14cfe659ddfdf36e2eb741003b76e

[whoozle]

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

Summary:
80a9cec19f PHOENIXVR: implement Stop_AnimBloc
3f36b6a259 PHOENIXVR: do not change vertical angle if it was saved as -1


Commit: 80a9cec19fb921dd339852b03c1db5e1c68676a5
    https://github.com/scummvm/scummvm/commit/80a9cec19fb921dd339852b03c1db5e1c68676a5
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-02-18T21:28:38Z

Commit Message:
PHOENIXVR: implement Stop_AnimBloc

Changed paths:
    engines/phoenixvr/commands.h
    engines/phoenixvr/phoenixvr.cpp
    engines/phoenixvr/phoenixvr.h
    engines/phoenixvr/vr.cpp
    engines/phoenixvr/vr.h


diff --git a/engines/phoenixvr/commands.h b/engines/phoenixvr/commands.h
index 2b959418c6a..cf034ee8c81 100644
--- a/engines/phoenixvr/commands.h
+++ b/engines/phoenixvr/commands.h
@@ -89,7 +89,8 @@ struct Stop_AnimBloc : public Script::Command {
 
 	Stop_AnimBloc(const Common::Array<Common::String> &args) : name(args[0]) {}
 	void exec(Script::ExecutionContext &ctx) const override {
-		warning("Stop_AnimBloc %s", name.c_str());
+		debug("Stop_AnimBloc %s", name.c_str());
+		g_engine->stopAnimation(name);
 	}
 };
 
diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index ccba18d3b0e..b82e6bd4c99 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -352,6 +352,10 @@ void PhoenixVREngine::playAnimation(const Common::String &name, const Common::St
 	_vr.playAnimation(name, var, varValue, speed);
 }
 
+void PhoenixVREngine::stopAnimation(const Common::String &name) {
+	_vr.stopAnimation(name);
+}
+
 void PhoenixVREngine::resetLockKey() {
 	debug("resetlockkey");
 	_prevWarp = -1; // original game does only this o_O
diff --git a/engines/phoenixvr/phoenixvr.h b/engines/phoenixvr/phoenixvr.h
index 5b07cc66812..613a1415e44 100644
--- a/engines/phoenixvr/phoenixvr.h
+++ b/engines/phoenixvr/phoenixvr.h
@@ -141,6 +141,7 @@ public:
 	void pauseTimer(bool pause, bool deactivate);
 	void killTimer();
 	void playAnimation(const Common::String &name, const Common::String &var, int varValue, float speed);
+	void stopAnimation(const Common::String &name);
 	void setZoom(int fov) {
 		_fov = kPi * fov / 180;
 	}
diff --git a/engines/phoenixvr/vr.cpp b/engines/phoenixvr/vr.cpp
index c3ab3007466..24827ef807a 100644
--- a/engines/phoenixvr/vr.cpp
+++ b/engines/phoenixvr/vr.cpp
@@ -383,6 +383,16 @@ void VR::playAnimation(const Common::String &name, const Common::String &variabl
 		g_engine->setVariable(variable, value);
 }
 
+void VR::stopAnimation(const Common::String &name) {
+	auto it = Common::find_if(_animations.begin(), _animations.end(), [&](const Animation &a) { return a.name.compareToIgnoreCase(name) == 0; });
+	if (it == _animations.end()) {
+		debug("no animation %s", name.c_str());
+		return;
+	}
+	auto &animation = *it;
+	animation.active = false;
+}
+
 void VR::Animation::renderNextFrame(Graphics::Surface &pic) {
 	assert(active);
 	if (frameIndex >= frames.size()) {
diff --git a/engines/phoenixvr/vr.h b/engines/phoenixvr/vr.h
index 7abe4b0d8c9..49778f70302 100644
--- a/engines/phoenixvr/vr.h
+++ b/engines/phoenixvr/vr.h
@@ -67,6 +67,7 @@ public:
 	void render(Graphics::Screen *screen, float ax, float ay, float fov, float dt, RegionSet *regSet);
 	bool isVR() const { return _vr; }
 	void playAnimation(const Common::String &name, const Common::String &variable, int value, float speed);
+	void stopAnimation(const Common::String &name);
 	Graphics::Surface &getSurface() { return *_pic->surfacePtr(); }
 };
 } // namespace PhoenixVR


Commit: 3f36b6a259f14cfe659ddfdf36e2eb741003b76e
    https://github.com/scummvm/scummvm/commit/3f36b6a259f14cfe659ddfdf36e2eb741003b76e
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-02-18T21:28:38Z

Commit Message:
PHOENIXVR: do not change vertical angle if it was saved as -1

Changed paths:
    engines/phoenixvr/phoenixvr.cpp


diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index b82e6bd4c99..7663a435e55 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -999,7 +999,8 @@ bool PhoenixVREngine::enterScript() {
 		  currentWarpIdx, currentWarpTests);
 
 	setAngle(toAngle(angleX), toAngle(angleY));
-	setXMax(toAngle(angleXMax));
+	if (angleXMax != -1)
+		setXMax(toAngle(angleXMax));
 	if (angleYMin != -1 && angleYMax != -1)
 		setYMax(toAngle(angleYMin), toAngle(angleYMax));