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

Sun Nov 1 13:10:16 UTC 2020

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:
d44f1f77ed GRIM: Rename engine data patches


Commit: d44f1f77edccbf73949e347692fc7e85cda890f6
    https://github.com/scummvm/scummvm/commit/d44f1f77edccbf73949e347692fc7e85cda890f6
Author: PaweÅ‚ KoÅ‚odziejski (aquadran at users.sourceforge.net)
Date: 2020-11-01T14:10:09+01:00

Commit Message:
GRIM: Rename engine data patches

Changed paths:
  A dists/engine-data/grim-patch.lab
  A dists/engine-data/monkey4-patch.m4b
  A dists/engine-data/patches/monkey4/_options.lua.patchr
  A dists/engine-data/patches/monkey4/_options.lua_1.patchr
  A dists/engine-data/patches/monkey4/mot.lua.patchr
  A dists/engine-data/patches/monkey4/residualvm-prefs.lua
  R dists/engine-data/patches/emi/_options.lua.patchr
  R dists/engine-data/patches/emi/_options.lua_1.patchr
  R dists/engine-data/patches/emi/mot.lua.patchr
  R dists/engine-data/patches/emi/residualvm-prefs.lua
  R dists/engine-data/residualvm-emi-patch.m4b
  R dists/engine-data/residualvm-grim-patch.lab
    Makefile.common
    devtools/create_project/xcode.cpp
    dists/engine-data/patches/EmiPatchesDesc.txt
    dists/engine-data/patches/GrimPatchesDesc.txt
    dists/scummvm.rc
    engines/grim/resource.cpp

diff --git a/Makefile.common b/Makefile.common
index 0fa6849d45..b004db8eed 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -425,10 +425,10 @@ DIST_FILES_ENGINEDATA+=fonts.dat
 endif
 DIST_FILES_ENGINEDATA+=macgui.dat
 ifdef ENABLE_GRIM
-DIST_FILES_ENGINEDATA+=residualvm-grim-patch.lab
+DIST_FILES_ENGINEDATA+=grim-patch.lab
 endif
 ifdef ENABLE_MONKEY4
-DIST_FILES_ENGINEDATA+=residualvm-emi-patch.m4b
+DIST_FILES_ENGINEDATA+=monkey4-patch.m4b
 endif
 ifdef ENABLE_MYST3
 DIST_FILES_ENGINEDATA+=myst3.dat
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 78d39a6b39..d50fd93821 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -828,8 +828,8 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
 		files.push_back("dists/engine-data/lure.dat");
 		files.push_back("dists/engine-data/macgui.dat");
 		files.push_back("dists/engine-data/myst3.dat");
-		files.push_back("dists/engine-data/residualvm-emi-patch.m4b");
-		files.push_back("dists/engine-data/residualvm-grim-patch.lab");
+		files.push_back("dists/engine-data/monkey4-patch.m4b");
+		files.push_back("dists/engine-data/grim-patch.lab");
 		files.push_back("dists/engine-data/macventure.dat");
 		files.push_back("dists/engine-data/mort.dat");
 		files.push_back("dists/engine-data/neverhood.dat");
diff --git a/dists/engine-data/residualvm-grim-patch.lab b/dists/engine-data/grim-patch.lab
similarity index 100%
rename from dists/engine-data/residualvm-grim-patch.lab
rename to dists/engine-data/grim-patch.lab
diff --git a/dists/engine-data/residualvm-emi-patch.m4b b/dists/engine-data/monkey4-patch.m4b
similarity index 100%
rename from dists/engine-data/residualvm-emi-patch.m4b
rename to dists/engine-data/monkey4-patch.m4b
diff --git a/dists/engine-data/patches/EmiPatchesDesc.txt b/dists/engine-data/patches/EmiPatchesDesc.txt
index 9e03ccf847..07f2b7b821 100644
--- a/dists/engine-data/patches/EmiPatchesDesc.txt
+++ b/dists/engine-data/patches/EmiPatchesDesc.txt
@@ -3,7 +3,7 @@ List of fixed bugs in EMI scripts:
 +Others modifications:
 	-Differently from Grim Fandango, global preferences (such as volume, subtitles, ...)
 	in EMI are saved in a text file (at least in Windows reatil version and demo).
-	Patches to _options.lua modifies this behaviour and hooks directly into ResidualVM
+	Patches to _options.lua modifies this behaviour and hooks directly into ScummVM
 	configuration manager through GetResidualVMPreference and SetResidualVMPreference
 	opcodes. For simplicity, these patches patches only load the file residualvm-prefs.lua,
 	(they add a 'dofile("residualvm-prefs.lua")' at the end of _options.lua) see it for
@@ -14,17 +14,17 @@ List of fixed bugs in EMI scripts:
 	There is a varible that is never declared in mot.lua which positions Guybrush on
 	the raft. Instead of using that one, just use the other variable they probably meant to use.
 
-Contents of residualvm-emi-patch.m4b and its rebuild:
+Contents of monkey4-patch.m4b and its rebuild:
 
-residualvm-emi-patch.m4b contains all .patchr files in the
-dists/engine-data/patches/emi/ directory.
+monkey4-patch.m4b contains all .patchr files in the
+dists/engine-data/patches/monkey4/ directory.
 If you add a new patch in that directory, you have to update this file
 with a detailed description of what that patch does.
-Then you have to rebuild residualvm-emi-patch.m4b with mklab from the
+Then you have to rebuild monkey4-patch.m4b with mklab from the
 residualvm-tools repo. The rebuild command is (assuming that you are
 launching it in dists/engine-data/):
 
- $ mklab --emi patches/emi residualvm-emi-patch.m4b
+ $ mklab --emi patches/monkey4 monkey4-patch.m4b
 
 Please check that there aren't any files different from .patchr inside
 that directory before the rebuild, so delete all junk, backup and system
diff --git a/dists/engine-data/patches/GrimPatchesDesc.txt b/dists/engine-data/patches/GrimPatchesDesc.txt
index a0494cb9b5..3bf803f423 100644
--- a/dists/engine-data/patches/GrimPatchesDesc.txt
+++ b/dists/engine-data/patches/GrimPatchesDesc.txt
@@ -208,7 +208,7 @@ List of fixed bugs in GF scripts:
 	-Fix the missing dialogue with Domino at third year
 	In dlg_dom2.lua, the argument of CheckFirstTime is wrong; this
 	prevents the correct load of this script.
-	See https://forums.residualvm.org/viewtopic.php?t=108
+	See https://forums.scummvm.org/viewtopic.php?t=108
 
 +Others modifications:
 	-The function si.set_up_actors (si.lua), calls "start_script(si.naranja_drinking)",
@@ -217,17 +217,17 @@ List of fixed bugs in GF scripts:
 	with "start_script(si.naranja_drink)", which does exists, but which can cause Naranja to stutter
 	when entering the set.
 
-Contents of residualvm-grim-patches.lab and its rebuild:
+Contents of grim-patches.lab and its rebuild:
 
-residualvm-grim-patches.lab contains all .patchr files in the
+grim-patches.lab contains all .patchr files in the
 dists/engine-data/patches/grim/ directory.
 If you add a new patch in that directory, you have to update this file
 with a detailed description of what that patch does.
 Then you have to rebuild residualvm-grim-patches.lab with mklab from the
-residualvm-tools repo. The rebuild command is (assuming that you are
+scummvm-tools repo. The rebuild command is (assuming that you are
 launching it in dists/engine-data/):
 
- $ mklab --grim patches/grim residualvm-grim-patch.lab
+ $ mklab --grim patches/grim grim-patch.lab
 
 Please check that there aren't any files different from .patchr inside
 that directory before the rebuild, so delete all junk, backup and system
diff --git a/dists/engine-data/patches/emi/_options.lua.patchr b/dists/engine-data/patches/monkey4/_options.lua.patchr
similarity index 100%
rename from dists/engine-data/patches/emi/_options.lua.patchr
rename to dists/engine-data/patches/monkey4/_options.lua.patchr
diff --git a/dists/engine-data/patches/emi/_options.lua_1.patchr b/dists/engine-data/patches/monkey4/_options.lua_1.patchr
similarity index 100%
rename from dists/engine-data/patches/emi/_options.lua_1.patchr
rename to dists/engine-data/patches/monkey4/_options.lua_1.patchr
diff --git a/dists/engine-data/patches/emi/mot.lua.patchr b/dists/engine-data/patches/monkey4/mot.lua.patchr
similarity index 100%
rename from dists/engine-data/patches/emi/mot.lua.patchr
rename to dists/engine-data/patches/monkey4/mot.lua.patchr
diff --git a/dists/engine-data/patches/emi/residualvm-prefs.lua b/dists/engine-data/patches/monkey4/residualvm-prefs.lua
similarity index 100%
rename from dists/engine-data/patches/emi/residualvm-prefs.lua
rename to dists/engine-data/patches/monkey4/residualvm-prefs.lua
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index f0a1283ca8..c54fe77b56 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -25,8 +25,8 @@ residualvm.zip         FILE    "gui/themes/residualvm.zip"
 
 #ifdef BUILTIN_RESOURCES
 #if PLUGIN_ENABLED_STATIC(GRIM)
-residualvm-grim-patch.lab       FILE    "dists/engine-data/residualvm-grim-patch.lab"
-residualvm-emi-patch.m4b        FILE    "dists/engine-data/residualvm-emi-patch.m4b"
+grim-patch.lab         FILE    "dists/engine-data/grim-patch.lab"
+monkey4-patch.m4b      FILE    "dists/engine-data/monkey4-patch.m4b"
 #endif
 #if PLUGIN_ENABLED_STATIC(MYST3)
 myst3.dat                       FILE    "dists/engine-data/myst3.dat"
diff --git a/engines/grim/resource.cpp b/engines/grim/resource.cpp
index 58723c56c3..612494779c 100644
--- a/engines/grim/resource.cpp
+++ b/engines/grim/resource.cpp
@@ -121,10 +121,10 @@ ResourceLoader::ResourceLoader() {
 			SearchMan.listMatchingMembers(files, "sound001.lab");
 			SearchMan.listMatchingMembers(files, "voice001.lab");
 		} else {
-			if (!SearchMan.hasFile("residualvm-grim-patch.lab"))
-				error("%s", "residualvm-grim-patch.lab not found");
+			if (!SearchMan.hasFile("grim-patch.lab"))
+				error("%s", "grim-patch.lab not found");
 
-			SearchMan.listMatchingMembers(files, "residualvm-grim-patch.lab");
+			SearchMan.listMatchingMembers(files, "grim-patch.lab");
 			SearchMan.listMatchingMembers(files, "data005.lab");
 			SearchMan.listMatchingMembers(files, "data004.lab");
 			SearchMan.listMatchingMembers(files, "data003.lab");
@@ -153,7 +153,7 @@ ResourceLoader::ResourceLoader() {
 			}
 		}
 	} else if (g_grim->getGameType() == GType_MONKEY4) {
-		const char *emi_patches_filename = "residualvm-emi-patch.m4b";
+		const char *emi_patches_filename = "monkey4-patch.m4b";
 		if (!SearchMan.hasFile(emi_patches_filename))
 			error("%s not found", emi_patches_filename);
 


