[Scummvm-git-logs] scummvm master -> 047891947466d6e4e411d241c12e7785d6e7da8a

[whoozle]

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

Summary:
0478919474 PHOENIXVR: Remove go back by right click for V2


Commit: 047891947466d6e4e411d241c12e7785d6e7da8a
    https://github.com/scummvm/scummvm/commit/047891947466d6e4e411d241c12e7785d6e7da8a
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-07-21T00:13:54+01:00

Commit Message:
PHOENIXVR: Remove go back by right click for V2

Changed paths:
    engines/phoenixvr/commands_v2.cpp
    engines/phoenixvr/phoenixvr.cpp


diff --git a/engines/phoenixvr/commands_v2.cpp b/engines/phoenixvr/commands_v2.cpp
index b04f2b6bada..d663af463ac 100644
--- a/engines/phoenixvr/commands_v2.cpp
+++ b/engines/phoenixvr/commands_v2.cpp
@@ -94,7 +94,7 @@ struct Goto_Warp : public Command {
 	Common::String name;
 	Goto_Warp(const Common::Array<Common::String> &args) : name(args[0]) {}
 	void exec(ExecutionContext &ctx) const override {
-		g_engine->goToWarp(name);
+		g_engine->goToWarp(name, true);
 	}
 };
 
diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index dff2f0513c4..0932e992a76 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -1828,7 +1828,7 @@ Common::Error PhoenixVREngine::run() {
 			case Common::EVENT_RBUTTONUP: {
 				if (!_hasFocus)
 					break;
-				if (_prevWarp != -1) {
+				if (_prevWarp != -1 && version() == 1) {
 					returnToWarp();
 					break;
 				}