fn/cstrike
fn/cstrike
3
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Client: Replace all calls from View_EjectShell to View_EjectShellAttachment

Browse source
This commit is contained in:
Marco Cawthorne 2021-03-17 14:36:39 +01:00
parent 29009ffbb9
commit 14c23b521f
19 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/client/defs.h
View file

@ -60,8 +60,12 @@ struct
entity m_eViewModel;
entity m_eMuzzleflash;
int m_iVMBones;
int m_iVMEjectBone;
/* viewmodel shell ejection */
float m_fEjectModel;
vector m_vecEjectPos;
vector m_vecEjectVel;
int m_iLastWeapon;
int m_iOldWeapon;
float m_flBobTime;

2
src/shared/w_ak47.qc
View file

@ -126,7 +126,7 @@ w_ak47_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/w_aug.qc
View file

@ -126,7 +126,7 @@ w_aug_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/w_deagle.qc
View file

@ -129,7 +129,7 @@ w_deagle_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
if (pl.deagle_mag <= 0) {
Weapons_ViewAnimation(DEAGLE_SHOOT_EMPTY);

4
src/shared/w_elites.qc
View file

@ -144,7 +144,7 @@ w_elites_primary(void)
int r = (float)input_sequence % 5;
if (pl.mode_temp) {
View_EjectShell(SHELL_PISTOL, 1);
View_EjectShellAttachment(SHELL_PISTOL, 1, [0, -80, 100]);
if (pl.elites_mag <= 0) {
Weapons_ViewAnimation(ELITES_SHOOT_LEFTLAST);
@ -168,7 +168,7 @@ w_elites_primary(void)
}
}
} else {
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, 80, 100]);
if (pl.elites_mag <= 0) {
Weapons_ViewAnimation(ELITES_SHOOT_RIGHTLAST);
} else {

2
src/shared/w_fiveseven.qc
View file

@ -129,7 +129,7 @@ w_fiveseven_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
if (pl.fiveseven_mag <= 0) {
Weapons_ViewAnimation(FIVESEVEN_SHOOT_EMPTY);

2
src/shared/w_g3sg1.qc
View file

@ -124,7 +124,7 @@ w_g3sg1_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
int r = (float)input_sequence % 2;
switch (r) {

2
src/shared/w_glock18.qc
View file

@ -159,7 +159,7 @@ w_glock18_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
#else
if (pl.flags & FL_CROUCHING)

2
src/shared/w_m4a1.qc
View file

@ -146,7 +146,7 @@ w_m4a1_primary(void)
} else {
View_SetMuzzleflash(MUZZLE_RIFLE);
}
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
/* this stuff is predicted */
int r = (float)input_sequence % 3;

2
src/shared/w_mac10.qc
View file

@ -125,7 +125,7 @@ w_mac10_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/w_mp5.qc
View file

@ -125,7 +125,7 @@ w_mp5_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/w_p228.qc
View file

@ -129,7 +129,7 @@ w_p228_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
if (pl.p228_mag <= 0) {
Weapons_ViewAnimation(P228_SHOOT_EMPTY);

2
src/shared/w_p90.qc
View file

@ -125,7 +125,7 @@ w_p90_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/w_para.qc
View file

@ -124,7 +124,7 @@ w_para_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
int r = (float)input_sequence % 2;
switch (r) {

2
src/shared/w_sg550.qc
View file

@ -124,7 +124,7 @@ w_sg550_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
int r = (float)input_sequence % 2;
switch (r) {

2
src/shared/w_sg552.qc
View file

@ -125,7 +125,7 @@ w_sg552_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_RIFLE, 0);
View_EjectShellAttachment(SHELL_RIFLE, 0, [0, -80, 100]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/w_tmp.qc
View file

@ -127,7 +127,7 @@ w_tmp_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/w_ump45.qc
View file

@ -127,7 +127,7 @@ w_ump45_primary(void)
#ifdef CLIENT
View_SetMuzzleflash(MUZZLE_RIFLE);
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
#else
TraceAttack_SetPenetrationPower(0);
TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, 30, [accuracy,accuracy], WEAPON_UMP45);

2
src/shared/w_usp45.qc
View file

@ -155,7 +155,7 @@ w_usp45_primary(void)
View_SetMuzzleflash(MUZZLE_SMALL);
}
View_EjectShell(SHELL_PISTOL, 0);
View_EjectShellAttachment(SHELL_PISTOL, 0, [0, -80, 100]);
#else
/* Different sounds without silencer */
if (pl.mode_usp45 == 1) {