[Scummvm-git-logs] scummvm master -> af326039c42fed8382732b92f4127b35a8546696

[Scorpeg]

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:
af326039c4 PHOENIXVR: Fix red overlay for combining items


Commit: af326039c42fed8382732b92f4127b35a8546696
    https://github.com/scummvm/scummvm/commit/af326039c42fed8382732b92f4127b35a8546696
Author: Scorp (scorp at mrs.mn)
Date: 2026-07-18T22:56:09+03:00

Commit Message:
PHOENIXVR: Fix red overlay for combining items

Changed paths:
    engines/phoenixvr/commands.h


diff --git a/engines/phoenixvr/commands.h b/engines/phoenixvr/commands.h
index 923783ba2d3..4e6b1b22cee 100644
--- a/engines/phoenixvr/commands.h
+++ b/engines/phoenixvr/commands.h
@@ -258,12 +258,14 @@ void drawLouvreActionButtons() {
 	int mask = louvreSelectedObjectActionMask();
 	int currentAction = g_engine->getVariable("CurrentAction");
 	for (uint i = 0; i < ARRAYSIZE(kActionValues); ++i) {
-		int button = i + 1;
+		drawLouvreImage(Common::String::format("Bout%04d.bmp", i + 1), kActionButtonX[i], kActionButtonY[i]);
 		if ((mask & kActionValues[i]) != 0)
-			button += 10;
+			drawLouvreImage(Common::String::format("Bout%04d.bmp", i + 11), kActionButtonX[i], kActionButtonY[i]);
+	}
+
+	for (uint i = 0; i < ARRAYSIZE(kActionValues); ++i) {
 		if (currentAction == kActionValues[i])
-			button += 20;
-		drawLouvreImage(Common::String::format("Bout%04d.bmp", button), kActionButtonX[i], kActionButtonY[i]);
+			drawLouvreImage(Common::String::format("Bout%04d.bmp", i + 21), kActionButtonX[i], kActionButtonY[i]);
 	}
 }
 
@@ -899,6 +901,7 @@ struct DoAction : public Script::Command {
 		case 4:
 			g_engine->setVariable("CurrentAction", value);
 			setLouvreSelectedSlot(selection + 100, 0);
+			drawLouvreActionButtons();
 			break;
 		case 8:
 			g_engine->setVariable("CurrentAction", value);