From a94049b1a43f83d750b9b5dee031c19a6b1fafb0 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 30 Jan 2008 17:32:00 +0000 Subject: accomodate the new modules --- src/client/video.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/client/video.cc') diff --git a/src/client/video.cc b/src/client/video.cc index a76b4b9..9a542f3 100644 --- a/src/client/video.cc +++ b/src/client/video.cc @@ -4,8 +4,9 @@ the terms and conditions of the GNU General Public License version 2 */ -#include "client.h" -#include "gl/osiriongl.h" +#include "client/client.h" +#include "gl/gllib.h" +#include "common/common.h" #include @@ -61,13 +62,13 @@ void Video::init() int flags = 0; if( SDL_Init(SDL_INIT_VIDEO) < 0 ) { - conwarn << "SDL_Init() failed: " << SDL_GetError() << std::endl; + con_warn << "SDL_Init() failed: " << SDL_GetError() << std::endl; return; } const SDL_VideoInfo* sdl_videoinfo = SDL_GetVideoInfo(); if( !sdl_videoinfo) { - conwarn << "SDL_GetVideoInfo() failed: " << SDL_GetError() << std::endl; + con_warn << "SDL_GetVideoInfo() failed: " << SDL_GetError() << std::endl; return; } @@ -85,7 +86,7 @@ void Video::init() flags = SDL_OPENGL | SDL_FULLSCREEN; if(!SDL_SetVideoMode(width, height, bpp, flags )) { - conwarn << "SDL_SetVideoMode() failed: " << SDL_GetError() << std::endl; + con_warn << "SDL_SetVideoMode() failed: " << SDL_GetError() << std::endl; return; } -- cgit v1.2.3