[Scummvm-git-logs] scummvm master -> 50fc95b1e850f7fceddd4ba47b0818c4dad6d5c0

[dreammaster]

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:
50fc95b1e8 NUVIE: Revert Change defaultkeys missing to warning


Commit: 50fc95b1e850f7fceddd4ba47b0818c4dad6d5c0
    https://github.com/scummvm/scummvm/commit/50fc95b1e850f7fceddd4ba47b0818c4dad6d5c0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-28T20:25:18-07:00

Commit Message:
NUVIE: Revert Change defaultkeys missing to warning

The defaultkeys file is actually present in the ultima.dat
data file, so not being able to find it does mean that
something has gone seriously wrong

Changed paths:
    engines/ultima/nuvie/keybinding/keys.cpp


diff --git a/engines/ultima/nuvie/keybinding/keys.cpp b/engines/ultima/nuvie/keybinding/keys.cpp
index fe27b8d187..0107f3f3a7 100644
--- a/engines/ultima/nuvie/keybinding/keys.cpp
+++ b/engines/ultima/nuvie/keybinding/keys.cpp
@@ -270,15 +270,13 @@ KeyBinder::KeyBinder(Configuration *config) {
 	config->value("config/keys", keyfilename, "(default)");
 	bool key_file_exists = fileExists(keyfilename.c_str());
 
-	if (keyfilename != "(default)" && !key_file_exists) {
-		::warning("Couldn't find the default key setting at %s - trying defaultkeys.txt in the data directory\n", keyfilename.c_str());
-	} else {
-		if (keyfilename == "(default)" || !key_file_exists)
-			keyfilename = "defaultkeys.txt";
-
-		if (fileExists(keyfilename.c_str()))
-			LoadFromFile(keyfilename.c_str());
+	if (keyfilename != "(default)" && !key_file_exists)
+		::error("Couldn't find the default key setting at %s - trying defaultkeys.txt in the data directory\n", keyfilename.c_str());
+	if (keyfilename == "(default)" || !key_file_exists) {
+		config->value("config/datadir", dir, "./data");
+		keyfilename = dir + "/defaultkeys.txt";
 	}
+	LoadFromFile(keyfilename.c_str());
 
 	LoadGameSpecificKeys(); // won't load if file isn't found
 	LoadFromPatch(); // won't load if file isn't found