[Scummvm-git-logs] scummvm master -> 2a9f49e1e0e4823109a796150c608b89ad96025f

[mduggan]

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:
2a9f49e1e0 ACCESS: Fix some GCC warnings


Commit: 2a9f49e1e0e4823109a796150c608b89ad96025f
    https://github.com/scummvm/scummvm/commit/2a9f49e1e0e4823109a796150c608b89ad96025f
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-05-23T19:43:02+10:00

Commit Message:
ACCESS: Fix some GCC warnings

Changed paths:
    engines/access/noctropolis/noctropolis_game.cpp
    engines/access/noctropolis/noctropolis_resources.cpp
    engines/access/noctropolis/noctropolis_resources.h
    engines/access/noctropolis/noctropolis_room.cpp


diff --git a/engines/access/noctropolis/noctropolis_game.cpp b/engines/access/noctropolis/noctropolis_game.cpp
index 4c9d6f1eb79..f535c584bb0 100644
--- a/engines/access/noctropolis/noctropolis_game.cpp
+++ b/engines/access/noctropolis/noctropolis_game.cpp
@@ -165,8 +165,8 @@ void NoctropolisEngine::drawOverlays() {
 }
 
 void NoctropolisEngine::drawDeathTimer() {
-  if (!_flags[200])
-	return;
+	if (!_flags[200])
+		return;
 
 	int seconds = _timers[0x12]._timer / 60;
 	Common::String time = Common::String::format("%02d:%02d", seconds / 60, seconds % 60);
diff --git a/engines/access/noctropolis/noctropolis_resources.cpp b/engines/access/noctropolis/noctropolis_resources.cpp
index 85f0f75cbdf..f10a7a052c7 100644
--- a/engines/access/noctropolis/noctropolis_resources.cpp
+++ b/engines/access/noctropolis/noctropolis_resources.cpp
@@ -1806,7 +1806,7 @@ static constexpr const char *ASKITEMS[4][33] = {
 
 ///////////////////////////////////////////////////////////////
 
-NoctropolisResources::NoctropolisResources(AccessEngine *_vm) : Resources(_vm), _fontChaleteu(nullptr), _fontSystemeu(nullptr),
+NoctropolisResources::NoctropolisResources(AccessEngine *vm) : Resources(vm), _fontChaleteu(nullptr), _fontSystemeu(nullptr),
 _fontSml3x5(nullptr), _fontNaples12(nullptr), _fontGothiceu(nullptr), _fontChaletse(nullptr),_fontComicseu(nullptr)
 {
 }
diff --git a/engines/access/noctropolis/noctropolis_resources.h b/engines/access/noctropolis/noctropolis_resources.h
index a690b944719..056b8bf1b2b 100644
--- a/engines/access/noctropolis/noctropolis_resources.h
+++ b/engines/access/noctropolis/noctropolis_resources.h
@@ -45,7 +45,7 @@ extern const int16 TRAV_ICONS[];
 
 class NoctropolisResources : public Resources {
 public:
-	NoctropolisResources(AccessEngine *_vm);
+	NoctropolisResources(AccessEngine *vm);
 	~NoctropolisResources();
 
 	const byte *getCursor(int num) const override;
diff --git a/engines/access/noctropolis/noctropolis_room.cpp b/engines/access/noctropolis/noctropolis_room.cpp
index 51f9b6ea759..6efe620c1ae 100644
--- a/engines/access/noctropolis/noctropolis_room.cpp
+++ b/engines/access/noctropolis/noctropolis_room.cpp
@@ -303,9 +303,9 @@ int NoctropolisRoom::checkPlayerBox(const Common::Point &pt) {
 	_vm->_scale = _vm->_stilScaleOff;
 	if (_vm->_stilScaleOff == 0) {
 		_vm->_scale = (_vm->_scaleI *
-						(((_vm->_scaleH2 << 8) +
+						((((_vm->_scaleH2 << 8) +
 						  _vm->_scaleT1 *
-						  (_vm->_scaleN1 + (stil->_rawPlayer.y - _vm->_scaleMaxY)) & 0xff00)
+						  (_vm->_scaleN1 + (stil->_rawPlayer.y - _vm->_scaleMaxY))) & 0xff00)
 						 / (uint)_vm->_scaleH1) >> 8);
 	}
 	_vm->_screen->setScaleTable(_vm->_scale);