[Scummvm-git-logs] scummvm master -> 07c69bd6617e9774564de41cf82d23bf95d52362

dreammaster noreply at scummvm.org
Thu May 18 05:47:13 UTC 2023


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:
07c69bd661 MM: XEEN: Fix METAL_DAMAGE_PERCENT negative numbers


Commit: 07c69bd6617e9774564de41cf82d23bf95d52362
    https://github.com/scummvm/scummvm/commit/07c69bd6617e9774564de41cf82d23bf95d52362
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-17T22:47:04-07:00

Commit Message:
MM: XEEN: Fix METAL_DAMAGE_PERCENT negative numbers

Changed paths:
    devtools/create_mm/create_xeen/constants.cpp
    devtools/create_mm/create_xeen/create_xeen.cpp
    devtools/create_mm/files/xeen/CONSTANTS_26
    devtools/create_mm/files/xeen/CONSTANTS_4
    devtools/create_mm/files/xeen/CONSTANTS_7
    devtools/create_mm/files/xeen/version.txt
    engines/mm/xeen/files.cpp


diff --git a/devtools/create_mm/create_xeen/constants.cpp b/devtools/create_mm/create_xeen/constants.cpp
index a61e10798cf..0fb843f5d7f 100644
--- a/devtools/create_mm/create_xeen/constants.cpp
+++ b/devtools/create_mm/create_xeen/constants.cpp
@@ -562,7 +562,7 @@ const int LangConstants::METAL_DAMAGE[22] = {
 };
 
 const int LangConstants::METAL_DAMAGE_PERCENT[22] = {
-	253, 252, 3, 2, 1, 2, 3, 4, 6, 0, 1,
+	-3, -4, 3, 2, 1, 2, 3, 4, 6, 0, 1,
 	1, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10
 };
 
diff --git a/devtools/create_mm/create_xeen/create_xeen.cpp b/devtools/create_mm/create_xeen/create_xeen.cpp
index 82798cde375..4fc3a2effd7 100644
--- a/devtools/create_mm/create_xeen/create_xeen.cpp
+++ b/devtools/create_mm/create_xeen/create_xeen.cpp
@@ -49,7 +49,7 @@ static void writeVersion() {
 	if (!f.open("version.txt", Common::kFileWriteMode))
 		error("Could not create version.txt");
 
-	f.write("1.0\n", 4);
+	f.write("1.1\n", 4);
 	f.close();
 }
 
diff --git a/devtools/create_mm/files/xeen/CONSTANTS_26 b/devtools/create_mm/files/xeen/CONSTANTS_26
index b5e1beb455b..a155e3f916b 100644
Binary files a/devtools/create_mm/files/xeen/CONSTANTS_26 and b/devtools/create_mm/files/xeen/CONSTANTS_26 differ
diff --git a/devtools/create_mm/files/xeen/CONSTANTS_4 b/devtools/create_mm/files/xeen/CONSTANTS_4
index 7aa88816e1c..3c51154e247 100644
Binary files a/devtools/create_mm/files/xeen/CONSTANTS_4 and b/devtools/create_mm/files/xeen/CONSTANTS_4 differ
diff --git a/devtools/create_mm/files/xeen/CONSTANTS_7 b/devtools/create_mm/files/xeen/CONSTANTS_7
index 23febc70ffe..455b2eb3900 100644
Binary files a/devtools/create_mm/files/xeen/CONSTANTS_7 and b/devtools/create_mm/files/xeen/CONSTANTS_7 differ
diff --git a/devtools/create_mm/files/xeen/version.txt b/devtools/create_mm/files/xeen/version.txt
index d3827e75a5c..9459d4ba2a0 100644
--- a/devtools/create_mm/files/xeen/version.txt
+++ b/devtools/create_mm/files/xeen/version.txt
@@ -1 +1 @@
-1.0
+1.1
diff --git a/engines/mm/xeen/files.cpp b/engines/mm/xeen/files.cpp
index d661918f063..607ad8c607e 100644
--- a/engines/mm/xeen/files.cpp
+++ b/engines/mm/xeen/files.cpp
@@ -69,7 +69,7 @@ bool FileManager::setup() {
 
 	// Set up the engine data file
 	Common::U32String errMsg;
-	if (!MM::load_engine_data("xeen", 1, 0, errMsg)) {
+	if (!MM::load_engine_data("xeen", 1, 1, errMsg)) {
 		GUIErrorMessage(errMsg);
 		return false;
 	}




More information about the Scummvm-git-logs mailing list