quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* camera strafe: m1 one is disableable by mode 'none'

Browse Source 
do not block strafe by pressed shift in up/forward modes
			enable forward strafe with only shift pressed in 'both' modes (no ctrl is required)
This commit is contained in:
Garux 2018-04-20 16:38:20 +03:00
parent 0cae576d5e
commit a3201f1954
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
radiant/camwindow.cpp
View File

@ -672,27 +672,22 @@ void Camera_motionDelta( int x, int y, unsigned int state, void* data ){
cam->m_strafe = false;
break;
case 1:
cam->m_strafe = ( ( state & GDK_CONTROL_MASK ) != 0 || ( state & GDK_BUTTON3_MASK ) != 0 ) && ( state & GDK_SHIFT_MASK ) == 0;
cam->m_strafe = ( state & GDK_CONTROL_MASK ) || ( state & GDK_BUTTON3_MASK );
cam->m_strafe_forward = false;
break;
case 2:
cam->m_strafe = ( ( state & GDK_CONTROL_MASK ) != 0 || ( state & GDK_BUTTON3_MASK ) != 0 ) && ( state & GDK_SHIFT_MASK ) == 0;
cam->m_strafe_forward = cam->m_strafe;
cam->m_strafe = ( state & GDK_CONTROL_MASK ) || ( state & GDK_BUTTON3_MASK );
cam->m_strafe_forward = true;
break;
case 4:
cam->m_strafe_forward_invert = true;
default:
cam->m_strafe = ( state & GDK_CONTROL_MASK ) != 0 || ( state & GDK_BUTTON3_MASK ) != 0;
if ( cam->m_strafe ) {
cam->m_strafe_forward = ( state & GDK_SHIFT_MASK ) != 0;
}
else{
cam->m_strafe_forward = false;
}
default: /* 3 & 4 */
cam->m_strafe = ( state & GDK_CONTROL_MASK ) || ( state & GDK_BUTTON3_MASK ) || ( state & GDK_SHIFT_MASK );
cam->m_strafe_forward = ( state & GDK_SHIFT_MASK ) != 0;
break;
}
if( ( state & GDK_BUTTON1_MASK ) != 0 ){
if( ( state & GDK_BUTTON1_MASK ) != 0 && g_camwindow_globals_private.m_strafeMode != 0 ){
cam->m_strafe = true;
cam->m_strafe_forward = false;
}