diff --git a/src/shared/player.h b/src/shared/player.h index 2ce2921..5590217 100644 --- a/src/shared/player.h +++ b/src/shared/player.h @@ -247,11 +247,9 @@ class player:base_player //vector vViewAngleOffsetTotalChange; PREDICTED_VECTOR(vViewAngleOffsetTotalChange); +#ifdef SERVER vector vViewAngleOffsetTotalChangeAlt; - - vector receivedViewAngles; - vector oldViewAngles; - +#endif diff --git a/src/shared/player.qc b/src/shared/player.qc index b274200..ef27cf7 100644 --- a/src/shared/player.qc +++ b/src/shared/player.qc @@ -50,7 +50,26 @@ enumflags }; -// player class wuz here + + +#ifdef SERVER +void CSEv_ViewAnglesR_fff(float arg_x, float arg_y, float arg_z){ + player pl = (player)self; + pl.v_angle.x = arg_x; + pl.v_angle.y = arg_y; + pl.v_angle.z = arg_z; + pl.vViewAngleOffsetTotalChangeAlt = [0,0,0]; +} +void CSEv_ViewOffsetR_fff(float arg_x, float arg_y, float arg_z){ + player pl = (player)self; + pl.vViewAngleOffsetTotalChangeAlt.x = arg_x; + pl.vViewAngleOffsetTotalChangeAlt.y = arg_y; + pl.vViewAngleOffsetTotalChangeAlt.z = arg_z; + //pl.vViewAngleOffsetTotalChangeAlt = [0,0,0]; +} +#endif + + @@ -229,14 +248,6 @@ player::ReceiveEntity(float new, float fl) //flKarateBlockCooldown iMeleeCycler = readbyte(); - /* - vViewAngleOffsetTargetDir[0] = readcoord(); - vViewAngleOffsetTargetDir[1] = readcoord(); - vViewAngleOffsetTargetDir[2] = readcoord(); - */ - - - vViewAngleOffsetTotalChange[0] = readcoord(); vViewAngleOffsetTotalChange[1] = readcoord(); @@ -249,7 +260,6 @@ player::ReceiveEntity(float new, float fl) vViewAngleOffsetTotalChange = [0,0,0]; - fAccuracyKickback = readfloat(); fAccuracyKickbackStartCooldown = readfloat(); @@ -266,13 +276,11 @@ player::ReceiveEntity(float new, float fl) fKarateStamina = readfloat(); - shotgunReloadIndex = readbyte(); shotgunAddAmmoTime = readfloat(); shotgunAddAmmoSoundTime = readfloat(); - ary_myWeapons_softMax = readbyte(); @@ -322,11 +330,6 @@ player::ReceiveEntity(float new, float fl) ///////////////////////////////////////////////////// - // safe? - receivedViewAngles = this.v_angle; - - - // TODO! Check for any change in ammo values like this: // Or maybe not, looks like Weapons_AmmoUpdate isn't needed for FreeTS, HUD draw methods @@ -380,8 +383,6 @@ player::PredictPreFrame(void) { //printfline("---PREDICT PRE FRAME"); - //sendevent("ViewOffsetR", "fff", vViewAngleOffsetTotalChange[0], vViewAngleOffsetTotalChange[1], vViewAngleOffsetTotalChange[2]); - /* the generic client attributes */ base_player::PredictPreFrame(); @@ -729,22 +730,6 @@ player::EvaluateEntity(void) } - - -void CSEv_ViewAnglesR_fff(float arg_x, float arg_y, float arg_z){ - player pl = (player)self; - pl.v_angle.x = arg_x; - pl.v_angle.y = arg_y; - pl.v_angle.z = arg_z; - pl.vViewAngleOffsetTotalChangeAlt = [0,0,0]; -} -void CSEv_ViewOffsetR_fff(float arg_x, float arg_y, float arg_z){ - player pl = (player)self; - pl.vViewAngleOffsetTotalChangeAlt.x = arg_x; - pl.vViewAngleOffsetTotalChangeAlt.y = arg_y; - pl.vViewAngleOffsetTotalChangeAlt.z = arg_z; - //pl.vViewAngleOffsetTotalChangeAlt = [0,0,0]; -} /* @@ -1218,19 +1203,19 @@ player::updateTimers(void){ } } - vector finalChange = flViewChange * vViewChangeDir; this.vViewAngleOffsetTotalChange += finalChange; - this.vViewAngleOffsetTotalChangeAlt += finalChange; // test? main one - #ifndef CLIENT +#ifndef CLIENT GET_MY_VIEW_ANGLES = GET_MY_VIEW_ANGLES + finalChange; - #else - - #endif +#else + // (this might be pointless?) + this.vViewAngleOffsetTotalChangeAlt += finalChange; +#endif + }//updateTimers @@ -1243,23 +1228,6 @@ player::updateTimers(void){ void player::addViewAngleOffset(float arg_ang, float arg_len){ - /* - #ifdef CLIENT - - printfline("--- %d - %d", input_sequence, tempQueue2[input_sequence % 512]); - - if(!tempQueue2[input_sequence % 512]){ - return; - }else{ - tempQueue2[input_sequence % 512] = FALSE; - } - - printfline("!!! addViewAngleOffset !!! %d", input_sequence); - #endif - */ - - - if(flViewAngleOffsetTarget == 0){ // easy, replace completely flViewAngleOffsetTarget = arg_len;