teambeef/doom3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Doom3Quest.git synced 2024-11-10 06:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix soul cube def file

Browse source 
few tweaks to weapon stuff too
This commit is contained in:
Simon 2020-09-19 11:23:28 +01:00
parent c6d666aba0
commit 8e382b4f64
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Projects/Android/jni/d3es-multithread-master/neo/game/Player.cpp
View file

@ -3553,6 +3553,9 @@ void idPlayer::NextBestWeapon( void ) {
if ( !spawnArgs.GetBool( va( "weapon%d_best", w ) ) ) {
continue;
}
if (w == WEAPON_FLASHLIGHT) {
continue;
}
break;
}
idealWeapon = w;
@ -3598,6 +3601,10 @@ void idPlayer::NextWeapon( void ) {
if ( ( inventory.weapons & ( 1 << w ) ) == 0 ) {
continue;
}
if (w == WEAPON_FLASHLIGHT) {
// Don't let user cycle through flashlight, they have to get it from the holster
continue;
}
if ( inventory.HasAmmo( weap ) ) {
break;
}
@ -3648,6 +3655,10 @@ void idPlayer::PrevWeapon( void ) {
if ( ( inventory.weapons & ( 1 << w ) ) == 0 ) {
continue;
}
if (w == WEAPON_FLASHLIGHT) {
// Don't let user cycle through flashlight, they have to get it from the holster
continue;
}
if ( inventory.HasAmmo( weap ) ) {
break;
}
@ -6334,15 +6345,17 @@ void idPlayer::Think( void ) {
if (pVRClientInfo != nullptr)
{
if (inventory.weapons > 1) {
if (inventory.weapons > WEAPON_FISTS) {
pVRClientInfo->weaponid = currentWeapon;
}
else {
pVRClientInfo->weaponid = -1;
}
cvarSystem->SetCVarBool("vr_weapon_stabilised", pVRClientInfo->weapon_stabilised);
pVRClientInfo->velocitytriggered = (currentWeapon == 11 || // 11 is flashlight
currentWeapon == 10); // 10 is chainsaw
pVRClientInfo->velocitytriggered = (
currentWeapon == WEAPON_FISTS ||
currentWeapon == WEAPON_FLASHLIGHT ||
currentWeapon == WEAPON_CHAINSAW);
}
// clear the ik before we do anything else so the skeleton doesn't get updated twice
@ -7246,7 +7259,8 @@ void idPlayer::CalculateViewWeaponPos( bool adjusted, idVec3 &origin, idMat3 &ax
const idVec3 &viewOrigin = firstPersonViewOrigin;
const idMat3 &viewAxis = firstPersonViewAxis;
if (pVRClientInfo)
if (pVRClientInfo &&
currentWeapon != weapon_pda)
{
if (adjusted) {
angles.pitch = pVRClientInfo->weaponangles[PITCH];
@ -7274,7 +7288,7 @@ void idPlayer::CalculateViewWeaponPos( bool adjusted, idVec3 &origin, idMat3 &ax
gunpos *= cvarSystem->GetCVarFloat( "vr_worldscale" );
if (currentWeapon == 11) // Flashlight adjustment
if (currentWeapon == WEAPON_FLASHLIGHT) // Flashlight adjustment
{
idVec3 gunOfs( -14, 9, 20 );
origin = viewOrigin + gunpos + (gunOfs * axis);

4
Projects/Android/jni/d3es-multithread-master/neo/game/Player.h
View file

@ -66,6 +66,10 @@ const int FOCUS_GUI_TIME = 500;
const int MAX_WEAPONS = 16;
const int WEAPON_FISTS = 1;
const int WEAPON_CHAINSAW = 10;
const int WEAPON_FLASHLIGHT = 11;
const int DEAD_HEARTRATE = 0; // fall to as you die
const int LOWHEALTH_HEARTRATE_ADJ = 20; //
const int DYING_HEARTRATE = 30; // used for volumen calc when dying/dead

BIN
assets/pak099.pk4
View file

Binary file not shown.