[Scummvm-git-logs] scummvm master -> 9ee549edd2a8554ffa78939ce3d501713b63eec1
fracturehill
noreply at scummvm.org
Thu Jan 11 22:06:15 UTC 2024
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e97c93f276 NANCY: Remove PLG0 flag from detection
40fb2f8f60 NANCY: Ad button fixes
0ddf8d0549 NANCY: JANITORIAL: Clean up triple newlines
9ee549edd2 NANCY: Remove unnecessary ConfMan instance calls
Commit: e97c93f276f1b21097f50a360962ac1b8c1675fb
https://github.com/scummvm/scummvm/commit/e97c93f276f1b21097f50a360962ac1b8c1675fb
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2024-01-11T23:04:14+01:00
Commit Message:
NANCY: Remove PLG0 flag from detection
Removed the detection flag that was used to mark a
specific nancy3 version with 1 extra byte in its BSUM.
Instead, a heuristic has been added to the BSUM reading
code that checks for it at runtime.
Changed paths:
engines/nancy/detection.cpp
engines/nancy/detection.h
engines/nancy/enginedata.cpp
engines/nancy/nancy.cpp
engines/nancy/state/logo.cpp
diff --git a/engines/nancy/detection.cpp b/engines/nancy/detection.cpp
index 249d43f437d..6a29b1b0fea 100644
--- a/engines/nancy/detection.cpp
+++ b/engines/nancy/detection.cpp
@@ -155,7 +155,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
AD_ENTRY1s("ciftree.dat", "ee5f8832226567c3610556497c451b09", 16256355),
Common::EN_ANY,
Common::kPlatformWindows,
- ADGF_DROPPLATFORM | Nancy::GF_PLG_BYTE_IN_BSUM,
+ ADGF_DROPPLATFORM,
GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
},
Nancy::kGameTypeNancy3
@@ -200,7 +200,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
},
Common::EN_ANY,
Common::kPlatformWindows,
- ADGF_UNSTABLE | ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED | Nancy::GF_PLG_BYTE_IN_BSUM,
+ ADGF_UNSTABLE | ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
},
Nancy::kGameTypeNancy3
diff --git a/engines/nancy/detection.h b/engines/nancy/detection.h
index 2e002abd051..a4a9c14b10e 100644
--- a/engines/nancy/detection.h
+++ b/engines/nancy/detection.h
@@ -41,8 +41,7 @@ enum GameType {
};
enum NancyGameFlags {
- GF_COMPRESSED = 1 << 0,
- GF_PLG_BYTE_IN_BSUM = 1 << 1
+ GF_COMPRESSED = 1 << 0
};
struct NancyGameDescription {
diff --git a/engines/nancy/enginedata.cpp b/engines/nancy/enginedata.cpp
index 04e930ef631..1930ac90d02 100644
--- a/engines/nancy/enginedata.cpp
+++ b/engines/nancy/enginedata.cpp
@@ -60,10 +60,11 @@ BSUM::BSUM(Common::SeekableReadStream *chunkStream) : EngineData(chunkStream) {
s.skip(0xA4, kGameTypeVampire, kGameTypeNancy2);
s.skip(3); // Number of object, frame, and logo images
- if (g_nancy->getGameFlags() & GF_PLG_BYTE_IN_BSUM) {
- // There's a weird version of nancy3 with an extra byte counting the number of partner logos.
- // On first glance this seems to be the only difference, but it'll need to be checked more thoroughly
- // TODO
+ if (g_nancy->getEngineData("PLG0")) {
+ // Parner logos were introduced with nancy4, but at least one nancy3 release
+ // had one as well. For some reason they didn't port over the code from the
+ // later games, but implemented it the same way the other BSUM images work.
+ // Hence, we skip an extra byte indicating the number of partner logos.
s.skip(1);
}
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index 12a36f26394..2dc0e79ea07 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -420,7 +420,19 @@ void NancyEngine::bootGameEngine() {
}
#define LOAD_BOOT(t) LOAD_BOOT_L(t, #t)
- LOAD_BOOT(BSUM)
+ LOAD_BOOT_L(ImageChunk, "OB0")
+ LOAD_BOOT_L(ImageChunk, "FR0")
+ LOAD_BOOT_L(ImageChunk, "LG0")
+
+ // One weird version of nancy3 has a partner logo implemented the same way as the other image chunks
+ LOAD_BOOT_L(ImageChunk, "PLG0")
+
+ // For all other games (starting with nancy4) the partner logo is a larger struct,
+ // containing video and sound data as well. Those go unused, however, so we still
+ // treat is as a simple image. Note the O instead of the 0 above.
+ LOAD_BOOT_L(ImageChunk, "PLGO")
+
+ LOAD_BOOT(BSUM) // This checks for PLG0, do NOT reorder
LOAD_BOOT(VIEW)
LOAD_BOOT(PCAL)
LOAD_BOOT(INV)
@@ -440,19 +452,6 @@ void NancyEngine::bootGameEngine() {
LOAD_BOOT(RCLB)
LOAD_BOOT(TABL)
- LOAD_BOOT_L(ImageChunk, "OB0")
- LOAD_BOOT_L(ImageChunk, "FR0")
- LOAD_BOOT_L(ImageChunk, "LG0")
-
- chunkStream = iff->getChunkStream("PLG0");
- if (!chunkStream) {
- chunkStream = iff->getChunkStream("PLGO"); // nancy4 and above use an O instead of a zero
- }
-
- if (chunkStream) {
- _engineData.setVal("PLG0", new ImageChunk(chunkStream));
- }
-
_cursorManager->init(iff->getChunkStream("CURS"));
_graphicsManager->init();
diff --git a/engines/nancy/state/logo.cpp b/engines/nancy/state/logo.cpp
index 1c1f6332fc9..087b15991c1 100644
--- a/engines/nancy/state/logo.cpp
+++ b/engines/nancy/state/logo.cpp
@@ -83,6 +83,9 @@ bool Logo::onStateExit(const NancyState::NancyState nextState) {
void Logo::init() {
const ImageChunk *lg0 = (const ImageChunk *)g_nancy->getEngineData("LG0");
const ImageChunk *plg0 = (const ImageChunk *)g_nancy->getEngineData("PLG0");
+ if (!plg0) {
+ plg0 = (const ImageChunk *)g_nancy->getEngineData("PLGO");
+ }
assert(lg0);
_logoImage.init(lg0->imageName);
Commit: 40fb2f8f606bc30ecde5a7145660b6df203b1e86
https://github.com/scummvm/scummvm/commit/40fb2f8f606bc30ecde5a7145660b6df203b1e86
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2024-01-11T23:04:14+01:00
Commit Message:
NANCY: Ad button fixes
Fixed several issues with the nancy7 ad button:
- the sound in the main menu no longer cuts out when
returning from the ad
- an ad scene now never ends up in a second chance save
- going to the ad 2 times in a row does no longer continues
the game instead.
Also, the GotoMenu record now always forces the player
back to the menu, even when original menus have been
disabled; the old behavior never made sense.
Changed paths:
engines/nancy/action/miscrecords.cpp
engines/nancy/state/mainmenu.cpp
engines/nancy/state/scene.cpp
diff --git a/engines/nancy/action/miscrecords.cpp b/engines/nancy/action/miscrecords.cpp
index a3e8b13358b..9ba54e98919 100644
--- a/engines/nancy/action/miscrecords.cpp
+++ b/engines/nancy/action/miscrecords.cpp
@@ -328,18 +328,12 @@ void GotoMenu::readData(Common::SeekableReadStream &stream) {
}
void GotoMenu::execute() {
- if (!ConfMan.hasKey("original_menus") || ConfMan.getBool("original_menus")) {
- g_nancy->setState(NancyState::kMainMenu);
- } else {
- Common::Event ev;
- ev.type = Common::EVENT_RETURN_TO_LAUNCHER;
- g_system->getEventManager()->pushEvent(ev);
- }
+ //NancySceneState.setDestroyOnExit();
+ g_nancy->setState(NancyState::kMainMenu);
_isDone = true;
}
-
void LoseGame::readData(Common::SeekableReadStream &stream) {
stream.skip(1);
}
diff --git a/engines/nancy/state/mainmenu.cpp b/engines/nancy/state/mainmenu.cpp
index 99891987351..ee496fee546 100644
--- a/engines/nancy/state/mainmenu.cpp
+++ b/engines/nancy/state/mainmenu.cpp
@@ -114,9 +114,17 @@ void MainMenu::init() {
if (!Scene::hasInstance()) {
_buttons[3]->setDisabled(true);
} else {
- if (NancySceneState.isRunningAd() && ConfMan.hasKey("restore_after_ad", ConfMan.kTransientDomain)) {
- // Force immediate load of second chance save, if we need to restore the game that was running
- g_nancy->loadGameState(g_nancy->getMetaEngine()->getMaximumSaveSlot());
+ if (NancySceneState.isRunningAd()) {
+ // Always destroy current state to make sure music starts again
+ NancySceneState.destroy();
+
+ if (ConfMan.hasKey("restore_after_ad", ConfMan.kTransientDomain)) {
+ // Returning to running game, restore second chance
+ ConfMan.setInt("save_slot", g_nancy->getMetaEngine()->getMaximumSaveSlot(), Common::ConfigManager::kTransientDomain);
+ } else {
+ // Not returning to running game, disable Continue button
+ _buttons[3]->setDisabled(true);
+ }
}
}
@@ -251,10 +259,14 @@ void MainMenu::stop() {
case 8:
// More Nancy Drew!
if (Scene::hasInstance()) {
- // The second chance slot is used as temporary save
- g_nancy->secondChance();
- NancySceneState.destroy();
+ // The second chance slot is used as temporary save. We make sure not to
+ // overwrite it when selecting the ad button multiple times in a row.
+ if (!ConfMan.hasKey("restore_after_ad", ConfMan.kTransientDomain)) {
+ g_nancy->secondChance();
+ }
+
ConfMan.setBool("restore_after_ad", true, ConfMan.kTransientDomain);
+ NancySceneState.destroy();
}
ConfMan.setBool("load_ad", true, ConfMan.kTransientDomain);
diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index 85a7ba88220..d6c10fc8ac4 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -776,9 +776,9 @@ void Scene::init() {
initStaticData();
- if (ConfMan.hasKey("save_slot")) {
+ if (!_isRunningAd && ConfMan.hasKey("save_slot", Common::ConfigManager::kTransientDomain)) {
// Load savefile directly from the launcher
- int saveSlot = ConfMan.getInt("save_slot");
+ int saveSlot = ConfMan.getInt("save_slot", Common::ConfigManager::kTransientDomain);
if (saveSlot >= 0 && saveSlot <= g_nancy->getMetaEngine()->getMaximumSaveSlot()) {
g_nancy->loadGameState(saveSlot);
}
Commit: 0ddf8d0549086bc2f6fa55af23bac448e7e4d61f
https://github.com/scummvm/scummvm/commit/0ddf8d0549086bc2f6fa55af23bac448e7e4d61f
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2024-01-11T23:04:14+01:00
Commit Message:
NANCY: JANITORIAL: Clean up triple newlines
Changed paths:
engines/nancy/action/miscrecords.h
engines/nancy/action/puzzle/bulpuzzle.cpp
engines/nancy/action/puzzle/rotatinglockpuzzle.h
engines/nancy/action/puzzle/tangrampuzzle.cpp
engines/nancy/action/puzzle/turningpuzzle.h
engines/nancy/console.cpp
engines/nancy/state/scene.cpp
engines/nancy/ui/ornaments.cpp
engines/nancy/ui/ornaments.h
diff --git a/engines/nancy/action/miscrecords.h b/engines/nancy/action/miscrecords.h
index 393caf91ec3..a16691d71d0 100644
--- a/engines/nancy/action/miscrecords.h
+++ b/engines/nancy/action/miscrecords.h
@@ -289,8 +289,6 @@ protected:
Common::String getRecordTypeName() const override { return "WinGame"; }
};
-
-
// Sets the difficulty level for the current save. Only appears at the start of the game.
// First appears in nancy1. Nancy1 and nancy2 have three difficulty values, while later games
// only have two: 0 and 2.
diff --git a/engines/nancy/action/puzzle/bulpuzzle.cpp b/engines/nancy/action/puzzle/bulpuzzle.cpp
index 040a760da69..f1926b62c82 100644
--- a/engines/nancy/action/puzzle/bulpuzzle.cpp
+++ b/engines/nancy/action/puzzle/bulpuzzle.cpp
@@ -312,7 +312,6 @@ void BulPuzzle::execute() {
g_nancy->_sound->playSound(sound);
}
-
if (_nextMoveTime == 0 && !g_nancy->_sound->isSoundPlaying(sound)) {
if (_playerWon) {
_solveScene.execute();
diff --git a/engines/nancy/action/puzzle/rotatinglockpuzzle.h b/engines/nancy/action/puzzle/rotatinglockpuzzle.h
index 27561c02924..0365a452101 100644
--- a/engines/nancy/action/puzzle/rotatinglockpuzzle.h
+++ b/engines/nancy/action/puzzle/rotatinglockpuzzle.h
@@ -57,7 +57,6 @@ public:
Common::Array<byte> _currentSequence;
Time _solveSoundPlayTime;
-
protected:
Common::String getRecordTypeName() const override { return "RotatingLockPuzzle"; }
bool isViewportRelative() const override { return true; }
diff --git a/engines/nancy/action/puzzle/tangrampuzzle.cpp b/engines/nancy/action/puzzle/tangrampuzzle.cpp
index caacfd2f7ab..be70e73a6a3 100644
--- a/engines/nancy/action/puzzle/tangrampuzzle.cpp
+++ b/engines/nancy/action/puzzle/tangrampuzzle.cpp
@@ -352,7 +352,6 @@ void TangramPuzzle::rotateTile(uint id) {
tileToRotate.moveTo(newPos);
_needsRedraw = true;
-
tileToRotate.drawMask();
tileToRotate._needsRedraw = true;
diff --git a/engines/nancy/action/puzzle/turningpuzzle.h b/engines/nancy/action/puzzle/turningpuzzle.h
index cb8a9884f98..dcbe384a3b3 100644
--- a/engines/nancy/action/puzzle/turningpuzzle.h
+++ b/engines/nancy/action/puzzle/turningpuzzle.h
@@ -43,7 +43,6 @@ public:
void execute() override;
void handleInput(NancyInput &input) override;
-
protected:
Common::String getRecordTypeName() const override { return "TurningPuzzle"; }
bool isViewportRelative() const override { return true; }
diff --git a/engines/nancy/console.cpp b/engines/nancy/console.cpp
index d1a700d40e6..e28400a184f 100644
--- a/engines/nancy/console.cpp
+++ b/engines/nancy/console.cpp
@@ -1039,5 +1039,4 @@ bool NancyConsole::Cmd_showHotspots(int argc, const char **argv) {
return cmdExit(0, nullptr);
}
-
} // End of namespace Nancy
diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index d6c10fc8ac4..5225d5e0c54 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -187,7 +187,6 @@ void Scene::onStateEnter(const NancyState::NancyState prevState) {
g_nancy->_cursorManager->setCursorItemID(getHeldItem());
}
-
if (prevState == NancyState::kPause) {
g_nancy->_sound->pauseAllSounds(false);
} else {
diff --git a/engines/nancy/ui/ornaments.cpp b/engines/nancy/ui/ornaments.cpp
index 59521bcb270..6691114fd0f 100644
--- a/engines/nancy/ui/ornaments.cpp
+++ b/engines/nancy/ui/ornaments.cpp
@@ -69,7 +69,6 @@ void ViewportOrnaments::init() {
// Middle right
_drawSurface.blitFrom(object0, src[5], Common::Point(viewportBounds.right - src[5].width(), 205));
-
RenderObject::init();
}
diff --git a/engines/nancy/ui/ornaments.h b/engines/nancy/ui/ornaments.h
index 8ed2a890c4e..53362fdf66d 100644
--- a/engines/nancy/ui/ornaments.h
+++ b/engines/nancy/ui/ornaments.h
@@ -54,5 +54,4 @@ public:
} // End of namespace UI
} // End of namespace Nancy
-
#endif // NANCY_UI_ORNAMENTS_H
Commit: 9ee549edd2a8554ffa78939ce3d501713b63eec1
https://github.com/scummvm/scummvm/commit/9ee549edd2a8554ffa78939ce3d501713b63eec1
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2024-01-11T23:04:14+01:00
Commit Message:
NANCY: Remove unnecessary ConfMan instance calls
Removed occurences of the ConfMan macro being used
to get the transient domain name. This makes sure we don't
generate unnecessary calls to ConfigManager::getInstance().
Changed paths:
engines/nancy/action/actionmanager.cpp
engines/nancy/console.cpp
engines/nancy/state/loadsave.cpp
engines/nancy/state/mainmenu.cpp
engines/nancy/state/savedialog.cpp
engines/nancy/state/scene.cpp
diff --git a/engines/nancy/action/actionmanager.cpp b/engines/nancy/action/actionmanager.cpp
index 7cfdb146180..7e4db14e873 100644
--- a/engines/nancy/action/actionmanager.cpp
+++ b/engines/nancy/action/actionmanager.cpp
@@ -674,7 +674,7 @@ void ActionManager::debugDrawHotspots() {
// and type of the owning ActionRecord. Hardcoded to font 0 since that's
// the smallest one available in the engine.
RenderObject &obj = NancySceneState._hotspotDebug;
- if (ConfMan.getBool("debug_hotspots", ConfMan.kTransientDomain)) {
+ if (ConfMan.getBool("debug_hotspots", Common::ConfigManager::kTransientDomain)) {
const Font *font = g_nancy->_graphicsManager->getFont(0);
assert(font);
uint16 yOffset = NancySceneState.getViewport().getCurVerticalScroll();
diff --git a/engines/nancy/console.cpp b/engines/nancy/console.cpp
index e28400a184f..b76383e2f8b 100644
--- a/engines/nancy/console.cpp
+++ b/engines/nancy/console.cpp
@@ -1034,7 +1034,7 @@ bool NancyConsole::Cmd_soundInfo(int argc, const char **argv) {
}
bool NancyConsole::Cmd_showHotspots(int argc, const char **argv) {
- ConfMan.setBool("debug_hotspots", !ConfMan.getBool("debug_hotspots", ConfMan.kTransientDomain), ConfMan.kTransientDomain);
+ ConfMan.setBool("debug_hotspots", !ConfMan.getBool("debug_hotspots", Common::ConfigManager::kTransientDomain), Common::ConfigManager::kTransientDomain);
return cmdExit(0, nullptr);
}
diff --git a/engines/nancy/state/loadsave.cpp b/engines/nancy/state/loadsave.cpp
index 7db120b0d12..0fb04739c41 100644
--- a/engines/nancy/state/loadsave.cpp
+++ b/engines/nancy/state/loadsave.cpp
@@ -465,9 +465,9 @@ void LoadSaveMenu::save() {
// First, check if we are actually overwriting
SaveStateDescriptor desc = g_nancy->getMetaEngine()->querySaveMetaInfos(ConfMan.getActiveDomainName().c_str(), _selectedSave + 1);
if (desc.isValid()) {
- if (!ConfMan.hasKey("sdlg_return", ConfMan.kTransientDomain)) {
+ if (!ConfMan.hasKey("sdlg_return", Common::ConfigManager::kTransientDomain)) {
// Request the dialog
- ConfMan.setInt("sdlg_id", 1, ConfMan.kTransientDomain);
+ ConfMan.setInt("sdlg_id", 1, Common::ConfigManager::kTransientDomain);
_destroyOnExit = false;
g_nancy->setState(NancyState::kSaveDialog);
return;
@@ -475,8 +475,8 @@ void LoadSaveMenu::save() {
// Dialog has returned
g_nancy->_graphicsManager->suppressNextDraw();
_destroyOnExit = true;
- uint ret = ConfMan.getInt("sdlg_return", ConfMan.kTransientDomain);
- ConfMan.removeKey("sdlg_return", ConfMan.kTransientDomain);
+ uint ret = ConfMan.getInt("sdlg_return", Common::ConfigManager::kTransientDomain);
+ ConfMan.removeKey("sdlg_return", Common::ConfigManager::kTransientDomain);
switch (ret) {
case 1 :
// "No" keeps us in the LoadSave state but doesn't save
@@ -557,9 +557,9 @@ void LoadSaveMenu::load() {
if (sdlg && sdlg->dialogs.size() > 1 && Nancy::State::Scene::hasInstance() && !g_nancy->_hasJustSaved) {
// nancy6 added a "Do you want load without saving" dialog.
- if (!ConfMan.hasKey("sdlg_return", ConfMan.kTransientDomain)) {
+ if (!ConfMan.hasKey("sdlg_return", Common::ConfigManager::kTransientDomain)) {
// Request the dialog
- ConfMan.setInt("sdlg_id", 2, ConfMan.kTransientDomain);
+ ConfMan.setInt("sdlg_id", 2, Common::ConfigManager::kTransientDomain);
_destroyOnExit = false;
g_nancy->setState(NancyState::kSaveDialog);
return;
@@ -567,8 +567,8 @@ void LoadSaveMenu::load() {
// Dialog has returned
_destroyOnExit = true;
g_nancy->_graphicsManager->suppressNextDraw();
- uint ret = ConfMan.getInt("sdlg_return", ConfMan.kTransientDomain);
- ConfMan.removeKey("sdlg_return", ConfMan.kTransientDomain);
+ uint ret = ConfMan.getInt("sdlg_return", Common::ConfigManager::kTransientDomain);
+ ConfMan.removeKey("sdlg_return", Common::ConfigManager::kTransientDomain);
switch (ret) {
case 1 :
// "No" keeps us in the LoadSave state but doesn't load
diff --git a/engines/nancy/state/mainmenu.cpp b/engines/nancy/state/mainmenu.cpp
index ee496fee546..a08fa7e6a2d 100644
--- a/engines/nancy/state/mainmenu.cpp
+++ b/engines/nancy/state/mainmenu.cpp
@@ -118,7 +118,7 @@ void MainMenu::init() {
// Always destroy current state to make sure music starts again
NancySceneState.destroy();
- if (ConfMan.hasKey("restore_after_ad", ConfMan.kTransientDomain)) {
+ if (ConfMan.hasKey("restore_after_ad", Common::ConfigManager::kTransientDomain)) {
// Returning to running game, restore second chance
ConfMan.setInt("save_slot", g_nancy->getMetaEngine()->getMaximumSaveSlot(), Common::ConfigManager::kTransientDomain);
} else {
@@ -204,17 +204,17 @@ void MainMenu::stop() {
case 6:
// Exit Game
if (g_nancy->getEngineData("SDLG") && Nancy::State::Scene::hasInstance() && !g_nancy->_hasJustSaved) {
- if (!ConfMan.hasKey("sdlg_return", ConfMan.kTransientDomain)) {
+ if (!ConfMan.hasKey("sdlg_return", Common::ConfigManager::kTransientDomain)) {
// Request the "Do you want to save before quitting" dialog
- ConfMan.setInt("sdlg_id", 0, ConfMan.kTransientDomain);
+ ConfMan.setInt("sdlg_id", 0, Common::ConfigManager::kTransientDomain);
_destroyOnExit = false;
g_nancy->setState(NancyState::kSaveDialog);
} else {
// Dialog has returned
_destroyOnExit = true;
g_nancy->_graphicsManager->suppressNextDraw();
- uint ret = ConfMan.getInt("sdlg_return", ConfMan.kTransientDomain);
- ConfMan.removeKey("sdlg_return", ConfMan.kTransientDomain);
+ uint ret = ConfMan.getInt("sdlg_return", Common::ConfigManager::kTransientDomain);
+ ConfMan.removeKey("sdlg_return", Common::ConfigManager::kTransientDomain);
switch (ret) {
case 0 :
// "Yes" switches to LoadSave
@@ -261,15 +261,15 @@ void MainMenu::stop() {
if (Scene::hasInstance()) {
// The second chance slot is used as temporary save. We make sure not to
// overwrite it when selecting the ad button multiple times in a row.
- if (!ConfMan.hasKey("restore_after_ad", ConfMan.kTransientDomain)) {
+ if (!ConfMan.hasKey("restore_after_ad", Common::ConfigManager::kTransientDomain)) {
g_nancy->secondChance();
}
- ConfMan.setBool("restore_after_ad", true, ConfMan.kTransientDomain);
+ ConfMan.setBool("restore_after_ad", true, Common::ConfigManager::kTransientDomain);
NancySceneState.destroy();
}
- ConfMan.setBool("load_ad", true, ConfMan.kTransientDomain);
+ ConfMan.setBool("load_ad", true, Common::ConfigManager::kTransientDomain);
g_nancy->setState(NancyState::kScene);
break;
}
diff --git a/engines/nancy/state/savedialog.cpp b/engines/nancy/state/savedialog.cpp
index b9a860e46e4..75689116a91 100644
--- a/engines/nancy/state/savedialog.cpp
+++ b/engines/nancy/state/savedialog.cpp
@@ -92,8 +92,8 @@ void SaveDialog::init() {
auto *sdlg = GetEngineData(SDLG);
assert(sdlg);
- _dialogData = &sdlg->dialogs[ConfMan.getInt("sdlg_id", ConfMan.kTransientDomain)];
- ConfMan.removeKey("sdlg_id", ConfMan.kTransientDomain);
+ _dialogData = &sdlg->dialogs[ConfMan.getInt("sdlg_id", Common::ConfigManager::kTransientDomain)];
+ ConfMan.removeKey("sdlg_id", Common::ConfigManager::kTransientDomain);
_background.init(_dialogData->imageName);
@@ -132,7 +132,7 @@ void SaveDialog::run() {
}
void SaveDialog::stop() {
- ConfMan.setInt("sdlg_return", _selected, ConfMan.kTransientDomain);
+ ConfMan.setInt("sdlg_return", _selected, Common::ConfigManager::kTransientDomain);
g_nancy->setToPreviousState();
}
diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index 5225d5e0c54..aac21165c93 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -730,7 +730,7 @@ void Scene::synchronize(Common::Serializer &ser) {
}
_isRunningAd = false;
- ConfMan.removeKey("restore_after_ad", ConfMan.kTransientDomain);
+ ConfMan.removeKey("restore_after_ad", Common::ConfigManager::kTransientDomain);
g_nancy->_graphicsManager->suppressNextDraw();
}
@@ -759,9 +759,9 @@ void Scene::init() {
_timers.playerTimeNextMinute = 0;
_timers.pushedPlayTime = 0;
- if (ConfMan.hasKey("load_ad", ConfMan.kTransientDomain)) {
+ if (ConfMan.hasKey("load_ad", Common::ConfigManager::kTransientDomain)) {
changeScene(bootSummary->adScene);
- ConfMan.removeKey("load_ad", ConfMan.kTransientDomain);
+ ConfMan.removeKey("load_ad", Common::ConfigManager::kTransientDomain);
_isRunningAd = true;
} else {
changeScene(bootSummary->firstScene);
More information about the Scummvm-git-logs
mailing list