FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'opfor' into opforfixed

This commit is contained in:
Andrey Akhmichin 2022-08-23 16:57:46 +05:00
parent c12f8e5207 0ef24db3f8
commit bf7fb2ab12
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cl_dll/hl/hl_weapons.cpp
View File

@ -1012,13 +1012,7 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
body = 1;
if (pWeapon == &g_M249) {
if (g_M249.m_iVisibleClip == 0) {
body = 8;
} else if (g_M249.m_iVisibleClip > 0 && g_M249.m_iVisibleClip < 8) {
body = 9 - g_M249.m_iVisibleClip;
} else {
body = 0;
}
body = g_M249.BodyFromClip();
}
// Force a fixed anim down to viewmodel

5
cl_dll/input_mouse.h
View File

@ -1,4 +1,7 @@
#pragma once
#include "build.h"
#if !defined(INPUT_MOUSE_H)
#define INPUT_MOUSE_H
#include "cl_dll.h"
@ -45,7 +48,7 @@ protected:
};
// No need for goldsource input support on the platforms that are not supported by GoldSource.
#if GOLDSOURCE_SUPPORT && (_WIN32 || __linux__ || __APPLE__) && (__i386 || _M_IX86)
#if GOLDSOURCE_SUPPORT && ( XASH_WIN32 || ( XASH_LINUX && !XASH_ANDROID ) || XASH_APPLE ) && XASH_X86
#define SUPPORT_GOLDSOURCE_INPUT 1
#if _WIN32

20
dlls/gearbox/m249.cpp
View File

@ -203,7 +203,7 @@ void CM249::PrimaryAttack()
if (m_flNextPrimaryAttack < UTIL_WeaponTimeBase())
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.1;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat(m_pPlayer->random_seed, 10, 15);
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.2f;
}
@ -282,13 +282,23 @@ void CM249::UpdateTape()
}
void CM249::UpdateTape(int clip)
{
pev->body = BodyFromClip(clip);
}
int CM249::BodyFromClip()
{
return BodyFromClip(m_iVisibleClip);
}
int CM249::BodyFromClip(int clip)
{
if (clip == 0) {
pev->body = 8;
} else if (m_iClip > 0 && clip < 8) {
pev->body = 9 - clip;
return 8;
} else if (clip > 0 && clip < 8) {
return 9 - clip;
} else {
pev->body = 0;
return 0;
}
}

2
dlls/weapons.h
View File

@ -1266,6 +1266,8 @@ public:
void UpdateTape();
void UpdateTape(int clip);
int BodyFromClip();
int BodyFromClip(int clip);
int m_iVisibleClip;