diff options
| author | Johannes Schickel | 2006-10-08 21:03:19 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-10-08 21:03:19 +0000 |
| commit | 7721c0d0392c1d47c7f36cd26fa5d2ea485e6e2e (patch) | |
| tree | e1d43d637086d2533fe83ddad0881ed958b8e31e | |
| parent | 16276155b68a9a7978199edc86be8fa01a32f0c0 (diff) | |
| download | scummvm-rg350-7721c0d0392c1d47c7f36cd26fa5d2ea485e6e2e.tar.gz scummvm-rg350-7721c0d0392c1d47c7f36cd26fa5d2ea485e6e2e.tar.bz2 scummvm-rg350-7721c0d0392c1d47c7f36cd26fa5d2ea485e6e2e.zip | |
Make modern and classic theme config files use the same version number.
svn-id: r24236
| -rw-r--r-- | gui/ThemeClassic.cpp | 2 | ||||
| -rw-r--r-- | gui/ThemeNew.cpp | 2 | ||||
| -rw-r--r-- | gui/theme.h | 2 | ||||
| -rw-r--r-- | gui/themes/classic080.ini | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp index d1b434a535..b8c99dc9ff 100644 --- a/gui/ThemeClassic.cpp +++ b/gui/ThemeClassic.cpp @@ -22,8 +22,6 @@ #include "gui/theme.h" #include "gui/eval.h" -#define THEME_VERSION 2 - namespace GUI { ThemeClassic::ThemeClassic(OSystem *system, const Common::String &config, const Common::ConfigFile *cfg) : Theme() { _enableBlending = true; diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index b510b78485..5edc4e2883 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -41,8 +41,6 @@ #define kShadowTr4 128 #define kShadowTr5 192 -#define THEME_VERSION 18 - using Graphics::Surface; /** Specifies the currently active 16bit pixel format, 555 or 565. */ diff --git a/gui/theme.h b/gui/theme.h index ad654ccb1e..db7def60ec 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -34,6 +34,8 @@ #include "gui/widget.h" +#define THEME_VERSION 18 + namespace GUI { class Eval; diff --git a/gui/themes/classic080.ini b/gui/themes/classic080.ini index 6f425c8aeb..ed2440518e 100644 --- a/gui/themes/classic080.ini +++ b/gui/themes/classic080.ini @@ -1,7 +1,7 @@ # $URL$ # $Id$ [theme] -version=2 +version=18 type=classic name=Classic (ScummVM 0.8.0) |