From bcf9e2e758e1ac472d5028f54ebc06d8da4ab4a0 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Tue, 1 Feb 2022 13:37:21 -0800 Subject: [PATCH] Cleaning up some warnings. --- base/src/shared/fx_corpse.qc | 4 ++-- src/client/entry.qc | 19 ++----------------- src/client/include.src | 1 + src/client/shake.qc | 12 ++++++++++++ src/gs-entbase/server/momentary_rot_button.qc | 2 +- src/gs-entbase/server/prop_dynamic.qc | 4 +++- src/gs-entbase/shared/NSEntity.qc | 3 +++ src/gs-entbase/shared/NSMonster.qc | 2 +- src/gs-entbase/shared/NSSurfacePropEntity.qc | 4 ++-- src/menu-fn/m_customize.qc | 2 +- src/platform/achievements.qc | 3 +++ src/server/gamerules.qc | 4 ++-- src/shared/sound.qc | 2 -- src/vgui/ui.qc | 2 +- 14 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 src/client/shake.qc diff --git a/base/src/shared/fx_corpse.qc b/base/src/shared/fx_corpse.qc index 38746f17..528b48e2 100644 --- a/base/src/shared/fx_corpse.qc +++ b/base/src/shared/fx_corpse.qc @@ -47,7 +47,7 @@ FX_Corpse_Next(void) entity FX_Corpse_Spawn(player pl, float anim) { - NSRenderableEntity body_next = FX_Corpse_Next(); + NSRenderableEntity body_next = (NSRenderableEntity)FX_Corpse_Next(); setorigin(body_next, pl.origin + [0,0,32]); setmodel(body_next, pl.model); setsize(body_next, VEC_HULL_MIN, VEC_HULL_MAX); @@ -60,4 +60,4 @@ FX_Corpse_Spawn(player pl, float anim) body_next.SetFrame(anim); return (entity)body_next; } -#endif \ No newline at end of file +#endif diff --git a/src/client/entry.qc b/src/client/entry.qc index 581ffbf8..69d226fd 100644 --- a/src/client/entry.qc +++ b/src/client/entry.qc @@ -312,14 +312,7 @@ CSQC_UpdateView(float w, float h, float focus) } } - if (pSeat->m_flShakeDuration > 0.0) { - vector vecShake = [0,0,0]; - vecShake[0] += random() * 3; - vecShake[1] += random() * 3; - vecShake[2] += random() * 3; - pl.punchangle += (vecShake * pSeat->m_flShakeAmp) * (pSeat->m_flShakeDuration / pSeat->m_flShakeTime); - pSeat->m_flShakeDuration -= clframetime; - } + Shake_Update(pl); setproperty(VF_ANGLES, view_angles + pl.punchangle); } else if (getplayerkeyvalue(pl.entnum-1, "*spec") == "1") { spec = (spectator)self; @@ -353,15 +346,7 @@ CSQC_UpdateView(float w, float h, float focus) } } else if (getplayerkeyvalue(pl.entnum-1, "*spec") == "2") { setproperty(VF_ORIGIN, pSeat->m_vecPredictedOrigin); - - if (pSeat->m_flShakeDuration > 0.0) { - vector vecShake = [0,0,0]; - vecShake[0] += random() * 3; - vecShake[1] += random() * 3; - vecShake[2] += random() * 3; - pl.punchangle += (vecShake * pSeat->m_flShakeAmp) * (pSeat->m_flShakeDuration / pSeat->m_flShakeTime); - pSeat->m_flShakeDuration -= clframetime; - } + Shake_Update(pl); setproperty(VF_ANGLES, view_angles + pl.punchangle); } diff --git a/src/client/include.src b/src/client/include.src index 698d558a..b1552909 100644 --- a/src/client/include.src +++ b/src/client/include.src @@ -22,5 +22,6 @@ vgui.qc way.qc efx.qc detailtex.qc +shake.qc entry.qc #endlist diff --git a/src/client/shake.qc b/src/client/shake.qc new file mode 100644 index 00000000..ab86ff3b --- /dev/null +++ b/src/client/shake.qc @@ -0,0 +1,12 @@ +void +Shake_Update(player pl) +{ + if (pSeat->m_flShakeDuration > 0.0) { + vector vecShake = [0,0,0]; + vecShake[0] += random() * 3; + vecShake[1] += random() * 3; + vecShake[2] += random() * 3; + pl.punchangle += (vecShake * pSeat->m_flShakeAmp) * (pSeat->m_flShakeDuration / pSeat->m_flShakeTime); + pSeat->m_flShakeDuration -= clframetime; + } +} diff --git a/src/gs-entbase/server/momentary_rot_button.qc b/src/gs-entbase/server/momentary_rot_button.qc index c1fddef5..42871699 100644 --- a/src/gs-entbase/server/momentary_rot_button.qc +++ b/src/gs-entbase/server/momentary_rot_button.qc @@ -103,7 +103,7 @@ momentary_rot_button::MovementStateChanged(void) vector vecAngleDifference; float flTravelLength; float flTravelTime; - float flSpeed; + float flSpeed = 0; switch (m_iMoveState) { case MOMENTARY_IDLE: diff --git a/src/gs-entbase/server/prop_dynamic.qc b/src/gs-entbase/server/prop_dynamic.qc index 657463bd..5523df6e 100644 --- a/src/gs-entbase/server/prop_dynamic.qc +++ b/src/gs-entbase/server/prop_dynamic.qc @@ -43,10 +43,12 @@ prop_dynamic::Respawn(void) { super::Respawn(); SetModel(GetSpawnModel()); - UpdateBounds(); + //UpdateBounds(); if (spawnflags & PRPDYN_NONSOLID) SetSolid(SOLID_NOT); + + SetSolid(SOLID_BBOX); } void diff --git a/src/gs-entbase/shared/NSEntity.qc b/src/gs-entbase/shared/NSEntity.qc index b170bb56..de4132b7 100644 --- a/src/gs-entbase/shared/NSEntity.qc +++ b/src/gs-entbase/shared/NSEntity.qc @@ -289,6 +289,9 @@ NSEntity::UpdateBounds(void) vector newMins, newMaxs; float flScale = 1.0f; + newMins = m_vecMins; + newMaxs = m_vecMaxs; + /* avoid useless computation */ if (angles != [0,0,0]) { /* adjust bbox according to rotation */ diff --git a/src/gs-entbase/shared/NSMonster.qc b/src/gs-entbase/shared/NSMonster.qc index 74aaf9e5..e7266f47 100644 --- a/src/gs-entbase/shared/NSMonster.qc +++ b/src/gs-entbase/shared/NSMonster.qc @@ -368,7 +368,7 @@ NSMonster::FreeStateMoved(void) dprint("NSMonster::FreeStateMoved\n"); new_origin = gettaginfo(this, 1); SetOrigin(new_origin); - droptofloor(this); + droptofloor(); FreeState(); } diff --git a/src/gs-entbase/shared/NSSurfacePropEntity.qc b/src/gs-entbase/shared/NSSurfacePropEntity.qc index fd12b40e..dd1fe807 100644 --- a/src/gs-entbase/shared/NSSurfacePropEntity.qc +++ b/src/gs-entbase/shared/NSSurfacePropEntity.qc @@ -220,7 +220,7 @@ NSSurfacePropEntity::Death(void) if (GetPropData(PROPINFO_SKIN) != 0) { SetSkin(GetPropData(PROPINFO_SKIN)); - } else if (GetPropData(PROPINFO_BREAKMODEL)) { + } else if (GetPropData(PROPINFO_BREAKMODEL) != __NULL__) { string gibeffect = GetPropData(PROPINFO_BREAKMODEL); int breakcount = GetPropData(PROPINFO_BREAKCOUNT); BreakModel_Spawn(absmin, absmax, [0,0,0], 100, breakcount, gibeffect); @@ -280,7 +280,7 @@ NSSurfacePropEntity::predraw(void) m_flBurnNext = time + 0.1f; } } - super::predraw(); + return super::predraw(); } #endif diff --git a/src/menu-fn/m_customize.qc b/src/menu-fn/m_customize.qc index e8d8e30b..9659168f 100644 --- a/src/menu-fn/m_customize.qc +++ b/src/menu-fn/m_customize.qc @@ -341,7 +341,7 @@ menu_customize_init(void) cz_3dModel = spawn(CUI3DView); cz_3dModel.SetPos(410,160); - cz_3dModel.SetSize(170,221); + cz_3dModel.SetSize([170,221]); cz_3dModel.SetDrawFunc(ModelPreview_Draw); cz_3dModel.SetInputFunc(ModelPreview_Input); Widget_Add(fn_customize, cz_3dModel); diff --git a/src/platform/achievements.qc b/src/platform/achievements.qc index 9cb0a952..a0716a21 100644 --- a/src/platform/achievements.qc +++ b/src/platform/achievements.qc @@ -14,18 +14,21 @@ Achievement_Clear(string strName) int Achievement_Get(string strName) { + return 0; } /* get the icon of an achievement */ string Achievement_GetIcon(string strName) { + return __NULL__; } /* STUB, returns how many other users achieved this */ float Achievement_GetPercentage(string strName) { + return 0.0f; } /* called when you want to show a pop-up indicating progress */ diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc index 62121e75..5efac851 100644 --- a/src/server/gamerules.qc +++ b/src/server/gamerules.qc @@ -184,8 +184,8 @@ CGameRules::DamageApply(entity t, entity c, float dmg, int w, damageType_t type) base_player tp = (base_player)t; /* for armor damage */ - float flArmor; - float flNewDamage; + float flArmor = 0; + float flNewDamage = 0; /* player god mode */ if (t.flags & FL_CLIENT && t.flags & FL_GODMODE) diff --git a/src/shared/sound.qc b/src/shared/sound.qc index 8382ff5a..c72b05a3 100644 --- a/src/shared/sound.qc +++ b/src/shared/sound.qc @@ -562,8 +562,6 @@ void Sound_PlayLocal(string shader) { int r; - float radius; - float pitch; int flag; int sample; diff --git a/src/vgui/ui.qc b/src/vgui/ui.qc index 8c9b5248..52b3cca6 100644 --- a/src/vgui/ui.qc +++ b/src/vgui/ui.qc @@ -25,7 +25,7 @@ var int g_vguiWidgetCount; var float UI_MAINALPHA; #endif -void +int VGUI_Active(void) { return (g_vguiWidgetCount > 0) ? TRUE : FALSE;