target hovering, cursors and mouse and joystick interaction

1 files changed, 12 insertions, 2 deletions

diff --git a/src/client/view.cc b/src/client/view.cc
index a551bf6..610c1a5 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -222,9 +222,10 @@ void draw_cursor()
 	
 	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 && 
+		if ((input::mouse_control || input::joystick_control) && 
 			(render::Camera::mode() == render::Camera::Cockpit || render::Camera::mode() == render::Camera::Track)) {
 			
 			if (ui_pointercolor) {
@@ -264,6 +265,11 @@ void draw_cursor()
 
 			cursor_animated = true;
 
+			if (input::joystick_lastmoved_time() > input::mouse_lastmoved_time()) {
+ 				x = (video::width - pointer_size) /2;
+ 				y = (video::height - pointer_size) /2;
+			}
+
 		} else if (input::mouse_control) {
 
 			if (ui_pointercolor) {
@@ -283,7 +289,11 @@ void draw_cursor()
  			}
 
 		} else {
-
+			if ((input::joystick_lastmoved_time() > input::mouse_lastmoved_time()) && (render::Camera::mode() == render::Camera::Cockpit || render::Camera::mode() == render::Camera::Track)) {
+ 				color.assign(1.0, 0.0);
+			} else {
+				color.assign(1.0, 0.5);
+			}
 			render::Textures::bind("bitmaps/pointers/aim");
 		}