dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2025-04-04 16:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Player.cpp

Browse source 
Added the telishield key for the player def and script to use.  This key disables the player taking damage and can be checked in the script for stuff like changing skins, etc.

cross hair fix:  pm_modelview .  This cvar changes the origin of the playerview to a joint for the crosshairs.  This is set to a joint close to the player weapons to prevent the trace line used for cross hairs stopping too early when shooting around corners. 
Additionally pm_modelview's axis is now the renderview axis and not the joint other wise the thirdperson crosshair is displayed in wrong directions.
pm_modelview is now on by default.
This commit is contained in:
revility 2018-09-21 14:13:35 -04:00 committed by Daniel Gibson
parent d1093579ff
commit 864fa1fd3d
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
game/Player.cpp
View file

@ -1199,6 +1199,7 @@ idPlayer::idPlayer() {
noclip = false;
godmode = false;
telishield = 0; //added Revility 2018 for shield spells, player taking no damage
//ivan start
animMoveNoGravity = false;
animMoveType = ANIMMOVE_NONE;
@ -8211,15 +8212,16 @@ void idPlayer::CalcDamagePoints( idEntity *inflictor, idEntity *attacker, const
}
}
/*
////REVILITY START. THIS REDUCES DAMAGE WHILE STAMINA IS RUNNING
if ( (usercmd.buttons & BUTTON_RUN) && stamina > 0 ) {
////REVILITY 2018 start. No damage while the telishield key is greater than 0
telishield = spawnArgs.GetInt( "telishield" );
if ( telishield > 0 ) {
damage = 0;
//damage *= damageDef->GetFloat( "selfDamageScale", "0.5" );
//the above line is useful for reducing a specific % of damage.
}
////REVILITY END
*/
// inform the attacker that they hit someone
attacker->DamageFeedback( this, inflictor, damage );
@ -8885,12 +8887,12 @@ void idPlayer::CalculateFirstPersonView( void ) {
idAngles ang;
ang = viewBobAngles + playerView.AngleOffset();
ang.yaw += viewAxis[ 0 ].ToYaw();
ang.yaw += viewAxis[ 180 ].ToYaw();
jointHandle_t joint = animator.GetJointHandle( "camera" );
jointHandle_t joint = animator.GetJointHandle( "SHOTGUN_ATTACHER" ); //now set to an actual joint on the player model Revility 2018. This moves the line to draw the crosshair closer to the weapon.
animator.GetJointTransform( joint, gameLocal.time, origin, axis );
firstPersonViewOrigin = ( origin + modelOffset ) * ( viewAxis * physicsObj.GetGravityAxis() ) + physicsObj.GetOrigin() + viewBob;
firstPersonViewAxis = axis * ang.ToMat3() * physicsObj.GetGravityAxis();
firstPersonViewAxis = renderView->viewaxis; //changed to the axis of the camera and not the bone. Revility 2018
} else {
// offset for local bobbing and kicks
GetViewPos( firstPersonViewOrigin, firstPersonViewAxis );