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

[dwatteau]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
51ac525263 GUI: Fix builds without USE_TRANSLATION
f04d35a9bd NGI: Remove various unused variables


Commit: 51ac52526349fb777a103be930dc2f39735d0519
    https://github.com/scummvm/scummvm/commit/51ac52526349fb777a103be930dc2f39735d0519
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-05-15T18:06:35+02:00

Commit Message:
GUI: Fix builds without USE_TRANSLATION

Changed paths:
    gui/dump-all-dialogs.cpp


diff --git a/gui/dump-all-dialogs.cpp b/gui/dump-all-dialogs.cpp
index 3ed5c2ed4e6..dce64245799 100644
--- a/gui/dump-all-dialogs.cpp
+++ b/gui/dump-all-dialogs.cpp
@@ -48,8 +48,10 @@ void saveGUISnapshot(Graphics::Surface surf, const Common::String &filename) {
 }
 
 void dumpDialogs(const Common::String &message, int res, const Common::String &lang) {
+#ifdef USE_TRANSLATION
 	// Update GUI language
 	TransMan.setLanguage(lang);
+#endif
 
 	// Update resolution
 	ConfMan.setInt("last_window_width", res, Common::ConfigManager::kApplicationDomain);
@@ -87,7 +89,9 @@ void dumpDialogs(const Common::String &message, int res, const Common::String &l
 }
 
 void dumpAllDialogs(const Common::String &message) {
+#ifdef USE_TRANSLATION
 	auto originalLang = TransMan.getCurrentLanguage();
+#endif
 	int original_window_width = ConfMan.getInt("last_window_width", Common::ConfigManager::kApplicationDomain);
 	int original_window_height = ConfMan.getInt("last_window_height", Common::ConfigManager::kApplicationDomain);
 	Common::List<Common::String> list = Common::getLanguageList();
@@ -104,7 +108,9 @@ void dumpAllDialogs(const Common::String &message) {
 		dumpDialogs(message, res_to_test[0], lang);
 	}
 
+#ifdef USE_TRANSLATION
 	TransMan.setLanguage(originalLang);
+#endif
 	ConfMan.setInt("last_window_width", original_window_width, Common::ConfigManager::kApplicationDomain);
 	ConfMan.setInt("last_window_height", original_window_height, Common::ConfigManager::kApplicationDomain);
 	g_system->initSize(original_window_width, original_window_height);


Commit: f04d35a9bd5f5b55cdeabe72c1e6989bad3d8bb0
    https://github.com/scummvm/scummvm/commit/f04d35a9bd5f5b55cdeabe72c1e6989bad3d8bb0
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-05-15T18:08:08+02:00

Commit Message:
NGI: Remove various unused variables

Changed paths:
    engines/ngi/fullpipe/scene08.cpp
    engines/ngi/fullpipe/scene14.cpp
    engines/ngi/statics.cpp


diff --git a/engines/ngi/fullpipe/scene08.cpp b/engines/ngi/fullpipe/scene08.cpp
index 4b4c8ddc339..2718bd9a75b 100644
--- a/engines/ngi/fullpipe/scene08.cpp
+++ b/engines/ngi/fullpipe/scene08.cpp
@@ -248,7 +248,6 @@ void sceneHandler08_airMoves() {
 	if (g_nmi->_aniMan->isIdle() && !(g_nmi->_aniMan->_flags & 0x100)) {
 		int x = g_nmi->_aniMan->_ox;
 		int y = g_nmi->_aniMan->_oy;
-		Common::Point point;
 
 		if (703 - g_nmi->_aniMan->getSomeXY().y - y < 150) {
 			if (g_nmi->_aniMan->_statics) {
@@ -345,7 +344,6 @@ void sceneHandler08_sitDown() {
 }
 
 void sceneHandler08_calcFlight() {
-	Common::Point point;
 	int y = g_vars->scene08_manOffsetY + g_nmi->_aniMan->_oy;
 
 	g_nmi->_aniMan->setOXY(g_nmi->_aniMan->_ox, y);
diff --git a/engines/ngi/fullpipe/scene14.cpp b/engines/ngi/fullpipe/scene14.cpp
index 8354f69204d..f67d08e0c88 100644
--- a/engines/ngi/fullpipe/scene14.cpp
+++ b/engines/ngi/fullpipe/scene14.cpp
@@ -403,8 +403,6 @@ void sceneHandler14_kickAnimation() {
 }
 
 void sceneHandler14_declineCallback(int *arg) {
-	Common::Point point;
-
 	if (g_vars->scene14_dudeIsKicking) {
 		*arg = (int)(sqrt((double)(g_nmi->_mouseVirtY - g_vars->scene14_mouseCursorPos.y)
 							 * (g_nmi->_mouseVirtY - g_vars->scene14_mouseCursorPos.y)
diff --git a/engines/ngi/statics.cpp b/engines/ngi/statics.cpp
index 80b7ff096a4..a27113da6ba 100644
--- a/engines/ngi/statics.cpp
+++ b/engines/ngi/statics.cpp
@@ -1735,8 +1735,6 @@ void Movement::initStatics(StaticANIObject *ani) {
 
 	_currMovement->setDynamicPhaseIndex(_currMovement->_updateFlag1 != 0 ? 1 : 0);
 
-	Common::Point point;
-
 	int x1 = _currMovement->_staticsObj1->getDimensions().x - _mx;
 
 	_mx = x1 - _currMovement->_currDynamicPhase->getDimensions().x;