X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Ft_items.qc;h=c256d4df9022dc6a9fa7b8de864f2506737603fb;hb=7a85bc59ba3d8d35a90d20b364f53669430eb229;hp=2ad260769979496d7f42108b26d290e598d81973;hpb=f1a11cabe78baaaa067fe22bbdf2ca1546d1e8fc;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 2ad260769..c256d4df9 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -5,8 +5,6 @@ #if defined(SVQC) #include "_all.qh" - #include "waypointsprites.qh" - #include "bot/bot.qh" #include "bot/waypoints.qh" @@ -31,7 +29,7 @@ #ifdef CSQC void ItemDraw() -{ +{SELFPARAM(); if(self.gravity) { Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy); @@ -67,7 +65,7 @@ void ItemDraw() } void ItemDrawSimple() -{ +{SELFPARAM(); if(self.gravity) { Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy); @@ -77,8 +75,28 @@ void ItemDrawSimple() } } +void Item_PreDraw() +{SELFPARAM(); + vector org; + float alph; + org = getpropertyvec(VF_ORIGIN); + if(!checkpvs(org, self)) // this makes sense as long as we don't support recursive warpzones + alph = 0; + else if(self.fade_start) + alph = bound(0, (self.fade_end - vlen(org - self.origin - 0.5 * (self.mins + self.maxs))) / (self.fade_end - self.fade_start), 1); + else + alph = 1; + //printf("%v <-> %v\n", view_origin, self.origin + 0.5 * (self.mins + self.maxs)); + if(self.ItemStatus & ITS_AVAILABLE) + self.alpha = alph; + if(alph <= 0) + self.drawmask = 0; + else + self.drawmask = MASK_NORMAL; +} + void ItemRead(float _IsNew) -{ +{SELFPARAM(); int sf = ReadByte(); if(sf & ISF_LOCATION) @@ -92,21 +110,16 @@ void ItemRead(float _IsNew) if(sf & ISF_ANGLES) { - self.angles_x = ReadCoord(); - self.angles_y = ReadCoord(); - self.angles_z = ReadCoord(); + self.angles_x = ReadAngle(); + self.angles_y = ReadAngle(); + self.angles_z = ReadAngle(); self.move_angles = self.angles; } if(sf & ISF_SIZE) { - self.mins_x = ReadCoord(); - self.mins_y = ReadCoord(); - self.mins_z = ReadCoord(); - self.maxs_x = ReadCoord(); - self.maxs_y = ReadCoord(); - self.maxs_z = ReadCoord(); - setsize(self, self.mins, self.maxs); + float use_bigsize = ReadByte(); + setsize(self, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32'); } if(sf & ISF_STATUS) // need to read/write status frist so model can handle simple, fb etc. @@ -152,9 +165,14 @@ void ItemRead(float _IsNew) if(sf & ISF_MODEL) { self.drawmask = MASK_NORMAL; - self.movetype = MOVETYPE_TOSS; + self.move_movetype = self.movetype = MOVETYPE_TOSS; self.draw = ItemDraw; + self.fade_end = ReadShort(); + self.fade_start = ReadShort(); + if(self.fade_start && !autocvar_cl_items_nofade) + self.predraw = Item_PreDraw; + if(self.mdl) strunzone(self.mdl); @@ -166,20 +184,18 @@ void ItemRead(float _IsNew) string _fn2 = substring(_fn, 0 , strlen(_fn) -4); self.draw = ItemDrawSimple; - - if(fexists(sprintf("%s%s.md3", _fn2, autocvar_cl_simpleitems_postfix))) self.mdl = strzone(sprintf("%s%s.md3", _fn2, autocvar_cl_simpleitems_postfix)); else if(fexists(sprintf("%s%s.dpm", _fn2, autocvar_cl_simpleitems_postfix))) self.mdl = strzone(sprintf("%s%s.dpm", _fn2, autocvar_cl_simpleitems_postfix)); else if(fexists(sprintf("%s%s.iqm", _fn2, autocvar_cl_simpleitems_postfix))) self.mdl = strzone(sprintf("%s%s.iqm", _fn2, autocvar_cl_simpleitems_postfix)); - else if(fexists(sprintf("%s%s.obj", _fn2, autocvar_cl_simpleitems_postfix))) - self.mdl = strzone(sprintf("%s%s.obj", _fn2, autocvar_cl_simpleitems_postfix)); + else if(fexists(sprintf("%s%s.mdl", _fn2, autocvar_cl_simpleitems_postfix))) + self.mdl = strzone(sprintf("%s%s.mdl", _fn2, autocvar_cl_simpleitems_postfix)); else { self.draw = ItemDraw; - dprint("Simple item requested for ", _fn, " but no model exsist for it\n"); + LOG_TRACE("Simple item requested for ", _fn, " but no model exists for it\n"); } } @@ -188,10 +204,10 @@ void ItemRead(float _IsNew) if(self.mdl == "") - dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, " tell tZork aboute this!\n"); + LOG_TRACE("^1WARNING!^7 self.mdl is unset for item ", self.classname, " tell tZork aboute this!\n"); precache_model(self.mdl); - setmodel(self, self.mdl); + _setmodel(self, self.mdl); } if(sf & ISF_COLORMAP) @@ -231,64 +247,61 @@ void ItemRead(float _IsNew) #ifdef SVQC bool ItemSend(entity to, int sf) -{ - if(self.gravity) - sf |= ISF_DROP; - else - sf &= ~ISF_DROP; +{SELFPARAM(); + if(self.gravity) + sf |= ISF_DROP; + else + sf &= ~ISF_DROP; WriteByte(MSG_ENTITY, ENT_CLIENT_ITEM); WriteByte(MSG_ENTITY, sf); //WriteByte(MSG_ENTITY, self.cnt); - if(sf & ISF_LOCATION) - { - WriteCoord(MSG_ENTITY, self.origin.x); - WriteCoord(MSG_ENTITY, self.origin.y); - WriteCoord(MSG_ENTITY, self.origin.z); - } + if(sf & ISF_LOCATION) + { + WriteCoord(MSG_ENTITY, self.origin.x); + WriteCoord(MSG_ENTITY, self.origin.y); + WriteCoord(MSG_ENTITY, self.origin.z); + } - if(sf & ISF_ANGLES) - { - WriteCoord(MSG_ENTITY, self.angles.x); - WriteCoord(MSG_ENTITY, self.angles.y); - WriteCoord(MSG_ENTITY, self.angles.z); - } + if(sf & ISF_ANGLES) + { + WriteAngle(MSG_ENTITY, self.angles_x); + WriteAngle(MSG_ENTITY, self.angles_y); + WriteAngle(MSG_ENTITY, self.angles_z); + } - if(sf & ISF_SIZE) - { - WriteCoord(MSG_ENTITY, self.mins.x); - WriteCoord(MSG_ENTITY, self.mins.y); - WriteCoord(MSG_ENTITY, self.mins.z); - WriteCoord(MSG_ENTITY, self.maxs.x); - WriteCoord(MSG_ENTITY, self.maxs.y); - WriteCoord(MSG_ENTITY, self.maxs.z); - } + if(sf & ISF_SIZE) + { + WriteByte(MSG_ENTITY, ((self.flags & FL_POWERUP) || self.health || self.armorvalue)); + } - if(sf & ISF_STATUS) - WriteByte(MSG_ENTITY, self.ItemStatus); + if(sf & ISF_STATUS) + WriteByte(MSG_ENTITY, self.ItemStatus); - if(sf & ISF_MODEL) - { + if(sf & ISF_MODEL) + { + WriteShort(MSG_ENTITY, self.fade_end); + WriteShort(MSG_ENTITY, self.fade_start); - if(self.mdl == "") - dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, "exspect a crash just aboute now\n"); + if(self.mdl == "") + LOG_TRACE("^1WARNING!^7 self.mdl is unset for item ", self.classname, "exspect a crash just aboute now\n"); - WriteString(MSG_ENTITY, self.mdl); - } + WriteString(MSG_ENTITY, self.mdl); + } - if(sf & ISF_COLORMAP) - WriteShort(MSG_ENTITY, self.colormap); + if(sf & ISF_COLORMAP) + WriteShort(MSG_ENTITY, self.colormap); - if(sf & ISF_DROP) - { - WriteCoord(MSG_ENTITY, self.velocity.x); - WriteCoord(MSG_ENTITY, self.velocity.y); - WriteCoord(MSG_ENTITY, self.velocity.z); - } + if(sf & ISF_DROP) + { + WriteCoord(MSG_ENTITY, self.velocity.x); + WriteCoord(MSG_ENTITY, self.velocity.y); + WriteCoord(MSG_ENTITY, self.velocity.z); + } - return true; + return true; } void ItemUpdate(entity item) @@ -297,7 +310,7 @@ void ItemUpdate(entity item) } float have_pickup_item(void) -{ +{SELFPARAM(); if(self.flags & FL_POWERUP) { if(autocvar_g_powerups > 0) @@ -384,26 +397,26 @@ void Item_Show (entity e, float mode) e.ItemStatus &= ~ITS_AVAILABLE; } - if (e.items & IT_STRENGTH || e.items & IT_INVINCIBLE) - e.ItemStatus |= ITS_POWERUP; + if (e.items & ITEM_Strength.m_itemid || e.items & ITEM_Shield.m_itemid) + e.ItemStatus |= ITS_POWERUP; if (autocvar_g_nodepthtestitems) e.effects |= EF_NODEPTHTEST; - if (autocvar_g_fullbrightitems) + if (autocvar_g_fullbrightitems) e.ItemStatus |= ITS_ALLOWFB; if (autocvar_sv_simple_items) - e.ItemStatus |= ITS_ALLOWSI; + e.ItemStatus |= ITS_ALLOWSI; // relink entity (because solid may have changed) setorigin(e, e.origin); - e.SendFlags |= ISF_STATUS; + e.SendFlags |= ISF_STATUS; } void Item_Think() -{ +{SELFPARAM(); self.nextthink = time; if(self.origin != self.oldorigin) { @@ -412,186 +425,40 @@ void Item_Think() } } -float it_armor_large_time; -float it_health_mega_time; -float it_invisible_time; -float it_speed_time; -float it_extralife_time; -float it_strength_time; -float it_shield_time; -float it_fuelregen_time; -float it_jetpack_time; -float it_superweapons_time; - -void Item_ItemsTime_Init() -{ - it_armor_large_time = -1; - it_health_mega_time = -1; - it_invisible_time = -1; - it_speed_time = -1; - it_extralife_time = -1; - it_strength_time = -1; - it_shield_time = -1; - it_fuelregen_time = -1; - it_jetpack_time = -1; - it_superweapons_time = -1; -} -void Item_ItemsTime_ResetTimes() -{ - it_armor_large_time = (it_armor_large_time == -1) ? -1 : 0; - it_health_mega_time = (it_health_mega_time == -1) ? -1 : 0; - it_invisible_time = (it_invisible_time == -1) ? -1 : 0; - it_speed_time = (it_speed_time == -1) ? -1 : 0; - it_extralife_time = (it_extralife_time == -1) ? -1 : 0; - it_strength_time = (it_strength_time == -1) ? -1 : 0; - it_shield_time = (it_shield_time == -1) ? -1 : 0; - it_fuelregen_time = (it_fuelregen_time == -1) ? -1 : 0; - it_jetpack_time = (it_jetpack_time == -1) ? -1 : 0; - it_superweapons_time= (it_superweapons_time== -1) ? -1 : 0; -} -void Item_ItemsTime_ResetTimesForPlayer(entity e) -{ - e.item_armor_large_time = (it_armor_large_time == -1) ? -1 : 0; - e.item_health_mega_time = (it_health_mega_time == -1) ? -1 : 0; - e.item_invisible_time = (it_invisible_time == -1) ? -1 : 0; - e.item_speed_time = (it_speed_time == -1) ? -1 : 0; - e.item_extralife_time = (it_extralife_time == -1) ? -1 : 0; - e.item_strength_time = (it_strength_time == -1) ? -1 : 0; - e.item_shield_time = (it_shield_time == -1) ? -1 : 0; - e.item_fuelregen_time = (it_fuelregen_time == -1) ? -1 : 0; - e.item_jetpack_time = (it_jetpack_time == -1) ? -1 : 0; - e.item_superweapons_time= (it_superweapons_time== -1) ? -1 : 0; -} -void Item_ItemsTime_SetTimesForPlayer(entity e) -{ - e.item_armor_large_time = it_armor_large_time; - e.item_health_mega_time = it_health_mega_time; - e.item_invisible_time = it_invisible_time; - e.item_speed_time = it_speed_time; - e.item_extralife_time = it_extralife_time; - e.item_strength_time = it_strength_time; - e.item_shield_time = it_shield_time; - e.item_fuelregen_time = it_fuelregen_time; - e.item_jetpack_time = it_jetpack_time; - e.item_superweapons_time = it_superweapons_time; -} -bool Item_ItemsTime_UpdateTime_Check(float item_time, float t) -{ - if(t == 0 && item_time == -1) - return true; - if(time < t && (item_time <= time || t < item_time)) - return true; - return false; -} -void Item_ItemsTime_UpdateTime(entity e, float t) -{ - if(g_instagib) - { - switch(e.items) - { - case IT_STRENGTH://"item-invis" - if(Item_ItemsTime_UpdateTime_Check(it_invisible_time, t)) - it_invisible_time = t; - break; - case IT_NAILS://"item-extralife" - if(Item_ItemsTime_UpdateTime_Check(it_extralife_time, t)) - it_extralife_time = t; - break; - case IT_INVINCIBLE://"item-speed" - if(Item_ItemsTime_UpdateTime_Check(it_speed_time, t)) - it_speed_time = t; - break; - } - } - else - { - switch(e.items) - { - case IT_HEALTH: - if(!autocvar_sv_itemstime) - break; - //if (e.classname == "item_health_mega") - if(Item_ItemsTime_UpdateTime_Check(it_health_mega_time, t)) - it_health_mega_time = t; - break; - case IT_ARMOR: - if(!autocvar_sv_itemstime) - break; - if (e.classname == "item_armor_large") - if(Item_ItemsTime_UpdateTime_Check(it_armor_large_time, t)) - it_armor_large_time = t; - break; - case IT_STRENGTH://"item-strength" - if(Item_ItemsTime_UpdateTime_Check(it_strength_time, t)) - it_strength_time = t; - break; - case IT_INVINCIBLE://"item-shield" - if(Item_ItemsTime_UpdateTime_Check(it_shield_time, t)) - it_shield_time = t; - break; - default: - if(e.weapons & WEPSET_SUPERWEAPONS) - if(Item_ItemsTime_UpdateTime_Check(it_superweapons_time, t)) - it_superweapons_time = t; - } - } - switch(e.items) - { - case IT_FUEL_REGEN://"item-fuelregen" - if(Item_ItemsTime_UpdateTime_Check(it_fuelregen_time, t)) - it_fuelregen_time = t; - break; - case IT_JETPACK://"item-jetpack" - if(Item_ItemsTime_UpdateTime_Check(it_jetpack_time, t)) - it_jetpack_time = t; - break; - } -} -void Item_ItemsTime_SetTimesForAllPlayers() -{ - entity e; - if(warmup_stage) - { - FOR_EACH_REALCLIENT(e) - Item_ItemsTime_SetTimesForPlayer(e); - } - else - { - FOR_EACH_REALCLIENT(e) - { - if(!IS_PLAYER(e)) - Item_ItemsTime_SetTimesForPlayer(e); - } - } -} +bool Item_ItemsTime_SpectatorOnly(GameItem it); +bool Item_ItemsTime_Allow(GameItem it, WepSet _weapons); +float Item_ItemsTime_UpdateTime(entity e, float t); +void Item_ItemsTime_SetTime(entity e, float t); +void Item_ItemsTime_SetTimesForAllPlayers(); void Item_Respawn (void) -{ +{SELFPARAM(); Item_Show(self, 1); // this is ugly... - if(self.items == IT_STRENGTH) + if(self.items == ITEM_Strength.m_itemid) sound (self, CH_TRIGGER, "misc/strength_respawn.wav", VOL_BASE, ATTEN_NORM); // play respawn sound - else if(self.items == IT_INVINCIBLE) + else if(self.items == ITEM_Shield.m_itemid) sound (self, CH_TRIGGER, "misc/shield_respawn.wav", VOL_BASE, ATTEN_NORM); // play respawn sound else sound (self, CH_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTEN_NORM); // play respawn sound setorigin (self, self.origin); - if(self.flags & FL_POWERUP || self.classname == "item_armor_large" || self.items == IT_HEALTH || (self.weapons & WEPSET_SUPERWEAPONS)) + if (Item_ItemsTime_Allow(self.itemdef, self.weapons)) { - Item_ItemsTime_UpdateTime(self, 0); + float t = Item_ItemsTime_UpdateTime(self, 0); + Item_ItemsTime_SetTime(self, t); Item_ItemsTime_SetTimesForAllPlayers(); } self.think = Item_Think; self.nextthink = time; - //pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1); - pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1); + //Send_Effect(EFFECT_ITEM_RESPAWN, self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1); + Send_Effect(EFFECT_ITEM_RESPAWN, CENTER_OR_VIEWOFS(self), '0 0 0', 1); } void Item_RespawnCountdown (void) -{ +{SELFPARAM(); if(self.count >= ITEM_RESPAWN_TICKS) { if(self.waypointsprite_attached) @@ -604,65 +471,47 @@ void Item_RespawnCountdown (void) self.count += 1; if(self.count == 1) { - string name; - vector rgb = '1 0 1'; - name = string_null; - switch(self.items) - { - case IT_FUEL_REGEN: name = "item-fuelregen"; rgb = '1 0.5 0'; break; - case IT_JETPACK: name = "item-jetpack"; rgb = '0.5 0.5 0.5'; break; - case IT_STRENGTH: name = "item-strength"; rgb = '0 0 1'; break; - case IT_INVINCIBLE: name = "item-shield"; rgb = '1 0 1'; break; - case IT_HEALTH: - //if (self.classname == "item_health_mega") - {name = "item_health_mega"; rgb = '1 0 0';} - break; - case IT_ARMOR: - if (self.classname == "item_armor_large") - {name = "item_armor_large"; rgb = '0 1 0';} - break; - } - item_name = name; - item_color = rgb; - MUTATOR_CALLHOOK(Item_RespawnCountdown); - name = item_name; - rgb = item_color; - if(self.flags & FL_WEAPON) - { + MUTATOR_CALLHOOK(Item_RespawnCountdown, string_null, '0 0 0'); + int wpextra = 0; + entity e = self.itemdef; + if (e) wpextra = e.m_id; + if (self.flags & FL_WEAPON) { entity wi = get_weaponinfo(self.weapon); - if(wi) - { - name = wi.wpmodel; - rgb = '1 0 0'; - } - } - if(name) - { - WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP, rgb); - if(self.waypointsprite_attached) - { - if (self.items == IT_HEALTH || self.items == IT_ARMOR) - WaypointSprite_UpdateRule(self.waypointsprite_attached, 0, SPRITERULE_SPECTATOR); - WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, time + ITEM_RESPAWN_TICKS); - } - } - else - { - print("Unknown powerup-marked item is wanting to respawn\n"); - localcmd(sprintf("prvm_edict server %d\n", num_for_edict(self))); + if (wi) wpextra = wi.m_id; } + entity wp = WaypointSprite_Spawn(WP_Item, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP); + wp.wp_extra = wpextra; + if(self.waypointsprite_attached) + { + GameItem def = self.itemdef; + if (Item_ItemsTime_SpectatorOnly(def)) + WaypointSprite_UpdateRule(self.waypointsprite_attached, 0, SPRITERULE_SPECTATOR); + WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, time + ITEM_RESPAWN_TICKS); + } } - sound (self, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM); // play respawn sound + if(self.waypointsprite_attached) { + setself(self.waypointsprite_attached); + entity e; + FOR_EACH_REALCLIENT(e) + if(self.waypointsprite_visible_for_player(e)) + { + msg_entity = e; + soundto(MSG_ONE, this, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM); // play respawn sound + } + setself(this); + WaypointSprite_Ping(self.waypointsprite_attached); //WaypointSprite_UpdateHealth(self.waypointsprite_attached, self.count); } + else + sound(self, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM); // play respawn sound } } void Item_RespawnThink() -{ +{SELFPARAM(); self.nextthink = time; if(self.origin != self.oldorigin) { @@ -676,50 +525,14 @@ void Item_RespawnThink() void Item_ScheduleRespawnIn(entity e, float t) { - if((e.flags & FL_POWERUP) || (e.weapons & WEPSET_SUPERWEAPONS) || e.classname == "item_armor_large" || e.items == IT_HEALTH) + if (Item_ItemsTime_Allow(e.itemdef, e.weapons)) { - entity head; e.think = Item_RespawnCountdown; e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS); e.scheduledrespawntime = e.nextthink + ITEM_RESPAWN_TICKS; e.count = 0; - if(e.weapons & WEPSET_SUPERWEAPONS) - { - for(t = e.scheduledrespawntime, head = world; (head = nextent(head)); ) - { - if(e == head) - continue; - if(clienttype(head) == CLIENTTYPE_NOTACLIENT) - if(head.weapons & WEPSET_SUPERWEAPONS) - if(head.classname != "weapon_info") - { - if(head.scheduledrespawntime <= time) - { - t = 0; - break; - } - if(head.scheduledrespawntime < t) - t = head.scheduledrespawntime; - } - } - } - else - { - for(t = e.scheduledrespawntime, head = world; (head = find(head, classname, e.classname)); ) - { - // in instagib .classname is "instagib" for every item - if(e == head || (g_instagib && e.items != head.items)) - continue; - if(head.scheduledrespawntime <= time) - { - t = 0; - break; - } - if(head.scheduledrespawntime < t) - t = head.scheduledrespawntime; - } - } - Item_ItemsTime_UpdateTime(e, t); + t = Item_ItemsTime_UpdateTime(e, e.scheduledrespawntime); + Item_ItemsTime_SetTime(e, t); Item_ItemsTime_SetTimesForAllPlayers(); } else @@ -870,6 +683,13 @@ float Item_GiveTo(entity item, entity player) if (!pickedup) return 0; + // crude hack to enforce switching weapons + if(g_cts && (item.flags & FL_WEAPON)) + { + W_SwitchWeapon_Force(player, item.weapon); + return 1; + } + if (_switchweapon) if (player.switchweapon != w_getbestweapon(player)) W_SwitchWeapon_Force(player, w_getbestweapon(player)); @@ -877,10 +697,8 @@ float Item_GiveTo(entity item, entity player) return 1; } -.entity itemdef; - void Item_Touch (void) -{ +{SELFPARAM(); entity e, head; // remove the item if it's currnetly in a NODROP brush or hits a NOIMPACT surface (such as sky) @@ -893,20 +711,15 @@ void Item_Touch (void) } } - if (!IS_PLAYER(other)) - return; - if (other.frozen) - return; - if (other.deadflag) - return; - if (self.solid != SOLID_TRIGGER) - return; - if (self.owner == other) - return; - if (time < self.item_spawnshieldtime) - return; + if(!(other.flags & FL_PICKUPITEMS) + || other.frozen + || other.deadflag + || (self.solid != SOLID_TRIGGER) + || (self.owner == other) + || (time < self.item_spawnshieldtime) + ) { return;} - switch(MUTATOR_CALLHOOK(ItemTouch)) + switch(MUTATOR_CALLHOOK(ItemTouch, self, other)) { case MUT_ITEMTOUCH_RETURN: { return; } case MUT_ITEMTOUCH_PICKUP: { goto pickup; } @@ -936,7 +749,7 @@ void Item_Touch (void) other.last_pickup = time; - pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1); + Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(self), '0 0 0', 1); sound (other, CH_TRIGGER, self.item_pickupsound, VOL_BASE, ATTEN_NORM); if (self.classname == "droppedweapon") @@ -949,6 +762,7 @@ void Item_Touch (void) for(head = world; (head = findfloat(head, team, self.team)); ) { if(head.flags & FL_ITEM) + if(head.classname != "item_flag_team" && head.classname != "item_key_team") { Item_Show(head, -1); RandomSelection_Add(head, 0, string_null, head.cnt, 0); @@ -964,7 +778,7 @@ void Item_Touch (void) } void Item_Reset() -{ +{SELFPARAM(); Item_Show(self, !self.state); setorigin (self, self.origin); @@ -982,21 +796,25 @@ void Item_Reset() } void Item_FindTeam() -{ +{SELFPARAM(); entity head, e; if(self.effects & EF_NODRAW) { // marker for item team search - dprint("Initializing item team ", ftos(self.team), "\n"); + LOG_TRACE("Initializing item team ", ftos(self.team), "\n"); RandomSelection_Init(); - for(head = world; (head = findfloat(head, team, self.team)); ) if(head.flags & FL_ITEM) + for(head = world; (head = findfloat(head, team, self.team)); ) + if(head.flags & FL_ITEM) + if(head.classname != "item_flag_team" && head.classname != "item_key_team") RandomSelection_Add(head, 0, string_null, head.cnt, 0); e = RandomSelection_chosen_ent; e.state = 0; Item_Show(e, 1); - for(head = world; (head = findfloat(head, team, self.team)); ) if(head.flags & FL_ITEM) + for(head = world; (head = findfloat(head, team, self.team)); ) + if(head.flags & FL_ITEM) + if(head.classname != "item_flag_team" && head.classname != "item_key_team") { if(head != e) { @@ -1014,7 +832,9 @@ void Item_FindTeam() // Savage: used for item garbage-collection // TODO: perhaps nice special effect? void RemoveItem(void) -{ +{SELFPARAM(); + if(wasfreed(self) || !self) { return; } + Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(self), '0 0 0', 1); remove(self); } @@ -1088,17 +908,17 @@ float commodity_pickupevalfunc(entity player, entity item) if (!(player.weapons & WepSet_FromWeapon(i))) continue; - if(wi.items & IT_SHELLS) + if(wi.items & ITEM_Shells.m_itemid) need_shells = true; - else if(wi.items & IT_NAILS) + else if(wi.items & ITEM_Bullets.m_itemid) need_nails = true; - else if(wi.items & IT_ROCKETS) + else if(wi.items & ITEM_Rockets.m_itemid) need_rockets = true; - else if(wi.items & IT_CELLS) + else if(wi.items & ITEM_Cells.m_itemid) need_cells = true; - else if(wi.items & IT_PLASMA) + else if(wi.items & ITEM_Plasma.m_itemid) need_plasma = true; - else if(wi.items & IT_FUEL) + else if(wi.items & ITEM_JetpackFuel.m_itemid) need_fuel = true; } @@ -1146,7 +966,7 @@ void Item_Damage(entity inflictor, entity attacker, float damage, int deathtype, } void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, float defaultrespawntimejitter, string itemname, float itemid, float weaponid, float itemflags, float(entity player, entity item) pickupevalfunc, float pickupbasevalue) -{ +{SELFPARAM(); startitem_failed = false; if(self.model == "") @@ -1170,6 +990,12 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.items = itemid; self.weapon = weaponid; + if(!self.fade_end) + { + self.fade_start = autocvar_g_items_mindist; + self.fade_end = autocvar_g_items_maxdist; + } + if(weaponid) self.weapons = WepSet_FromWeapon(weaponid); @@ -1231,6 +1057,9 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } + if(self.angles != '0 0 0') + self.SendFlags |= ISF_ANGLES; + self.reset = Item_Reset; // it's a level item if(self.spawnflags & 1) @@ -1249,7 +1078,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, setsize (self, '-16 -16 0', '16 16 48'); else setsize (self, '-16 -16 0', '16 16 32'); - + self.SendFlags |= ISF_SIZE; // note droptofloor returns false if stuck/or would fall too far droptofloor(); waypoint_spawnforitem(self); @@ -1277,8 +1106,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, // why not flags & fl_item? if(otheritem.is_item) { - dprint("XXX Found duplicated item: ", itemname, vtos(self.origin)); - dprint(" vs ", otheritem.netname, vtos(otheritem.origin), "\n"); + LOG_TRACE("XXX Found duplicated item: ", itemname, vtos(self.origin)); + LOG_TRACE(" vs ", otheritem.netname, vtos(otheritem.origin), "\n"); error("Mapper sucks."); } } @@ -1291,9 +1120,9 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, precache_sound (self.item_pickupsound); precache_sound ("misc/itemrespawncountdown.wav"); - if(itemid == IT_STRENGTH) + if(itemid == ITEM_Strength.m_itemid) precache_sound ("misc/strength_respawn.wav"); - else if(itemid == IT_INVINCIBLE) + else if(itemid == ITEM_Shield.m_itemid) precache_sound ("misc/shield_respawn.wav"); else precache_sound ("misc/itemrespawn.wav"); @@ -1301,7 +1130,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, if((itemflags & (FL_POWERUP | FL_WEAPON)) || (itemid & (IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2))) self.target = "###item###"; // for finding the nearest item using find() - Item_ItemsTime_UpdateTime(self, 0); + Item_ItemsTime_SetTime(self, 0); } self.bot_pickup = true; @@ -1310,33 +1139,35 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.mdl = self.model; self.netname = itemname; self.touch = Item_Touch; - setmodel(self, "null"); // precision set below + setmodel(self, MDL_Null); // precision set below //self.effects |= EF_LOWPRECISION; if((itemflags & FL_POWERUP) || self.health || self.armorvalue) - { - self.pos1 = '-16 -16 0'; - self.pos2 = '16 16 48'; - } + { + self.pos1 = '-16 -16 0'; + self.pos2 = '16 16 48'; + } else - { - self.pos1 = '-16 -16 0'; - self.pos2 = '16 16 32'; - } - setsize (self, self.pos1, self.pos2); + { + self.pos1 = '-16 -16 0'; + self.pos2 = '16 16 32'; + } + setsize (self, self.pos1, self.pos2); - if(itemflags & FL_POWERUP) - self.ItemStatus |= ITS_ANIMATE1; + self.SendFlags |= ISF_SIZE; + + if(itemflags & FL_POWERUP) + self.ItemStatus |= ITS_ANIMATE1; if(self.armorvalue || self.health) - self.ItemStatus |= ITS_ANIMATE2; + self.ItemStatus |= ITS_ANIMATE2; if(itemflags & FL_WEAPON) { if (self.classname != "droppedweapon") // if dropped, colormap is already set up nicely - self.colormap = 1024; // color shirt=0 pants=0 grey - else - self.gravity = 1; + self.colormap = 1024; // color shirt=0 pants=0 grey + else + self.gravity = 1; self.ItemStatus |= ITS_ANIMATE1; self.ItemStatus |= ISF_COLORMAP; @@ -1354,14 +1185,10 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, else Item_Reset(); - Net_LinkEntity(self, false, 0, ItemSend); - - self.SendFlags |= ISF_SIZE; - if(self.angles) - self.SendFlags |= ISF_ANGLES; + Net_LinkEntity(self, !((itemflags & FL_POWERUP) || self.health || self.armorvalue), 0, ItemSend); // call this hook after everything else has been done - if(MUTATOR_CALLHOOK(Item_Spawn)) + if(MUTATOR_CALLHOOK(Item_Spawn, self)) { startitem_failed = true; remove(self); @@ -1369,13 +1196,21 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, } } -void StartItemA (entity a) +string Item_Model(string item_mdl) { + string output = strcat("models/items/", item_mdl); + MUTATOR_CALLHOOK(ItemModel, item_mdl, output); + return strzone(item_model_output); +} + +void StartItemA (entity a) +{SELFPARAM(); self.itemdef = a; - StartItem(a.m_model, a.m_sound, a.m_respawntime(), a.m_respawntimejitter(), a.m_name, a.m_itemid, 0, a.m_itemflags, a.m_pickupevalfunc, a.m_botvalue); + StartItem(Item_Model(a.m_model), a.m_sound, a.m_respawntime(), a.m_respawntimejitter(), a.m_name, a.m_itemid, 0, a.m_itemflags, a.m_pickupevalfunc, a.m_botvalue); } -void spawnfunc_item_rockets (void) { +spawnfunc(item_rockets) +{ if(!self.ammo_rockets) self.ammo_rockets = g_pickup_rockets; if(!self.pickup_anyway) @@ -1383,13 +1218,14 @@ void spawnfunc_item_rockets (void) { StartItemA (ITEM_Rockets); } -void spawnfunc_item_bullets (void) { +spawnfunc(item_bullets) +{ if(!weaponswapping) if(autocvar_sv_q3acompat_machineshotgunswap) if(self.classname != "droppedweapon") { weaponswapping = true; - spawnfunc_item_shells(); + spawnfunc_item_shells(this); weaponswapping = false; return; } @@ -1401,7 +1237,8 @@ void spawnfunc_item_bullets (void) { StartItemA (ITEM_Bullets); } -void spawnfunc_item_cells (void) { +spawnfunc(item_cells) +{ if(!self.ammo_cells) self.ammo_cells = g_pickup_cells; if(!self.pickup_anyway) @@ -1409,7 +1246,7 @@ void spawnfunc_item_cells (void) { StartItemA (ITEM_Cells); } -void spawnfunc_item_plasma() +spawnfunc(item_plasma) { if(!self.ammo_plasma) self.ammo_plasma = g_pickup_plasma; @@ -1418,13 +1255,14 @@ void spawnfunc_item_plasma() StartItemA (ITEM_Plasma); } -void spawnfunc_item_shells (void) { +spawnfunc(item_shells) +{ if(!weaponswapping) if(autocvar_sv_q3acompat_machineshotgunswap) if(self.classname != "droppedweapon") { weaponswapping = true; - spawnfunc_item_bullets(); + spawnfunc_item_bullets(this); weaponswapping = false; return; } @@ -1436,7 +1274,8 @@ void spawnfunc_item_shells (void) { StartItemA (ITEM_Shells); } -void spawnfunc_item_armor_small (void) { +spawnfunc(item_armor_small) +{ if(!self.armorvalue) self.armorvalue = g_pickup_armorsmall; if(!self.max_armorvalue) @@ -1446,7 +1285,8 @@ void spawnfunc_item_armor_small (void) { StartItemA (ITEM_ArmorSmall); } -void spawnfunc_item_armor_medium (void) { +spawnfunc(item_armor_medium) +{ if(!self.armorvalue) self.armorvalue = g_pickup_armormedium; if(!self.max_armorvalue) @@ -1456,27 +1296,30 @@ void spawnfunc_item_armor_medium (void) { StartItemA (ITEM_ArmorMedium); } -void spawnfunc_item_armor_big (void) { +spawnfunc(item_armor_big) +{ if(!self.armorvalue) self.armorvalue = g_pickup_armorbig; if(!self.max_armorvalue) self.max_armorvalue = g_pickup_armorbig_max; if(!self.pickup_anyway) self.pickup_anyway = g_pickup_armorbig_anyway; - StartItemA (ITEM_ArmorBig); + StartItemA (ITEM_ArmorLarge); } -void spawnfunc_item_armor_large (void) { +spawnfunc(item_armor_large) +{ if(!self.armorvalue) self.armorvalue = g_pickup_armorlarge; if(!self.max_armorvalue) self.max_armorvalue = g_pickup_armorlarge_max; if(!self.pickup_anyway) self.pickup_anyway = g_pickup_armorlarge_anyway; - StartItemA (ITEM_ArmorLarge); + StartItemA (ITEM_ArmorMega); } -void spawnfunc_item_health_small (void) { +spawnfunc(item_health_small) +{ if(!self.max_health) self.max_health = g_pickup_healthsmall_max; if(!self.health) @@ -1486,7 +1329,8 @@ void spawnfunc_item_health_small (void) { StartItemA (ITEM_HealthSmall); } -void spawnfunc_item_health_medium (void) { +spawnfunc(item_health_medium) +{ if(!self.max_health) self.max_health = g_pickup_healthmedium_max; if(!self.health) @@ -1496,7 +1340,8 @@ void spawnfunc_item_health_medium (void) { StartItemA (ITEM_HealthMedium); } -void spawnfunc_item_health_large (void) { +spawnfunc(item_health_large) +{ if(!self.max_health) self.max_health = g_pickup_healthlarge_max; if(!self.health) @@ -1506,7 +1351,8 @@ void spawnfunc_item_health_large (void) { StartItemA (ITEM_HealthLarge); } -void spawnfunc_item_health_mega (void) { +spawnfunc(item_health_mega) +{ if(!self.max_health) self.max_health = g_pickup_healthmega_max; if(!self.health) @@ -1517,30 +1363,32 @@ void spawnfunc_item_health_mega (void) { } // support old misnamed entities -void spawnfunc_item_armor1() { spawnfunc_item_armor_small(); } // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard -void spawnfunc_item_armor25() { spawnfunc_item_armor_large(); } -void spawnfunc_item_health1() { spawnfunc_item_health_small(); } -void spawnfunc_item_health25() { spawnfunc_item_health_medium(); } -void spawnfunc_item_health100() { spawnfunc_item_health_mega(); } +spawnfunc(item_armor1) { spawnfunc_item_armor_small(this); } // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard +spawnfunc(item_armor25) { spawnfunc_item_armor_large(this); } +spawnfunc(item_health1) { spawnfunc_item_health_small(this); } +spawnfunc(item_health25) { spawnfunc_item_health_medium(this); } +spawnfunc(item_health100) { spawnfunc_item_health_mega(this); } -void spawnfunc_item_strength (void) { +spawnfunc(item_strength) +{ precache_sound("weapons/strength_fire.wav"); if(!self.strength_finished) self.strength_finished = autocvar_g_balance_powerup_strength_time; StartItemA (ITEM_Strength); } -void spawnfunc_item_invincible (void) { +spawnfunc(item_invincible) +{ if(!self.invincible_finished) self.invincible_finished = autocvar_g_balance_powerup_invincible_time; StartItemA (ITEM_Shield); } // compatibility: -void spawnfunc_item_quad (void) {self.classname = "item_strength";spawnfunc_item_strength();} +spawnfunc(item_quad) { self.classname = "item_strength";spawnfunc_item_strength(this);} -void target_items_use (void) -{ +void target_items_use() +{SELFPARAM(); if(activator.classname == "droppedweapon") { EXACTTRIGGER_TOUCH; @@ -1563,7 +1411,7 @@ void target_items_use (void) centerprint(activator, self.message); } -void spawnfunc_target_items (void) +spawnfunc(target_items) { float n, i, j; entity e; @@ -1582,7 +1430,7 @@ void spawnfunc_target_items (void) precache_sound("misc/armor25.wav"); precache_sound("misc/powerup.wav"); precache_sound("misc/poweroff.wav"); - precache_sound("weapons/weaponpickup.wav"); + precache_sound(W_Sound("weaponpickup")); n = tokenize_console(self.netname); if(argv(0) == "give") @@ -1596,11 +1444,11 @@ void spawnfunc_target_items (void) if (argv(i) == "unlimited_ammo") self.items |= IT_UNLIMITED_AMMO; else if(argv(i) == "unlimited_weapon_ammo") self.items |= IT_UNLIMITED_WEAPON_AMMO; else if(argv(i) == "unlimited_superweapons") self.items |= IT_UNLIMITED_SUPERWEAPONS; - else if(argv(i) == "strength") self.items |= IT_STRENGTH; - else if(argv(i) == "invincible") self.items |= IT_INVINCIBLE; + else if(argv(i) == "strength") self.items |= ITEM_Strength.m_itemid; + else if(argv(i) == "invincible") self.items |= ITEM_Shield.m_itemid; else if(argv(i) == "superweapons") self.items |= IT_SUPERWEAPON; - else if(argv(i) == "jetpack") self.items |= IT_JETPACK; - else if(argv(i) == "fuel_regen") self.items |= IT_FUEL_REGEN; + else if(argv(i) == "jetpack") self.items |= ITEM_Jetpack.m_itemid; + else if(argv(i) == "fuel_regen") self.items |= ITEM_JetpackRegen.m_itemid; else { for(j = WEP_FIRST; j <= WEP_LAST; ++j) @@ -1616,7 +1464,7 @@ void spawnfunc_target_items (void) } } if(j > WEP_LAST) - print("target_items: invalid item ", argv(i), "\n"); + LOG_INFO("target_items: invalid item ", argv(i), "\n"); } } @@ -1650,11 +1498,11 @@ void spawnfunc_target_items (void) self.netname = ""; self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_UNLIMITED_WEAPON_AMMO), "unlimited_weapon_ammo"); self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_UNLIMITED_SUPERWEAPONS), "unlimited_superweapons"); - self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.strength_finished * !!(self.items & IT_STRENGTH), "strength"); - self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.invincible_finished * !!(self.items & IT_INVINCIBLE), "invincible"); + self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.strength_finished * !!(self.items & ITEM_Strength.m_itemid), "strength"); + self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.invincible_finished * !!(self.items & ITEM_Shield.m_itemid), "invincible"); self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.superweapons_finished * !!(self.items & IT_SUPERWEAPON), "superweapons"); - self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_JETPACK), "jetpack"); - self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_FUEL_REGEN), "fuel_regen"); + self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & ITEM_Jetpack.m_itemid), "jetpack"); + self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & ITEM_JetpackRegen.m_itemid), "fuel_regen"); if(self.ammo_shells != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_shells), "shells"); if(self.ammo_nails != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_nails), "nails"); if(self.ammo_rockets != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_rockets), "rockets"); @@ -1688,7 +1536,7 @@ void spawnfunc_target_items (void) } } -void spawnfunc_item_fuel(void) +spawnfunc(item_fuel) { if(!self.ammo_fuel) self.ammo_fuel = g_pickup_fuel; @@ -1697,23 +1545,23 @@ void spawnfunc_item_fuel(void) StartItemA (ITEM_JetpackFuel); } -void spawnfunc_item_fuel_regen(void) +spawnfunc(item_fuel_regen) { - if(start_items & IT_FUEL_REGEN) + if(start_items & ITEM_JetpackRegen.m_itemid) { - spawnfunc_item_fuel(); + spawnfunc_item_fuel(this); return; } StartItemA (ITEM_JetpackRegen); } -void spawnfunc_item_jetpack(void) +spawnfunc(item_jetpack) { if(!self.ammo_fuel) self.ammo_fuel = g_pickup_fuel_jetpack; - if(start_items & IT_JETPACK) + if(start_items & ITEM_Jetpack.m_itemid) { - spawnfunc_item_fuel(); + spawnfunc_item_fuel(this); return; } StartItemA (ITEM_Jetpack); @@ -1829,7 +1677,7 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa e.(regenfield) = max(e.(regenfield), time + regentime); } float GiveItems(entity e, float beginarg, float endarg) -{ +{SELFPARAM(); float got, i, j, val, op; float _switchweapon; entity wi; @@ -1891,13 +1739,13 @@ float GiveItems(entity e, float beginarg, float endarg) op = OP_MINUS; continue; case "ALL": - got += GiveBit(e, items, IT_FUEL_REGEN, op, val); + got += GiveBit(e, items, ITEM_JetpackRegen.m_itemid, op, val); got += GiveValue(e, strength_finished, op, val); got += GiveValue(e, invincible_finished, op, val); got += GiveValue(e, superweapons_finished, op, val); got += GiveBit(e, items, IT_UNLIMITED_AMMO, op, val); case "all": - got += GiveBit(e, items, IT_JETPACK, op, val); + got += GiveBit(e, items, ITEM_Jetpack.m_itemid, op, val); got += GiveValue(e, health, op, val); got += GiveValue(e, armorvalue, op, val); case "allweapons": @@ -1926,10 +1774,10 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveBit(e, items, IT_UNLIMITED_SUPERWEAPONS, op, val); break; case "jetpack": - got += GiveBit(e, items, IT_JETPACK, op, val); + got += GiveBit(e, items, ITEM_Jetpack.m_itemid, op, val); break; case "fuel_regen": - got += GiveBit(e, items, IT_FUEL_REGEN, op, val); + got += GiveBit(e, items, ITEM_JetpackRegen.m_itemid, op, val); break; case "strength": got += GiveValue(e, strength_finished, op, val); @@ -1976,23 +1824,23 @@ float GiveItems(entity e, float beginarg, float endarg) } } if(j > WEP_LAST) - print("give: invalid item ", cmd, "\n"); + LOG_INFO("give: invalid item ", cmd, "\n"); break; } val = 999; op = OP_SET; } - POSTGIVE_BIT(e, items, IT_FUEL_REGEN, "misc/itempickup.wav", string_null); + POSTGIVE_BIT(e, items, ITEM_JetpackRegen.m_itemid, "misc/itempickup.wav", string_null); POSTGIVE_BIT(e, items, IT_UNLIMITED_SUPERWEAPONS, "misc/powerup.wav", "misc/poweroff.wav"); POSTGIVE_BIT(e, items, IT_UNLIMITED_WEAPON_AMMO, "misc/powerup.wav", "misc/poweroff.wav"); - POSTGIVE_BIT(e, items, IT_JETPACK, "misc/itempickup.wav", string_null); + POSTGIVE_BIT(e, items, ITEM_Jetpack.m_itemid, "misc/itempickup.wav", string_null); for(j = WEP_FIRST; j <= WEP_LAST; ++j) { wi = get_weaponinfo(j); if(wi.weapon) { - POSTGIVE_WEAPON(e, j, "weapons/weaponpickup.wav", string_null); + POSTGIVE_WEAPON(e, j, W_Sound("weaponpickup"), string_null); if (!(save_weapons & WepSet_FromWeapon(j))) if(e.weapons & WepSet_FromWeapon(j)) WEP_ACTION(wi.weapon, WR_INIT);