Merge branches 'TimePath/weaponsys' and 'Mario/modpack'

diff --cc qcsrc/Makefile
index 26797c55a1459fd67fe9599f97158d3707a4f7e4,26797c55a1459fd67fe9599f97158d3707a4f7e4,3f58e672cbb83f67c7e8ab4a929123fcfb7787fd..143f53249b43f3b79f5e9a7cb323e6237ffac117
--- 1/qcsrc/Makefile
--- 2/qcsrc/Makefile
--- 3/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@@@ -13,7 -13,7 -13,7 +13,7 @@@@ QCCFLAGS ?= 
        -std=gmqcc \
        -O3 -flno \
        -Werror -fno-bail-on-werror -Wall \
--      -fftepp -fftepp-predefs -Wcpp -futf8 -frelaxed-switch \
  -     -fftepp -fftepp-predefs -Wcpp -futf8 -freturn-assignments \
+++     -fftepp -fftepp-predefs -Wcpp -futf8 -frelaxed-switch -freturn-assignments \
        $(QCCFLAGS_WTFS) \
        $(QCCFLAGS_FEATURES) \
        $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)

diff --cc qcsrc/client/main.qc
Simple merge

diff --cc qcsrc/client/progs.src
Simple merge

diff --cc qcsrc/common/monsters/monster/shambler.qc
Simple merge

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

diff --cc qcsrc/common/physics.qc
Simple merge

diff --cc qcsrc/common/weapons/all.qc
Simple merge

diff --cc qcsrc/common/weapons/w_arc.qc
Simple merge

diff --cc qcsrc/common/weapons/w_blaster.qc
Simple merge

diff --cc qcsrc/common/weapons/w_crylink.qc
Simple merge

diff --cc qcsrc/common/weapons/w_devastator.qc
Simple merge

diff --cc qcsrc/common/weapons/w_electro.qc
Simple merge

diff --cc qcsrc/common/weapons/w_fireball.qc
index 1cec08e9691fb0cc7fb1f611bf11cd5e14965cb2,32ae555e41b47ca97f8419078e819943b441b97a,112b6524eade596d0601257b7507cd508a4ca006..f9a4928b745b484f7651054a41f7ba37dadb5d59
--- 1/qcsrc/common/weapons/w_fireball.qc
--- 2/qcsrc/common/weapons/w_fireball.qc
--- 3/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@@@ -96,10 -97,10 -96,10 +97,10 @@@@ void W_Fireball_Explode(void
                        dir = normalize(e.origin + e.view_ofs - self.origin);
   
                        if(accuracy_isgooddamage(self.realowner, e))
- -                             accuracy_add(self.realowner, WEP_FIREBALL, 0, WEP_CVAR_PRI(fireball, bfgdamage) * points);
+ +                             accuracy_add(self.realowner, WEP_FIREBALL.m_id, 0, WEP_CVAR_PRI(fireball, bfgdamage) * points);
   
                        Damage(e, self, self.realowner, WEP_CVAR_PRI(fireball, bfgdamage) * points, self.projectiledeathtype | HITTYPE_BOUNCE | HITTYPE_SPLASH, e.origin + e.view_ofs, WEP_CVAR_PRI(fireball, bfgforce) * dir);
 --                     pointparticles(particleeffectnum("fireball_bfgdamage"), e.origin, -1 * dir, 1);
 ++                     Send_Effect("fireball_bfgdamage", e.origin, -1 * dir, 1);
                }
        }
   

diff --cc qcsrc/common/weapons/w_hagar.qc
Simple merge

diff --cc qcsrc/common/weapons/w_hlac.qc
Simple merge

diff --cc qcsrc/common/weapons/w_hmg.qc
Simple merge

diff --cc qcsrc/common/weapons/w_hook.qc
Simple merge

diff --cc qcsrc/common/weapons/w_machinegun.qc
index 56a89fd9dcf77f3bca61f0669a077d4edec2c51a,92629a0bd7116a5f40c5c0e5d059914d0089749c,24a0db83f44534a4c7ff3cfbd453851b86796621..f320f711469cfb75a72daaa424bf262cafa54388
--- 1/qcsrc/common/weapons/w_machinegun.qc
--- 2/qcsrc/common/weapons/w_machinegun.qc
--- 3/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@@@ -212,9 -213,9 -212,9 +213,9 @@@@ void W_MachineGun_Attack_Burst(void
                self.punchangle_y = random() - 0.5;
        }
   
- -     fireBullet(w_shotorg, w_shotdir, WEP_CVAR(machinegun, burst_speed), WEP_CVAR(machinegun, solidpenetration), WEP_CVAR(machinegun, sustained_damage), WEP_CVAR(machinegun, sustained_force), WEP_MACHINEGUN, 0);
+ +     fireBullet(w_shotorg, w_shotdir, WEP_CVAR(machinegun, burst_speed), WEP_CVAR(machinegun, solidpenetration), WEP_CVAR(machinegun, sustained_damage), WEP_CVAR(machinegun, sustained_force), WEP_MACHINEGUN.m_id, 0);
   
 --     pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 ++     Send_Effect("uzi_muzzleflash", w_shotorg, w_shotdir * 1000, 1);
   
        W_MachineGun_MuzzleFlash();
        W_AttachToShotorg(self.muzzle_flash, '5 0 0');

diff --cc qcsrc/common/weapons/w_minelayer.qc
Simple merge

diff --cc qcsrc/common/weapons/w_mortar.qc
Simple merge

diff --cc qcsrc/common/weapons/w_porto.qc
Simple merge

diff --cc qcsrc/common/weapons/w_rifle.qc
Simple merge

diff --cc qcsrc/common/weapons/w_rpc.qc
Simple merge

diff --cc qcsrc/common/weapons/w_seeker.qc
Simple merge

diff --cc qcsrc/common/weapons/w_shockwave.qc
Simple merge

diff --cc qcsrc/common/weapons/w_shotgun.qc
index 95195bd3ac632456e10a394be8c24d0b85f4a27c,1d91689e505e3310bbd4bf8a9c6919c668349377,5415b4a6f0726d57b20ea393e1683efb704eedb0..d93e9dd3f9fd1627685e370801cb10f72e6b303e
--- 1/qcsrc/common/weapons/w_shotgun.qc
--- 2/qcsrc/common/weapons/w_shotgun.qc
--- 3/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@@@ -62,9 -63,9 -62,9 +63,9 @@@@ void W_Shotgun_Attack(float isprimary
   
        W_SetupShot(self, true, 5, "weapons/shotgun_fire.wav", ((isprimary) ? CH_WEAPON_A : CH_WEAPON_SINGLE), WEP_CVAR_PRI(shotgun, damage) * WEP_CVAR_PRI(shotgun, bullets));
        for(sc = 0;sc < WEP_CVAR_PRI(shotgun, bullets);sc = sc + 1)
- -             fireBullet(w_shotorg, w_shotdir, WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, damage), WEP_CVAR_PRI(shotgun, force), WEP_SHOTGUN, 0);
+ +             fireBullet(w_shotorg, w_shotdir, WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, damage), WEP_CVAR_PRI(shotgun, force), WEP_SHOTGUN.m_id, 0);
   
 --     pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, WEP_CVAR_PRI(shotgun, ammo));
 ++     Send_Effect("shotgun_muzzleflash", w_shotorg, w_shotdir * 1000, WEP_CVAR_PRI(shotgun, ammo));
   
        // casing code
        if(autocvar_g_casings >= 1)

diff --cc qcsrc/common/weapons/w_tuba.qc
Simple merge

diff --cc qcsrc/common/weapons/w_vaporizer.qc
Simple merge

diff --cc qcsrc/menu/menu.qc
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/g_hook.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
index 3e3682400bd2669a167fcc211ecd737ed9a222c7,f40acfd63b548ea24e354cabf6f0ed0ed0426a9f,de29c9a25ead17663da538b39ab8e6f25f03e024..dcfc19eb17e3d9440a8f84638795bdfd234d3ed1
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
--- 3/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@@ -561,10 -560,8 -560,9 +561,9 @@@@ void spawnfunc___init_dedicated_server(
   
        // needs to be done so early because of the constants they create
        static_init();
- -     CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 ++     CALL_ACCUMULATED_FUNCTION(RegisterEffects);
   
        MapInfo_Enumerate();
        MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
@@@@ -610,10 -607,8 -608,9 +609,9 @@@@ void spawnfunc_worldspawn (void
   
        // needs to be done so early because of the constants they create
        static_init();
- -     CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 ++     CALL_ACCUMULATED_FUNCTION(RegisterEffects);
   
        ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid));
   

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qh
Simple merge

diff --cc qcsrc/server/mutators/gamemode_nexball.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_buffs.qc
index f5e3fa8bdceab5e0869cc97fb8bafd632464e4f5,0f483abaf89aabd0f93956068403699008d33d97,b582e168604c9626b579258e19810c245144bd66..f144899c8d86a1da4d761cb34309f0c2f1f30ffd
--- 1/qcsrc/server/mutators/mutator_buffs.qc
--- 2/qcsrc/server/mutators/mutator_buffs.qc
--- 3/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@@@ -493,10 -493,10 -493,10 +493,10 @@@@ MUTATOR_HOOKFUNCTION(buffs_PlayerDamage
        // this... is ridiculous (TODO: fix!)
        if(frag_attacker.buffs & BUFF_VAMPIRE.m_itemid)
        if(!frag_target.vehicle)
- -     if(DEATH_WEAPONOF(frag_deathtype) != WEP_ARC)
+ +     if(DEATH_WEAPONOF(frag_deathtype) != WEP_ARC.m_id)
        if(!ITEM_DAMAGE_NEEDKILL(frag_deathtype))
        if(frag_target.deadflag == DEAD_NO)
 --     if(IS_PLAYER(frag_target) || (frag_target.flags & FL_MONSTER))
 ++     if(IS_PLAYER(frag_target) || IS_MONSTER(frag_target))
        if(frag_attacker != frag_target)
        if(!frag_target.frozen)
        if(frag_target.takedamage)

diff --cc qcsrc/server/mutators/mutator_instagib.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_nades.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_nix.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_overkill.qc
Simple merge

diff --cc qcsrc/server/progs.src
Simple merge

diff --cc qcsrc/server/vehicles/vehicle.qc
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge