From: Mario Date: Tue, 9 Oct 2018 10:57:55 +0000 (+1000) Subject: Remove FixSize (hack no longer needed) X-Git-Tag: xonotic-v0.8.5~1789 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de4083a47f8172a32c949ef7cbe8b5a3d112c016;p=xonotic%2Fxonotic-data.pk3dir.git Remove FixSize (hack no longer needed) --- diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index 6d719eb97..b4c4dc68f 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -27,7 +27,6 @@ float autocvar_g_onslaught_teleport_radius; float autocvar_g_onslaught_spawn_choose; float autocvar_g_onslaught_click_radius; -void FixSize(entity e); entity cam; // ======================= @@ -114,12 +113,6 @@ void ons_CaptureShield_Spawn(entity generator, bool is_generator) // Junk Pile // ========== -void setmodel_fixsize(entity e, Model m) -{ - setmodel(e, m); - FixSize(e); -} - void onslaught_updatelinks() { entity l; @@ -438,7 +431,7 @@ void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker this.owner.waslinked = this.owner.islinked; if(this.owner.model != "models/onslaught/controlpoint_pad.md3") - setmodel_fixsize(this.owner, MDL_ONS_CP_PAD1); + setmodel(this.owner, MDL_ONS_CP_PAD1); //setsize(this, '-32 -32 0', '32 32 8'); delete(this); @@ -578,7 +571,7 @@ void ons_ControlPoint_Icon_BuildThink(entity this) this.SendFlags |= CPSF_SETUP; } if(this.owner.model != MDL_ONS_CP_PAD2.model_str()) - setmodel_fixsize(this.owner, MDL_ONS_CP_PAD2); + setmodel(this.owner, MDL_ONS_CP_PAD2); if(random() < 0.9 - GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) Send_Effect(EFFECT_RAGE, this.origin + 10 * randomvec(), '0 0 -1', 1); @@ -737,7 +730,7 @@ void ons_ControlPoint_Reset(entity this) setthink(this, ons_ControlPoint_Think); this.ons_toucher = NULL; this.nextthink = time + ONS_CP_THINKRATE; - setmodel_fixsize(this, MDL_ONS_CP_PAD1); + setmodel(this, MDL_ONS_CP_PAD1); WaypointSprite_UpdateMaxHealth(this.sprite, 0); WaypointSprite_UpdateRule(this.sprite,this.team,SPRITERULE_TEAMPLAY); @@ -781,7 +774,7 @@ void ons_ControlPoint_Setup(entity cp) if(cp.message == "") { cp.message = "a"; } // appearence - setmodel_fixsize(cp, MDL_ONS_CP_PAD1); + setmodel(cp, MDL_ONS_CP_PAD1); // control point placement if((cp.spawnflags & 1) || cp.noalign) // don't drop to floor, just stay at fixed location diff --git a/qcsrc/common/mapobjects/func/conveyor.qc b/qcsrc/common/mapobjects/func/conveyor.qc index 9ad326cfa..4c40598d3 100644 --- a/qcsrc/common/mapobjects/func/conveyor.qc +++ b/qcsrc/common/mapobjects/func/conveyor.qc @@ -106,8 +106,6 @@ void conveyor_init(entity this) this.reset = generic_netlinked_reset; this.reset(this); - FixSize(this); - Net_LinkEntity(this, 0, false, conveyor_send); this.SendFlags |= SF_TRIGGER_INIT; diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc index 88997a471..1ba7bad3a 100644 --- a/qcsrc/common/mapobjects/func/door.qc +++ b/qcsrc/common/mapobjects/func/door.qc @@ -595,8 +595,6 @@ float door_send(entity this, entity to, float sf) void door_link() { - // set size now, as everything is loaded - //FixSize(this); //Net_LinkEntity(this, false, 0, door_send); } #endif diff --git a/qcsrc/common/mapobjects/subs.qh b/qcsrc/common/mapobjects/subs.qh index 0fa7db2f1..861d73e72 100644 --- a/qcsrc/common/mapobjects/subs.qh +++ b/qcsrc/common/mapobjects/subs.qh @@ -24,6 +24,7 @@ SUB_SetFade Fade 'ent' out when time >= 'when' ================== */ +.float fade_rate; void SUB_SetFade(entity ent, float when, float fading_time); .vector finaldest, finalangle; //plat.qc stuff diff --git a/qcsrc/common/mapobjects/triggers.qc b/qcsrc/common/mapobjects/triggers.qc index 6a2095999..62fabd2aa 100644 --- a/qcsrc/common/mapobjects/triggers.qc +++ b/qcsrc/common/mapobjects/triggers.qc @@ -10,17 +10,6 @@ void DelayThink(entity this) delete(this); } -void FixSize(entity e) -{ - e.mins_x = rint(e.mins_x); - e.mins_y = rint(e.mins_y); - e.mins_z = rint(e.mins_z); - - e.maxs_x = rint(e.maxs_x); - e.maxs_y = rint(e.maxs_y); - e.maxs_z = rint(e.maxs_z); -} - #ifdef SVQC void generic_setactive(entity this, int act) { diff --git a/qcsrc/common/mapobjects/triggers.qh b/qcsrc/common/mapobjects/triggers.qh index 82e7d54f0..b9baf63f1 100644 --- a/qcsrc/common/mapobjects/triggers.qh +++ b/qcsrc/common/mapobjects/triggers.qh @@ -40,8 +40,6 @@ void generic_netlinked_legacy_use(entity this, entity actor, entity trigger); .vector dest; -void FixSize(entity e); - #ifdef CSQC void trigger_common_read(entity this, bool withtarget); void trigger_remove_generic(entity this);