libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ENGNES: Reduced MASSIVE and unneeded dependency from gui_options.h header

Browse Source
This commit is contained in:
Eugene Sandulenko 2023-02-23 14:03:08 +01:00
parent c138d170a5
commit d80de9511e
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/advancedDetector.h
View File

@ -27,7 +27,7 @@
#include "common/hash-str.h"
#include "common/gui_options.h" // FIXME: Temporary hack?
#include "common/gui_options.h" // Keep it here, so detection tables can refer to them
namespace Common {
class Error;

12
engines/metaengine.cpp
View File

@ -25,6 +25,7 @@
#include "backends/keymapper/keymap.h"
#include "backends/keymapper/standard-actions.h"
#include "common/gui_options.h"
#include "common/savefile.h"
#include "common/system.h"
#include "common/translation.h"
@ -36,6 +37,10 @@
#include "graphics/managed_surface.h"
#include "graphics/thumbnail.h"
Common::String MetaEngineDetection::parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const {
return parseGameGUIOptions(optionsString);
}
Common::String MetaEngine::getSavegameFile(int saveGameIdx, const char *target) const {
if (!target)
target = getName();
@ -180,6 +185,10 @@ bool MetaEngine::hasFeature(MetaEngineFeature f) const {
(f == kSavesUseExtendedFormat);
}
/////////////////////////////////////////
//// Extended Saves
/////////////////////////////////////////
void MetaEngine::appendExtendedSave(Common::OutSaveFile *saveFile, uint32 playtime,
Common::String desc, bool isAutosave) {
appendExtendedSaveToStream(saveFile, playtime, desc, isAutosave);
@ -221,8 +230,7 @@ void MetaEngine::appendExtendedSaveToStream(Common::WriteStream *saveFile, uint3
saveFile->writeUint32LE(headerPos); // Store where the header starts
}
bool MetaEngine::copySaveFileToFreeSlot(const char *target, int slot)
{
bool MetaEngine::copySaveFileToFreeSlot(const char *target, int slot) {
const int emptySlot = findEmptySaveSlot(target);
if (emptySlot == -1)
return false;

5
engines/metaengine.h
View File

@ -25,7 +25,6 @@
#include "common/scummsys.h"
#include "common/error.h"
#include "common/array.h"
#include "common/gui_options.h"
#include "engines/achievements.h"
#include "engines/game.h"
@ -177,9 +176,7 @@ public:
* @return The fully processed options string that is usable by the GUI.
*
*/
virtual Common::String parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const {
return parseGameGUIOptions(optionsString);
}
virtual Common::String parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const;
/**
* Return a list of engine specified debug channels