diff --git a/Makefile.common b/Makefile.common index b3cad9a7b7d..80d5281cd0b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -241,7 +241,7 @@ endif DIST_FILES_THEMES:=$(addprefix $(srcdir)/gui/themes/,$(DIST_FILES_THEMES)) # Engine data files -DIST_FILES_ENGINEDATA=residual-grim-patch.lab +DIST_FILES_ENGINEDATA=residualvm-grim-patch.lab DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA)) diff --git a/dists/engine-data/patches/GrimPatchesDesc.txt b/dists/engine-data/patches/GrimPatchesDesc.txt index b800006dc34..d2be6b12094 100644 --- a/dists/engine-data/patches/GrimPatchesDesc.txt +++ b/dists/engine-data/patches/GrimPatchesDesc.txt @@ -12,15 +12,15 @@ List of fixed bug in GF scripts: In dlg_dom2.lua, the argument of CheckFirstTime is wrong; this prevents the correct load of this script. See http://residual.scummvm.org/viewtopic.php?t=108 -Contents of residual-grim-patches.lab and its rebuild: +Contents of residualvm-grim-patches.lab and its rebuild: -residual-grim-patches.lab contains all .patchr files in dists/engine-data/pacthes/grim/ directory. +residualvm-grim-patches.lab contains all .patchr files in dists/engine-data/pacthes/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 residual-grim-patches.lab with mklab from residualvm-tools repo. +Then you have to rebuild residualvm-grim-patches.lab with mklab from residualvm-tools repo. The rebuild command is (assuming that you are launching it in dists/engine-data/): -mklab --grim patches/grim residual-grim-patch.lab +mklab --grim patches/grim residualvm-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 files, like namepatch.patchr~, namepatch.patchr.bak, .DS_Store, Thumbs.db and so on. diff --git a/dists/engine-data/residual-grim-patch.lab b/dists/engine-data/residualvm-grim-patch.lab similarity index 100% rename from dists/engine-data/residual-grim-patch.lab rename to dists/engine-data/residualvm-grim-patch.lab diff --git a/dists/residualvm.rc b/dists/residualvm.rc index 3d5e13c5dac..46e809298bc 100644 --- a/dists/residualvm.rc +++ b/dists/residualvm.rc @@ -11,7 +11,7 @@ IDI_ICON ICON DISCARDABLE "icons/residualvm.ico" IDI_COUNT ICON DISCARDABLE "icons/count.ico" -residual-grim-patch.lab FILE "dists/engine-data/residual-grim-patch.lab" +residualvm-grim-patch.lab FILE "dists/engine-data/residualvm-grim-patch.lab" modern.zip FILE "gui/themes/modern.zip" #ifdef USE_TRANSLATION translations.dat FILE "gui/themes/translations.dat" diff --git a/dists/residualvm.rc.in b/dists/residualvm.rc.in index da69aa5cedb..56acad4086e 100644 --- a/dists/residualvm.rc.in +++ b/dists/residualvm.rc.in @@ -11,7 +11,7 @@ IDI_ICON ICON DISCARDABLE "icons/residualvm.ico" IDI_COUNT ICON DISCARDABLE "icons/count.ico" -residual-grim-patch.lab FILE "dists/engine-data/residual-grim-patch.lab" +residualvm-grim-patch.lab FILE "dists/engine-data/residualvm-grim-patch.lab" modern.zip FILE "gui/themes/modern.zip" #ifdef USE_TRANSLATION translations.dat FILE "gui/themes/translations.dat" diff --git a/dists/win32/residualvm.iss b/dists/win32/residualvm.iss index facd07c3e32..f285d6653d5 100644 --- a/dists/win32/residualvm.iss +++ b/dists/win32/residualvm.iss @@ -23,7 +23,7 @@ Source: "README.txt"; DestDir: "{app}"; Flags: ignoreversion isreadme Source: "README-SDL.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "residualvm.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "modern.zip"; DestDir: "{app}"; Flags: ignoreversion -Source: "residual-grim-patch.lab"; DestDir: "{app}"; Flags: ignoreversion +Source: "residualvm-grim-patch.lab"; DestDir: "{app}"; Flags: ignoreversion Source: "SDL.dll"; DestDir: "{app}" [Icons] diff --git a/doc/ResidualPatch.txt b/doc/ResidualVM-Patch.txt similarity index 96% rename from doc/ResidualPatch.txt rename to doc/ResidualVM-Patch.txt index 9cfcf6f850a..1d4e67db255 100644 --- a/doc/ResidualPatch.txt +++ b/doc/ResidualVM-Patch.txt @@ -1,6 +1,6 @@ -Residual Patch (patchr) +ResidualVM Patch (patchr) -The Residual Patch (patchr) is a binary patch engine, useful for small changes in games files. +The ResidualVM Patch (patchr) is a binary patch engine, useful for small changes in games files. Its mainly used to fix bugs in scripts of games, when the distribution of patched script is forbidden due to copyright. The patching is done in ram, after the file is loaded, before the file it's provided to the engine. diff --git a/engines/grim/patchr.cpp b/engines/grim/patchr.cpp index a363bd4bd5d..b8d67faac47 100644 --- a/engines/grim/patchr.cpp +++ b/engines/grim/patchr.cpp @@ -1,6 +1,6 @@ -/* Residual - A 3D game interpreter +/* ResidualVM - A 3D game interpreter * - * Residual is the legal property of its developers, whose names + * ResidualVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT * file distributed with this source distribution. * diff --git a/engines/grim/patchr.h b/engines/grim/patchr.h index d21f38f391c..a8b0d62fbdb 100644 --- a/engines/grim/patchr.h +++ b/engines/grim/patchr.h @@ -1,6 +1,6 @@ -/* Residual - A 3D game interpreter +/* ResidualVM - A 3D game interpreter * - * Residual is the legal property of its developers, whose names + * ResidualVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the AUTHORS * file distributed with this source distribution. * diff --git a/engines/grim/resource.cpp b/engines/grim/resource.cpp index 6d15a92d79f..e73013d433c 100644 --- a/engines/grim/resource.cpp +++ b/engines/grim/resource.cpp @@ -79,7 +79,7 @@ ResourceLoader::ResourceLoader() { SearchMan.listMatchingMembers(files, "year?mus.lab"); SearchMan.listMatchingMembers(files, "local.lab"); SearchMan.listMatchingMembers(files, "credits.lab"); - SearchMan.listMatchingMembers(files, "residual-grim-patch.lab"); + SearchMan.listMatchingMembers(files, "residualvm-grim-patch.lab"); //Sort the archives in order to ensure that they are loaded with the correct order Common::sort(files.begin(), files.end(), LabListComperator());