fn/valve
fn/valve
3
0
Fork 1
Code Issues 11 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Use GetSpawnX() methods instead of peeking into some attribute that

Browse source 
may change.
This commit is contained in:
Marco Cawthorne 2021-09-16 17:36:03 +02:00
parent fb11cb5f8f
commit c8a493fb00
Signed by: eukara
GPG key ID: C196CD8BA993248A
11 changed files with 45 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server/ammo.qc
View file

@ -45,8 +45,8 @@ void item_ammo::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetOrigin(GetSpawnOrigin());
SetModel(GetSpawnModel());
SetSize([-16,-16,0],[16,16,16]);
think = __NULL__;
@ -64,7 +64,7 @@ void item_ammo::item_ammo(void)
Sound_Precache("ammo.respawn");
precache_model(model);
m_oldModel = model;
SetModel(m_oldModel);
SetModel(GetSpawnModel());
CBaseEntity::CBaseEntity();
}

4
src/server/item_battery.qc
View file

@ -67,8 +67,8 @@ void item_battery::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetOrigin(GetSpawnOrigin());
SetModel(GetSpawnModel());
SetSize([-16,-16,0],[16,16,16]);
// botinfo = BOTINFO_ARMOR;

4
src/server/item_healthkit.qc
View file

@ -56,8 +56,8 @@ void item_healthkit::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetOrigin(GetSpawnOrigin());
SetModel(GetSpawnModel());
SetSize([-16,-16,0],[16,16,16]);
//botinfo = BOTINFO_HEALTH;

4
src/server/item_longjump.qc
View file

@ -71,8 +71,8 @@ item_longjump::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetOrigin(GetSpawnOrigin());
SetModel(GetSpawnModel());
SetSize([-16,-16,0],[16,16,16]);
think = __NULL__;

4
src/server/item_suit.qc
View file

@ -74,8 +74,8 @@ item_suit::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetOrigin(GetSpawnOrigin());
SetModel(GetSpawnModel());
SetSize(VEC_HULL_MIN, VEC_HULL_MAX);
m_iValue = FALSE;

8
src/server/items.qc
View file

@ -43,7 +43,7 @@ void item_pickup::SetItem(int i)
{
id = i;
m_oldModel = Weapons_GetWorldmodel(id);
SetModel(m_oldModel);
SetModel(GetSpawnModel());
SetSize([-16,-16,0], [16,16,16]);
}
@ -55,11 +55,11 @@ void item_pickup::SetFloating(int i)
void item_pickup::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetOrigin(m_oldOrigin);
SetOrigin(GetSpawnOrigin());
/* At some points, the item id might not yet be set */
if (m_oldModel) {
SetModel(m_oldModel);
if (GetSpawnModel()) {
SetModel(GetSpawnModel());
}
SetSize([-16,-16,0], [16,16,16]);

11
src/server/monster_barney_dead.qc
View file

@ -52,15 +52,16 @@ monster_barney_dead::Hide(void)
void
monster_barney_dead::Respawn(void)
{
v_angle[0] = Math_FixDelta(m_oldAngle[0]);
v_angle[1] = Math_FixDelta(m_oldAngle[1]);
v_angle[2] = Math_FixDelta(m_oldAngle[2]);
v_angle = GetSpawnAngles();
v_angle[0] = Math_FixDelta(v_angle[0]);
v_angle[1] = Math_FixDelta(v_angle[1]);
v_angle[2] = Math_FixDelta(v_angle[2]);
SetOrigin(m_oldOrigin);
SetOrigin(GetSpawnOrigin());
angles = v_angle;
solid = SOLID_CORPSE;
movetype = MOVETYPE_NONE;
SetModel(m_oldModel);
SetModel(GetSpawnModel());
setsize(this, VEC_HULL_MIN + [0,0,36], VEC_HULL_MAX + [0,0,36]);
takedamage = DAMAGE_YES;
health = 0;

11
src/server/monster_hevsuit_dead.qc
View file

@ -52,15 +52,16 @@ monster_hevsuit_dead::Hide(void)
void
monster_hevsuit_dead::Respawn(void)
{
v_angle[0] = Math_FixDelta(m_oldAngle[0]);
v_angle[1] = Math_FixDelta(m_oldAngle[1]);
v_angle[2] = Math_FixDelta(m_oldAngle[2]);
v_angle = GetSpawnAngles();
v_angle[0] = Math_FixDelta(v_angle[0]);
v_angle[1] = Math_FixDelta(v_angle[1]);
v_angle[2] = Math_FixDelta(v_angle[2]);
SetOrigin(m_oldOrigin);
SetOrigin(GetSpawnOrigin());
angles = v_angle;
solid = SOLID_CORPSE;
movetype = MOVETYPE_NONE;
SetModel(m_oldModel);
SetModel(GetSpawnModel());
setsize(this, VEC_HULL_MIN + [0,0,36], VEC_HULL_MAX + [0,0,36]);
takedamage = DAMAGE_YES;
health = 0;

11
src/server/monster_hgrunt_dead.qc
View file

@ -52,15 +52,16 @@ monster_hgrunt_dead::Hide(void)
void
monster_hgrunt_dead::Respawn(void)
{
v_angle[0] = Math_FixDelta(m_oldAngle[0]);
v_angle[1] = Math_FixDelta(m_oldAngle[1]);
v_angle[2] = Math_FixDelta(m_oldAngle[2]);
v_angle = GetSpawnAngles();
v_angle[0] = Math_FixDelta(v_angle[0]);
v_angle[1] = Math_FixDelta(v_angle[1]);
v_angle[2] = Math_FixDelta(v_angle[2]);
SetOrigin(m_oldOrigin);
SetOrigin(GetSpawnOrigin());
angles = v_angle;
solid = SOLID_CORPSE;
movetype = MOVETYPE_NONE;
SetModel(m_oldModel);
SetModel(GetSpawnModel());
setsize(this, VEC_HULL_MIN + [0,0,36], VEC_HULL_MAX + [0,0,36]);
takedamage = DAMAGE_YES;
health = 0;

11
src/server/monster_scientist_dead.qc
View file

@ -63,15 +63,16 @@ monster_scientist_dead::Hide(void)
void
monster_scientist_dead::Respawn(void)
{
v_angle[0] = Math_FixDelta(m_oldAngle[0]);
v_angle[1] = Math_FixDelta(m_oldAngle[1]);
v_angle[2] = Math_FixDelta(m_oldAngle[2]);
v_angle = GetSpawnAngles();
v_angle[0] = Math_FixDelta(v_angle[0]);
v_angle[1] = Math_FixDelta(v_angle[1]);
v_angle[2] = Math_FixDelta(v_angle[2]);
SetOrigin(m_oldOrigin);
SetOrigin(GetSpawnOrigin());
angles = v_angle;
solid = SOLID_CORPSE;
movetype = MOVETYPE_NONE;
SetModel(m_oldModel);
SetModel(GetSpawnModel());
setsize(this, VEC_HULL_MIN + [0,0,36], VEC_HULL_MIN + [0,0,36]);
takedamage = DAMAGE_YES;
health = 0;

11
src/server/monster_sitting_scientist.qc
View file

@ -73,15 +73,16 @@ monster_sitting_scientist::Hide(void)
void
monster_sitting_scientist::Respawn(void)
{
v_angle[0] = Math_FixDelta(m_oldAngle[0]);
v_angle[1] = Math_FixDelta(m_oldAngle[1]);
v_angle[2] = Math_FixDelta(m_oldAngle[2]);
v_angle = GetSpawnAngles();
v_angle[0] = Math_FixDelta(v_angle[0]);
v_angle[1] = Math_FixDelta(v_angle[1]);
v_angle[2] = Math_FixDelta(v_angle[2]);
SetOrigin(m_oldOrigin);
SetOrigin(GetSpawnOrigin());
angles = v_angle;
solid = SOLID_BBOX;
movetype = MOVETYPE_NONE;
SetModel(m_oldModel);
SetModel(GetSpawnModel());
setsize(this, [-14,-14,0],[14,14,36]);
takedamage = DAMAGE_YES;
health = 0;