[Scummvm-git-logs] scummvm master -> 62770fe1701c72aae48a78be7bcf74de42a520da

[aquadran]

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:
62770fe170 ICB: ELDORADO: Avoid selection mission and profiles in extras


Commit: 62770fe1701c72aae48a78be7bcf74de42a520da
    https://github.com/scummvm/scummvm/commit/62770fe1701c72aae48a78be7bcf74de42a520da
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-31T22:12:38+02:00

Commit Message:
ICB: ELDORADO: Avoid selection mission and profiles in extras

Changed paths:
    engines/icb/options_manager_pc.cpp


diff --git a/engines/icb/options_manager_pc.cpp b/engines/icb/options_manager_pc.cpp
index 3da740b140d..9f2b8b77e2d 100644
--- a/engines/icb/options_manager_pc.cpp
+++ b/engines/icb/options_manager_pc.cpp
@@ -1925,20 +1925,46 @@ void OptionsManager::MoveSelected(bool8 _down_) {
 			currentlySelected--;
 
 		if (g_px->game_completed) {
-			if (currentlySelected < 0)
-				m_M_EXTRA_selected = (M_EXTRA_CHOICES)(NUMBER_OF_EXTRA_CHOICES - 1);
-			else
-				m_M_EXTRA_selected = (M_EXTRA_CHOICES)(currentlySelected % NUMBER_OF_EXTRA_CHOICES);
+			if (g_icb->getGameType() == GType_ICB) {
+				if (currentlySelected < 0)
+					m_M_EXTRA_selected = (M_EXTRA_CHOICES)(NUMBER_OF_EXTRA_CHOICES - 1);
+				else
+					m_M_EXTRA_selected = (M_EXTRA_CHOICES)(currentlySelected % NUMBER_OF_EXTRA_CHOICES);
+			} else {
+				if (currentlySelected < 0)
+					m_M_EXTRA_selected = (M_EXTRA_CHOICES)(NUMBER_OF_EXTRA_CHOICES - 1);
+				else {
+					if (_down_ && currentlySelected == PLAYSELECT)
+						m_M_EXTRA_selected = CREDITS;
+					else if (!_down_ && currentlySelected == PROFILES)
+						m_M_EXTRA_selected = SLIDESHOW;
+					else
+						m_M_EXTRA_selected = (M_EXTRA_CHOICES)(currentlySelected % NUMBER_OF_EXTRA_CHOICES);
+				}
+			}
 		} else {
-			if (currentlySelected < 0)
-				m_M_EXTRA_selected = (M_EXTRA_CHOICES)(NUMBER_OF_EXTRA_CHOICES - 1);
-			else {
-				if (_down_ && currentlySelected == SLIDESHOW)
+			if (g_icb->getGameType() == GType_ICB) {
+				if (currentlySelected < 0)
 					m_M_EXTRA_selected = CREDITS;
-				else if (!_down_ && currentlySelected == PROFILES)
-					m_M_EXTRA_selected = MOVIES;
-				else
+				else {
+					if (_down_ && currentlySelected == SLIDESHOW)
+						m_M_EXTRA_selected = CREDITS;
+					else if (!_down_ && currentlySelected == PROFILES)
+						m_M_EXTRA_selected = MOVIES;
+					else
 					m_M_EXTRA_selected = (M_EXTRA_CHOICES)(currentlySelected % NUMBER_OF_EXTRA_CHOICES);
+				}
+			} else {
+				if (currentlySelected < 0)
+					m_M_EXTRA_selected = CREDITS;
+				else {
+					if (_down_ && currentlySelected == SLIDESHOW)
+						m_M_EXTRA_selected = CREDITS;
+					else if (!_down_ && currentlySelected == PROFILES)
+						m_M_EXTRA_selected = SLIDESHOW;
+					else
+						m_M_EXTRA_selected = (M_EXTRA_CHOICES)(currentlySelected % NUMBER_OF_EXTRA_CHOICES);
+				}
 			}
 		}