Merge branch 'master' into TimePath/debug_draw
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 1 Nov 2015 11:17:03 +0000 (22:17 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 1 Nov 2015 11:17:03 +0000 (22:17 +1100)
# Conflicts:
# qcsrc/common/effects/all.qc
# qcsrc/lib/net.qh

45 files changed:
1  2 
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/damage.qc
qcsrc/client/generator.qc
qcsrc/client/gibs.qc
qcsrc/client/hud.qh
qcsrc/client/main.qc
qcsrc/common/deathtypes/all.qh
qcsrc/common/effects/all.qc
qcsrc/common/effects/all.qh
qcsrc/common/effects/effect.qh
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/minigames/cl_minigames.qh
qcsrc/common/minigames/sv_minigames.qh
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/waypoints/all.qh
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/turrets/cl_turrets.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/lib/net.qh
qcsrc/lib/warpzone/common.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/mutators/mutator/gamemode_onslaught.qc
qcsrc/server/mutators/mutator/mutator_nades.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -5,12 -4,12 +5,12 @@@ REGISTER_NET_TEMP(net_effect, bool isNe
  {
        int net_name = (Effects_COUNT >= 255) ? ReadShort() : ReadByte();
  
-       entity eff = Effects[net_name];
+       entity eff = Effects_from(net_name);
  
 -      vector v, vel = '0 0 0';
 +      vector vel = '0 0 0';
        int eff_cnt = 1;
        bool eff_trail = eff.eent_eff_trail;
 +      vector v;
        v_x = ReadCoord();
        v_y = ReadCoord();
        v_z = ReadCoord();
        if(!eff_trail)
                eff_cnt = ReadByte();
  
 -      if(is_new)
 -      {
 -              if(eff_trail)
 -                      WarpZone_TrailParticles(world, particleeffectnum(eff), v, vel);
 -              else
 -                      pointparticles(eff, v, vel, eff_cnt);
 -      }
 +      if(eff_trail)
 +              WarpZone_TrailParticles(world, particleeffectnum(eff), v, vel);
 +      else
-               pointparticles(particleeffectnum(eff), v, vel, eff_cnt);
++              pointparticles(eff, v, vel, eff_cnt);
  }
  #endif
  
Simple merge
Simple merge
@@@ -114,10 -114,11 +114,11 @@@ void HUD_MinigameMenu_CustomEntry(entit
        while( (entityvar = findentity(entityvar,owner,active_minigame)) )
  
  
- REGISTRY(Minigames, BIT(3))
+ REGISTRY(Minigames, BITS(3))
+ #define Minigames_from(i) _Minigames_from(i, NULL)
  REGISTER_REGISTRY(RegisterMinigames)
  #define REGISTER_MINIGAME(name,nicename) \
 -    REGISTER(RegisterMinigames, MINIGAME, Minigames, name, m_id, spawn()); \
 +    REGISTER(RegisterMinigames, MINIGAME, Minigames, name, m_id, new(minigame_descriptor)); \
      void name##_hud_board(vector, vector); \
      void name##_hud_status(vector, vector); \
      int name##_client_event(entity, string, ...); \
@@@ -46,13 -46,14 +46,14 @@@ entity minigame_sessions
  
  bool minigame_SendEntity(entity this, entity to, int sf);
  
- REGISTRY(Minigames, BIT(3))
+ REGISTRY(Minigames, BITS(3))
+ #define Minigames_from(i) _Minigames_from(i, NULL)
  REGISTER_REGISTRY(RegisterMinigames)
  #define REGISTER_MINIGAME(name,nicename) \
 -    REGISTER(RegisterMinigames, MINIGAME, Minigames, name, m_id, spawn()); \
 +    REGISTER(RegisterMinigames, MINIGAME, Minigames, name, m_id, new(minigame_descriptor)); \
      int name##_server_event(entity, string, ...); \
      REGISTER_INIT_POST(MINIGAME, name) { \
 -        this.classname = "minigame_descriptor"; \
 +        make_pure(this); \
          this.netname = strzone(strtolower(#name)); \
          this.message = nicename; \
                this.minigame_event = name##_server_event; \
Simple merge
@@@ -26,9 -27,10 +27,10 @@@ ENDCLASS(Waypoint
  #define REGISTER_WAYPOINT(id, text, color, blink) REGISTER_WAYPOINT_(id, NEW(Waypoint, #id, text, color, blink))
  
  REGISTRY(RadarIcons, BITS(7))
+ #define RadarIcons_from(i) _RadarIcons_from(i, RADARICON_NONE)
  REGISTER_REGISTRY(RegisterRadarIcons)
  .int m_radaricon;
 -#define REGISTER_RADARICON(id, num) REGISTER(RegisterRadarIcons, RADARICON, RadarIcons, id, m_id, new(RadarIcon)) { this.m_radaricon = num; this.netname = #id; }
 +#define REGISTER_RADARICON(id, num) REGISTER(RegisterRadarIcons, RADARICON, RadarIcons, id, m_id, new(RadarIcon)) { make_pure(this); this.m_radaricon = num; this.netname = #id; }
  
  REGISTER_WAYPOINT(Null, "", '0 0 0', 1);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge