diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:37:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:46:44 +0200 |
| commit | 02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0 (patch) | |
| tree | 72b64a67ebeca41e9b83593da80850e848a99e2e /common/gui_options.h | |
| parent | 1539023834a2ad7cf8942711d60983891a10a82a (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.gz scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.bz2 scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.zip | |
Merge branch 'master'
Conflicts:
configure
base/plugins.cpp
Diffstat (limited to 'common/gui_options.h')
| -rw-r--r-- | common/gui_options.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/common/gui_options.h b/common/gui_options.h index 5649f1103d..447fff43ed 100644 --- a/common/gui_options.h +++ b/common/gui_options.h @@ -23,8 +23,6 @@ #ifndef COMMON_GUI_OPTIONS_H #define COMMON_GUI_OPTIONS_H -#include "common/language.h" - #define GUIO_NONE "\000" #define GUIO_NOSUBTITLES "\001" #define GUIO_NOMUSIC "\002" @@ -46,7 +44,6 @@ #define GUIO_MIDIGM "\021" #define GUIO_NOASPECT "\022" -#define GUIO_EGAUNDITHER "\023" #define GUIO_RENDERHERCGREEN "\030" #define GUIO_RENDERHERCAMBER "\031" @@ -58,6 +55,16 @@ #define GUIO_RENDERPC9821 "\037" #define GUIO_RENDERPC9801 "\040" +// Special GUIO flags for the AdvancedDetector's caching of game specific +// options. +#define GUIO_GAMEOPTIONS1 "\041" +#define GUIO_GAMEOPTIONS2 "\042" +#define GUIO_GAMEOPTIONS3 "\043" +#define GUIO_GAMEOPTIONS4 "\044" +#define GUIO_GAMEOPTIONS5 "\045" +#define GUIO_GAMEOPTIONS6 "\046" +#define GUIO_GAMEOPTIONS7 "\047" + #define GUIO0() (GUIO_NONE) #define GUIO1(a) (a) #define GUIO2(a,b) (a b) @@ -65,15 +72,16 @@ #define GUIO4(a,b,c,d) (a b c d) #define GUIO5(a,b,c,d,e) (a b c d e) #define GUIO6(a,b,c,d,e,f) (a b c d e f) +#define GUIO7(a,b,c,d,e,f,g) (a b c d e f g) +#define GUIO8(a,b,c,d,e,f,g,h) (a b c d e f g h) namespace Common { +class String; bool checkGameGUIOption(const String &option, const String &str); -bool checkGameGUIOptionLanguage(Common::Language lang, const String &str); String parseGameGUIOptions(const String &str); const String getGameGUIOptionsDescription(const String &options); -const String getGameGUIOptionsDescriptionLanguage(Common::Language lang); /** * Updates the GUI options of the current config manager |