[Scummvm-git-logs] scummvm master -> 05897db27ccbb949d7493b3d31b44f9cbbe7e0b8

[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:
bf008d5368 PHOENIXVR: do not overwrite warp index on duplicate entries, output warning
05897db27c PHOENIXVR: do not pass empty rect to screen->drawRoundRect


Commit: bf008d5368b95bbe878685e46532861e511ce097
    https://github.com/scummvm/scummvm/commit/bf008d5368b95bbe878685e46532861e511ce097
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-04-01T00:12:59+01:00

Commit Message:
PHOENIXVR: do not overwrite warp index on duplicate entries, output warning

Changed paths:
    engines/phoenixvr/script.cpp


diff --git a/engines/phoenixvr/script.cpp b/engines/phoenixvr/script.cpp
index 98d429502cc..c94900a60b1 100644
--- a/engines/phoenixvr/script.cpp
+++ b/engines/phoenixvr/script.cpp
@@ -325,7 +325,10 @@ void Script::parseLine(const Common::String &line, uint lineno) {
 			if (p.maybe(','))
 				test = p.nextWord();
 			_currentWarp.reset(new Warp{vr, Common::move(test), {}});
-			_warpsIndex[vr] = _warps.size();
+			if (!_warpsIndex.contains(vr))
+				_warpsIndex[vr] = _warps.size();
+			else
+				warning("duplicate warp %s\n", vr.c_str());
 			_warps.push_back(_currentWarp);
 			_warpNames.push_back(vr);
 		} else if (p.maybe("test]=")) {


Commit: 05897db27ccbb949d7493b3d31b44f9cbbe7e0b8
    https://github.com/scummvm/scummvm/commit/05897db27ccbb949d7493b3d31b44f9cbbe7e0b8
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-04-01T00:38:38+01:00

Commit Message:
PHOENIXVR: do not pass empty rect to screen->drawRoundRect

Changed paths:
    engines/phoenixvr/vr.cpp


diff --git a/engines/phoenixvr/vr.cpp b/engines/phoenixvr/vr.cpp
index 6e95616d0d5..efc1c623ca7 100644
--- a/engines/phoenixvr/vr.cpp
+++ b/engines/phoenixvr/vr.cpp
@@ -535,7 +535,7 @@ void VR::render(Graphics::Screen *screen, float ax, float ay, float fov, float d
 		if (regSet) {
 			for (auto &rect : regSet->getRegions()) {
 				auto dstRect = rect.toRect().toRect();
-				if (dstRect.isValidRect())
+				if (dstRect.isValidRect() && !dstRect.isEmpty())
 					screen->drawRoundRect(dstRect, 4, _pic->format.RGBToColor(255, 255, 255), false);
 			}
 		}