Merge branch 'master' into mirceakitsune/physical_entities
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 11 Jul 2012 19:24:05 +0000 (22:24 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 11 Jul 2012 19:24:05 +0000 (22:24 +0300)
Conflicts:
qcsrc/server/t_items.qc

1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -917,14 -1163,8 +1163,16 @@@ void StartItem (string itemmodel, strin
        }
        else
                Item_Reset();
+         
+     Net_LinkEntity(self, FALSE, 0, ItemSend);
 +
 +      // call this hook after everything else has been done
 +      if(MUTATOR_CALLHOOK(Item_Spawn))
 +      {
 +              startitem_failed = TRUE;
 +              remove(self);
 +              return;
 +      }
  }
  
  /* replace items in minstagib