tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Cstrike: Remove usage of Weapons_ViewPunchAngle, as that's calculated 

elsewhere (see weapons_cstrike.c)
This commit is contained in:
Marco Cawthorne 2020-04-07 15:00:11 +02:00
parent a2384fae50
commit 31793440c2
28 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/client/entry.c
View File

@ -605,17 +605,16 @@ CSQC_ConsoleCommand(string sCMD)
tokenize(sCMD);
switch (argv(0)) {
case "dev_sentence":
static CBaseEntity foo;
if (!foo) {
foo = spawn(CBaseEntity);
foo.drawmask = MASK_ENGINE;
setmodel(foo, "models/headcrab.mdl");
}
setorigin(foo, getproperty(VF_ORIGIN));
foo.Sentence(argv(1));
break;
case "dev_sentence":
static CBaseEntity foo;
if (!foo) {
foo = spawn(CBaseEntity);
foo.drawmask = MASK_ENGINE;
setmodel(foo, "sprites/muzzleflash1.spr");
}
setorigin(foo, getproperty(VF_ORIGIN));
foo.Sentence(argv(1));
break;
case "vote":
if (argv(1) == "yes") {
sendevent("VoteY", "");

2
src/client/fx_lensflare.c
View File

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
int trace_surfaceflagsi;
noref int trace_surfaceflagsi;
var vector g_vecLensPos;
var float g_flLensAlpha;

2
src/shared/cstrike/w_ak47.c
View File

@ -142,8 +142,6 @@ w_ak47_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_ak47.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {
case 0:

2
src/shared/cstrike/w_aug.c
View File

@ -142,8 +142,6 @@ w_aug_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_aug.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {
case 0:

2
src/shared/cstrike/w_awp.c
View File

@ -141,8 +141,6 @@ w_awp_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_awp.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {
case 0:

2
src/shared/cstrike/w_deagle.c
View File

@ -137,7 +137,6 @@ w_deagle_primary(void)
pl.deagle_mag--;
TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, 54, [accuracy,accuracy], WEAPON_DEAGLE);
if (self.flags & FL_CROUCHING)
Animation_PlayerTopTemp(ANIM_SHOOT1HAND, 0.45f);
else
@ -146,7 +145,6 @@ w_deagle_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_deagle.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
if (pl.a_ammo1 <= 0) {
Weapons_ViewAnimation(DEAGLE_SHOOT_EMPTY);

2
src/shared/cstrike/w_elites.c
View File

@ -156,8 +156,6 @@ w_elites_primary(void)
pl.a_ammo3 = 1 - pl.a_ammo3;
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 5;
if (pl.a_ammo3) {
if (pl.a_ammo1 <= 0) {

2
src/shared/cstrike/w_fiveseven.c
View File

@ -145,8 +145,6 @@ w_fiveseven_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_fiveseven.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
if (pl.a_ammo1 <= 0) {
Weapons_ViewAnimation(FIVESEVEN_SHOOT_EMPTY);
} else {

1
src/shared/cstrike/w_flashbang.c
View File

@ -94,7 +94,6 @@ w_flashbang_primary(void)
#ifdef CSQC
View_SetMuzzleflash(MUZZLE_RIFLE);
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/cstrike/w_g3sg1.c
View File

@ -140,8 +140,6 @@ w_g3sg1_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_g3sg1.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 2;
switch (r) {
case 0:

1
src/shared/cstrike/w_glock18.c
View File

@ -166,7 +166,6 @@ w_glock18_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_glock18.fire");
}
#endif
Weapons_ViewPunchAngle([-2,0,0]);
if (pl.a_ammo3) {
int r = (float)input_sequence % 2;

1
src/shared/cstrike/w_hegrenade.c
View File

@ -91,7 +91,6 @@ w_hegrenade_primary(void)
#ifdef CSQC
View_SetMuzzleflash(MUZZLE_RIFLE);
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {

1
src/shared/cstrike/w_knife.c
View File

@ -94,7 +94,6 @@ w_knife_primary(void)
#ifdef CSQC
View_SetMuzzleflash(MUZZLE_RIFLE);
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/cstrike/w_m3.c
View File

@ -150,8 +150,6 @@ w_m3_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_m3.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 2;
switch (r) {
case 0:

2
src/shared/cstrike/w_m4a1.c
View File

@ -170,7 +170,6 @@ w_m4a1_primary(void)
else
Animation_PlayerTopTemp(ANIM_CR_SHOOT1HAND, 0.45f);
#endif
Weapons_ViewPunchAngle([-2,0,0]);
/* this stuff is predicted */
int r = (float)input_sequence % 3;
@ -199,7 +198,6 @@ w_m4a1_primary(void)
break;
}
}
Weapons_ViewPunchAngle([-2,0,0]);
pl.w_attack_next = 0.0875f;
pl.w_idle_next = pl.w_attack_next;

2
src/shared/cstrike/w_mac10.c
View File

@ -141,8 +141,6 @@ w_mac10_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_mac10.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {
case 0:

1
src/shared/cstrike/w_mp5.c
View File

@ -145,7 +145,6 @@ w_mp5_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_mp5.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/cstrike/w_p228.c
View File

@ -149,8 +149,6 @@ w_p228_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_p228.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
if (pl.a_ammo1 <= 0) {
Weapons_ViewAnimation(P228_SHOOT_EMPTY);
} else {

1
src/shared/cstrike/w_p90.c
View File

@ -141,7 +141,6 @@ w_p90_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_p90.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/cstrike/w_para.c
View File

@ -141,8 +141,6 @@ w_para_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_para.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 2;
switch (r) {
case 0:

2
src/shared/cstrike/w_scout.c
View File

@ -141,8 +141,6 @@ w_scout_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_scout.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 2;
switch (r) {
case 0:

2
src/shared/cstrike/w_sg550.c
View File

@ -141,8 +141,6 @@ w_sg550_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_sg550.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 2;
switch (r) {
case 0:

2
src/shared/cstrike/w_sg552.c
View File

@ -142,8 +142,6 @@ w_sg552_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_sg552.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {
case 0:

1
src/shared/cstrike/w_smokegrenade.c
View File

@ -94,7 +94,6 @@ w_smokegrenade_primary(void)
#ifdef CSQC
View_SetMuzzleflash(MUZZLE_RIFLE);
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {

1
src/shared/cstrike/w_tmp.c
View File

@ -141,7 +141,6 @@ w_tmp_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_tmp.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {

2
src/shared/cstrike/w_ump45.c
View File

@ -142,8 +142,6 @@ w_ump45_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_ump45.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {
case 0:

1
src/shared/cstrike/w_usp45.c
View File

@ -175,7 +175,6 @@ w_usp45_primary(void)
else
Animation_PlayerTopTemp(ANIM_CR_SHOOT1HAND, 0.45f);
#endif
Weapons_ViewPunchAngle([-2,0,0]);
/* this stuff is predicted */
int r = (float)input_sequence % 3;

2
src/shared/cstrike/w_xm1014.c
View File

@ -152,8 +152,6 @@ w_xm1014_primary(void)
Sound_Play(pl, CHAN_WEAPON, "weapon_xm1014.fire");
#endif
Weapons_ViewPunchAngle([-2,0,0]);
int r = (float)input_sequence % 3;
switch (r) {
case 0: