teambeef/rtcwquest
0
0
Fork 0
mirror of https://github.com/DrBeef/RTCWQuest.git synced 2025-04-23 15:33:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure long running haptics stop on death

Browse source 
couple of minor unimportant fixes to do with weapon alignment editor too
This commit is contained in:
Simon 2020-08-04 21:25:53 +01:00
parent d6ba7e70d8
commit ee98743214
4 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Projects/Android/jni/rtcw/src/cgame/cg_view.c
View file

@ -1661,6 +1661,12 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demo
CG_Printf( "cg.clientFrame:%i\n", cg.clientFrame );
}
//Don't allow long running haptics to continue once dead
if ( cg.predictedPlayerState.stats[STAT_HEALTH] <= 0 ) {
trap_Vibrate(0, 0, 0.0);
trap_Vibrate(0, 1, 0.0);
}
DEBUGTIME
}

7
Projects/Android/jni/rtcw/src/cgame/cg_weapons.c
View file

@ -2227,7 +2227,6 @@ static void CG_FlamethrowerFlame( centity_t *cent, vec3_t origin ) {
CG_FireFlameChunks(cent, origin, angles, 1.0, qtrue, 1);
trap_Vibrate(-1, cgVR->right_handed ? 1 : 0, 0.6);
trap_Vibrate(-1, cgVR->right_handed ? 1 : 0, 0.6);
if (cgVR->weapon_stabilised)
{
@ -3560,9 +3559,11 @@ void CG_AddViewWeapon( playerState_t *ps ) {
vec3_t forward, right, up;
AngleVectors(angles, forward, right, up);
VectorMA(origin, 40, forward, endForward);
trace_t trace;
VectorMA(origin, 8192, forward, endForward);
trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SOLID);
VectorSet(ci.color, 1, 0, 0); // Forward is red
CG_RailTrail2(&ci, origin, endForward);
CG_RailTrail2(&ci, origin, trace.endpos);
VectorMA(origin, 20, right, endRight);
VectorSet(ci.color, 0, 1, 0); // right is green

7
Projects/Android/jni/rtcw/src/game/g_weapon.c
View file

@ -696,7 +696,7 @@ float G_GetWeaponSpread( int weapon ) {
// these should be higher since they become erratic if aiming is out
switch ( weapon ) {
case WP_LUGER: return 200;
case WP_SILENCER: return 100;//900; // make silencer very accurate
case WP_SILENCER: return 200;//900; // make silencer as accurate as luger
case WP_COLT: return 600;
case WP_AKIMBO: return 700; //----(SA) added
case WP_VENOM: return 1000;
@ -1964,13 +1964,10 @@ void FireWeapon( gentity_t *ent ) {
aimSpreadScale = 1.0;
}
//Let VR user be the bad shot
aimSpreadScale /= 1.2;
if (gVR->weapon_stabilised)
{
//Stabilised weapon is even more accurate
aimSpreadScale /= 2.0;
aimSpreadScale /= 2.5f;
}

37
assets/weapons_vr.cfg
View file

@ -33,22 +33,23 @@
// put the weapon id at the end of the cvar name, so the knife is vr_weapon_adjustment_1
// Values are: scale,right,up,forward,pitch,yaw,roll
seta vr_weapon_adjustment_20 "0.50,-11.0,12.40,-22.42,0.80,-1.40,0.00"
seta vr_weapon_adjustment_19 "0.50,-9.12,13.72,-20.60,-2.80,-4.60,0.00"
seta vr_weapon_adjustment_14 "0.54,-10.78,14.78,-19.89,0.00,7.20,-8.00"
seta vr_weapon_adjustment_8 "0.54,-9.08,11.38,-6.61,0.00,0.00,0.00"
seta vr_weapon_adjustment_5 "0.55,-8.70,8.91,-16.49,0.00,1.40,0.00"
seta vr_weapon_adjustment_4 "0.50,-8.65,11.80,-1.39,-1.20,-1.80,0.00"
seta vr_weapon_adjustment_22 "0.49,-11.93,14.43,-21.31,0.00,0.00,0.00"
seta vr_weapon_adjustment_13 "0.55,-9.38,10.32,-1.27,0.00,-1.80,0.00"
seta vr_weapon_adjustment_10 "0.54,-8.41,4.83,0.00,0.00,0.00,0.00"
seta vr_weapon_adjustment_9 "0.54,-9.52,4.83,4.39,0.00,0.00,0.00"
seta vr_weapon_adjustment_7 "0.91,-5.53,9.43,1.19,0.00,0.00,0.00"
seta vr_weapon_adjustment_18 "0.50,-8.53,12.52,0.00,-5.20,0.00,0.00"
seta vr_weapon_adjustment_12 "0.64,-7.66,10.35,-8.82,-3.20,0.00,0.00"
seta vr_weapon_adjustment_11 "0.50,-9.60,13.40,-22.42,0.80,-1.40,0.00"
seta vr_weapon_adjustment_6 "0.54,-10.78,14.78,-19.89,0.00,7.20,-8.00"
seta vr_weapon_adjustment_3 "0.60,-8.23,8.95,-9.46,-2.00,0.00,0.00"
seta vr_weapon_adjustment_2 "0.50,-8.99,13.81,-21.90,-5.20,-4.20,0.00"
seta vr_weapon_adjustment_1 "0.60,-5.23,9.24,-10.73,22.60,13.50,29.30"
seta vr_weapon_adjustment_20 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"
seta vr_weapon_adjustment_19 "0.55,-9.13,12.84,-20.25,-5.30,-4.60,0.00"
seta vr_weapon_adjustment_14 "0.55,-12.11,15.20,-21.05,0.20,1.40,0.00"
seta vr_weapon_adjustment_8 "0.75,-9.28,12.23,-6.09,0.00,0.00,0.00"
seta vr_weapon_adjustment_5 "0.65,-8.61,8.82,-16.44,0.20,1.40,0.00"
seta vr_weapon_adjustment_4 "0.53,-9.17,13.42,6.73,0.20,-1.50,5.50"
seta vr_weapon_adjustment_22 "0.65,-10.52,13.71,-20.46,0.20,1.40,0.00"
seta vr_weapon_adjustment_13 "0.55,-9.34,10.40,-2.15,0.20,-1.50,5.50"
seta vr_weapon_adjustment_10 "0.70,-8.28,8.19,-12.26,0.00,0.40,0.00"
seta vr_weapon_adjustment_9 "0.75,-9.52,7.61,-11.47,0.00,0.00,0.00"
seta vr_weapon_adjustment_7 "1.17,-5.62,7.62,-6.15,0.00,0.00,0.00"
seta vr_weapon_adjustment_18 "0.55,-7.88,12.70,-3.87,-4.80,1.50,-3.70"
seta vr_weapon_adjustment_12 "0.75,-7.59,9.30,-12.25,-3.40,0.00,0.00"
seta vr_weapon_adjustment_11 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"
seta vr_weapon_adjustment_6 "0.65,-10.62,12.90,-20.74,0.20,1.40,0.00"
seta vr_weapon_adjustment_3 "0.60,-8.76,11.68,-7.21,-3.40,0.00,3.60"
seta vr_weapon_adjustment_2 "0.55,-9.13,12.84,-20.25,-5.30,-4.60,0.00"
seta vr_weapon_adjustment_1 "0.60,-5.03,7.45,-13.41,0.00,0.00,0.00"