[Scummvm-git-logs] scummvm master -> 9273cfba9a7d60ddaa956820f04f12da63d6a1a4

[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:
9273cfba9a ICB: Corrected relative method logic


Commit: 9273cfba9a7d60ddaa956820f04f12da63d6a1a4
    https://github.com/scummvm/scummvm/commit/9273cfba9a7d60ddaa956820f04f12da63d6a1a4
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-03-07T22:11:44+01:00

Commit Message:
ICB: Corrected relative method logic

Changed paths:
    engines/icb/p4_pc.cpp


diff --git a/engines/icb/p4_pc.cpp b/engines/icb/p4_pc.cpp
index 6ed2449dc6..0530a5cfc5 100644
--- a/engines/icb/p4_pc.cpp
+++ b/engines/icb/p4_pc.cpp
@@ -91,10 +91,10 @@ uint32 getConfigValueWithDefault(const ConfigFile &config, const Common::String
 	} else if (scumm_stricmp("Controller Settings", section.c_str()) == 0 &&
 		   scumm_stricmp("Method", key.c_str()) == 0) {
 		if (ConfMan.hasKey("actor_relative"))
-			return ConfMan.getBool("actor_relative") ? 1 : 0;
+			return ConfMan.getBool("actor_relative") ? 0 : 1;
 		else {
 			uint32 result = config.readIntSetting(section, key, defaultValue);
-			ConfMan.setBool("actor_relative", result != 0);
+			ConfMan.setBool("actor_relative", result == 0);
 		}
 	}
 
@@ -132,14 +132,14 @@ void ReadConfigFromIniFile() {
 		px.game_completed = TRUE8;
 
 	// Subtitle switch
-	temp = getConfigValueWithDefault(config, "Video Settings", "Subtitles", 0);
+	temp = getConfigValueWithDefault(config, "Video Settings", "Subtitles", 1);
 	if (temp == 0)
 		px.on_screen_text = FALSE8;
 	else
 		px.on_screen_text = TRUE8;
 
 	// Control method
-	temp = getConfigValueWithDefault(config, "Controller Settings", "Method", 0);
+	temp = getConfigValueWithDefault(config, "Controller Settings", "Method", ACTOR_RELATIVE);
 	if ((__Actor_control_mode)temp == SCREEN_RELATIVE)
 		g_icb_session->player.Set_control_mode(SCREEN_RELATIVE);
 	else