qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-22 12:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

s/ABS/abs/, abs is standard C, no evil defines.

Browse source
This commit is contained in:
Zephaniah E. Hull 2000-10-26 05:07:00 +00:00
parent c9b3b34f26
commit 07322ef780
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/in_x11.c
View file

@ -272,19 +272,18 @@ event_motion (XEvent *event)
mouse_x += event->xmotion.x_root * in_dga_mouseaccel->value; mouse_x += event->xmotion.x_root * in_dga_mouseaccel->value;
mouse_y += event->xmotion.y_root * in_dga_mouseaccel->value; mouse_y += event->xmotion.y_root * in_dga_mouseaccel->value;
} else { } else {
if (!p_mouse_x && !p_mouse_y) {
Con_Printf("event->xmotion.x: %d\n", event->xmotion.x);
Con_Printf("event->xmotion.y: %d\n", event->xmotion.y);
}
//printf("_windowed_mouse: %f\n", _windowed_mouse->int_val); //printf("_windowed_mouse: %f\n", _windowed_mouse->int_val);
//printf("CurrentTime: %ld\n", CurrentTime); //printf("CurrentTime: %ld\n", CurrentTime);
if (_windowed_mouse->int_val) { if (_windowed_mouse->int_val) {
if (!event->xmotion.send_event) { if (!event->xmotion.send_event) {
mouse_x += (event->xmotion.x - p_mouse_x); mouse_x += (event->xmotion.x - p_mouse_x);
mouse_y += (event->xmotion.y - p_mouse_y); mouse_y += (event->xmotion.y - p_mouse_y);
#undef ABS if (abs(vid.width/2 - event->xmotion.x) > vid.width / 4
#define ABS(a) (((int)(a) < 0) ? -(a) : (a)) || abs(vid.height/2 - event->xmotion.y) > vid.height / 4) {
if (ABS(vid.width/2 - event->xmotion.x)
> vid.width / 4
|| ABS(vid.height/2 - event->xmotion.y)
> vid.height / 4) {
#undef ABS
center_pointer(); center_pointer();
} }
} }
@ -352,10 +351,10 @@ IN_Move (usercmd_t *cmd)
if (m_filter->int_val) { if (m_filter->int_val) {
mouse_x = (mouse_x + old_mouse_x) * 0.5; mouse_x = (mouse_x + old_mouse_x) * 0.5;
mouse_y = (mouse_y + old_mouse_y) * 0.5; mouse_y = (mouse_y + old_mouse_y) * 0.5;
}
old_mouse_x = mouse_x; old_mouse_x = mouse_x;
old_mouse_y = mouse_y; old_mouse_y = mouse_y;
}
mouse_x *= sensitivity->value; mouse_x *= sensitivity->value;
mouse_y *= sensitivity->value; mouse_y *= sensitivity->value;