namespace cleanup

1 files changed, 20 insertions, 23 deletions

diff --git a/src/client/video.cc b/src/client/video.cc
index 2697585..a676d10 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -1,27 +1,24 @@
-/* video.cc
+/*
+   video.cc
    This file is part of the Osirion project and is distributed under 
    the terms and conditions of the GNU General Public License version 2 
 */
 
-// SDL headers
-#include <SDL/SDL.h>
+#include "video.h"
+#include "view.h"
+#include "gl/osiriongl.h"
 
-// C++ headers
+#include <SDL/SDL.h>
 #include <iostream>
 
-// project headers
-#include "gl/osiriongl.h"
-#include "view.h"
+namespace client {
 
+int Video::width = 0;
+int Video::height = 0;
+bool Video::initialized = false;
+float Video::ratio = 1;
 
-namespace video 
-{
-int width = 0;
-int height = 0;
-bool initialized = false;
-float ratio = 1;
-
-void reset()
+void Video::reset()
 {
 	ratio = (float) width / (float) height;
 
@@ -46,10 +43,10 @@ void reset()
 	// Setup our viewport.
 	gl::viewport(0, 0, width, height );
 
-	view::reset();
+	View::reset();
 }
 
-void init() 
+void Video::init() 
 {
 	if (initialized) {
 		return;
@@ -90,20 +87,20 @@ void init()
 	gl::init();
 
 	initialized = true;
-	view::init();
+	View::init();
 
 	reset();
 	return;
 }
 
-void draw(float elapsed)
+void Video::draw(float elapsed)
 {
-	view::draw(elapsed);
+	View::draw(elapsed);
 }
 
-void shutdown()
+void Video::shutdown()
 {
-	view::shutdown();
+	client::View::shutdown();
 	gl::shutdown();
 
 	initialized = false;
@@ -111,4 +108,4 @@ void shutdown()
 	height = 0;
 }
 
-} // namespace video
+} // namespace client