diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/graphicsmanager.h | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/graphicsmanager.h')
| -rw-r--r-- | src/graphicsmanager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index 744514ed2..8e5aba51f 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -78,7 +78,7 @@ class GraphicsManager final void initGraphics(const bool noOpenGL); - void setVideoMode(); + static void setVideoMode(); SDL_Window *createWindow(const int w, const int h, const int bpp, const int flags); @@ -94,7 +94,7 @@ class GraphicsManager final std::string getDensityString() const; - int getDensity() + int getDensity() const { return mDensity; } #ifdef USE_OPENGL @@ -104,7 +104,7 @@ class GraphicsManager final bool supportExtension(const std::string &ext) const A_WARN_UNUSED; - void updateTextureFormat(); + void updateTextureFormat() const; bool checkGLVersion(const int major, const int minor) const A_WARN_UNUSED; @@ -154,7 +154,7 @@ class GraphicsManager final void updateDebugLog() const; - std::string getGLVersion() + std::string getGLVersion() const { return mGlVersionString; } #endif |