[Scummvm-git-logs] scummvm master -> 19a3968a486ea8a19acc68750a65b8103bbe662b

[dreammaster]

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:
19a3968a48 GOT: Properly reset flags and area when restarting game from title screen


Commit: 19a3968a486ea8a19acc68750a65b8103bbe662b
    https://github.com/scummvm/scummvm/commit/19a3968a486ea8a19acc68750a65b8103bbe662b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-16T21:35:09-08:00

Commit Message:
GOT: Properly reset flags and area when restarting game from title screen

Changed paths:
    engines/got/data/setup.cpp
    engines/got/vars.cpp


diff --git a/engines/got/data/setup.cpp b/engines/got/data/setup.cpp
index f2a6cfb3e59..1b8cb571ced 100644
--- a/engines/got/data/setup.cpp
+++ b/engines/got/data/setup.cpp
@@ -25,7 +25,7 @@
 namespace Got {
 
 SetupFlags &SetupFlags::operator=(const Got::SetupFlags &src) {
-	Common::copy(src._flags, src._flags + 8, _flags);
+	Common::copy(src._flags, src._flags + 64, _flags);
 	return *this;
 }
 
diff --git a/engines/got/vars.cpp b/engines/got/vars.cpp
index 17ffdaa3cb3..69d382ab28f 100644
--- a/engines/got/vars.cpp
+++ b/engines/got/vars.cpp
@@ -74,28 +74,28 @@ Vars::~Vars() {
 }
 
 void Vars::setArea(int areaNum) {
-	if (areaNum != _area) {
-		_area = areaNum;
-		_setup._areaNum = areaNum;
-		_sdData.setArea(areaNum);
-		_bgPics.setArea(areaNum);
-
-		switch (areaNum) {
-		case 1:
-			_currentLevel = 23;
-			break;
-
-		case 2:
-			_currentLevel = 51;
-			break;
-
-		case 3:
-			_currentLevel = 33;
-			break;
-
-		default:
-			break;
-		}
+	_area = areaNum;
+	_setup = Setup();
+	_setup._areaNum = areaNum;
+
+	_sdData.setArea(areaNum);
+	_bgPics.setArea(areaNum);
+
+	switch (areaNum) {
+	case 1:
+		_currentLevel = 23;
+		break;
+
+	case 2:
+		_currentLevel = 51;
+		break;
+
+	case 3:
+		_currentLevel = 33;
+		break;
+
+	default:
+		break;
 	}
 }