From 5c108ea81f843cda00fbc8f842ae295cfcfb9c43 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 12 Mar 2013 22:44:37 +0000 Subject: [PATCH] ------------------------------------------------------------------------ r4188 | acceptthis | 2013-02-04 06:54:57 +0000 (Mon, 04 Feb 2013) | 1 line try to fix osx compile errors. ------------------------------------------------------------------------ git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4186 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_vidcocoa.m | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/engine/gl/gl_vidcocoa.m b/engine/gl/gl_vidcocoa.m index 7c1336131..374859845 100644 --- a/engine/gl/gl_vidcocoa.m +++ b/engine/gl/gl_vidcocoa.m @@ -24,7 +24,6 @@ #include "quakedef.h" id _p; -extern float mouse_x,mouse_y; int evcnt = 2; // Jacek: some keys are bogus, my ibook kb lacks keys and apple's docs lack @@ -466,8 +465,7 @@ int checkDepth(int d) if ([event type] == NSMouseMoved) { - mouse_x += [event deltaX]; - mouse_y += [event deltaY]; + IN_MouseMove(0, false, [event deltaX], [event deltaY], 0, 0); // lame hack to avoid mouse ptr moving to the top of the screen since // a click there causes the mouse to appear and lock the event stream @@ -480,8 +478,7 @@ int checkDepth(int d) if ([event type] == NSLeftMouseDragged) { - mouse_x += [event deltaX]; - mouse_y += [event deltaY]; + IN_MouseMove(0, false, [event deltaX], [event deltaY], 0, 0); CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, CGPointMake(vid.width - 1,vid.height - 1)); return; @@ -489,8 +486,7 @@ int checkDepth(int d) if ([event type] == NSRightMouseDragged) { - mouse_x += [event deltaX]; - mouse_y += [event deltaY]; + IN_MouseMove(0, false, [event deltaX], [event deltaY], 0, 0); CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, CGPointMake(vid.width - 1,vid.height - 1)); return; @@ -498,8 +494,7 @@ int checkDepth(int d) if ([event type] == NSOtherMouseDragged) { - mouse_x += [event deltaX]; - mouse_y += [event deltaY]; + IN_MouseMove(0, false, [event deltaX], [event deltaY], 0, 0); CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, CGPointMake(vid.width - 1,vid.height - 1)); return;