select-on-release

1 files changed, 28 insertions, 33 deletions

diff --git a/src/client/view.cc b/src/client/view.cc
index 75c4989..41cdd80 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -163,20 +163,15 @@ void draw_cursor()
 	if (!core::localcontrol() || console()->visible()) 
 		return;
 
+	float angle = 0;
 	float pointer_size = 48.0f;
-	float x = input::mouse_x - (pointer_size /2);
-	float y = input::mouse_y - (pointer_size /2);
-
-	using namespace render;
-	
-	math::Color color;
-	color.a = 0.5f;
-
+	float x = (float) input::mouse_position_x() - (pointer_size / 2.0f);
+	float y = (float) input::mouse_position_y() - (pointer_size / 2.0f);
 	bool cursor_animated = false;
-
+	math::Color color(1.0, 0.5);
+	
 	if (render::Camera::mode() == render::Camera::Overview) {
 		render::Textures::bind("bitmaps/pointers/aim");
-
 	} else {
 		// draw center cursor in Cockpit and Track mode
 		if (input::mouse_control && 
@@ -191,25 +186,25 @@ void draw_cursor()
 			float cx = (video::width - pointer_size) /2;
 			float cy = (video::height - pointer_size) /2;
 
-			gl::color(color);
-			gl::begin(gl::Quads);
+			render::gl::color(color);
+			render::gl::begin(render::gl::Quads);
 
 			glTexCoord2f(0,0 );
-			gl::vertex(cx,cy,0.0f);
+			render::gl::vertex(cx,cy,0.0f);
 		
 			glTexCoord2f(1, 0);
-			gl::vertex(cx+pointer_size, cy, 0.0f);
+			render::gl::vertex(cx+pointer_size, cy, 0.0f);
 		
 			glTexCoord2f(1, 1);
-			gl::vertex(cx+pointer_size, cy+pointer_size, 0.0f);
+			render::gl::vertex(cx+pointer_size, cy+pointer_size, 0.0f);
 		
 			glTexCoord2f(0, 1);
-			gl::vertex(cx, cy+pointer_size, 0.0f);
+			render::gl::vertex(cx, cy+pointer_size, 0.0f);
 		
-			gl::end();
+			render::gl::end();
 		}
 
-		if (!input::mouse_control_override && targets::hover()) {
+		if (targets::hover()) {
 
 			if (ui_pointerhovercolor) {
 				std::stringstream colorstr(ui_pointerhovercolor->str());
@@ -229,8 +224,8 @@ void draw_cursor()
 			render::Textures::bind("bitmaps/pointers/control");
 
 			if (!input::mouse_deadzone) {
-				x = input::mouse_x - (pointer_size /2);
-				y = input::mouse_y - (pointer_size /2);
+				x = input::mouse_position_x() - (pointer_size /2);
+				y = input::mouse_position_y() - (pointer_size /2);
 
  			} else {
  				x = (video::width - pointer_size) /2;
@@ -245,34 +240,34 @@ void draw_cursor()
 	}
 
 	if (cursor_animated) {
-		gl::push();
-		gl::translate(x+pointer_size/2, y+pointer_size/2, 0.0f);
+		render::gl::push();
+		render::gl::translate(x+pointer_size/2, y+pointer_size/2, 0.0f);
 
-		float angle = core::application()->time()* 0.75f - floorf(core::application()->time() * 0.75f);
+		angle = core::application()->time()* 0.75f - floorf(core::application()->time() * 0.75f);
 		angle *= 360.0f;
-		gl::rotate(angle, math::Vector3f(0, 0, 1.0f));
-		gl::translate(-x-pointer_size/2, -y-pointer_size/2, 0.0f);
+		render::gl::rotate(angle, math::Vector3f(0, 0, 1.0f));
+		render::gl::translate(-x-pointer_size/2, -y-pointer_size/2, 0.0f);
 	}
 
-	gl::color(color);
-	gl::begin(gl::Quads);
+	render::gl::color(color);
+	render::gl::begin(render::gl::Quads);
 
 	glTexCoord2f(0,0 );
-	gl::vertex(x,y,0.0f);
+	render::gl::vertex(x,y,0.0f);
 
 	glTexCoord2f(1, 0);
-	gl::vertex(x+pointer_size, y, 0.0f);
+	render::gl::vertex(x+pointer_size, y, 0.0f);
 
 	glTexCoord2f(1, 1);
-	gl::vertex(x+pointer_size, y+pointer_size, 0.0f);
+	render::gl::vertex(x+pointer_size, y+pointer_size, 0.0f);
 
 	glTexCoord2f(0, 1);
-	gl::vertex(x, y+pointer_size, 0.0f);
+	render::gl::vertex(x, y+pointer_size, 0.0f);
 
-	gl::end();
+	render::gl::end();
 
 	if (cursor_animated) {
-		gl::pop();
+		render::gl::pop();
 	}
 }