diff --git a/src/gs-entbase/client/baseentity.cpp b/src/gs-entbase/client/baseentity.cpp index 8135b7d1..5cad4fe6 100644 --- a/src/gs-entbase/client/baseentity.cpp +++ b/src/gs-entbase/client/baseentity.cpp @@ -150,7 +150,10 @@ CBaseEntity::predraw(void) /* mouth flapping action */ bonecontrol5 = getchannellevel(this, CHAN_VOICE) * 20; m_flBaseTime = frame1time; - frame1time += clframetime; + + if (serverkeyfloat(SERVERKEY_PAUSESTATE) != 1) + frame1time += frametime; + ProcessWordQue(); processmodelevents(modelindex, frame, m_flBaseTime, diff --git a/src/gs-entbase/server/basemonster.cpp b/src/gs-entbase/server/basemonster.cpp index 82ded809..bc7a17a8 100644 --- a/src/gs-entbase/server/basemonster.cpp +++ b/src/gs-entbase/server/basemonster.cpp @@ -502,8 +502,6 @@ CBaseMonster::NewRoute(vector destination) vector vecDest = p.m_pRoute[i].m_vecDest; tracebox(p.origin, p.mins, p.maxs, vecDest, TRUE, p); - print(sprintf("%v %v\n", p.origin, vecDest)); - if (trace_fraction == 1.0) { p.m_iCurNode = i; break; diff --git a/src/gs-entbase/server/func_tankmortar.cpp b/src/gs-entbase/server/func_tankmortar.cpp index c7669716..7ba0a27d 100644 --- a/src/gs-entbase/server/func_tankmortar.cpp +++ b/src/gs-entbase/server/func_tankmortar.cpp @@ -107,6 +107,7 @@ func_tankmortar::SpriteSmoke(vector org) smoke.think = Die; smoke.nextthink = time + 0.1f; smoke.scale = m_flSpriteScale; + smoke.effects = EF_FLAG2; } void @@ -125,6 +126,7 @@ func_tankmortar::SpriteFlash(vector org) smoke.think = Die; smoke.nextthink = time + 0.1f; smoke.scale = m_flSpriteScale; + smoke.effects = EF_FLAG2; } void diff --git a/src/server/scihunt/input.c b/src/server/scihunt/input.c index 32ed798c..13149486 100644 --- a/src/server/scihunt/input.c +++ b/src/server/scihunt/input.c @@ -56,10 +56,9 @@ void Game_Input(void) } if (self.impulse == 103) { - // Respawn all the entities for (entity a = world; (a = find(a, classname, "func_breakable"));) { func_breakable caw = (func_breakable)a; - caw.Death(0); + caw.Death(); } bprint(PRINT_HIGH, "BREAK EVERYTHING!\n"); } diff --git a/src/server/scihunt/monster_scientist.cpp b/src/server/scihunt/monster_scientist.cpp index 35fd51fb..8f75ef68 100644 --- a/src/server/scihunt/monster_scientist.cpp +++ b/src/server/scihunt/monster_scientist.cpp @@ -616,6 +616,7 @@ void monster_scientist::Death(void) flags &= ~FL_MONSTER; SetFrame(SCIA_DIE_SIMPLE + floor(random(0, 6))); + SetSize(VEC_HULL_MIN + [0,0,36], VEC_HULL_MAX); /* corpse health */ SetMovetype(MOVETYPE_NONE); diff --git a/src/server/valve/monster_barney.cpp b/src/server/valve/monster_barney.cpp index 5acadf9e..a6d99e18 100644 --- a/src/server/valve/monster_barney.cpp +++ b/src/server/valve/monster_barney.cpp @@ -109,7 +109,7 @@ monster_barney::AttackRanged(void) /* functional */ v_angle = vectoangles(m_eEnemy.origin - origin); - TraceAttack_FireBullets(1, origin + [0,0,16], 8, [0.01,0,01], 2); + TraceAttack_FireBullets(1, origin + [0,0,16], 8, [0.01,0.01], 2); Sound_Play(this, CHAN_WEAPON, "weapon_glock.fire"); return TRUE; } diff --git a/src/server/valve/monster_human_grunt.cpp b/src/server/valve/monster_human_grunt.cpp index 960e75ae..d1d471f4 100644 --- a/src/server/valve/monster_human_grunt.cpp +++ b/src/server/valve/monster_human_grunt.cpp @@ -196,7 +196,7 @@ monster_human_grunt::AttackRanged(void) /* functional */ v_angle = vectoangles(m_eEnemy.origin - origin); - TraceAttack_FireBullets(1, origin + [0,0,16], 8, [0.01,0,01], 2); + TraceAttack_FireBullets(1, origin + [0,0,16], 8, [0.01,0.01], 2); return TRUE; } diff --git a/src/shared/hunger/w_taurus.c b/src/shared/hunger/w_taurus.c index 92965fc3..093284c8 100644 --- a/src/shared/hunger/w_taurus.c +++ b/src/shared/hunger/w_taurus.c @@ -136,7 +136,7 @@ w_taurus_primary(void) } #else pl.taurus_mag--; - TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, 12, [0.01,0,01], WEAPON_TAURUS); + TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, 12, [0.01,0.01], WEAPON_TAURUS); Sound_Play(pl, CHAN_WEAPON, "weapon_taurus.fire"); if (self.flags & FL_CROUCHING) diff --git a/src/shared/valve/w_glock.c b/src/shared/valve/w_glock.c index c9c5680b..fb4d9b53 100644 --- a/src/shared/valve/w_glock.c +++ b/src/shared/valve/w_glock.c @@ -154,7 +154,7 @@ w_glock_primary(void) } #else pl.glock_mag--; - TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet"), [0.01,0,01], WEAPON_GLOCK); + TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet"), [0.01,0.01], WEAPON_GLOCK); Sound_Play(pl, CHAN_WEAPON, "weapon_glock.fire"); if (self.flags & FL_CROUCHING)