diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-01-06 16:09:47 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-01-06 16:09:47 +0300 |
commit | 51ecf500f30bb26ae1e08f3b4187386b6a9edf9b (patch) | |
tree | ea4e3a08ef3af2358c26bff84f5f60a5cb90000e /src | |
parent | 410b960d2e3ac19df78b0f5ce42d4cef18c0df25 (diff) | |
download | manaplus-51ecf500f30bb26ae1e08f3b4187386b6a9edf9b.tar.gz manaplus-51ecf500f30bb26ae1e08f3b4187386b6a9edf9b.tar.bz2 manaplus-51ecf500f30bb26ae1e08f3b4187386b6a9edf9b.tar.xz manaplus-51ecf500f30bb26ae1e08f3b4187386b6a9edf9b.zip |
Move screen density enum into separate file.
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/defaults.cpp | 2 | ||||
-rw-r--r-- | src/enums/screendensity.h | 38 | ||||
-rw-r--r-- | src/graphicsmanager.h | 11 |
5 files changed, 42 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c11d34c4f..791be1d14 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1054,6 +1054,7 @@ SET(SRCS soundmanager.cpp soundmanager.h sprite.h + enums/screendensity.h enums/state.h statuseffect.cpp statuseffect.h diff --git a/src/Makefile.am b/src/Makefile.am index d186aa9e8..c8cfa5c02 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1174,6 +1174,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ soundmanager.cpp \ soundmanager.h \ sprite.h \ + enums/screendensity.h \ enums/state.h \ statuseffect.cpp \ statuseffect.h \ diff --git a/src/defaults.cpp b/src/defaults.cpp index a3acf1b1c..b0349954c 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -24,6 +24,8 @@ #include "graphicsmanager.h" #include "variabledata.h" +#include "enums/screendensity.h" + #include "being/beingspeech.h" #include "input/inputaction.h" diff --git a/src/enums/screendensity.h b/src/enums/screendensity.h new file mode 100644 index 000000000..2227cdba4 --- /dev/null +++ b/src/enums/screendensity.h @@ -0,0 +1,38 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef ENUMS_SCREENDENSITY_H +#define ENUMS_SCREENDENSITY_H + +#ifdef USE_OPENGL + +enum ScreenDensity +{ + DENSITY_UNKNOWN = -1, + DENSITY_LOW = 0, + DENSITY_MEDIUM = 1, + DENSITY_TV = 2, + DENSITY_HIGH = 3, + DENSITY_XHIGH = 4, + DENSITY_XXHIGH = 5 +}; + +#endif // USE_OPENGL +#endif // ENUMS_SCREENDENSITY_H diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index 2462d8d05..47db93dea 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -56,17 +56,6 @@ struct SDL_Renderer; #endif struct SDL_Window; -enum ScreenDensity -{ - DENSITY_UNKNOWN = -1, - DENSITY_LOW = 0, - DENSITY_MEDIUM = 1, - DENSITY_TV = 2, - DENSITY_HIGH = 3, - DENSITY_XHIGH = 4, - DENSITY_XXHIGH = 5 -}; - class GraphicsManager final { public: |