X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=f9bb3ff10b64d173d028a32345c7c63a682e7b40;hb=e511b0e845ad1696a6ff992d9bf80f2aa1b9e7ad;hp=392c05ce14f3e9b9ac0671b662e510adf34393fd;hpb=9267080769d5642f19ce38a68f297a231a29750b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 392c05ce1..f9bb3ff10 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -1,64 +1,36 @@ -#define ISF_LOCATION 2 -#define ISF_MODEL 4 -#define ISF_STATUS 8 - #define ITS_STAYWEP 1 - #define ITS_ANIMATE1 2 - #define ITS_ANIMATE2 4 - #define ITS_AVAILABLE 8 - #define ITS_ALLOWFB 16 - #define ITS_ALLOWSI 32 - #define ITS_POWERUP 64 -#define ISF_COLORMAP 16 -#define ISF_DROP 32 -#define ISF_ANGLES 64 - -.float ItemStatus; - #ifdef CSQC - -var float autocvar_cl_animate_items = 1; -var float autocvar_cl_ghost_items = 0.45; -var vector autocvar_cl_ghost_items_color = '-1 -1 -1'; -var float autocvar_cl_fullbright_items = 0; -var vector autocvar_cl_weapon_stay_color = '2 0.5 0.5'; -var float autocvar_cl_weapon_stay_alpha = 0.75; -var float autocvar_cl_simple_items = 0; -var string autocvr_cl_simpleitems_postfix = "_simple"; -.float spawntime; -.float gravity; -.vector colormod; void ItemDraw() -{ +{ if(self.gravity) - { + { Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy); - if(self.move_flags & FL_ONGROUND) + if(self.move_flags & FL_ONGROUND) { // For some reason move_avelocity gets set to '0 0 0' here ... self.oldorigin = self.origin; self.gravity = 0; - if(autocvar_cl_animate_items) - { // ... so reset it if animations are requested. + if(autocvar_cl_animate_items) + { // ... so reset it if animations are requested. if(self.ItemStatus & ITS_ANIMATE1) self.move_avelocity = '0 180 0'; - + if(self.ItemStatus & ITS_ANIMATE2) self.move_avelocity = '0 -90 0'; } } } else if (autocvar_cl_animate_items) - { + { if(self.ItemStatus & ITS_ANIMATE1) { self.angles += self.move_avelocity * frametime; - setorigin(self, '0 0 10' + self.oldorigin + '0 0 8' * sin(time * 2)); - } - + setorigin(self, '0 0 10' + self.oldorigin + '0 0 8' * sin(time * 2)); + } + if(self.ItemStatus & ITS_ANIMATE2) { self.angles += self.move_avelocity * frametime; - setorigin(self, '0 0 8' + self.oldorigin + '0 0 4' * sin(time * 3)); + setorigin(self, '0 0 8' + self.oldorigin + '0 0 4' * sin(time * 3)); } } } @@ -66,9 +38,9 @@ void ItemDraw() void ItemDrawSimple() { if(self.gravity) - { - Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy); - + { + Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy); + if(self.move_flags & FL_ONGROUND) self.gravity = 0; } @@ -86,19 +58,30 @@ void ItemRead(float _IsNew) setorigin(self, self.origin); self.oldorigin = self.origin; } - - if(sf & ISF_ANGLES) + + if(sf & ISF_ANGLES) { self.angles_x = ReadCoord(); self.angles_y = ReadCoord(); - self.angles_z = ReadCoord(); + self.angles_z = ReadCoord(); 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); + } + if(sf & ISF_STATUS) // need to read/write status frist so model can handle simple, fb etc. { - self.ItemStatus = ReadByte(); - + self.ItemStatus = ReadByte(); + if(self.ItemStatus & ITS_AVAILABLE) { self.alpha = 1; @@ -113,47 +96,47 @@ void ItemRead(float _IsNew) } else self.alpha = -1; - } - + } + if(autocvar_cl_fullbright_items) if(self.ItemStatus & ITS_ALLOWFB) self.effects |= EF_FULLBRIGHT; - + if(self.ItemStatus & ITS_STAYWEP) { self.colormod = self.glowmod = autocvar_cl_weapon_stay_color; self.alpha = autocvar_cl_weapon_stay_alpha; - + } - + if(self.ItemStatus & ITS_POWERUP) { if(self.ItemStatus & ITS_AVAILABLE) self.effects |= (EF_ADDITIVE | EF_FULLBRIGHT); else - self.effects &~= (EF_ADDITIVE | EF_FULLBRIGHT); + self.effects &= ~(EF_ADDITIVE | EF_FULLBRIGHT); } } - + if(sf & ISF_MODEL) { self.drawmask = MASK_NORMAL; - self.movetype = MOVETYPE_NOCLIP; + self.movetype = MOVETYPE_TOSS; self.draw = ItemDraw; - + if(self.mdl) strunzone(self.mdl); - + self.mdl = ""; string _fn = ReadString(); - + if(autocvar_cl_simple_items && (self.ItemStatus & ITS_ALLOWSI)) { string _fn2 = substring(_fn, 0 , strlen(_fn) -4); self.draw = ItemDrawSimple; - - - + + + if(fexists(sprintf("%s%s.md3", _fn2, autocvr_cl_simpleitems_postfix))) self.mdl = strzone(sprintf("%s%s.md3", _fn2, autocvr_cl_simpleitems_postfix)); else if(fexists(sprintf("%s%s.dpm", _fn2, autocvr_cl_simpleitems_postfix))) @@ -168,32 +151,32 @@ void ItemRead(float _IsNew) dprint("Simple item requested for ", _fn, " but no model exsist for it\n"); } } - - if(self.draw != ItemDrawSimple) - self.mdl = strzone(_fn); - - + + if(self.draw != ItemDrawSimple) + self.mdl = strzone(_fn); + + if(self.mdl == "") dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, " tell tZork aboute this!\n"); - + precache_model(self.mdl); setmodel(self, self.mdl); } - + if(sf & ISF_COLORMAP) self.colormap = ReadShort(); - + if(sf & ISF_DROP) { self.gravity = 1; - self.move_angles = '0 0 0'; + //self.move_angles = '0 0 0'; self.move_movetype = MOVETYPE_TOSS; self.move_velocity_x = ReadCoord(); self.move_velocity_y = ReadCoord(); self.move_velocity_z = ReadCoord(); self.velocity = self.move_velocity; self.move_origin = self.oldorigin; - + if(!self.move_time) { self.move_time = time; @@ -202,12 +185,12 @@ void ItemRead(float _IsNew) else self.move_time = max(self.move_time, time); } - + if(autocvar_cl_animate_items) - { + { if(self.ItemStatus & ITS_ANIMATE1) self.move_avelocity = '0 180 0'; - + if(self.ItemStatus & ITS_ANIMATE2) self.move_avelocity = '0 -90 0'; } @@ -216,15 +199,14 @@ void ItemRead(float _IsNew) #endif #ifdef SVQC -float autocvar_sv_simple_items; float ItemSend(entity to, float sf) { if(self.gravity) sf |= ISF_DROP; else - sf &~= ISF_DROP; - - WriteByte(MSG_ENTITY, ENT_CLIENT_ITEM); + sf &= ~ISF_DROP; + + WriteByte(MSG_ENTITY, ENT_CLIENT_ITEM); WriteByte(MSG_ENTITY, sf); //WriteByte(MSG_ENTITY, self.cnt); @@ -234,7 +216,7 @@ float ItemSend(entity to, float sf) WriteCoord(MSG_ENTITY, self.origin_y); WriteCoord(MSG_ENTITY, self.origin_z); } - + if(sf & ISF_ANGLES) { WriteCoord(MSG_ENTITY, self.angles_x); @@ -242,19 +224,29 @@ float ItemSend(entity to, float sf) WriteCoord(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_STATUS) WriteByte(MSG_ENTITY, self.ItemStatus); if(sf & ISF_MODEL) { - + if(self.mdl == "") dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, "exspect a crash just aboute now\n"); - + WriteString(MSG_ENTITY, self.mdl); } - - + + if(sf & ISF_COLORMAP) WriteShort(MSG_ENTITY, self.colormap); @@ -264,30 +256,23 @@ float ItemSend(entity to, float sf) WriteCoord(MSG_ENTITY, self.velocity_y); WriteCoord(MSG_ENTITY, self.velocity_z); } - + return TRUE; } +void ItemUpdate(entity item) +{ + item.SendFlags |= ISF_LOCATION; +} float have_pickup_item(void) { - // minstagib: only allow filtered items - if(g_minstagib) - if(self.classname != "minstagib") - return FALSE; - if(self.flags & FL_POWERUP) { if(autocvar_g_powerups > 0) return TRUE; if(autocvar_g_powerups == 0) return FALSE; - if(g_lms) - return FALSE; - if(g_ca) - return FALSE; - if(g_arena) - return FALSE; } else { @@ -295,24 +280,13 @@ float have_pickup_item(void) return TRUE; if(autocvar_g_pickup_items == 0) return FALSE; - if(g_lms) - return FALSE; - if(g_ca) - return FALSE; if(g_weaponarena) - if(!WEPSET_EMPTY_E(self) || (self.items & IT_AMMO)) + if(self.weapons || (self.items & IT_AMMO)) return FALSE; } return TRUE; } -#define ITEM_RESPAWN_TICKS 10 - -#define ITEM_RESPAWNTIME(i) ((i).respawntime + crandom() * (i).respawntimejitter) - // range: respawntime - respawntimejitter .. respawntime + respawntimejitter -#define ITEM_RESPAWNTIME_INITIAL(i) (ITEM_RESPAWN_TICKS + random() * ((i).respawntime + (i).respawntimejitter - ITEM_RESPAWN_TICKS)) - // range: 10 .. respawntime + respawntimejitter - floatfield Item_CounterField(float it) { switch(it) @@ -355,14 +329,12 @@ string Item_CounterFieldName(float it) #endif } -.float max_armorvalue; -.float pickup_anyway; /* float Item_Customize() { if(self.spawnshieldtime) return TRUE; - if(!WEPSET_CONTAINS_ALL_EE(other, self)) + if(self.weapons & ~other.weapons) { self.colormod = '0 0 0'; self.glowmod = self.colormod; @@ -385,9 +357,9 @@ float Item_Customize() */ void Item_Show (entity e, float mode) -{ - e.effects &~= EF_ADDITIVE | EF_STARDUST | EF_FULLBRIGHT | EF_NODEPTHTEST; - e.ItemStatus &~= ITS_STAYWEP; +{ + e.effects &= ~(EF_ADDITIVE | EF_STARDUST | EF_FULLBRIGHT | EF_NODEPTHTEST); + e.ItemStatus &= ~ITS_STAYWEP; if (mode > 0) { // make the item look normal, and be touchable @@ -402,7 +374,7 @@ void Item_Show (entity e, float mode) e.model = string_null; e.solid = SOLID_NOT; e.spawnshieldtime = 1; - e.ItemStatus &~= ITS_AVAILABLE; + e.ItemStatus &= ~ITS_AVAILABLE; } else if((e.flags & FL_WEAPON) && !(e.flags & FL_NO_WEAPON_STAY) && g_weapon_stay) { @@ -420,19 +392,19 @@ void Item_Show (entity e, float mode) e.colormod = '0 0 0'; e.glowmod = e.colormod; e.spawnshieldtime = 1; - e.ItemStatus &~= ITS_AVAILABLE; + e.ItemStatus &= ~ITS_AVAILABLE; } - + if (e.items & IT_STRENGTH || e.items & IT_INVINCIBLE) - e.ItemStatus |= ITS_POWERUP; - + e.ItemStatus |= ITS_POWERUP; + if (autocvar_g_nodepthtestitems) e.effects |= EF_NODEPTHTEST; - - + + if (autocvar_g_fullbrightitems) e.ItemStatus |= ITS_ALLOWFB; - + if (autocvar_sv_simple_items) e.ItemStatus |= ITS_ALLOWSI; @@ -441,17 +413,31 @@ void Item_Show (entity e, float mode) e.SendFlags |= ISF_STATUS; } +void Item_Think() +{ + self.nextthink = time; + if(self.origin != self.oldorigin) + { + self.oldorigin = self.origin; + ItemUpdate(self); + } +} + void Item_Respawn (void) { Item_Show(self, 1); - if(!g_minstagib && self.items == IT_STRENGTH) - sound (self, CH_TRIGGER, "misc/strength_respawn.wav", VOL_BASE, ATTN_NORM); // play respawn sound - else if(!g_minstagib && self.items == IT_INVINCIBLE) - sound (self, CH_TRIGGER, "misc/shield_respawn.wav", VOL_BASE, ATTN_NORM); // play respawn sound + // this is ugly... + if(self.items == IT_STRENGTH) + sound (self, CH_TRIGGER, "misc/strength_respawn.wav", VOL_BASE, ATTEN_NORM); // play respawn sound + else if(self.items == IT_INVINCIBLE) + 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, ATTN_NORM); // play respawn sound + sound (self, CH_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTEN_NORM); // play respawn sound setorigin (self, self.origin); + 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); } @@ -473,28 +459,18 @@ void Item_RespawnCountdown (void) string name; vector rgb = '1 0 1'; name = string_null; - if(g_minstagib) - { - switch(self.items) - { - case IT_STRENGTH: name = "item-invis"; rgb = '0 0 1'; break; - case IT_NAILS: name = "item-extralife"; rgb = '1 0 0'; break; - case IT_INVINCIBLE: name = "item-speed"; rgb = '1 0 1'; break; - } - } - else - { - switch(self.items) - { - case IT_STRENGTH: name = "item-strength"; rgb = '0 0 1'; break; - case IT_INVINCIBLE: name = "item-shield"; rgb = '1 0 1'; break; - } - } 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_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; } + item_name = name; + item_color = rgb; + MUTATOR_CALLHOOK(Item_RespawnCountdown); + name = item_name; + rgb = item_color; if(self.flags & FL_WEAPON) { entity wi = get_weaponinfo(self.weapon); @@ -516,7 +492,7 @@ void Item_RespawnCountdown (void) localcmd(sprintf("prvm_edict server %d\n", num_for_edict(self))); } } - sound (self, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTN_NORM); // play respawn sound + sound (self, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM); // play respawn sound if(self.waypointsprite_attached) { WaypointSprite_Ping(self.waypointsprite_attached); @@ -525,9 +501,22 @@ void Item_RespawnCountdown (void) } } +void Item_RespawnThink() +{ + self.nextthink = time; + if(self.origin != self.oldorigin) + { + self.oldorigin = self.origin; + ItemUpdate(self); + } + + if(time >= self.wait) + Item_Respawn(); +} + void Item_ScheduleRespawnIn(entity e, float t) { - if((e.flags & FL_POWERUP) || WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS)) + if((e.flags & FL_POWERUP) || (e.weapons & WEPSET_SUPERWEAPONS)) { e.think = Item_RespawnCountdown; e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS); @@ -535,8 +524,9 @@ void Item_ScheduleRespawnIn(entity e, float t) } else { - e.think = Item_Respawn; - e.nextthink = time + t; + e.think = Item_RespawnThink; + e.nextthink = time; + e.wait = time + t; } } @@ -557,10 +547,6 @@ void Item_ScheduleInitialRespawn(entity e) Item_ScheduleRespawnIn(e, game_starttime - time + ITEM_RESPAWNTIME_INITIAL(e)); } -float ITEM_MODE_NONE = 0; -float ITEM_MODE_HEALTH = 1; -float ITEM_MODE_ARMOR = 2; -float ITEM_MODE_FUEL = 3; float Item_GiveAmmoTo(entity item, entity player, .float ammofield, float ammomax, float mode) { if (!item.ammofield) @@ -614,130 +600,64 @@ float Item_GiveTo(entity item, entity player) // if nothing happens to player, just return without taking the item pickedup = FALSE; _switchweapon = FALSE; + // in case the player has autoswitch enabled do the following: + // if the player is using their best weapon before items are given, they + // probably want to switch to an even better weapon after items are given + if (player.autoswitch) + if (player.switchweapon == w_getbestweapon(player)) + _switchweapon = TRUE; - if (g_minstagib) - { - float prevcells = player.ammo_cells; - - pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL); - pickedup |= Item_GiveAmmoTo(item, player, ammo_cells, 999, ITEM_MODE_NONE); - - if(player.ammo_cells > prevcells) - { - _switchweapon = TRUE; - - // play some cool sounds ;) - if (clienttype(player) == CLIENTTYPE_REAL) - { - if(player.health <= 5) - Send_Notification(NOTIF_ONE, player, MSG_ANNCE, ANNCE_MINSTAGIB_LASTSECOND); - else if(player.health < 50) - Send_Notification(NOTIF_ONE, player, MSG_ANNCE, ANNCE_MINSTAGIB_NARROWLY); - } - // sound not available - // else if(item.items == IT_CELLS) - // AnnounceTo(player, "ammo"); + if (!(player.weapons & WepSet_FromWeapon(player.switchweapon))) + _switchweapon = TRUE; - if (WEPSET_CONTAINS_EW(item, WEP_MINSTANEX)) - W_GiveWeapon (player, WEP_MINSTANEX); - player.health = 100; - } + pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL); + pickedup |= Item_GiveAmmoTo(item, player, ammo_shells, g_pickup_shells_max, ITEM_MODE_NONE); + pickedup |= Item_GiveAmmoTo(item, player, ammo_nails, g_pickup_nails_max, ITEM_MODE_NONE); + pickedup |= Item_GiveAmmoTo(item, player, ammo_rockets, g_pickup_rockets_max, ITEM_MODE_NONE); + pickedup |= Item_GiveAmmoTo(item, player, ammo_cells, g_pickup_cells_max, ITEM_MODE_NONE); + pickedup |= Item_GiveAmmoTo(item, player, health, item.max_health, ITEM_MODE_HEALTH); + pickedup |= Item_GiveAmmoTo(item, player, armorvalue, item.max_armorvalue, ITEM_MODE_ARMOR); - if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK)) - { - pickedup = TRUE; - player.items |= it; - sprint (player, strcat("You got the ^2", item.netname, "\n")); - } + if (item.flags & FL_WEAPON) + { + WepSet it; + it = item.weapons; + it &= ~player.weapons; - // extralife powerup - if (item.max_health) + if (it || (item.spawnshieldtime && item.pickup_anyway)) { pickedup = TRUE; - // sound not available - // AnnounceTo(player, "_lives"); - player.armorvalue = bound(player.armorvalue, 999, player.armorvalue + autocvar_g_minstagib_extralives); - sprint(player, "^3You picked up some extra lives\n"); + for(i = WEP_FIRST; i <= WEP_LAST; ++i) + if(it & WepSet_FromWeapon(i)) + W_GiveWeapon(player, i); } + } - // invis powerup - if (item.strength_finished) - { - pickedup = TRUE; - // sound not available - // AnnounceTo(player, "invisible"); - player.strength_finished = max(player.strength_finished, time) + autocvar_g_balance_powerup_strength_time; - } + if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK)) + { + pickedup = TRUE; + player.items |= it; + sprint (player, strcat("You got the ^2", item.netname, "\n")); + } - // speed powerup - if (item.invincible_finished) - { - pickedup = TRUE; - // sound not available - // AnnounceTo(player, "speed"); - player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_invincible_time; - } + if (item.strength_finished) + { + pickedup = TRUE; + player.strength_finished = max(player.strength_finished, time) + item.strength_finished; } - else + if (item.invincible_finished) { - // in case the player has autoswitch enabled do the following: - // if the player is using their best weapon before items are given, they - // probably want to switch to an even better weapon after items are given - if (player.autoswitch) - if (player.switchweapon == w_getbestweapon(player)) - _switchweapon = TRUE; - - if not(WEPSET_CONTAINS_EW(player, player.switchweapon)) - _switchweapon = TRUE; - - pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL); - pickedup |= Item_GiveAmmoTo(item, player, ammo_shells, g_pickup_shells_max, ITEM_MODE_NONE); - pickedup |= Item_GiveAmmoTo(item, player, ammo_nails, g_pickup_nails_max, ITEM_MODE_NONE); - pickedup |= Item_GiveAmmoTo(item, player, ammo_rockets, g_pickup_rockets_max, ITEM_MODE_NONE); - pickedup |= Item_GiveAmmoTo(item, player, ammo_cells, g_pickup_cells_max, ITEM_MODE_NONE); - pickedup |= Item_GiveAmmoTo(item, player, health, item.max_health, ITEM_MODE_HEALTH); - pickedup |= Item_GiveAmmoTo(item, player, armorvalue, item.max_armorvalue, ITEM_MODE_ARMOR); - - if (item.flags & FL_WEAPON) - { - WEPSET_DECLARE_A(it); - WEPSET_COPY_AE(it, item); - WEPSET_ANDNOT_AE(it, player); - - if (!WEPSET_EMPTY_A(it) || (item.spawnshieldtime && self.pickup_anyway)) - { - pickedup = TRUE; - for(i = WEP_FIRST; i <= WEP_LAST; ++i) - if(WEPSET_CONTAINS_AW(it, i)) - W_GiveWeapon(player, i); - } - } - - if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK)) - { - pickedup = TRUE; - player.items |= it; - sprint (player, strcat("You got the ^2", item.netname, "\n")); - } - - if (item.strength_finished) - { - pickedup = TRUE; - player.strength_finished = max(player.strength_finished, time) + item.strength_finished; - } - if (item.invincible_finished) - { - pickedup = TRUE; - player.invincible_finished = max(player.invincible_finished, time) + item.invincible_finished; - } - if (item.superweapons_finished) - { - pickedup = TRUE; - player.superweapons_finished = max(player.superweapons_finished, time) + item.superweapons_finished; - } + pickedup = TRUE; + player.invincible_finished = max(player.invincible_finished, time) + item.invincible_finished; + } + if (item.superweapons_finished) + { + pickedup = TRUE; + player.superweapons_finished = max(player.superweapons_finished, time) + item.superweapons_finished; } :skip + // always eat teamed entities if(item.team) pickedup = TRUE; @@ -755,7 +675,7 @@ float Item_GiveTo(entity item, entity player) void Item_Touch (void) { entity e, head; - + // remove the item if it's currnetly in a NODROP brush or hits a NOIMPACT surface (such as sky) if(self.classname == "droppedweapon") { @@ -766,7 +686,7 @@ void Item_Touch (void) } } - if (other.classname != "player") + if (!IS_PLAYER(other)) return; if (other.deadflag) return; @@ -774,8 +694,12 @@ void Item_Touch (void) return; if (self.owner == other) return; - if(MUTATOR_CALLHOOK(ItemTouch)) - return; + + switch(MUTATOR_CALLHOOK(ItemTouch)) + { + case MUT_ITEMTOUCH_RETURN: { return; } + case MUT_ITEMTOUCH_PICKUP: { goto pickup; } + } if (self.classname == "droppedweapon") { @@ -796,14 +720,16 @@ void Item_Touch (void) return; } + :pickup + other.last_pickup = time; pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1); - sound (other, CH_TRIGGER, self.item_pickupsound, VOL_BASE, ATTN_NORM); + sound (other, CH_TRIGGER, self.item_pickupsound, VOL_BASE, ATTEN_NORM); if (self.classname == "droppedweapon") remove (self); - else if not(self.spawnshieldtime) + else if (!self.spawnshieldtime) return; else { @@ -834,13 +760,13 @@ void Item_Reset() if(self.classname != "droppedweapon") { - self.think = func_null; - self.nextthink = 0; + self.think = Item_Think; + self.nextthink = time; if(self.waypointsprite_attached) WaypointSprite_Kill(self.waypointsprite_attached); - if((self.flags & FL_POWERUP) | WEPSET_CONTAINS_ANY_EA(self, WEPBIT_SUPERWEAPONS)) // do not spawn powerups initially! + if((self.flags & FL_POWERUP) || (self.weapons & WEPSET_SUPERWEAPONS)) // do not spawn powerups initially! Item_ScheduleInitialRespawn(self); } } @@ -868,7 +794,7 @@ void Item_FindTeam() Item_Show(head, -1); head.state = 1; // state 1 = initially hidden item } - head.effects &~= EF_NODRAW; + head.effects &= ~EF_NODRAW; } Item_Reset(); @@ -892,7 +818,7 @@ float weapon_pickupevalfunc(entity player, entity item) float c, j, position; // See if I have it already - if(!WEPSET_CONTAINS_ALL_EE(player, item)) + if(item.weapons & ~player.weapons) { // If I can pick it up if(!item.spawnshieldtime) @@ -949,7 +875,7 @@ float commodity_pickupevalfunc(entity player, entity item) { wi = get_weaponinfo(i); - if not(WEPSET_CONTAINS_EW(player, i)) + if (!(player.weapons & WepSet_FromWeapon(i))) continue; if(wi.items & IT_SHELLS) @@ -1003,23 +929,22 @@ void Item_Damage(entity inflictor, entity attacker, float damage, float deathtyp RemoveItem(); } -.float is_item; 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) { startitem_failed = FALSE; if(self.model == "") self.model = itemmodel; - + if(self.model == "") { error(strcat("^1Tried to spawn ", itemname, " with no model!\n")); return; } - + if(self.item_pickupsound == "") self.item_pickupsound = pickupsound; - + if(!self.respawntime) // both need to be set { self.respawntime = defaultrespawntime; @@ -1030,8 +955,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.weapon = weaponid; if(weaponid) - WEPSET_COPY_EW(self, weaponid); - + self.weapons = WepSet_FromWeapon(weaponid); + self.flags = FL_ITEM | itemflags; if(MUTATOR_CALLHOOK(FilterItem)) // error means we do not want the item @@ -1058,7 +983,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, if(self.strength_finished || self.invincible_finished || self.superweapons_finished) /* if(self.items == 0) - if(WEPSET_CONTAINS_ALL_AE(WEPBIT_SUPERWEAPONS, self)) // only superweapons + if(!(self.weapons & ~WEPSET_SUPERWEAPONS)) // only superweapons if(self.ammo_nails == 0) if(self.ammo_cells == 0) if(self.ammo_rockets == 0) @@ -1089,9 +1014,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, remove (self); return; } - - if(self.angles != '0 0 0') - self.SendFlags |= ISF_ANGLES; self.reset = Item_Reset; // it's a level item @@ -1111,6 +1033,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'); + // note droptofloor returns FALSE if stuck/or would fall too far droptofloor(); waypoint_spawnforitem(self); @@ -1146,15 +1069,15 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.is_item = TRUE; } - WEPSET_OR_AW(weaponsInMap, weaponid); + weaponsInMap |= WepSet_FromWeapon(weaponid); precache_model (self.model); precache_sound (self.item_pickupsound); precache_sound ("misc/itemrespawncountdown.wav"); - if(!g_minstagib && itemid == IT_STRENGTH) + if(itemid == IT_STRENGTH) precache_sound ("misc/strength_respawn.wav"); - else if(!g_minstagib && itemid == IT_INVINCIBLE) + else if(itemid == IT_INVINCIBLE) precache_sound ("misc/shield_respawn.wav"); else precache_sound ("misc/itemrespawn.wav"); @@ -1170,8 +1093,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.netname = itemname; self.touch = Item_Touch; setmodel(self, "null"); // precision set below - //self.effects |= EF_LOWPRECISION; - + //self.effects |= EF_LOWPRECISION; + if((itemflags & FL_POWERUP) || self.health || self.armorvalue) { self.pos1 = '-16 -16 0'; @@ -1183,20 +1106,20 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.pos2 = '16 16 32'; } setsize (self, self.pos1, self.pos2); - - if(itemflags & FL_POWERUP) + + if(itemflags & FL_POWERUP) self.ItemStatus |= ITS_ANIMATE1; - + if(self.armorvalue || self.health) 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.ItemStatus |= ITS_ANIMATE1; self.ItemStatus |= ISF_COLORMAP; } @@ -1206,14 +1129,18 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, { if(!self.cnt) self.cnt = 1; // item probability weight - + self.effects |= EF_NODRAW; // marker for item team search InitializeEntity(self, Item_FindTeam, INITPRIO_FINDTARGET); } else Item_Reset(); - + Net_LinkEntity(self, FALSE, 0, ItemSend); + + self.SendFlags |= ISF_SIZE; + if(self.angles) + self.SendFlags |= ISF_ANGLES; // call this hook after everything else has been done if(MUTATOR_CALLHOOK(Item_Spawn)) @@ -1223,275 +1150,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } } - -/* replace items in minstagib - * IT_STRENGTH = invisibility - * IT_NAILS = extra lives - * IT_INVINCIBLE = speed - */ -void minstagib_items (float itemid) // will be deleted soon. -{ - float rnd; - self.classname = "minstagib"; // ...? - - // replace rocket launchers and nex guns with ammo cells - if (itemid == IT_CELLS) - { - self.ammo_cells = autocvar_g_minstagib_ammo_drop; - StartItem ("models/items/a_cells.md3", - "misc/itempickup.wav", 45, 0, - "MinstaNex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100); - return; - } - - // randomize - rnd = random() * 3; - if (rnd <= 1) - itemid = IT_STRENGTH; - else if (rnd <= 2) - itemid = IT_NAILS; - else - itemid = IT_INVINCIBLE; - - // replace with invis - if (itemid == IT_STRENGTH) - { - if(!self.strength_finished) - self.strength_finished = autocvar_g_balance_powerup_strength_time; - StartItem ("models/items/g_strength.md3", - "misc/powerup.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, - "Invisibility", IT_STRENGTH, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_MID); - } - // replace with extra lives - if (itemid == IT_NAILS) - { - self.max_health = 1; - StartItem ("models/items/g_h100.md3", - "misc/megahealth.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, - "Extralife", IT_NAILS, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_HIGH); - } - // replace with speed - if (itemid == IT_INVINCIBLE) - { - if(!self.invincible_finished) - self.invincible_finished = autocvar_g_balance_powerup_invincible_time; - StartItem ("models/items/g_invincible.md3", - "misc/powerup_shield.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, - "Speed", IT_INVINCIBLE, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_MID); - } -} - -float minst_no_auto_cells; -void minst_remove_item (void) { - if(minst_no_auto_cells) - remove(self); -} - -float weaponswapping; -float internalteam; - -void weapon_defaultspawnfunc(float wpn) -{ - entity e; - float t; - var .float ammofield; - string s; - entity oldself; - float i, j; - float f; - - if(self.classname != "droppedweapon" && self.classname != "replacedweapon") - { - e = get_weaponinfo(wpn); - - if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED) - { - print("Attempted to spawn a mutator-blocked weapon; these guns will in the future require a mutator\n"); - /* - objerror("Attempted to spawn a mutator-blocked weapon rejected"); - startitem_failed = TRUE; - return; - */ - } - - s = W_Apply_Weaponreplace(e.netname); - ret_string = s; - other = e; - MUTATOR_CALLHOOK(SetWeaponreplace); - s = ret_string; - if(s == "") - { - remove(self); - startitem_failed = TRUE; - return; - } - t = tokenize_console(s); - if(t >= 2) - { - self.team = --internalteam; - oldself = self; - for(i = 1; i < t; ++i) - { - s = argv(i); - for(j = WEP_FIRST; j <= WEP_LAST; ++j) - { - e = get_weaponinfo(j); - if(e.netname == s) - { - self = spawn(); - copyentity(oldself, self); - self.classname = "replacedweapon"; - weapon_defaultspawnfunc(j); - break; - } - } - if(j > WEP_LAST) - { - print("The weapon replace list for ", oldself.classname, " contains an unknown weapon ", s, ". Skipped.\n"); - } - } - self = oldself; - } - if(t >= 1) // always the case! - { - s = argv(0); - wpn = 0; - for(j = WEP_FIRST; j <= WEP_LAST; ++j) - { - e = get_weaponinfo(j); - if(e.netname == s) - { - wpn = j; - break; - } - } - if(j > WEP_LAST) - { - print("The weapon replace list for ", self.classname, " contains an unknown weapon ", s, ". Skipped.\n"); - } - } - if(wpn == 0) - { - remove(self); - startitem_failed = TRUE; - return; - } - } - - e = get_weaponinfo(wpn); - - if(!self.respawntime) - { - if(WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS)) - { - self.respawntime = g_pickup_respawntime_superweapon; - self.respawntimejitter = g_pickup_respawntimejitter_superweapon; - } - else - { - self.respawntime = g_pickup_respawntime_weapon; - self.respawntimejitter = g_pickup_respawntimejitter_weapon; - } - } - - if(WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS)) - if(!self.superweapons_finished) - self.superweapons_finished = autocvar_g_balance_superweapons_time; - - if(e.items) - { - for(i = 0, j = 1; i < 24; ++i, j *= 2) - { - if(e.items & j) - { - ammofield = Item_CounterField(j); - if(!self.ammofield) - self.ammofield = cvar(strcat("g_pickup_", Item_CounterFieldName(j), "_weapon")); - } - } - } - - // pickup anyway - if(g_pickup_weapons_anyway) - self.pickup_anyway = TRUE; - - f = FL_WEAPON; - - // no weapon-stay on superweapons - if(WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS)) - f |= FL_NO_WEAPON_STAY; - - // weapon stay isn't supported for teamed weapons - if(self.team) - f |= FL_NO_WEAPON_STAY; - - // stupid minstagib hack, don't ask - if(g_minstagib) - if(self.ammo_cells) - self.ammo_cells = autocvar_g_minstagib_ammo_drop; - - StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue); - if (self.modelindex) // don't precache if self was removed - weapon_action(e.weapon, WR_PRECACHE); -} - -void spawnfunc_weapon_shotgun (void); -void spawnfunc_weapon_uzi (void) { - if(autocvar_sv_q3acompat_machineshotgunswap) - if(self.classname != "droppedweapon") - { - weapon_defaultspawnfunc(WEP_SHOTGUN); - return; - } - weapon_defaultspawnfunc(WEP_UZI); -} - -void spawnfunc_weapon_shotgun (void) { - if(autocvar_sv_q3acompat_machineshotgunswap) - if(self.classname != "droppedweapon") - { - weapon_defaultspawnfunc(WEP_UZI); - return; - } - weapon_defaultspawnfunc(WEP_SHOTGUN); -} - -void spawnfunc_weapon_nex (void) -{ - if (g_minstagib) - { - minstagib_items(IT_CELLS); - self.think = minst_remove_item; - self.nextthink = time; - return; - } - weapon_defaultspawnfunc(WEP_NEX); -} - -void spawnfunc_weapon_minstanex (void) -{ - if (g_minstagib) - { - minstagib_items(IT_CELLS); - self.think = minst_remove_item; - self.nextthink = time; - return; - } - weapon_defaultspawnfunc(WEP_MINSTANEX); -} - -void spawnfunc_weapon_rocketlauncher (void) -{ - if (g_minstagib) - { - minstagib_items(IT_CELLS); // replace rocketlauncher with cells - self.think = minst_remove_item; - self.nextthink = time; - return; - } - weapon_defaultspawnfunc(WEP_ROCKET_LAUNCHER); -} - void spawnfunc_item_rockets (void) { if(!self.ammo_rockets) self.ammo_rockets = g_pickup_rockets; @@ -1616,9 +1274,6 @@ void spawnfunc_item_health_large (void) { } void spawnfunc_item_health_mega (void) { - if(g_minstagib) { - minstagib_items(IT_NAILS); - } else { if(!self.max_health) self.max_health = g_pickup_healthmega_max; if(!self.health) @@ -1626,7 +1281,6 @@ void spawnfunc_item_health_mega (void) { if(!self.pickup_anyway) self.pickup_anyway = g_pickup_healthmega_anyway; StartItem ("models/items/g_h100.md3", "misc/megahealth.wav", g_pickup_respawntime_long, g_pickup_respawntimejitter_long, "100 Health", IT_HEALTH, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_HIGH); - } } // support old misnamed entities @@ -1637,40 +1291,21 @@ void spawnfunc_item_health25() { spawnfunc_item_health_medium(); } void spawnfunc_item_health100() { spawnfunc_item_health_mega(); } void spawnfunc_item_strength (void) { - if(g_minstagib) { - minstagib_items(IT_STRENGTH); - } else { precache_sound("weapons/strength_fire.wav"); if(!self.strength_finished) self.strength_finished = autocvar_g_balance_powerup_strength_time; StartItem ("models/items/g_strength.md3", "misc/powerup.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Strength Powerup", IT_STRENGTH, 0, FL_POWERUP, generic_pickupevalfunc, 100000); - } } void spawnfunc_item_invincible (void) { - if(g_minstagib) { - minstagib_items(IT_INVINCIBLE); - } else { if(!self.invincible_finished) self.invincible_finished = autocvar_g_balance_powerup_invincible_time; StartItem ("models/items/g_invincible.md3", "misc/powerup_shield.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Shield", IT_INVINCIBLE, 0, FL_POWERUP, generic_pickupevalfunc, 100000); - } -} - -void spawnfunc_item_minst_cells (void) { - if (g_minstagib) - { - minst_no_auto_cells = TRUE; - minstagib_items(IT_CELLS); - } - else - remove(self); } // compatibility: void spawnfunc_item_quad (void) {self.classname = "item_strength";spawnfunc_item_strength();} -float GiveItems(entity e, float beginarg, float endarg); void target_items_use (void) { if(activator.classname == "droppedweapon") @@ -1680,7 +1315,7 @@ void target_items_use (void) return; } - if(activator.classname != "player") + if (!IS_PLAYER(activator)) return; if(activator.deadflag != DEAD_NO) return; @@ -1739,9 +1374,9 @@ void spawnfunc_target_items (void) e = get_weaponinfo(j); if(argv(i) == e.netname) { - WEPSET_OR_EW(self, j); + self.weapons |= WepSet_FromWeapon(j); if(self.spawnflags == 0 || self.spawnflags == 2) - weapon_action(e.weapon, WR_PRECACHE); + WEP_ACTION(e.weapon, WR_INIT); break; } } @@ -1799,7 +1434,7 @@ void spawnfunc_target_items (void) { e = get_weaponinfo(j); if(e.weapon) - self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, WEPSET_CONTAINS_EW(self, j), e.netname); + self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.weapons & WepSet_FromWeapon(j)), e.netname); } } self.netname = strzone(self.netname); @@ -1813,7 +1448,7 @@ void spawnfunc_target_items (void) e = get_weaponinfo(j); if(argv(i) == e.netname) { - weapon_action(e.weapon, WR_PRECACHE); + WEP_ACTION(e.weapon, WR_INIT); break; } } @@ -1853,40 +1488,33 @@ void spawnfunc_item_jetpack(void) StartItem ("models/items/g_jetpack.md3", "misc/itempickup.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Jet pack", IT_JETPACK, 0, FL_POWERUP, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW); } - -#define OP_SET 0 -#define OP_MIN 1 -#define OP_MAX 2 -#define OP_PLUS 3 -#define OP_MINUS 4 - float GiveWeapon(entity e, float wpn, float op, float val) { - float v0, v1; - v0 = WEPSET_CONTAINS_EW(e, wpn); + WepSet v0, v1; + v0 = (e.weapons & WepSet_FromWeapon(wpn)); switch(op) { case OP_SET: if(val > 0) - WEPSET_OR_EW(e, wpn); + e.weapons |= WepSet_FromWeapon(wpn); else - WEPSET_ANDNOT_EW(e, wpn); + e.weapons &= ~WepSet_FromWeapon(wpn); break; case OP_MIN: case OP_PLUS: if(val > 0) - WEPSET_OR_EW(e, wpn); + e.weapons |= WepSet_FromWeapon(wpn); break; case OP_MAX: if(val <= 0) - WEPSET_ANDNOT_EW(e, wpn); + e.weapons &= ~WepSet_FromWeapon(wpn); break; case OP_MINUS: if(val > 0) - WEPSET_ANDNOT_EW(e, wpn); + e.weapons &= ~WepSet_FromWeapon(wpn); break; } - v1 = WEPSET_CONTAINS_EW(e, wpn); + v1 = (e.weapons & WepSet_FromWeapon(wpn)); return (v0 != v1); } @@ -1900,7 +1528,7 @@ float GiveBit(entity e, .float fld, float bit, float op, float val) if(val > 0) e.fld |= bit; else - e.fld &~= bit; + e.fld &= ~bit; break; case OP_MIN: case OP_PLUS: @@ -1909,11 +1537,11 @@ float GiveBit(entity e, .float fld, float bit, float op, float val) break; case OP_MAX: if(val <= 0) - e.fld &~= bit; + e.fld &= ~bit; break; case OP_MINUS: if(val > 0) - e.fld &~= bit; + e.fld &= ~bit; break; } v1 = (e.fld & bit); @@ -1953,12 +1581,12 @@ void GiveSound(entity e, float v0, float v1, float t, string snd_incr, string sn if(v1 <= v0 - t) { if(snd_decr != "") - sound (e, CH_TRIGGER, snd_decr, VOL_BASE, ATTN_NORM); + sound (e, CH_TRIGGER, snd_decr, VOL_BASE, ATTEN_NORM); } else if(v0 >= v0 + t) { if(snd_incr != "") - sound (e, CH_TRIGGER, snd_incr, VOL_BASE, ATTN_NORM); + sound (e, CH_TRIGGER, snd_incr, VOL_BASE, ATTEN_NORM); } } @@ -1969,14 +1597,6 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa else if(v0 > v1) e.regenfield = max(e.regenfield, time + regentime); } - -#define PREGIVE_WEAPONS(e) WEPSET_DECLARE_A(save_weapons); WEPSET_COPY_AE(save_weapons, e) -#define PREGIVE(e,f) float save_##f; save_##f = (e).f -#define POSTGIVE_WEAPON(e,b,snd_incr,snd_decr) GiveSound((e), WEPSET_CONTAINS_AW(save_weapons, b), WEPSET_CONTAINS_EW(e, b), 0, snd_incr, snd_decr) -#define POSTGIVE_BIT(e,f,b,snd_incr,snd_decr) GiveSound((e), save_##f & (b), (e).f & (b), 0, snd_incr, snd_decr) -#define POSTGIVE_VALUE(e,f,t,snd_incr,snd_decr) GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr) -#define POSTGIVE_VALUE_ROT(e,f,t,rotfield,rottime,regenfield,regentime,snd_incr,snd_decr) GiveRot((e), save_##f, (e).f, rotfield, rottime, regenfield, regentime); GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr) - float GiveItems(entity e, float beginarg, float endarg) { float got, i, j, val, op; @@ -1997,7 +1617,7 @@ float GiveItems(entity e, float beginarg, float endarg) e.strength_finished = max(0, e.strength_finished - time); e.invincible_finished = max(0, e.invincible_finished - time); e.superweapons_finished = max(0, e.superweapons_finished - time); - + PREGIVE(e, items); PREGIVE_WEAPONS(e); PREGIVE(e, strength_finished); @@ -2053,7 +1673,7 @@ float GiveItems(entity e, float beginarg, float endarg) { wi = get_weaponinfo(j); if(wi.weapon) - if not(wi.spawnflags & WEP_FLAG_MUTATORBLOCKED) + if (!(wi.spawnflags & WEP_FLAG_MUTATORBLOCKED)) got += GiveWeapon(e, j, op, val); } case "allammo": @@ -2137,9 +1757,9 @@ float GiveItems(entity e, float beginarg, float endarg) if(wi.weapon) { POSTGIVE_WEAPON(e, j, "weapons/weaponpickup.wav", string_null); - if not(WEPSET_CONTAINS_AW(save_weapons, j)) - if(WEPSET_CONTAINS_EW(e, j)) - weapon_action(wi.weapon, WR_PRECACHE); + if (!(save_weapons & WepSet_FromWeapon(j))) + if(e.weapons & WepSet_FromWeapon(j)) + WEP_ACTION(wi.weapon, WR_INIT); } } POSTGIVE_VALUE(e, strength_finished, 1, "misc/powerup.wav", "misc/poweroff.wav"); @@ -2153,15 +1773,9 @@ float GiveItems(entity e, float beginarg, float endarg) POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, "misc/megahealth.wav", string_null); if(e.superweapons_finished <= 0) - if(WEPSET_CONTAINS_ANY_EA(self, WEPBIT_SUPERWEAPONS)) + if(self.weapons & WEPSET_SUPERWEAPONS) e.superweapons_finished = autocvar_g_balance_superweapons_time; - if (g_minstagib) - { - e.health = bound(0, e.health, 100); - e.armorvalue = bound(0, e.armorvalue, 999); - } - if(e.strength_finished <= 0) e.strength_finished = 0; else @@ -2175,7 +1789,7 @@ float GiveItems(entity e, float beginarg, float endarg) else e.superweapons_finished += time; - if not(WEPSET_CONTAINS_EW(e, e.switchweapon)) + if (!(e.weapons & WepSet_FromWeapon(e.switchweapon))) _switchweapon = TRUE; if(_switchweapon) W_SwitchWeapon_Force(e, w_getbestweapon(e));