From 769e093ae2fbba98058dd60b1d00fd31fa3b5bba Mon Sep 17 00:00:00 2001 From: curaga Date: Sat, 1 Jun 2013 10:31:27 +0000 Subject: [PATCH] Fix linux build from 12832 git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12834 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/graphics/irr_driver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index 7f5ed8520..c68a7c6f4 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -202,7 +202,7 @@ void IrrDriver::updateConfigIfRelevant() } #elif defined(__linux__) && !defined(ANDROID) using namespace X11; - const SExposedVideoData& videoData = + const video::SExposedVideoData& videoData = m_device->getVideoDriver()->getExposedVideoData(); Display* display = (Display*)videoData.OpenGLLinux.X11Display; XWindowAttributes xwa; @@ -388,7 +388,7 @@ void IrrDriver::initDevice() #if defined(__linux__) && !defined(ANDROID) // Set class hints on Linux, used by Window Managers. using namespace X11; - const SExposedVideoData& videoData = m_video_driver + const video::SExposedVideoData& videoData = m_video_driver ->getExposedVideoData(); XClassHint* classhint = XAllocClassHint(); classhint->res_name = (char*)"SuperTuxKart"; @@ -508,7 +508,7 @@ bool IrrDriver::moveWindow(const int x, const int y) } #elif defined(__linux__) && !defined(ANDROID) using namespace X11; - const SExposedVideoData& videoData = m_video_driver->getExposedVideoData(); + const video::SExposedVideoData& videoData = m_video_driver->getExposedVideoData(); // TODO: Actually handle possible failure XMoveWindow((Display*)videoData.OpenGLLinux.X11Display, videoData.OpenGLLinux.X11Window,