[Scummvm-git-logs] scummvm master -> 0c5d73fd29a20e7a687ad29e0a273b1649a7fa2f

dreammaster noreply at scummvm.org
Sat Mar 22 03:10:36 UTC 2025


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:
0c5d73fd29 GOT: Properly reset everything pick-upable after starting new game


Commit: 0c5d73fd29a20e7a687ad29e0a273b1649a7fa2f
    https://github.com/scummvm/scummvm/commit/0c5d73fd29a20e7a687ad29e0a273b1649a7fa2f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-03-21T20:10:30-07:00

Commit Message:
GOT: Properly reset everything pick-upable after starting new game

Changed paths:
    engines/got/data/sd_data.cpp
    engines/got/gfx/gfx_pics.cpp


diff --git a/engines/got/data/sd_data.cpp b/engines/got/data/sd_data.cpp
index 2b2a859bbd0..e2b0e70cf24 100644
--- a/engines/got/data/sd_data.cpp
+++ b/engines/got/data/sd_data.cpp
@@ -40,10 +40,8 @@ void SdData::load() {
 }
 
 void SdData::setArea(int area) {
-	if (area != _area) {
-		_area = area;
-		load();
-	}
+	_area = area;
+	load();
 }
 
 void SdData::sync(Common::Serializer &s) {
diff --git a/engines/got/gfx/gfx_pics.cpp b/engines/got/gfx/gfx_pics.cpp
index 961fd350dcf..40e0d40df13 100644
--- a/engines/got/gfx/gfx_pics.cpp
+++ b/engines/got/gfx/gfx_pics.cpp
@@ -97,10 +97,8 @@ GfxPics &GfxPics::operator=(const GfxPics &src) {
 }
 
 void BgPics::setArea(int area) {
-	if (area != _area) {
-		_area = area;
-		load();
-	}
+	_area = area;
+	load();
 }
 
 void BgPics::load() {




More information about the Scummvm-git-logs mailing list