namespace and class cleanups

1 files changed, 16 insertions, 10 deletions

diff --git a/src/client/video.cc b/src/client/video.cc
index a676d10..1dc596e 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -4,8 +4,7 @@
    the terms and conditions of the GNU General Public License version 2 
 */
 
-#include "video.h"
-#include "view.h"
+#include "client.h"
 #include "gl/osiriongl.h"
 
 #include <SDL/SDL.h>
@@ -13,10 +12,17 @@
 
 namespace client {
 
-int Video::width = 0;
-int Video::height = 0;
-bool Video::initialized = false;
-float Video::ratio = 1;
+Video::Video()
+{	
+	width = 0;
+	height = 0;
+	initialized = false;
+	ratio = 1;
+}
+
+Video::~Video()
+{
+}
 
 void Video::reset()
 {
@@ -43,7 +49,7 @@ void Video::reset()
 	// Setup our viewport.
 	gl::viewport(0, 0, width, height );
 
-	View::reset();
+	view.reset();
 }
 
 void Video::init() 
@@ -87,7 +93,7 @@ void Video::init()
 	gl::init();
 
 	initialized = true;
-	View::init();
+	view.init();
 
 	reset();
 	return;
@@ -95,12 +101,12 @@ void Video::init()
 
 void Video::draw(float elapsed)
 {
-	View::draw(elapsed);
+	view.draw(elapsed);
 }
 
 void Video::shutdown()
 {
-	client::View::shutdown();
+	view.shutdown();
 	gl::shutdown();
 
 	initialized = false;