diff options
| author | Johannes Schickel | 2012-08-12 14:49:28 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-08-12 14:49:28 +0200 |
| commit | 4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24 (patch) | |
| tree | efa33c489905333cd56c8988c3a03e27f47f1fcf /base | |
| parent | 61af435d8a870a0630b5dea2ecf69cd58fc95946 (diff) | |
| parent | 71daae7bbc03c1d9327f5353b1450f9d0d9774da (diff) | |
| download | scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.tar.gz scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.tar.bz2 scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.zip | |
Merge pull request #260 from lordhoto/new-chooser.
New save/load chooser
Conflicts:
gui/saveload.cpp
Diffstat (limited to 'base')
| -rw-r--r-- | base/commandLine.cpp | 2 | ||||
| -rw-r--r-- | base/plugins.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 6fd020cb15..5ad23313dc 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -237,6 +237,8 @@ void registerDefaults() { ConfMan.registerDefault("record_temp_file_name", "record.tmp"); ConfMan.registerDefault("record_time_file_name", "record.time"); + ConfMan.registerDefault("gui_saveload_chooser", "grid"); + } // diff --git a/base/plugins.h b/base/plugins.h index fffb5fb910..4409c9eaea 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -205,6 +205,10 @@ typedef Common::Array<Plugin *> PluginList; template<class PO_t> class PluginSubclass : public Plugin { public: + PO_t &operator*() const { + return *(PO_t *)_pluginObject; + } + PO_t *operator->() const { return (PO_t *)_pluginObject; } |