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

[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:
c96eed94cf ICB: Remove 'semitrans' option


Commit: c96eed94cf15f767e9cf3defbbe43d6b405128ff
    https://github.com/scummvm/scummvm/commit/c96eed94cf15f767e9cf3defbbe43d6b405128ff
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-03-06T13:02:40+01:00

Commit Message:
ICB: Remove 'semitrans' option

Changed paths:
    engines/icb/options_manager_pc.cpp
    engines/icb/options_manager_pc.h


diff --git a/engines/icb/options_manager_pc.cpp b/engines/icb/options_manager_pc.cpp
index 0a719735a0..8963b8470e 100644
--- a/engines/icb/options_manager_pc.cpp
+++ b/engines/icb/options_manager_pc.cpp
@@ -2339,7 +2339,7 @@ void OptionsManager::MoveSelected(bool8 _down_) {
 				if (_down_ == TRUE8)
 					currentlySelected = LEAVE;
 				else
-					currentlySelected = SEMITRANS;
+					currentlySelected = SUBTITLES;
 			}
 		}
 
@@ -2600,17 +2600,6 @@ void OptionsManager::AlterSelected(bool8 _right_) {
 			Poll_Sound_Engine();
 			return;
 
-		case SEMITRANS:
-			if (px.semitransparencies)
-				px.semitransparencies = FALSE8;
-			else
-				px.semitransparencies = TRUE8;
-
-			// Chosen noise please
-			PlayChosenFX();
-			Poll_Sound_Engine();
-			return;
-
 		case SHADOWS:
 			if (_right_) {
 				if (px.actorShadows == 3)
@@ -5452,16 +5441,6 @@ void OptionsManager::DrawVideoSettings() {
 	DisplayText(ad, pitch, msg, halfScreen, hite, NORMALFONT, FALSE8);
 	hite += 20;
 
-	// Semi-transparency
-	msg = GetTextFromReference(HashString("opt_semitransparency"));
-	temp = CalculateStringWidth(msg);
-	DisplayText(ad, pitch, msg, halfScreen - temp - 10, hite, (m_VIDEO_selected == SEMITRANS) ? SELECTEDFONT : NORMALFONT, FALSE8);
-	if (px.semitransparencies)
-		msg = GetTextFromReference(HashString("opt_on"));
-	else
-		msg = GetTextFromReference(HashString("opt_off"));
-	DisplayText(ad, pitch, msg, halfScreen, hite, NORMALFONT, FALSE8);
-
 	if (g_videoOptionsCheat == TRUE8) {
 		hite += 20;
 
@@ -6666,7 +6645,7 @@ void OptionsManager::PollInput() {
 			if (g_videoOptionsCheat == FALSE8) {
 				// Illegal selections without cheat
 				if (m_VIDEO_selected == SHADOWS)
-					m_VIDEO_selected = SEMITRANS;
+					m_VIDEO_selected = LEAVE;
 				if (m_VIDEO_selected == FRAMELIMITER)
 					m_VIDEO_selected = LEAVE;
 			}
diff --git a/engines/icb/options_manager_pc.h b/engines/icb/options_manager_pc.h
index 034477ecd3..934d52ae52 100644
--- a/engines/icb/options_manager_pc.h
+++ b/engines/icb/options_manager_pc.h
@@ -131,14 +131,13 @@ enum AUDIO_CHOICES {
 	DO_ONE = 3
 };
 
-#define NUMBER_OF_VIDEO_CHOICES 5
+#define NUMBER_OF_VIDEO_CHOICES 4
 
 enum VIDEO_CHOICES {
 	SUBTITLES = 0,
-	SEMITRANS = 1,
-	SHADOWS = 2,
-	FRAMELIMITER = 3,
-	LEAVE = 4
+	SHADOWS = 1,
+	FRAMELIMITER = 2,
+	LEAVE = 3
 };
 
 #define NUMBER_OF_CONTROL_CHOICES 11