summaryrefslogtreecommitdiffstats
path: root/src/graphics/opengl/gldevice.h
diff options
context:
space:
mode:
authorMichał Konopacki <konopacki.m@gmail.com>2012-08-13 23:46:47 +0200
committerMichał Konopacki <konopacki.m@gmail.com>2012-08-13 23:46:47 +0200
commite942400c8bb9b6836bdfe705111f7ec63ef19e28 (patch)
tree66d5aea574f5a4530492b6ab69956003427df98b /src/graphics/opengl/gldevice.h
parent9ee1d2e172162be25b113595ad16779aa0a49a87 (diff)
parent8b2bca72dd71a1c23db51269a147443c80758f10 (diff)
downloadcolobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.tar.gz
colobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.tar.bz2
colobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.zip
Merge remote-tracking branch 'upstream/dev-ui' into dev-ui
Diffstat (limited to 'src/graphics/opengl/gldevice.h')
-rw-r--r--src/graphics/opengl/gldevice.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h
index 3daea8a..b59af1c 100644
--- a/src/graphics/opengl/gldevice.h
+++ b/src/graphics/opengl/gldevice.h
@@ -78,8 +78,6 @@ public:
virtual void DebugHook();
- virtual std::string GetError();
-
virtual bool Create();
virtual void Destroy();
@@ -169,8 +167,6 @@ private:
private:
//! Current config
Gfx::GLDeviceConfig m_config;
- //! Last encountered error
- std::string m_error;
//! Current world matrix
Math::Matrix m_worldMat;