Merge branch 'master' into DefaultUser/trigger_cleanup
authorMario <mario@smbclan.net>
Wed, 25 Apr 2018 12:26:45 +0000 (22:26 +1000)
committerMario <mario@smbclan.net>
Wed, 25 Apr 2018 12:26:45 +0000 (22:26 +1000)
# Conflicts:
# qcsrc/common/triggers/func/pointparticles.qc
# qcsrc/common/triggers/misc/laser.qc
# qcsrc/common/triggers/target/music.qc

1  2 
qcsrc/common/sounds/sound.qh
qcsrc/common/triggers/func/door.qc
qcsrc/common/triggers/func/pointparticles.qc
qcsrc/common/triggers/misc/laser.qc
qcsrc/common/triggers/misc/teleport_dest.qc
qcsrc/common/triggers/target/music.qc
qcsrc/common/triggers/target/music.qh
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/triggers.qc
qcsrc/lib/net.qh
qcsrc/lib/spawnfunc.qh

Simple merge
Simple merge
index 18d3c30e8d774478102c28344bd894bc4681cb6c,e028b4c837d7b20bddc47223b060dcff0ff40c9e..7de5a03ef8171e905ea0d7eff538580ad7e22f5e
@@@ -149,20 -169,18 +149,20 @@@ spawnfunc(func_sparks
  .int dphitcontentsmask;
  
  entityclass(PointParticles);
- class(PointParticles) .int cnt; // effect number
- class(PointParticles) .vector velocity; // particle velocity
- class(PointParticles) .float waterlevel; // direction jitter
- class(PointParticles) .int count; // count multiplier
- class(PointParticles) .int impulse; // density
- class(PointParticles) .string noise; // sound
- class(PointParticles) .float atten;
- class(PointParticles) .float volume;
- class(PointParticles) .int absolute; // 1 = count per second is absolute, ABSOLUTE_ONLY_SPAWN_AT_TOGGLE = only spawn at toggle
- class(PointParticles) .vector movedir; // trace direction
- class(PointParticles) .float glow_color; // palette index
+ classfield(PointParticles) .int cnt; // effect number
+ classfield(PointParticles) .vector velocity; // particle velocity
+ classfield(PointParticles) .float waterlevel; // direction jitter
+ classfield(PointParticles) .int count; // count multiplier
+ classfield(PointParticles) .int impulse; // density
+ classfield(PointParticles) .string noise; // sound
+ classfield(PointParticles) .float atten;
+ classfield(PointParticles) .float volume;
 -classfield(PointParticles) .float absolute; // 1 = count per second is absolute, 2 = only spawn at toggle
++classfield(PointParticles) .float absolute; // 1 = count per second is absolute, ABSOLUTE_ONLY_SPAWN_AT_TOGGLE = only spawn at toggle
+ classfield(PointParticles) .vector movedir; // trace direction
+ classfield(PointParticles) .float glow_color; // palette index
  
 +const int ABSOLUTE_ONLY_SPAWN_AT_TOGGLE = 2;
 +
  void Draw_PointParticles(entity this)
  {
        float n, i, fail;
index 12b67c3715368b7df38a7897736f1cd3e52d944d,b7bdede728211a77f0df4adf05211f3e11770ab4..df88b750f245dbc7000deccd0a6785bf5ae1a300
@@@ -292,17 -249,17 +292,17 @@@ spawnfunc(misc_laser
  #elif defined(CSQC)
  
  // a laser goes from origin in direction angles
 -// it has color 'colormod'
 +// it has color 'beam_color'
  // and stops when something is in the way
  entityclass(Laser);
- class(Laser) .int cnt; // end effect
- class(Laser) .vector beam_color;
- class(Laser) .int active; // on-off
- class(Laser) .int count; // flags for the laser
- class(Laser) .vector velocity; // laser endpoint if it is FINITE
- class(Laser) .float alpha;
- class(Laser) .float scale; // scaling factor of the thickness
- class(Laser) .float modelscale; // scaling factor of the dlight
+ classfield(Laser) .int cnt; // end effect
+ classfield(Laser) .vector colormod;
+ classfield(Laser) .int state; // on-off
+ classfield(Laser) .int count; // flags for the laser
 -classfield(Laser) .vector velocity;
++classfield(Laser) .vector velocity; // laser endpoint if it is FINITE
+ classfield(Laser) .float alpha;
+ classfield(Laser) .float scale; // scaling factor of the thickness
+ classfield(Laser) .float modelscale; // scaling factor of the dlight
  
  void Draw_Laser(entity this)
  {
index 24951b42b3b6a40427f2edb310a9976fbeb008fb,47977f267eff651f01575b1a13fddf01956f9640..5a63872dbd6c46b6742b3534be7b4531c0d38ef2
@@@ -324,12 -291,11 +317,11 @@@ NET_HANDLE(ENT_CLIENT_TRIGGER_MUSIC, bo
                if(this.noise != s)
                {
                        precache_sound(this.noise);
 -                      _sound(this, CH_BGM_SINGLE, this.noise, 0, ATTEN_NONE);
 +                      sound7(this, CH_BGM_SINGLE, this.noise, 0, ATTEN_NONE, 0, BIT(4));
                        if(getsoundtime(this, CH_BGM_SINGLE) < 0)
                        {
 -                              LOG_TRACEF("Cannot initialize sound %s", this.noise);
 +                              LOG_WARNF("Cannot initialize sound %s", this.noise);
-                               strunzone(this.noise);
-                               this.noise = string_null;
+                               strfree(this.noise);
                        }
                }
        }
Simple merge
Simple merge
Simple merge
Simple merge