Night Owl
6 years ago
279 changed files with 7554 additions and 3340 deletions
@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
|
||||
version: 1.0.{build} |
||||
|
||||
branches: |
||||
only: |
||||
- master |
||||
|
||||
environment: |
||||
matrix: |
||||
- os: Visual Studio 2013 |
||||
GENERATOR_NAME: "Visual Studio 12 2013" |
||||
- os: Visual Studio 2015 |
||||
GENERATOR_NAME: "Visual Studio 14 2015" |
||||
# TODO: Uncomment when AppVeyor will provide XP toolchain for VS2017 |
||||
# - os: Visual Studio 2017 |
||||
# GENERATOR_NAME: "Visual Studio 15 2017" |
||||
|
||||
clone_folder: c:\projects\xash\hlsdk-xash3d |
||||
|
||||
build: |
||||
project: INSTALL.vcxproj |
||||
verbosity: normal |
||||
|
||||
configuration: |
||||
- Debug |
||||
|
||||
before_build: |
||||
- git submodule update --init --recursive |
||||
- cmake -G "%GENERATOR_NAME%" |
||||
@ -1,31 +0,0 @@
@@ -1,31 +0,0 @@
|
||||
@echo off |
||||
color 4F |
||||
echo XashXT Group 2006 (C) |
||||
echo Prepare source for backup |
||||
echo. |
||||
|
||||
if exist backup.log del /f /q backup.log |
||||
if not exist D:\!backup/ mkdir D:\!backup\ |
||||
echo Prepare OK! |
||||
echo Please wait: backup in progress |
||||
C:\Progra~1\WinRar\rar a -agMMMYYYY-DD D:\!backup\.rar -dh -m5 @backup.lst >>backup.log |
||||
if errorlevel 1 goto error |
||||
if errorlevel 0 goto ok |
||||
:ok |
||||
cls |
||||
echo Source was sucessfully backuped |
||||
echo and stored in folder "backup" |
||||
echo Press any key for exit. :-) |
||||
if exist backup.log del /f /q backup.log |
||||
exit |
||||
:error |
||||
echo ****************************** |
||||
echo ***********Error!************* |
||||
echo ****************************** |
||||
echo **See backup.log for details** |
||||
echo ****************************** |
||||
echo ****************************** |
||||
echo. |
||||
echo press any key for exit :-( |
||||
pause>nul |
||||
exit |
||||
@ -1,36 +0,0 @@
@@ -1,36 +0,0 @@
|
||||
//======================================================================= |
||||
// Copyright XashXT Group 2007 © |
||||
// list with backup directories |
||||
//======================================================================= |
||||
|
||||
// global stuff |
||||
xash.dsw |
||||
debug.bat |
||||
backup.lst |
||||
backup.bat |
||||
release.bat |
||||
change.log |
||||
make_sdk.bat |
||||
xash_sdk.lst |
||||
|
||||
cl_dll\ |
||||
cl_dll\hl\ |
||||
common\ |
||||
dlls\ |
||||
game_shared\ |
||||
game_launch\ |
||||
engine\ |
||||
engine\client\ |
||||
engine\client\vgui\ |
||||
engine\server\ |
||||
engine\common\ |
||||
engine\common\imagelib\ |
||||
engine\common\soundlib\ |
||||
pm_shared\ |
||||
mainui\ |
||||
mainui\legacy |
||||
utils\ |
||||
utils\makefont\ |
||||
utils\vgui\ |
||||
utils\vgui\include\ |
||||
utils\vgui\lib\win32_vc6\ |
||||
@ -0,0 +1,84 @@
@@ -0,0 +1,84 @@
|
||||
@echo off |
||||
echo Setting environment for minimal Visual C++ 6 |
||||
set INCLUDE=%MSVCDir%\VC98\Include |
||||
set LIB=%MSVCDir%\VC98\Lib |
||||
set PATH=%MSVCDir%\VC98\Bin;%MSVCDir%\Common\MSDev98\Bin\;%PATH% |
||||
|
||||
echo -- Compiler is MSVC6 |
||||
|
||||
set XASH3DSRC=..\..\Xash3D_original |
||||
set INCLUDES=-I../common -I../engine -I../pm_shared -I../game_shared -I../public -I../external -I../dlls -I../utils/false_vgui/include |
||||
set SOURCES=../dlls/crossbow.cpp^ |
||||
../dlls/crowbar.cpp^ |
||||
../dlls/egon.cpp^ |
||||
../dlls/gauss.cpp^ |
||||
../dlls/handgrenade.cpp^ |
||||
../dlls/hornetgun.cpp^ |
||||
../dlls/mp5.cpp^ |
||||
../dlls/python.cpp^ |
||||
../dlls/rpg.cpp^ |
||||
../dlls/satchel.cpp^ |
||||
../dlls/shotgun.cpp^ |
||||
../dlls/squeakgrenade.cpp^ |
||||
../dlls/tripmine.cpp^ |
||||
../dlls/glock.cpp^ |
||||
ev_hldm.cpp^ |
||||
hl/hl_baseentity.cpp^ |
||||
hl/hl_events.cpp^ |
||||
hl/hl_objects.cpp^ |
||||
hl/hl_weapons.cpp^ |
||||
ammo.cpp^ |
||||
ammo_secondary.cpp^ |
||||
ammohistory.cpp^ |
||||
battery.cpp^ |
||||
cdll_int.cpp^ |
||||
com_weapons.cpp^ |
||||
death.cpp^ |
||||
demo.cpp^ |
||||
entity.cpp^ |
||||
ev_common.cpp^ |
||||
events.cpp^ |
||||
flashlight.cpp^ |
||||
GameStudioModelRenderer.cpp^ |
||||
geiger.cpp^ |
||||
health.cpp^ |
||||
hud.cpp^ |
||||
hud_msg.cpp^ |
||||
hud_redraw.cpp^ |
||||
hud_spectator.cpp^ |
||||
hud_update.cpp^ |
||||
in_camera.cpp^ |
||||
input.cpp^ |
||||
input_goldsource.cpp^ |
||||
input_mouse.cpp^ |
||||
input_xash3d.cpp^ |
||||
menu.cpp^ |
||||
message.cpp^ |
||||
overview.cpp^ |
||||
parsemsg.cpp^ |
||||
../pm_shared/pm_debug.c^ |
||||
../pm_shared/pm_math.c^ |
||||
../pm_shared/pm_shared.c^ |
||||
saytext.cpp^ |
||||
status_icons.cpp^ |
||||
statusbar.cpp^ |
||||
studio_util.cpp^ |
||||
StudioModelRenderer.cpp^ |
||||
text_message.cpp^ |
||||
train.cpp^ |
||||
tri.cpp^ |
||||
util.cpp^ |
||||
view.cpp^ |
||||
scoreboard.cpp^ |
||||
MOTD.cpp |
||||
set DEFINES=/DCLIENT_DLL /DCLIENT_WEAPONS /Dsnprintf=_snprintf /DNO_VOICEGAMEMGR /DGOLDSOURCE_SUPPORT |
||||
set LIBS=user32.lib Winmm.lib |
||||
set OUTNAME=client.dll |
||||
set DEBUG=/debug |
||||
|
||||
cl %DEFINES% %LIBS% %SOURCES% %INCLUDES% -o %OUTNAME% /link /dll /out:%OUTNAME% %DEBUG% |
||||
|
||||
echo -- Compile done. Cleaning... |
||||
|
||||
del *.obj *.exp *.lib *.ilk |
||||
echo -- Done. |
||||
@ -0,0 +1,83 @@
@@ -0,0 +1,83 @@
|
||||
#include "input_mouse.h" |
||||
#include "exportdef.h" |
||||
#include "hud.h" |
||||
#include "cl_util.h" |
||||
|
||||
// shared between backends
|
||||
Vector dead_viewangles(0, 0, 0); |
||||
cvar_t *sensitivity; |
||||
cvar_t *in_joystick; |
||||
|
||||
FWGSInput fwgsInput; |
||||
|
||||
#ifdef SUPPORT_GOLDSOURCE_INPUT |
||||
GoldSourceInput goldSourceInput; |
||||
AbstractInput* currentInput = &goldSourceInput; |
||||
#else |
||||
AbstractInput* currentInput = &fwgsInput; |
||||
#endif |
||||
extern "C" void DLLEXPORT IN_ClientMoveEvent( float forwardmove, float sidemove ) |
||||
{ |
||||
currentInput->IN_ClientMoveEvent(forwardmove, sidemove); |
||||
} |
||||
|
||||
extern "C" void DLLEXPORT IN_ClientLookEvent( float relyaw, float relpitch ) |
||||
{ |
||||
currentInput->IN_ClientLookEvent(relyaw, relpitch); |
||||
} |
||||
|
||||
void IN_Move( float frametime, usercmd_t *cmd ) |
||||
{ |
||||
currentInput->IN_Move(frametime, cmd); |
||||
} |
||||
|
||||
extern "C" void DLLEXPORT IN_MouseEvent( int mstate ) |
||||
{ |
||||
currentInput->IN_MouseEvent(mstate); |
||||
} |
||||
|
||||
extern "C" void DLLEXPORT IN_ClearStates( void ) |
||||
{ |
||||
currentInput->IN_ClearStates(); |
||||
} |
||||
|
||||
extern "C" void DLLEXPORT IN_ActivateMouse( void ) |
||||
{ |
||||
currentInput->IN_ActivateMouse(); |
||||
} |
||||
|
||||
extern "C" void DLLEXPORT IN_DeactivateMouse( void ) |
||||
{ |
||||
currentInput->IN_DeactivateMouse(); |
||||
} |
||||
|
||||
extern "C" void DLLEXPORT IN_Accumulate( void ) |
||||
{ |
||||
currentInput->IN_Accumulate(); |
||||
} |
||||
|
||||
void IN_Commands( void ) |
||||
{ |
||||
currentInput->IN_Commands(); |
||||
} |
||||
|
||||
void IN_Shutdown( void ) |
||||
{ |
||||
currentInput->IN_Shutdown(); |
||||
} |
||||
|
||||
void IN_Init( void ) |
||||
{ |
||||
#ifdef SUPPORT_GOLDSOURCE_INPUT |
||||
if (IsXashFWGS()) { |
||||
gEngfuncs.Con_Printf( "FWGS Xash3D input is in use\n" ); |
||||
currentInput = &fwgsInput; |
||||
} else { |
||||
gEngfuncs.Con_Printf( "GoldSource input is in use\n" ); |
||||
currentInput = &goldSourceInput; |
||||
} |
||||
#else |
||||
currentInput = &fwgsInput; |
||||
#endif |
||||
currentInput->IN_Init(); |
||||
} |
||||
@ -0,0 +1,79 @@
@@ -0,0 +1,79 @@
|
||||
#pragma once |
||||
#ifndef INPUT_MOUSE_H |
||||
#define INPUT_MOUSE_H |
||||
#include "cl_dll.h" |
||||
#include "usercmd.h" |
||||
#include "in_defs.h" |
||||
|
||||
class AbstractInput |
||||
{ |
||||
public: |
||||
virtual void IN_ClientMoveEvent( float forwardmove, float sidemove ) = 0; |
||||
virtual void IN_ClientLookEvent( float relyaw, float relpitch ) = 0; |
||||
virtual void IN_Move( float frametime, usercmd_t *cmd ) = 0; |
||||
virtual void IN_MouseEvent( int mstate ) = 0; |
||||
virtual void IN_ClearStates( void ) = 0; |
||||
virtual void IN_ActivateMouse( void ) = 0; |
||||
virtual void IN_DeactivateMouse( void ) = 0; |
||||
virtual void IN_Accumulate( void ) = 0; |
||||
virtual void IN_Commands( void ) = 0; |
||||
virtual void IN_Shutdown( void ) = 0; |
||||
virtual void IN_Init( void ) = 0; |
||||
}; |
||||
|
||||
class FWGSInput : public AbstractInput |
||||
{ |
||||
public: |
||||
virtual void IN_ClientMoveEvent( float forwardmove, float sidemove ); |
||||
virtual void IN_ClientLookEvent( float relyaw, float relpitch ); |
||||
virtual void IN_Move( float frametime, usercmd_t *cmd ); |
||||
virtual void IN_MouseEvent( int mstate ); |
||||
virtual void IN_ClearStates( void ); |
||||
virtual void IN_ActivateMouse( void ); |
||||
virtual void IN_DeactivateMouse( void ); |
||||
virtual void IN_Accumulate( void ); |
||||
virtual void IN_Commands( void ); |
||||
virtual void IN_Shutdown( void ); |
||||
virtual void IN_Init( void ); |
||||
|
||||
protected: |
||||
float ac_forwardmove; |
||||
float ac_sidemove; |
||||
int ac_movecount; |
||||
float rel_yaw; |
||||
float rel_pitch; |
||||
}; |
||||
|
||||
// No need for goldsource input support on the platforms that are not supported by GoldSource.
|
||||
#if defined(GOLDSOURCE_SUPPORT) && (defined(_WIN32) || defined(__linux__) || defined(__APPLE__)) && (defined(__i386) || defined(_M_IX86)) |
||||
#define SUPPORT_GOLDSOURCE_INPUT |
||||
class GoldSourceInput : public AbstractInput |
||||
{ |
||||
public: |
||||
virtual void IN_ClientMoveEvent( float forwardmove, float sidemove ) {} |
||||
virtual void IN_ClientLookEvent( float relyaw, float relpitch ) {} |
||||
virtual void IN_Move( float frametime, usercmd_t *cmd ); |
||||
virtual void IN_MouseEvent( int mstate ); |
||||
virtual void IN_ClearStates( void ); |
||||
virtual void IN_ActivateMouse( void ); |
||||
virtual void IN_DeactivateMouse( void ); |
||||
virtual void IN_Accumulate( void ); |
||||
virtual void IN_Commands( void ); |
||||
virtual void IN_Shutdown( void ); |
||||
virtual void IN_Init( void ); |
||||
|
||||
protected: |
||||
void IN_GetMouseDelta( int *pOutX, int *pOutY); |
||||
void IN_MouseMove ( float frametime, usercmd_t *cmd); |
||||
void IN_StartupMouse (void); |
||||
|
||||
int mouse_buttons; |
||||
int mouse_oldbuttonstate; |
||||
POINT current_pos; |
||||
int old_mouse_x, old_mouse_y, mx_accum, my_accum; |
||||
int mouseinitialized; |
||||
void* sdl2Lib; |
||||
}; |
||||
#endif |
||||
|
||||
#endif |
||||
@ -1,934 +0,0 @@
@@ -1,934 +0,0 @@
|
||||
//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
|
||||
//
|
||||
// Purpose:
|
||||
//
|
||||
// $NoKeywords: $
|
||||
//=============================================================================
|
||||
|
||||
// in_win.c -- windows 95 mouse and joystick code
|
||||
// 02/21/97 JCB Added extended DirectInput code to support external controllers.
|
||||
|
||||
#include "hud.h" |
||||
#include "cl_util.h" |
||||
#include "camera.h" |
||||
#include "kbutton.h" |
||||
#include "cvardef.h" |
||||
#include "usercmd.h" |
||||
#include "const.h" |
||||
#include "camera.h" |
||||
#include "in_defs.h" |
||||
#include "../engine/keydefs.h" |
||||
//#include "view.h"
|
||||
//#include "windows.h"
|
||||
|
||||
//++ BulliT
|
||||
extern int g_iPure; |
||||
#include "AgVariableChecker.h" |
||||
//-- Martin Webrant
|
||||
#define MOUSE_BUTTON_COUNT 5 |
||||
|
||||
// Set this to 1 to show mouse cursor. Experimental
|
||||
int g_iVisibleMouse = 0; |
||||
|
||||
extern "C" |
||||
{ |
||||
void DLLEXPORT IN_ActivateMouse( void ); |
||||
void DLLEXPORT IN_DeactivateMouse( void ); |
||||
void DLLEXPORT IN_MouseEvent( int mstate ); |
||||
void DLLEXPORT IN_Accumulate( void ); |
||||
void DLLEXPORT IN_ClearStates( void ); |
||||
} |
||||
|
||||
extern cl_enginefunc_t gEngfuncs; |
||||
|
||||
extern int iMouseInUse; |
||||
|
||||
extern kbutton_t in_strafe; |
||||
extern kbutton_t in_mlook; |
||||
extern kbutton_t in_speed; |
||||
extern kbutton_t in_jlook; |
||||
|
||||
extern cvar_t *m_pitch; |
||||
extern cvar_t *m_yaw; |
||||
extern cvar_t *m_forward; |
||||
extern cvar_t *m_side; |
||||
|
||||
extern cvar_t *lookstrafe; |
||||
extern cvar_t *lookspring; |
||||
extern cvar_t *cl_pitchdown; |
||||
extern cvar_t *cl_pitchup; |
||||
extern cvar_t *cl_yawspeed; |
||||
extern cvar_t *cl_sidespeed; |
||||
extern cvar_t *cl_forwardspeed; |
||||
extern cvar_t *cl_pitchspeed; |
||||
extern cvar_t *cl_movespeedkey; |
||||
|
||||
// mouse variables
|
||||
cvar_t *m_filter; |
||||
cvar_t *sensitivity; |
||||
|
||||
int mouse_buttons; |
||||
int mouse_oldbuttonstate; |
||||
POINT current_pos; |
||||
int mouse_x, mouse_y, old_mouse_x, old_mouse_y, mx_accum, my_accum; |
||||
|
||||
static int restore_spi; |
||||
static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1}; |
||||
static int mouseactive; |
||||
int mouseinitialized; |
||||
static int mouseparmsvalid; |
||||
static int mouseshowtoggle = 1; |
||||
|
||||
// joystick defines and variables
|
||||
// where should defines be moved?
|
||||
#define JOY_ABSOLUTE_AXIS 0x00000000 // control like a joystick
|
||||
#define JOY_RELATIVE_AXIS 0x00000010 // control like a mouse, spinner, trackball
|
||||
#define JOY_MAX_AXES 6 // X, Y, Z, R, U, V
|
||||
#define JOY_AXIS_X 0 |
||||
#define JOY_AXIS_Y 1 |
||||
#define JOY_AXIS_Z 2 |
||||
#define JOY_AXIS_R 3 |
||||
#define JOY_AXIS_U 4 |
||||
#define JOY_AXIS_V 5 |
||||
|
||||
enum _ControlList |
||||
{ |
||||
AxisNada = 0, |
||||
AxisForward, |
||||
AxisLook, |
||||
AxisSide, |
||||
AxisTurn |
||||
}; |
||||
|
||||
DWORD dwAxisFlags[JOY_MAX_AXES] = |
||||
{ |
||||
JOY_RETURNX, |
||||
JOY_RETURNY, |
||||
JOY_RETURNZ, |
||||
JOY_RETURNR, |
||||
JOY_RETURNU, |
||||
JOY_RETURNV |
||||
}; |
||||
|
||||
DWORD dwAxisMap[JOY_MAX_AXES]; |
||||
DWORD dwControlMap[JOY_MAX_AXES]; |
||||
PDWORD pdwRawValue[JOY_MAX_AXES]; |
||||
|
||||
// none of these cvars are saved over a session
|
||||
// this means that advanced controller configuration needs to be executed
|
||||
// each time. this avoids any problems with getting back to a default usage
|
||||
// or when changing from one controller to another. this way at least something
|
||||
// works.
|
||||
cvar_t *in_joystick; |
||||
cvar_t *joy_name; |
||||
cvar_t *joy_advanced; |
||||
cvar_t *joy_advaxisx; |
||||
cvar_t *joy_advaxisy; |
||||
cvar_t *joy_advaxisz; |
||||
cvar_t *joy_advaxisr; |
||||
cvar_t *joy_advaxisu; |
||||
cvar_t *joy_advaxisv; |
||||
cvar_t *joy_forwardthreshold; |
||||
cvar_t *joy_sidethreshold; |
||||
cvar_t *joy_pitchthreshold; |
||||
cvar_t *joy_yawthreshold; |
||||
cvar_t *joy_forwardsensitivity; |
||||
cvar_t *joy_sidesensitivity; |
||||
cvar_t *joy_pitchsensitivity; |
||||
cvar_t *joy_yawsensitivity; |
||||
cvar_t *joy_wwhack1; |
||||
cvar_t *joy_wwhack2; |
||||
|
||||
int joy_avail, joy_advancedinit, joy_haspov; |
||||
DWORD joy_oldbuttonstate, joy_oldpovstate; |
||||
|
||||
int joy_id; |
||||
DWORD joy_flags; |
||||
DWORD joy_numbuttons; |
||||
|
||||
static JOYINFOEX ji; |
||||
|
||||
/*
|
||||
=========== |
||||
Force_CenterView_f |
||||
=========== |
||||
*/ |
||||
void Force_CenterView_f( void ) |
||||
{ |
||||
//++ BulliT
|
||||
if( 0 < g_iPure ) |
||||
return; |
||||
//-- Martin Webrant
|
||||
vec3_t viewangles; |
||||
|
||||
if( !iMouseInUse ) |
||||
{ |
||||
gEngfuncs.GetViewAngles( (float *)viewangles ); |
||||
viewangles[PITCH] = 0; |
||||
gEngfuncs.SetViewAngles( (float *)viewangles ); |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_ActivateMouse |
||||
=========== |
||||
*/ |
||||
void DLLEXPORT IN_ActivateMouse( void ) |
||||
{ |
||||
if( mouseinitialized ) |
||||
{ |
||||
if( mouseparmsvalid ) |
||||
restore_spi = SystemParametersInfo( SPI_SETMOUSE, 0, newmouseparms, 0 ); |
||||
mouseactive = 1; |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_DeactivateMouse |
||||
=========== |
||||
*/ |
||||
void DLLEXPORT IN_DeactivateMouse( void ) |
||||
{ |
||||
if( mouseinitialized ) |
||||
{ |
||||
if( restore_spi ) |
||||
SystemParametersInfo( SPI_SETMOUSE, 0, originalmouseparms, 0 ); |
||||
mouseactive = 0; |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_StartupMouse |
||||
=========== |
||||
*/ |
||||
void IN_StartupMouse( void ) |
||||
{ |
||||
if( gEngfuncs.CheckParm( "-nomouse", NULL ) ) |
||||
return; |
||||
|
||||
mouseinitialized = 1; |
||||
mouseparmsvalid = SystemParametersInfo( SPI_GETMOUSE, 0, originalmouseparms, 0 ); |
||||
|
||||
if( mouseparmsvalid ) |
||||
{ |
||||
if( gEngfuncs.CheckParm( "-noforcemspd", NULL ) ) |
||||
newmouseparms[2] = originalmouseparms[2]; |
||||
|
||||
if( gEngfuncs.CheckParm( "-noforcemaccel", NULL ) ) |
||||
{ |
||||
newmouseparms[0] = originalmouseparms[0]; |
||||
newmouseparms[1] = originalmouseparms[1]; |
||||
} |
||||
|
||||
if( gEngfuncs.CheckParm( "-noforcemparms", NULL ) ) |
||||
{ |
||||
newmouseparms[0] = originalmouseparms[0]; |
||||
newmouseparms[1] = originalmouseparms[1]; |
||||
newmouseparms[2] = originalmouseparms[2]; |
||||
} |
||||
} |
||||
|
||||
mouse_buttons = MOUSE_BUTTON_COUNT; |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_Shutdown |
||||
=========== |
||||
*/ |
||||
void IN_Shutdown( void ) |
||||
{ |
||||
IN_DeactivateMouse (); |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_GetMousePos |
||||
|
||||
Ask for mouse position from engine |
||||
=========== |
||||
*/ |
||||
void IN_GetMousePos( int *mx, int *my ) |
||||
{ |
||||
gEngfuncs.GetMousePosition( mx, my ); |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_ResetMouse |
||||
|
||||
FIXME: Call through to engine? |
||||
=========== |
||||
*/ |
||||
void IN_ResetMouse( void ) |
||||
{ |
||||
SetCursorPos ( gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY() ); |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_MouseEvent |
||||
=========== |
||||
*/ |
||||
void DLLEXPORT IN_MouseEvent( int mstate ) |
||||
{ |
||||
int i; |
||||
|
||||
if( iMouseInUse || g_iVisibleMouse ) |
||||
return; |
||||
|
||||
// perform button actions
|
||||
for( i = 0; i < mouse_buttons; i++ ) |
||||
{ |
||||
if( ( mstate & ( 1 << i ) ) && |
||||
!( mouse_oldbuttonstate & ( 1 << i ) ) ) |
||||
{ |
||||
gEngfuncs.Key_Event( K_MOUSE1 + i, 1 ); |
||||
} |
||||
|
||||
if( !( mstate & ( 1 << i ) ) && |
||||
( mouse_oldbuttonstate & ( 1 << i ) ) ) |
||||
{ |
||||
gEngfuncs.Key_Event( K_MOUSE1 + i, 0 ); |
||||
} |
||||
} |
||||
|
||||
mouse_oldbuttonstate = mstate; |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_MouseMove |
||||
=========== |
||||
*/ |
||||
void IN_MouseMove( float frametime, usercmd_t *cmd ) |
||||
{ |
||||
int mx, my; |
||||
vec3_t viewangles; |
||||
|
||||
gEngfuncs.GetViewAngles( (float *)viewangles ); |
||||
|
||||
//jjb - this disbles normal mouse control if the user is trying to
|
||||
// move the camera, or if the mouse cursor is visible or if we're in intermission
|
||||
if( !iMouseInUse && !g_iVisibleMouse && !gHUD.m_iIntermission ) |
||||
{ |
||||
GetCursorPos( ¤t_pos ); |
||||
|
||||
mx = current_pos.x - gEngfuncs.GetWindowCenterX() + mx_accum; |
||||
my = current_pos.y - gEngfuncs.GetWindowCenterY() + my_accum; |
||||
|
||||
mx_accum = 0; |
||||
my_accum = 0; |
||||
|
||||
if( m_filter->value ) |
||||
{ |
||||
mouse_x = ( mx + old_mouse_x ) * 0.5; |
||||
mouse_y = ( my + old_mouse_y ) * 0.5; |
||||
} |
||||
else |
||||
{ |
||||
mouse_x = mx; |
||||
mouse_y = my; |
||||
} |
||||
|
||||
old_mouse_x = mx; |
||||
old_mouse_y = my; |
||||
|
||||
if( gHUD.GetSensitivity() != 0 ) |
||||
{ |
||||
mouse_x *= gHUD.GetSensitivity(); |
||||
mouse_y *= gHUD.GetSensitivity(); |
||||
} |
||||
else |
||||
{ |
||||
mouse_x *= sensitivity->value; |
||||
mouse_y *= sensitivity->value; |
||||
} |
||||
|
||||
// add mouse X/Y movement to cmd
|
||||
if( ( in_strafe.state & 1 ) || ( lookstrafe->value && ( in_mlook.state & 1 ) ) ) |
||||
cmd->sidemove += m_side->value * mouse_x; |
||||
else |
||||
viewangles[YAW] -= m_yaw->value * mouse_x; |
||||
|
||||
if( ( in_mlook.state & 1 ) && !( in_strafe.state & 1 ) ) |
||||
{ |
||||
viewangles[PITCH] += m_pitch->value * mouse_y; |
||||
//++ BulliT
|
||||
if( viewangles[PITCH] > ag_cl_pitchdown() ) |
||||
viewangles[PITCH] = ag_cl_pitchdown(); |
||||
if( viewangles[PITCH] < -ag_cl_pitchup() ) |
||||
viewangles[PITCH] = -ag_cl_pitchup(); |
||||
/*
|
||||
if( viewangles[PITCH] > cl_pitchdown->value ) |
||||
viewangles[PITCH] = cl_pitchdown->value; |
||||
if( viewangles[PITCH] < -cl_pitchup->value ) |
||||
viewangles[PITCH] = -cl_pitchup->value; |
||||
*/ |
||||
//-- Martin Webrant
|
||||
} |
||||
else |
||||
{ |
||||
if( ( in_strafe.state & 1 ) && gEngfuncs.IsNoClipping() ) |
||||
{ |
||||
cmd->upmove -= m_forward->value * mouse_y; |
||||
} |
||||
else |
||||
{ |
||||
cmd->forwardmove -= m_forward->value * mouse_y; |
||||
} |
||||
} |
||||
|
||||
// if the mouse has moved, force it to the center, so there's room to move
|
||||
if( mx || my ) |
||||
{ |
||||
IN_ResetMouse(); |
||||
} |
||||
} |
||||
|
||||
gEngfuncs.SetViewAngles( (float *)viewangles ); |
||||
|
||||
/*
|
||||
//#define TRACE_TEST
|
||||
#if defined( TRACE_TEST ) |
||||
{ |
||||
int mx, my; |
||||
void V_Move( int mx, int my ); |
||||
IN_GetMousePos( &mx, &my ); |
||||
V_Move( mx, my ); |
||||
} |
||||
#endif |
||||
*/ |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_Accumulate |
||||
=========== |
||||
*/ |
||||
void DLLEXPORT IN_Accumulate( void ) |
||||
{ |
||||
//only accumulate mouse if we are not moving the camera with the mouse
|
||||
if( !iMouseInUse && !g_iVisibleMouse ) |
||||
{ |
||||
if( mouseactive ) |
||||
{ |
||||
GetCursorPos( ¤t_pos ); |
||||
|
||||
mx_accum += current_pos.x - gEngfuncs.GetWindowCenterX(); |
||||
my_accum += current_pos.y - gEngfuncs.GetWindowCenterY(); |
||||
|
||||
// force the mouse to the center, so there's room to move
|
||||
IN_ResetMouse(); |
||||
} |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
=================== |
||||
IN_ClearStates |
||||
=================== |
||||
*/ |
||||
void DLLEXPORT IN_ClearStates( void ) |
||||
{ |
||||
if( !mouseactive ) |
||||
return; |
||||
|
||||
mx_accum = 0; |
||||
my_accum = 0; |
||||
mouse_oldbuttonstate = 0; |
||||
} |
||||
|
||||
/*
|
||||
=============== |
||||
IN_StartupJoystick |
||||
=============== |
||||
*/ |
||||
void IN_StartupJoystick( void ) |
||||
{ |
||||
int numdevs; |
||||
JOYCAPS jc; |
||||
MMRESULT mmr; |
||||
|
||||
// assume no joystick
|
||||
joy_avail = 0; |
||||
|
||||
// abort startup if user requests no joystick
|
||||
if( gEngfuncs.CheckParm( "-nojoy", NULL ) ) |
||||
return; |
||||
|
||||
// verify joystick driver is present
|
||||
if( ( numdevs = joyGetNumDevs() ) == 0 ) |
||||
{ |
||||
gEngfuncs.Con_DPrintf( "joystick not found -- driver not present\n\n" ); |
||||
return; |
||||
} |
||||
|
||||
// cycle through the joystick ids for the first valid one
|
||||
for( joy_id = 0; joy_id < numdevs; joy_id++ ) |
||||
{ |
||||
memset( &ji, 0, sizeof(ji) ); |
||||
ji.dwSize = sizeof(ji); |
||||
ji.dwFlags = JOY_RETURNCENTERED; |
||||
|
||||
if( ( mmr = joyGetPosEx( joy_id, &ji ) ) == JOYERR_NOERROR ) |
||||
break; |
||||
} |
||||
|
||||
// abort startup if we didn't find a valid joystick
|
||||
if( mmr != JOYERR_NOERROR ) |
||||
{ |
||||
gEngfuncs.Con_DPrintf( "joystick not found -- no valid joysticks (%x)\n\n", mmr ); |
||||
return; |
||||
} |
||||
|
||||
// get the capabilities of the selected joystick
|
||||
// abort startup if command fails
|
||||
memset( &jc, 0, sizeof(jc) ); |
||||
if( ( mmr = joyGetDevCaps( joy_id, &jc, sizeof(jc) ) ) != JOYERR_NOERROR ) |
||||
{ |
||||
gEngfuncs.Con_DPrintf( "joystick not found -- invalid joystick capabilities (%x)\n\n", mmr ); |
||||
return; |
||||
} |
||||
|
||||
// save the joystick's number of buttons and POV status
|
||||
joy_numbuttons = jc.wNumButtons; |
||||
joy_haspov = jc.wCaps & JOYCAPS_HASPOV; |
||||
|
||||
// old button and POV states default to no buttons pressed
|
||||
joy_oldbuttonstate = joy_oldpovstate = 0; |
||||
|
||||
// mark the joystick as available and advanced initialization not completed
|
||||
// this is needed as cvars are not available during initialization
|
||||
gEngfuncs.Con_Printf( "joystick found\n\n", mmr ); |
||||
joy_avail = 1; |
||||
joy_advancedinit = 0; |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
RawValuePointer |
||||
=========== |
||||
*/ |
||||
PDWORD RawValuePointer( int axis ) |
||||
{ |
||||
switch( axis ) |
||||
{ |
||||
case JOY_AXIS_X: |
||||
return &ji.dwXpos; |
||||
case JOY_AXIS_Y: |
||||
return &ji.dwYpos; |
||||
case JOY_AXIS_Z: |
||||
return &ji.dwZpos; |
||||
case JOY_AXIS_R: |
||||
return &ji.dwRpos; |
||||
case JOY_AXIS_U: |
||||
return &ji.dwUpos; |
||||
case JOY_AXIS_V: |
||||
return &ji.dwVpos; |
||||
} |
||||
// FIX: need to do some kind of error
|
||||
return &ji.dwXpos; |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
Joy_AdvancedUpdate_f |
||||
=========== |
||||
*/ |
||||
void Joy_AdvancedUpdate_f( void ) |
||||
{ |
||||
// called once by IN_ReadJoystick and by user whenever an update is needed
|
||||
// cvars are now available
|
||||
int i; |
||||
DWORD dwTemp; |
||||
|
||||
// initialize all the maps
|
||||
for( i = 0; i < JOY_MAX_AXES; i++ ) |
||||
{ |
||||
dwAxisMap[i] = AxisNada; |
||||
dwControlMap[i] = JOY_ABSOLUTE_AXIS; |
||||
pdwRawValue[i] = RawValuePointer(i); |
||||
} |
||||
|
||||
if( joy_advanced->value == 0.0 ) |
||||
{ |
||||
// default joystick initialization
|
||||
// 2 axes only with joystick control
|
||||
dwAxisMap[JOY_AXIS_X] = AxisTurn; |
||||
// dwControlMap[JOY_AXIS_X] = JOY_ABSOLUTE_AXIS;
|
||||
dwAxisMap[JOY_AXIS_Y] = AxisForward; |
||||
// dwControlMap[JOY_AXIS_Y] = JOY_ABSOLUTE_AXIS;
|
||||
} |
||||
else |
||||
{ |
||||
if( strcmp( joy_name->string, "joystick" ) != 0 ) |
||||
{ |
||||
// notify user of advanced controller
|
||||
gEngfuncs.Con_Printf( "\n%s configured\n\n", joy_name->string ); |
||||
} |
||||
|
||||
// advanced initialization here
|
||||
// data supplied by user via joy_axisn cvars
|
||||
dwTemp = (DWORD)joy_advaxisx->value; |
||||
dwAxisMap[JOY_AXIS_X] = dwTemp & 0x0000000f; |
||||
dwControlMap[JOY_AXIS_X] = dwTemp & JOY_RELATIVE_AXIS; |
||||
dwTemp = (DWORD)joy_advaxisy->value; |
||||
dwAxisMap[JOY_AXIS_Y] = dwTemp & 0x0000000f; |
||||
dwControlMap[JOY_AXIS_Y] = dwTemp & JOY_RELATIVE_AXIS; |
||||
dwTemp = (DWORD)joy_advaxisz->value; |
||||
dwAxisMap[JOY_AXIS_Z] = dwTemp & 0x0000000f; |
||||
dwControlMap[JOY_AXIS_Z] = dwTemp & JOY_RELATIVE_AXIS; |
||||
dwTemp = (DWORD)joy_advaxisr->value; |
||||
dwAxisMap[JOY_AXIS_R] = dwTemp & 0x0000000f; |
||||
dwControlMap[JOY_AXIS_R] = dwTemp & JOY_RELATIVE_AXIS; |
||||
dwTemp = (DWORD)joy_advaxisu->value; |
||||
dwAxisMap[JOY_AXIS_U] = dwTemp & 0x0000000f; |
||||
dwControlMap[JOY_AXIS_U] = dwTemp & JOY_RELATIVE_AXIS; |
||||
dwTemp = (DWORD)joy_advaxisv->value; |
||||
dwAxisMap[JOY_AXIS_V] = dwTemp & 0x0000000f; |
||||
dwControlMap[JOY_AXIS_V] = dwTemp & JOY_RELATIVE_AXIS; |
||||
} |
||||
|
||||
// compute the axes to collect from DirectInput
|
||||
joy_flags = JOY_RETURNCENTERED | JOY_RETURNBUTTONS | JOY_RETURNPOV; |
||||
for( i = 0; i < JOY_MAX_AXES; i++ ) |
||||
{ |
||||
if( dwAxisMap[i] != AxisNada ) |
||||
{ |
||||
joy_flags |= dwAxisFlags[i]; |
||||
} |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_Commands |
||||
=========== |
||||
*/ |
||||
void IN_Commands( void ) |
||||
{ |
||||
int i, key_index; |
||||
DWORD buttonstate, povstate; |
||||
|
||||
if( !joy_avail ) |
||||
{ |
||||
return; |
||||
} |
||||
|
||||
// loop through the joystick buttons
|
||||
// key a joystick event or auxillary event for higher number buttons for each state change
|
||||
buttonstate = ji.dwButtons; |
||||
for( i = 0; i < (int)joy_numbuttons; i++ ) |
||||
{ |
||||
if( ( buttonstate & ( 1 << i ) ) && !( joy_oldbuttonstate & ( 1 << i ) ) ) |
||||
{ |
||||
key_index = ( i < 4 ) ? K_JOY1 : K_AUX1; |
||||
gEngfuncs.Key_Event( key_index + i, 1 ); |
||||
} |
||||
|
||||
if( !( buttonstate & ( 1 << i ) ) && ( joy_oldbuttonstate & ( 1 << i ) ) ) |
||||
{ |
||||
key_index = ( i < 4 ) ? K_JOY1 : K_AUX1; |
||||
gEngfuncs.Key_Event( key_index + i, 0 ); |
||||
} |
||||
} |
||||
joy_oldbuttonstate = buttonstate; |
||||
|
||||
if( joy_haspov ) |
||||
{ |
||||
// convert POV information into 4 bits of state information
|
||||
// this avoids any potential problems related to moving from one
|
||||
// direction to another without going through the center position
|
||||
povstate = 0; |
||||
if( ji.dwPOV != JOY_POVCENTERED ) |
||||
{ |
||||
if( ji.dwPOV == JOY_POVFORWARD ) |
||||
povstate |= 0x01; |
||||
if( ji.dwPOV == JOY_POVRIGHT ) |
||||
povstate |= 0x02; |
||||
if( ji.dwPOV == JOY_POVBACKWARD ) |
||||
povstate |= 0x04; |
||||
if( ji.dwPOV == JOY_POVLEFT ) |
||||
povstate |= 0x08; |
||||
} |
||||
// determine which bits have changed and key an auxillary event for each change
|
||||
for( i = 0; i < 4; i++ ) |
||||
{ |
||||
if( ( povstate & ( 1 << i ) ) && !( joy_oldpovstate & ( 1 << i ) ) ) |
||||
{ |
||||
gEngfuncs.Key_Event( K_AUX29 + i, 1 ); |
||||
} |
||||
|
||||
if( !( povstate & ( 1 << i ) ) && ( joy_oldpovstate & ( 1 << i ) ) ) |
||||
{ |
||||
gEngfuncs.Key_Event( K_AUX29 + i, 0 ); |
||||
} |
||||
} |
||||
joy_oldpovstate = povstate; |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
=============== |
||||
IN_ReadJoystick |
||||
=============== |
||||
*/ |
||||
int IN_ReadJoystick( void ) |
||||
{ |
||||
memset( &ji, 0, sizeof(ji) ); |
||||
ji.dwSize = sizeof(ji); |
||||
ji.dwFlags = joy_flags; |
||||
|
||||
if( joyGetPosEx( joy_id, &ji ) == JOYERR_NOERROR ) |
||||
{ |
||||
// this is a hack -- there is a bug in the Logitech WingMan Warrior DirectInput Driver
|
||||
// rather than having 32768 be the zero point, they have the zero point at 32668
|
||||
// go figure -- anyway, now we get the full resolution out of the device
|
||||
if( joy_wwhack1->value != 0.0 ) |
||||
{ |
||||
ji.dwUpos += 100; |
||||
} |
||||
return 1; |
||||
} |
||||
else |
||||
{ |
||||
// read error occurred
|
||||
// turning off the joystick seems too harsh for 1 read error,\ |
||||
// but what should be done?
|
||||
// Con_Printf( "IN_ReadJoystick: no response\n" );
|
||||
// joy_avail = 0;
|
||||
return 0; |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_JoyMove |
||||
=========== |
||||
*/ |
||||
void IN_JoyMove( float frametime, usercmd_t *cmd ) |
||||
{ |
||||
float speed, aspeed; |
||||
float fAxisValue, fTemp; |
||||
int i; |
||||
vec3_t viewangles; |
||||
|
||||
gEngfuncs.GetViewAngles( (float *)viewangles ); |
||||
|
||||
// complete initialization if first time in
|
||||
// this is needed as cvars are not available at initialization time
|
||||
if( joy_advancedinit != 1 ) |
||||
{ |
||||
Joy_AdvancedUpdate_f(); |
||||
joy_advancedinit = 1; |
||||
} |
||||
|
||||
// verify joystick is available and that the user wants to use it
|
||||
if( !joy_avail || !in_joystick->value ) |
||||
{ |
||||
return; |
||||
} |
||||
|
||||
// collect the joystick data, if possible
|
||||
if( IN_ReadJoystick () != 1 ) |
||||
{ |
||||
return; |
||||
} |
||||
|
||||
if( in_speed.state & 1 ) |
||||
speed = cl_movespeedkey->value; |
||||
else |
||||
speed = 1; |
||||
|
||||
aspeed = speed * frametime; |
||||
|
||||
// loop through the axes
|
||||
for( i = 0; i < JOY_MAX_AXES; i++ ) |
||||
{ |
||||
// get the floating point zero-centered, potentially-inverted data for the current axis
|
||||
fAxisValue = (float) *pdwRawValue[i]; |
||||
// move centerpoint to zero
|
||||
fAxisValue -= 32768.0; |
||||
|
||||
if( joy_wwhack2->value != 0.0 ) |
||||
{ |
||||
if( dwAxisMap[i] == AxisTurn ) |
||||
{ |
||||
// this is a special formula for the Logitech WingMan Warrior
|
||||
// y=ax^b; where a = 300 and b = 1.3
|
||||
// also x values are in increments of 800 (so this is factored out)
|
||||
// then bounds check result to level out excessively high spin rates
|
||||
fTemp = 300.0 * pow( abs( fAxisValue ) / 800.0, 1.3 ); |
||||
if( fTemp > 14000.0 ) |
||||
fTemp = 14000.0; |
||||
// restore direction information
|
||||
fAxisValue = ( fAxisValue > 0.0 ) ? fTemp : -fTemp; |
||||
} |
||||
} |
||||
|
||||
// convert range from -32768..32767 to -1..1
|
||||
fAxisValue /= 32768.0; |
||||
|
||||
switch( dwAxisMap[i] ) |
||||
{ |
||||
case AxisForward: |
||||
if( ( joy_advanced->value == 0.0 ) && ( in_jlook.state & 1 ) ) |
||||
{ |
||||
// user wants forward control to become look control
|
||||
if( fabs( fAxisValue ) > joy_pitchthreshold->value ) |
||||
{ |
||||
// if mouse invert is on, invert the joystick pitch value
|
||||
// only absolute control support here (joy_advanced is 0)
|
||||
if( m_pitch->value < 0.0 ) |
||||
{ |
||||
//++ BulliT
|
||||
//viewangles[PITCH] -= ( fAxisValue * joy_pitchsensitivity->value ) * aspeed * cl_pitchspeed->value;
|
||||
viewangles[PITCH] -= ( fAxisValue * joy_pitchsensitivity->value ) * aspeed * ag_cl_pitchspeed(); |
||||
//-- Martin Webrant
|
||||
} |
||||
else |
||||
{ |
||||
//++ BulliT
|
||||
//viewangles[PITCH] += ( fAxisValue * joy_pitchsensitivity->value ) * aspeed * cl_pitchspeed->value;
|
||||
viewangles[PITCH] += ( fAxisValue * joy_pitchsensitivity->value ) * aspeed * ag_cl_pitchspeed(); |
||||
//-- Martin Webrant
|
||||
} |
||||
} |
||||
} |
||||
else |
||||
{ |
||||
// user wants forward control to be forward control
|
||||
if( fabs( fAxisValue ) > joy_forwardthreshold->value ) |
||||
{ |
||||
cmd->forwardmove += ( fAxisValue * joy_forwardsensitivity->value ) * speed * cl_forwardspeed->value; |
||||
} |
||||
} |
||||
break; |
||||
case AxisSide: |
||||
if( fabs( fAxisValue ) > joy_sidethreshold->value ) |
||||
{ |
||||
cmd->sidemove += ( fAxisValue * joy_sidesensitivity->value ) * speed * cl_sidespeed->value; |
||||
} |
||||
break; |
||||
case AxisTurn: |
||||
if( ( in_strafe.state & 1 ) || ( lookstrafe->value && ( in_jlook.state & 1 ) ) ) |
||||
{ |
||||
// user wants turn control to become side control
|
||||
if( fabs( fAxisValue ) > joy_sidethreshold->value ) |
||||
{ |
||||
cmd->sidemove -= ( fAxisValue * joy_sidesensitivity->value ) * speed * cl_sidespeed->value; |
||||
} |
||||
} |
||||
else |
||||
{ |
||||
// user wants turn control to be turn control
|
||||
if( fabs( fAxisValue ) > joy_yawthreshold->value ) |
||||
{ |
||||
if( dwControlMap[i] == JOY_ABSOLUTE_AXIS ) |
||||
{ |
||||
viewangles[YAW] += ( fAxisValue * joy_yawsensitivity->value ) * aspeed * ag_cl_yawspeed(); |
||||
//viewangles[YAW] += ( fAxisValue * joy_yawsensitivity->value ) * aspeed * cl_yawspeed->value;
|
||||
} |
||||
else |
||||
{ |
||||
viewangles[YAW] += ( fAxisValue * joy_yawsensitivity->value ) * speed * 180.0; |
||||
} |
||||
} |
||||
} |
||||
break; |
||||
case AxisLook: |
||||
if( in_jlook.state & 1 ) |
||||
{ |
||||
if( fabs( fAxisValue ) > joy_pitchthreshold->value ) |
||||
{ |
||||
// pitch movement detected and pitch movement desired by user
|
||||
if( dwControlMap[i] == JOY_ABSOLUTE_AXIS ) |
||||
{ |
||||
//++ BulliT
|
||||
//viewangles[PITCH] += ( fAxisValue * joy_pitchsensitivity->value ) * aspeed * cl_pitchspeed->value;
|
||||
viewangles[PITCH] += ( fAxisValue * joy_pitchsensitivity->value ) * aspeed * ag_cl_pitchspeed(); |
||||
//-- Martin Webrant
|
||||
} |
||||
else |
||||
{ |
||||
viewangles[PITCH] += ( fAxisValue * joy_pitchsensitivity->value ) * speed * 180.0; |
||||
} |
||||
} |
||||
} |
||||
break; |
||||
default: |
||||
break; |
||||
} |
||||
} |
||||
|
||||
// bounds check pitch
|
||||
//++ BulliT
|
||||
if( viewangles[PITCH] > ag_cl_pitchdown() ) |
||||
viewangles[PITCH] = ag_cl_pitchdown(); |
||||
if( viewangles[PITCH] < -ag_cl_pitchup() ) |
||||
viewangles[PITCH] = -ag_cl_pitchup(); |
||||
/*
|
||||
if( viewangles[PITCH] > cl_pitchdown->value ) |
||||
viewangles[PITCH] = cl_pitchdown->value; |
||||
if( viewangles[PITCH] < -cl_pitchup->value ) |
||||
viewangles[PITCH] = -cl_pitchup->value; |
||||
*/ |
||||
//-- Martin Webrant
|
||||
gEngfuncs.SetViewAngles( (float *)viewangles ); |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_Move |
||||
=========== |
||||
*/ |
||||
void IN_Move( float frametime, usercmd_t *cmd ) |
||||
{ |
||||
if( !iMouseInUse && mouseactive ) |
||||
{ |
||||
IN_MouseMove( frametime, cmd ); |
||||
} |
||||
|
||||
IN_JoyMove( frametime, cmd ); |
||||
} |
||||
|
||||
/*
|
||||
=========== |
||||
IN_Init |
||||
=========== |
||||
*/ |
||||
void IN_Init( void ) |
||||
{ |
||||
m_filter = gEngfuncs.pfnRegisterVariable( "m_filter","0", FCVAR_ARCHIVE ); |
||||
sensitivity = gEngfuncs.pfnRegisterVariable( "sensitivity","3", FCVAR_ARCHIVE ); // user mouse sensitivity setting.
|
||||
|
||||
in_joystick = gEngfuncs.pfnRegisterVariable( "joystick","0", FCVAR_ARCHIVE ); |
||||
joy_name = gEngfuncs.pfnRegisterVariable( "joyname", "joystick", 0 ); |
||||
joy_advanced = gEngfuncs.pfnRegisterVariable( "joyadvanced", "0", 0 ); |
||||
joy_advaxisx = gEngfuncs.pfnRegisterVariable( "joyadvaxisx", "0", 0 ); |
||||
joy_advaxisy = gEngfuncs.pfnRegisterVariable( "joyadvaxisy", "0", 0 ); |
||||
joy_advaxisz = gEngfuncs.pfnRegisterVariable( "joyadvaxisz", "0", 0 ); |
||||
joy_advaxisr = gEngfuncs.pfnRegisterVariable( "joyadvaxisr", "0", 0 ); |
||||
joy_advaxisu = gEngfuncs.pfnRegisterVariable( "joyadvaxisu", "0", 0 ); |
||||
joy_advaxisv = gEngfuncs.pfnRegisterVariable( "joyadvaxisv", "0", 0 ); |
||||
joy_forwardthreshold = gEngfuncs.pfnRegisterVariable( "joyforwardthreshold", "0.15", 0 ); |
||||
joy_sidethreshold = gEngfuncs.pfnRegisterVariable( "joysidethreshold", "0.15", 0 ); |
||||
joy_pitchthreshold = gEngfuncs.pfnRegisterVariable( "joypitchthreshold", "0.15", 0 ); |
||||
joy_yawthreshold = gEngfuncs.pfnRegisterVariable( "joyyawthreshold", "0.15", 0 ); |
||||
joy_forwardsensitivity = gEngfuncs.pfnRegisterVariable( "joyforwardsensitivity", "-1.0", 0 ); |
||||
joy_sidesensitivity = gEngfuncs.pfnRegisterVariable( "joysidesensitivity", "-1.0", 0 ); |
||||
joy_pitchsensitivity = gEngfuncs.pfnRegisterVariable( "joypitchsensitivity", "1.0", 0 ); |
||||
joy_yawsensitivity = gEngfuncs.pfnRegisterVariable( "joyyawsensitivity", "-1.0", 0 ); |
||||
joy_wwhack1 = gEngfuncs.pfnRegisterVariable( "joywwhack1", "0.0", 0 ); |
||||
joy_wwhack2 = gEngfuncs.pfnRegisterVariable( "joywwhack2", "0.0", 0 ); |
||||
|
||||
gEngfuncs.pfnAddCommand ("force_centerview", Force_CenterView_f); |
||||
gEngfuncs.pfnAddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f); |
||||
|
||||
IN_StartupMouse (); |
||||
IN_StartupJoystick (); |
||||
} |
||||
@ -0,0 +1,29 @@
@@ -0,0 +1,29 @@
|
||||
if(WIN32) |
||||
# Windows XP compatible platform toolset. Must be set before project(), |
||||
# otherwise change of CMAKE_*_TOOLSET will take no effect. |
||||
# We get VS version from the generator name because neither MSVC* nor other |
||||
# variables that describe the compiler aren't available before project(). |
||||
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)") |
||||
if(${CMAKE_MATCH_1} LESS 11) |
||||
# Nothing. Older VS does support XP by default. |
||||
elseif(${CMAKE_MATCH_1} EQUAL 11) |
||||
# Visual Studio 11 2012 |
||||
set(CMAKE_GENERATOR_TOOLSET "v110_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAK_VS_PLATFORM_TOOLSET "v110_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
elseif (${CMAKE_MATCH_1} EQUAL 12) |
||||
# Visual Studio 12 2013 |
||||
set(CMAKE_GENERATOR_TOOLSET "v120_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAKE_VS_PLATFORM_TOOLSET "v120_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
elseif (${CMAKE_MATCH_1} EQUAL 14) |
||||
# Visual Studio 14 2015 |
||||
set(CMAKE_GENERATOR_TOOLSET "v140_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAKE_VS_PLATFORM_TOOLSET "v140_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
elseif (${CMAKE_MATCH_1} EQUAL 15) |
||||
# Visual Studio 15 2017 |
||||
set(CMAKE_GENERATOR_TOOLSET "v141_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAKE_VS_PLATFORM_TOOLSET "v141_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
else() |
||||
message(WARNING "WARNING: You maybe building without Windows XP compability. See which toolchain version Visual Studio provides, and say cmake to use it: cmake -G \"Visual Studio XX\" -T \"vXXX_xp\"") |
||||
endif() |
||||
endif() |
||||
endif() |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue