diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /common/gui_options.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'common/gui_options.cpp')
| -rw-r--r-- | common/gui_options.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/common/gui_options.cpp b/common/gui_options.cpp index d79bf1b82f..df880f4fee 100644 --- a/common/gui_options.cpp +++ b/common/gui_options.cpp @@ -53,15 +53,18 @@ const struct GameOpt { { GUIO_NOASPECT, "noAspect" }, - { GUIO_RENDERHERCGREEN, "hercGreen" }, - { GUIO_RENDERHERCAMBER, "hercAmber" }, - { GUIO_RENDERCGA, "cga" }, - { GUIO_RENDEREGA, "ega" }, - { GUIO_RENDERVGA, "vga" }, - { GUIO_RENDERAMIGA, "amiga" }, - { GUIO_RENDERFMTOWNS, "fmtowns" }, - { GUIO_RENDERPC9821, "pc9821" }, - { GUIO_RENDERPC9801, "pc9801" }, + { GUIO_RENDERHERCGREEN, "hercGreen" }, + { GUIO_RENDERHERCAMBER, "hercAmber" }, + { GUIO_RENDERCGA, "cga" }, + { GUIO_RENDEREGA, "ega" }, + { GUIO_RENDERVGA, "vga" }, + { GUIO_RENDERAMIGA, "amiga" }, + { GUIO_RENDERFMTOWNS, "fmtowns" }, + { GUIO_RENDERPC9821, "pc9821" }, + { GUIO_RENDERPC9801, "pc9801" }, + { GUIO_RENDERAPPLE2GS, "2gs" }, + { GUIO_RENDERATARIST, "atari" }, + { GUIO_RENDERMACINTOSH, "macintosh" }, { GUIO_GAMEOPTIONS1, "gameOption1" }, { GUIO_GAMEOPTIONS2, "gameOption2" }, @@ -70,6 +73,8 @@ const struct GameOpt { { GUIO_GAMEOPTIONS5, "gameOption5" }, { GUIO_GAMEOPTIONS6, "gameOption6" }, { GUIO_GAMEOPTIONS7, "gameOption7" }, + { GUIO_GAMEOPTIONS8, "gameOption8" }, + { GUIO_GAMEOPTIONS9, "gameOption9" }, { GUIO_NONE, 0 } }; |