]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Mario/intrusive_2' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 23 Oct 2016 21:58:36 +0000 (21:58 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 23 Oct 2016 21:58:36 +0000 (21:58 +0000)
Merge branch Mario/intrusive_2 (M merge request)

Ports a few more things to intrusive lists, greatly improving performance on maps with warpzones.

See merge request !363

1  2 
qcsrc/common/vehicles/sv_vehicles.qc

index 788f095b8fbc90e1a59fab8b278650bffab8007d,6cd2c2b44e0c955d5a842c3d933621320bb7b66f..b165bb3e481551b5cf5261390832e2a50b55b764
@@@ -900,7 -900,7 +900,7 @@@ bool vehicle_impulse(entity this, int i
  
  void vehicles_enter(entity pl, entity veh)
  {
 -      // Remove this when bots know how to use vehicles
 +   // Remove this when bots know how to use vehicles
        if((IS_BOT_CLIENT(pl) && !autocvar_g_vehicles_allow_bots))
                return;
  
@@@ -1167,6 -1167,7 +1167,7 @@@ bool vehicle_initialize(entity this, Ve
        this.iscreature                         = true;
        this.teleportable                       = false; // no teleporting for vehicles, too buggy
        this.damagedbycontents          = true;
+       IL_PUSH(g_damagedbycontents, this);
        this.vehicleid                          = info.vehicleid;
        this.PlayerPhysplug                     = info.PlayerPhysplug;
        this.event_damage                       = func_null;
        else
                this.nextthink = time + game_starttime;
  
 -      if(!MUTATOR_CALLHOOK(VehicleInit, this))
 +      if(MUTATOR_CALLHOOK(VehicleInit, this))
                return false;
  
        return true;