Merge branch 'master' into tzork/ents-onoff

Conflicts:
	qcsrc/server/defs.qh

diff --combined qcsrc/server/defs.qh
index 26e7075d3c3943ca5b3033a90eeb4ea9bd5ad0e0,d4ee31d802d475ba8aedb5be65ec4aa6aa6e188c..f452e5110678cdf184e231ae3f00421ad03e03bc
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -636,10 -636,4 +636,12 @@@ string deathmessage
  
  .float ballistics_density; // wall piercing factor, larger = bullet can pass through more
  
- .float (float act_state) setactive;
 +#define ACTIVE_NOT            0
 +#define ACTIVE_ACTIVE         1
 +#define ACTIVE_IDLE   2
 +#define ACTIVE_BUSY   2
 +#define ACTIVE_TOGGLE 3
 +.float active;
++.float (float act_state) setactive;
++=======
+ .entity realowner;

diff --combined qcsrc/server/g_triggers.qc
index 2ed219ac26062eda36be23050d0104ff041eefe2,08964655d9b048faf1d0e696323dbe303c805e5d..cecca06d2e030fe96375326099fdedb9f3948472
--- 1/qcsrc/server/g_triggers.qc
--- 2/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@@ -462,6 -462,7 +462,7 @@@ void spawnfunc_trigger_hurt(
                self.message = "was in the wrong place";
        if (!self.message2)
                self.message2 = "was thrown into a world of hurt by";
+       // self.message = "someone like %s always gets wrongplaced";
  
        if(!trigger_hurt_first)
                trigger_hurt_first = self;
@@@ -818,7 -819,7 +819,7 @@@ void spawnfunc_func_pointparticles(
        if(!self.cnt)
                self.cnt = particleeffectnum(self.mdl);
  
-       Net_LinkEntity(self, FALSE, 0, pointparticles_SendEntity);
+       Net_LinkEntity(self, (self.spawnflags & 4), 0, pointparticles_SendEntity);
  
        IFTARGETED
        {
@@@ -1931,46 -1932,3 +1932,46 @@@ void spawnfunc_trigger_magicear(
        // target:
        //   what to trigger
  }
 +
 +void relay_activateors_use()
 +{
 +      entity trg, os;
 +      
 +      os = self;
 +      
 +      for(trg = world; (trg = find(trg, targetname, os.target)); )
 +      {
 +              self = trg;
 +              if (trg.setactive)
 +                      trg.setactive(os.cnt);
 +              else
 +              {
 +                      if(os.cnt == ACTIVE_TOGGLE)
 +                              if(trg.active)
 +                                      trg.active = ACTIVE_NOT;
 +                              else    
 +                                      trg.active = ACTIVE_ACTIVE;
 +                      else
 +                              trg.active = os.cnt;
 +              }               
 +      }
 +      self = os;
 +}
 +
 +void spawnfunc_relay_activate()
 +{
 +      self.cnt = ACTIVE_ACTIVE;
 +      self.use = relay_activateors_use;
 +}
 +
 +void spawnfunc_relay_deactivate()
 +{
 +      self.cnt = ACTIVE_NOT;
 +      self.use = relay_activateors_use;       
 +}
 +
 +void spawnfunc_relay_activatetoggle()
 +{
 +      self.cnt = ACTIVE_TOGGLE;
 +      self.use = relay_activateors_use;       
 +}