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

[Strangerke]

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:
f147f4af4c GOT: Fix the starting armor for area > 1 (#6448)


Commit: f147f4af4cb001b807c33db7f7cd1a535f6b4fe7
    https://github.com/scummvm/scummvm/commit/f147f4af4cb001b807c33db7f7cd1a535f6b4fe7
Author: blowfist (nik_89 at xroutine.net)
Date: 2025-02-23T08:45:03+01:00

Commit Message:
GOT: Fix the starting armor for area > 1 (#6448)

* GOT: Fix the starting armor for area > 1

* GOT: Fix armor state during game loads

Changed paths:
    engines/got/game/init.cpp
    engines/got/got.cpp


diff --git a/engines/got/game/init.cpp b/engines/got/game/init.cpp
index 48914f5fcac..4a2470bedee 100644
--- a/engines/got/game/init.cpp
+++ b/engines/got/game/init.cpp
@@ -74,6 +74,10 @@ void setupPlayer() {
 }
 
 void initGame() {
+	if (_G(area) == 2)
+		_G(thorInfo)._armor = 1;
+	if (_G(area) == 3)
+		_G(thorInfo)._armor = 10;
 	loadStandardActors();
 	setupPlayer();
 
diff --git a/engines/got/got.cpp b/engines/got/got.cpp
index 2f84f331c5f..337c40af1be 100644
--- a/engines/got/got.cpp
+++ b/engines/got/got.cpp
@@ -150,6 +150,10 @@ void GotEngine::savegameLoaded() {
 	_G(thor)->_vulnerableCountdown = 60;
 	_G(thor)->_show = 60;
 	_G(thor)->_moveCountdown = 6;
+	if (_G(area) == 2)
+		_G(thorInfo)._armor = 1;
+	if (_G(area) == 3)
+		_G(thorInfo)._armor = 10;
 	loadNewThor();
 
 	g_vars->resetEndGameFlags();