From 5487e5e718d4ce0a930dc936823a680e5e737d58 Mon Sep 17 00:00:00 2001 From: Pawel Kolodziejski Date: Sun, 27 Sep 2020 19:45:22 +0200 Subject: [PATCH] ALL: Sync with ScummVM rev: e08ba6ff14b70accaa04323d67952eeb53a0e82a --- Makefile.common | 3 +-- backends/keymapper/remap-widget.cpp | 7 ++++++- backends/keymapper/remap-widget.h | 2 +- devtools/create_project/cmake.cpp | 1 - devtools/create_project/xcode.cpp | 4 ++++ gui/debugger.cpp | 8 ++++++-- gui/debugger.h | 16 ++++++++++------ 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/Makefile.common b/Makefile.common index e4df5c46ca6..27e882efde7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -219,8 +219,7 @@ ifeq ($(origin VER_REV), undefined) # Are there uncommitted changes? (describe --dirty is only available since 1.6.6) VER_DIRTY := $(shell cd $(srcdir); git update-index --refresh --unmerged 1>/dev/null 2>&1; git diff-index --quiet HEAD || echo "-dirty") # Get the working copy base revision -#ResidualVM: --always -VER_REV := $(shell cd $(srcdir); git describe --always --long --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY) +VER_REV := $(shell cd $(srcdir); git describe --long --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY) endif else GITROOT := git://github.com/residualvm/residualvm.git diff --git a/backends/keymapper/remap-widget.cpp b/backends/keymapper/remap-widget.cpp index 594ac907ddb..a73b1fcfb6e 100644 --- a/backends/keymapper/remap-widget.cpp +++ b/backends/keymapper/remap-widget.cpp @@ -216,7 +216,12 @@ void RemapWidget::startRemapping(uint actionIndex) { _remapKeymap = _actions[actionIndex].keymap; _remapAction = _actions[actionIndex].action; - _remapTimeout = g_system->getMillis() + kRemapTimeoutDelay; + + uint32 remapTimeoutDelay = kRemapMinTimeoutDelay; + if (ConfMan.hasKey("remap_timeout_delay_ms") && (ConfMan.getInt("remap_timeout_delay_ms") > kRemapMinTimeoutDelay)) { + remapTimeoutDelay = (uint32)ConfMan.getInt("remap_timeout_delay_ms"); + } + _remapTimeout = g_system->getMillis() + remapTimeoutDelay; _remapInputWatcher->startWatching(); _actions[actionIndex].keyButton->setLabel("..."); diff --git a/backends/keymapper/remap-widget.h b/backends/keymapper/remap-widget.h index 3076b45633c..a0f9cdab6fe 100644 --- a/backends/keymapper/remap-widget.h +++ b/backends/keymapper/remap-widget.h @@ -90,7 +90,7 @@ protected: Action *_remapAction; uint32 _remapTimeout; - static const uint32 kRemapTimeoutDelay = 3000; + static const uint32 kRemapMinTimeoutDelay = 3000; bool _changes; diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp index d3f644d8ef4..45b0dbf9afb 100644 --- a/devtools/create_project/cmake.cpp +++ b/devtools/create_project/cmake.cpp @@ -258,7 +258,6 @@ void CMakeProvider::writeDefines(const BuildSetup &setup, std::ofstream &output) output << "endif()\n"; output << "add_definitions(-DSDL_BACKEND)\n\n"; - output << "add_definitions(-DHAVE_INT64)\n\n"; // ResidualVM specific } void CMakeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index b0bca732749..58db8c48b90 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -998,6 +998,10 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { REMOVE_SETTING(scummvm_Release, "GCC_WARN_UNUSED_VARIABLE"); REMOVE_SETTING(scummvm_Release, "ONLY_ACTIVE_ARCH"); REMOVE_SETTING(scummvm_Release, "ENABLE_TESTABILITY"); + REMOVE_SETTING(scummvm_Release, "GCC_PREPROCESSOR_DEFINITIONS"); + ValueList scummvm_Release_defines(scummvm_defines); + ADD_DEFINE(scummvm_Release_defines, "RELEASE_BUILD"); + ADD_SETTING_LIST(scummvm_Release, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_Release_defines, kSettingsNoQuote | kSettingsAsList, 5); scummvm_Release_Object->addProperty("name", "Release", "", kSettingsNoValue); scummvm_Release_Object->_properties["buildSettings"] = scummvm_Release; diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 895f37336d0..c56a6e09c53 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -59,7 +59,7 @@ Debugger::Debugger() { #endif // Register variables - registerVar("debug_countdown", &_frameCountdown, DVAR_INT, 0); + registerVarImpl("debug_countdown", &_frameCountdown, DVAR_INT, 0); // Register commands //registerCmd("continue", WRAP_METHOD(Debugger, cmdExit)); @@ -85,6 +85,10 @@ Debugger::~Debugger() { #endif } +void Debugger::clearVars() { + _vars.resize(1); // Keep "debug_countdown" +} + // Initialisation Functions int Debugger::getCharsPerLine() { @@ -520,7 +524,7 @@ char *Debugger::readlineComplete(const char *input, int state) { #endif // Variable registration function -void Debugger::registerVar(const Common::String &varname, void *pointer, VarType type, int arraySize) { +void Debugger::registerVarImpl(const Common::String &varname, void *pointer, VarType type, int arraySize) { // TODO: Filter out duplicates // TODO: Sort this list? Then we can do binary search later on when doing lookups. assert(pointer); diff --git a/gui/debugger.h b/gui/debugger.h index adbdfec4614..c667d1cbe27 100644 --- a/gui/debugger.h +++ b/gui/debugger.h @@ -113,31 +113,35 @@ private: * @param type the type of the variable (byte, int, bool, ...) * @param arraySize for type DVAR_INTARRAY this specifies the size of the array */ - void registerVar(const Common::String &varname, void *variable, VarType type, int arraySize); + void registerVarImpl(const Common::String &varname, void *variable, VarType type, int arraySize); protected: void registerVar(const Common::String &varname, byte *variable) { - registerVar(varname, variable, DVAR_BYTE, 0); + registerVarImpl(varname, variable, DVAR_BYTE, 0); } void registerVar(const Common::String &varname, int *variable) { - registerVar(varname, variable, DVAR_INT, 0); + registerVarImpl(varname, variable, DVAR_INT, 0); } void registerVar(const Common::String &varname, bool *variable) { - registerVar(varname, variable, DVAR_BOOL, 0); + registerVarImpl(varname, variable, DVAR_BOOL, 0); } void registerVar(const Common::String &varname, int32 **variable, int arraySize) { - registerVar(varname, variable, DVAR_INTARRAY, arraySize); + registerVarImpl(varname, variable, DVAR_INTARRAY, arraySize); } void registerVar(const Common::String &varname, Common::String *variable) { - registerVar(varname, variable, DVAR_STRING, 0); + registerVarImpl(varname, variable, DVAR_STRING, 0); } void registerCmd(const Common::String &cmdname, Debuglet *debuglet); + /** + * Remove all vars except default "debug_countdown" + */ + void clearVars(); private: /**