From: TimePath Date: Sat, 6 Aug 2016 06:35:07 +0000 (+0000) Subject: Merge branch 'Mario/intrusive' into 'master' X-Git-Tag: xonotic-v0.8.2~752 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5c9dd3786d57cbbbca67043ba8076548c1d486ef;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Mario/intrusive' into 'master' Merge branch Mario/intrusive (L merge request) Moves a few more entities to the new intrusive list system, further improving performance. See merge request !344 --- 5c9dd3786d57cbbbca67043ba8076548c1d486ef diff --cc qcsrc/common/weapons/weapon/minelayer.qc index b4b38031f,70925b835..e5ba64f24 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@@ -101,8 -102,9 +102,9 @@@ void W_MineLayer_Stick(entity this, ent newmine.nextthink = time; newmine.cnt = this.cnt; newmine.flags = this.flags; + IL_PUSH(g_projectiles, newmine); - remove(this); + delete(this); if(to) SetMovetypeFollow(newmine, to);