Make sure we call SetSize() after we SetModel, because with the cvar

sv_gameplayfix_setmodelsize_qw SetModel() calls override the size as well.
This commit is contained in:
Marco Cawthorne 2021-03-11 11:12:42 +01:00
parent 9c4f63ccf2
commit 977b336a9b
6 changed files with 6 additions and 9 deletions

View file

@ -45,9 +45,9 @@ void item_ammo::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetSize([-16,-16,0],[16,16,16]);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetSize([-16,-16,0],[16,16,16]);
think = __NULL__;
nextthink = -1;

View file

@ -67,9 +67,9 @@ void item_battery::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetSize([-16,-16,0],[16,16,16]);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetSize([-16,-16,0],[16,16,16]);
// botinfo = BOTINFO_ARMOR;
think = __NULL__;
@ -87,5 +87,4 @@ void item_battery::item_battery(void)
Sound_Precache("item.respawn");
model = "models/w_battery.mdl";
CBaseEntity::CBaseEntity();
item_healthkit::Respawn();
}

View file

@ -56,9 +56,9 @@ void item_healthkit::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetSize([-16,-16,0],[16,16,16]);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetSize([-16,-16,0],[16,16,16]);
//botinfo = BOTINFO_HEALTH;
think = __NULL__;
@ -76,5 +76,4 @@ void item_healthkit::item_healthkit(void)
Sound_Precache("item.respawn");
model = "models/w_medkit.mdl";
CBaseEntity::CBaseEntity();
item_healthkit::Respawn();
}

View file

@ -71,9 +71,9 @@ item_longjump::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
SetMovetype(MOVETYPE_TOSS);
SetSize([-16,-16,0],[16,16,16]);
SetOrigin(m_oldOrigin);
SetModel(m_oldModel);
SetSize([-16,-16,0],[16,16,16]);
think = __NULL__;
nextthink = -1;
@ -104,5 +104,4 @@ item_longjump::item_longjump(void)
precache_sound("fvox/powermove_on.wav");
precache_sound("fvox/blip.wav");
CBaseTrigger::CBaseTrigger();
Respawn();
}

View file

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

View file

@ -44,6 +44,7 @@ void item_pickup::SetItem(int i)
id = i;
m_oldModel = Weapons_GetWorldmodel(id);
SetModel(m_oldModel);
SetSize([-16,-16,0], [16,16,16]);
}
void item_pickup::SetFloating(int i)
@ -84,5 +85,4 @@ void item_pickup::item_pickup(void)
Sound_Precache("item.respawn");
Sound_Precache("weapon.pickup");
CBaseTrigger::CBaseTrigger();
Respawn();
}