[Scummvm-git-logs] scummvm master -> d1b35d26fce93d3c34c80e5fec1ec09d9152a62f
aquadran
aquadran at gmail.com
Tue Nov 2 09:23:20 UTC 2021
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:
d1b35d26fc GRIM: Add isRemastered convenience function to engine
Commit: d1b35d26fce93d3c34c80e5fec1ec09d9152a62f
https://github.com/scummvm/scummvm/commit/d1b35d26fce93d3c34c80e5fec1ec09d9152a62f
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-02T10:23:17+01:00
Commit Message:
GRIM: Add isRemastered convenience function to engine
Changed paths:
engines/grim/actor.cpp
engines/grim/gfx_opengl.cpp
engines/grim/grim.cpp
engines/grim/grim.h
engines/grim/localize.cpp
engines/grim/resource.cpp
diff --git a/engines/grim/actor.cpp b/engines/grim/actor.cpp
index 6f32af9f36..6199a5d5c4 100644
--- a/engines/grim/actor.cpp
+++ b/engines/grim/actor.cpp
@@ -1173,7 +1173,7 @@ void Actor::sayLine(const char *msgId, bool background, float x, float y) {
Common::String soundName = id;
if (g_grim->getGameType() == GType_GRIM) {
- if (g_grim->getGameFlags() & ADGF_REMASTERED) {
+ if (g_grim->isRemastered()) {
soundName = g_grim->getLanguagePrefix() + "_" + soundName;
}
soundName += ".wav";
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index a997d86dcf..8e4a6aa265 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -1426,7 +1426,7 @@ struct TextObjectUserData {
};
void GfxOpenGL::createTextObject(TextObject *text) {
- if (g_grim->getGameType() != GType_GRIM || !(g_grim->getGameFlags() & ADGF_REMASTERED))
+ if (g_grim->getGameType() != GType_GRIM || !g_grim->isRemastered())
return;
#ifdef USE_FREETYPE2
@@ -1489,7 +1489,7 @@ void GfxOpenGL::drawTextObject(const TextObject *text) {
glColor3ub(color.getRed(), color.getGreen(), color.getBlue());
const FontUserData *userData = (const FontUserData *)font->getUserData();
if (!userData) {
- if (g_grim->getGameType() != GType_GRIM || !(g_grim->getGameFlags() & ADGF_REMASTERED))
+ if (g_grim->getGameType() != GType_GRIM || !g_grim->isRemastered())
error("Could not get font userdata");
#ifdef USE_FREETYPE2
const FontTTF *f = static_cast<const FontTTF *>(font);
@@ -1591,7 +1591,7 @@ void GfxOpenGL::drawTextObject(const TextObject *text) {
}
void GfxOpenGL::destroyTextObject(TextObject *text) {
- if (g_grim->getGameType() != GType_GRIM || !(g_grim->getGameFlags() & ADGF_REMASTERED))
+ if (g_grim->getGameType() != GType_GRIM || !g_grim->isRemastered())
return;
TextObjectUserData *ud = (TextObjectUserData *)const_cast<void *>(text->getUserData());
diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index d34f956a2e..199cb6ff1c 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -188,7 +188,7 @@ GrimEngine::GrimEngine(OSystem *syst, uint32 gameFlags, GrimGameType gameType, C
//Remastered:
- if (getGameFlags() & ADGF_REMASTERED) {
+ if (isRemastered()) {
for (uint32 i = 0; i < kNumCutscenes; i++) {
_cutsceneEnabled[i] = false;
}
@@ -253,7 +253,7 @@ void GrimEngine::clearPools() {
}
LuaBase *GrimEngine::createLua() {
- if (getGameFlags() == ADGF_REMASTERED) {
+ if (isRemastered()) {
return new Lua_Remastered();
} else {
return new Lua_V1();
@@ -345,7 +345,7 @@ Common::Error GrimEngine::run() {
}
ConfMan.registerDefault("check_gamedata", true);
- if (ConfMan.getBool("check_gamedata") && getGameFlags() != ADGF_REMASTERED) {
+ if (ConfMan.getBool("check_gamedata") && !isRemastered()) {
MD5CheckDialog d;
if (!d.runModal()) {
Common::U32String confirmString = Common::U32String::format(_(
@@ -377,7 +377,7 @@ Common::Error GrimEngine::run() {
if (getGameType() == GType_GRIM) {
g_imuse = new Imuse(20, demo);
g_emiSound = nullptr;
- if (g_grim->getGameFlags() & ADGF_REMASTERED) {
+ if (g_grim->isRemastered()) {
// This must happen here, since we need the resource loader set up.
_commentary = new Commentary();
}
@@ -387,7 +387,7 @@ Common::Error GrimEngine::run() {
}
g_sound = new SoundPlayer();
- if (getGameType() == GType_GRIM && (g_grim->getGameFlags() & ADGF_REMASTERED)) {
+ if (getGameType() == GType_GRIM && g_grim->isRemastered()) {
g_driver = createRenderer(1600, 900);
} else {
g_driver = createRenderer(640, 480);
@@ -1291,7 +1291,7 @@ void GrimEngine::restoreGRIM() {
}
void GrimEngine::storeSaveGameMetadata(SaveGame *state) {
- if (!(g_grim->getGameFlags() & ADGF_REMASTERED)) {
+ if (!g_grim->isRemastered()) {
return;
}
state->beginSection('META');
diff --git a/engines/grim/grim.h b/engines/grim/grim.h
index dd43aa77ec..c1c4adc4f6 100644
--- a/engines/grim/grim.h
+++ b/engines/grim/grim.h
@@ -87,6 +87,7 @@ public:
virtual const char *getUpdateFilename();
bool canLoadGameStateCurrently() override { return true; }
Common::Error loadGameState(int slot) override;
+ bool isRemastered() const { return !!(_gameFlags & ADGF_REMASTERED); }
void setMode(EngineMode mode);
EngineMode getMode() { return _mode; }
diff --git a/engines/grim/localize.cpp b/engines/grim/localize.cpp
index 88384aed77..206235531e 100644
--- a/engines/grim/localize.cpp
+++ b/engines/grim/localize.cpp
@@ -43,7 +43,6 @@ Localizer::Localizer() {
bool isSpanish = g_grim->getGameLanguage() == Common::ES_ESP;
bool isTranslatedGrimDemo = (isGerman || isFrench || isItalian || isSpanish) && isGrimDemo;
bool isPS2 = g_grim->getGamePlatform() == Common::kPlatformPS2;
- bool isRemastered = g_grim->getGameFlags() & ADGF_REMASTERED; // TODO: Add handling of this from g_grim.
if (isGrimDemo && !isTranslatedGrimDemo)
return;
@@ -52,7 +51,7 @@ Localizer::Localizer() {
if (g_grim->getGameType() == GType_MONKEY4) {
filename = "script.tab";
} else {
- if (isRemastered) {
+ if (g_grim->isRemastered()) {
filename = Common::String("grim.") + g_grim->getLanguagePrefix() + Common::String(".tab"); // TODO: Detect based on language.
} else if (isTranslatedGrimDemo) {
filename = "language.tab";
@@ -75,7 +74,7 @@ Localizer::Localizer() {
data[filesize] = '\0';
delete f;
- if (isRemastered) {
+ if (g_grim->isRemastered()) {
parseRemasteredData(Common::String(data));
return;
}
diff --git a/engines/grim/resource.cpp b/engines/grim/resource.cpp
index 79d4f0fc9b..b27cd9278c 100644
--- a/engines/grim/resource.cpp
+++ b/engines/grim/resource.cpp
@@ -81,7 +81,7 @@ ResourceLoader::ResourceLoader() {
//Load the update from the executable, if needed
const char *updateFilename = nullptr;
- if (g_grim->getGameType() == GType_GRIM && !(g_grim->getGameFlags() & ADGF_REMASTERED)) {
+ if (g_grim->getGameType() == GType_GRIM && !g_grim->isRemastered()) {
updateFilename = g_grim->getUpdateFilename();
}
if (updateFilename) {
@@ -137,7 +137,7 @@ ResourceLoader::ResourceLoader() {
SearchMan.listMatchingMembers(files, "local.lab");
SearchMan.listMatchingMembers(files, "credits.lab");
- if (g_grim->getGameFlags() & ADGF_REMASTERED) {
+ if (g_grim->isRemastered()) {
SearchMan.listMatchingMembers(files, "commentary.lab");
SearchMan.listMatchingMembers(files, "images.lab");
}
@@ -367,7 +367,7 @@ Costume *ResourceLoader::loadCostume(const Common::String &filename, Actor *owne
Font *ResourceLoader::loadFont(const Common::String &filename) {
Common::SeekableReadStream *stream;
- if (g_grim->getGameType() == GType_GRIM && (g_grim->getGameFlags() & ADGF_REMASTERED)) {
+ if (g_grim->getGameType() == GType_GRIM && g_grim->isRemastered()) {
Common::String name = "FontsHD/" + filename + ".txt";
stream = openNewStreamFile(name, true);
if (stream) {
More information about the Scummvm-git-logs
mailing list