diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-01-30 17:32:00 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-01-30 17:32:00 +0000 |
| commit | a94049b1a43f83d750b9b5dee031c19a6b1fafb0 (patch) | |
| tree | 8677f67ba0ba0c0bb80b911d3aa0413d7e2a47c0 /src/client/video.cc | |
| parent | 7b5777160c7615443afc287fbdad6a861d69e36b (diff) | |
accomodate the new modules
Diffstat (limited to 'src/client/video.cc')
| -rw-r--r-- | src/client/video.cc | 11 |
1 files changed, 6 insertions, 5 deletions
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 <SDL/SDL.h> @@ -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; } |