X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Ft_items.qc;h=c256d4df9022dc6a9fa7b8de864f2506737603fb;hb=7a85bc59ba3d8d35a90d20b364f53669430eb229;hp=3c944619bfa693a259e86fe808de93a15ec342ae;hpb=2aed36e128f8f00da9c76f9e66baae89d5bb26b2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 3c944619b..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,8 +184,6 @@ 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))) @@ -179,7 +195,7 @@ void ItemRead(float _IsNew) else { self.draw = ItemDraw; - dprint("Simple item requested for ", _fn, " but no model exists 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) @@ -385,25 +398,25 @@ void Item_Show (entity e, float mode) } if (e.items & ITEM_Strength.m_itemid || e.items & ITEM_Shield.m_itemid) - e.ItemStatus |= ITS_POWERUP; + 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,13 +425,14 @@ void Item_Think() } } -bool Item_ItemsTime_Allow(entity 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 == ITEM_Strength.m_itemid) @@ -429,7 +443,7 @@ void Item_Respawn (void) sound (self, CH_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTEN_NORM); // play respawn sound setorigin (self, self.origin); - if (Item_ItemsTime_Allow(self)) + if (Item_ItemsTime_Allow(self.itemdef, self.weapons)) { float t = Item_ItemsTime_UpdateTime(self, 0); Item_ItemsTime_SetTime(self, t); @@ -439,12 +453,12 @@ void Item_Respawn (void) self.think = Item_Think; self.nextthink = time; - //Send_Effect("item_respawn", self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1); - Send_Effect("item_respawn", CENTER_OR_VIEWOFS(self), '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) @@ -457,54 +471,36 @@ void Item_RespawnCountdown (void) self.count += 1; if(self.count == 1) { - string name = string_null; - vector rgb = '1 0 1'; + MUTATOR_CALLHOOK(Item_RespawnCountdown, string_null, '0 0 0'); + int wpextra = 0; entity e = self.itemdef; - if (e) { - name = e.m_waypoint; - rgb = e.m_color; - } - MUTATOR_CALLHOOK(Item_RespawnCountdown, name, rgb); - name = item_name; - rgb = item_color; - if(self.flags & FL_WEAPON) - { + 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); + } } if(self.waypointsprite_attached) { + setself(self.waypointsprite_attached); entity e; - entity it = self; - self = self.waypointsprite_attached; FOR_EACH_REALCLIENT(e) if(self.waypointsprite_visible_for_player(e)) { msg_entity = e; - soundto(MSG_ONE, it, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM); // play respawn sound + soundto(MSG_ONE, this, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM); // play respawn sound } - self = it; + setself(this); WaypointSprite_Ping(self.waypointsprite_attached); //WaypointSprite_UpdateHealth(self.waypointsprite_attached, self.count); @@ -515,7 +511,7 @@ void Item_RespawnCountdown (void) } void Item_RespawnThink() -{ +{SELFPARAM(); self.nextthink = time; if(self.origin != self.oldorigin) { @@ -529,7 +525,7 @@ void Item_RespawnThink() void Item_ScheduleRespawnIn(entity e, float t) { - if (Item_ItemsTime_Allow(e)) + if (Item_ItemsTime_Allow(e.itemdef, e.weapons)) { e.think = Item_RespawnCountdown; e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS); @@ -687,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)); @@ -695,7 +698,7 @@ float Item_GiveTo(entity item, entity player) } 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) @@ -708,18 +711,13 @@ 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, self, other)) { @@ -751,7 +749,7 @@ void Item_Touch (void) other.last_pickup = time; - Send_Effect("item_pickup", CENTER_OR_VIEWOFS(self), '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") @@ -764,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); @@ -779,7 +778,7 @@ void Item_Touch (void) } void Item_Reset() -{ +{SELFPARAM(); Item_Show(self, !self.state); setorigin (self, self.origin); @@ -797,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) { @@ -829,8 +832,9 @@ void Item_FindTeam() // Savage: used for item garbage-collection // TODO: perhaps nice special effect? void RemoveItem(void) -{ - Send_Effect("item_pickup", CENTER_OR_VIEWOFS(self), '0 0 0', 1); +{SELFPARAM(); + if(wasfreed(self) || !self) { return; } + Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(self), '0 0 0', 1); remove(self); } @@ -962,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 == "") @@ -986,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); @@ -1047,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) @@ -1065,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); @@ -1093,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."); } } @@ -1126,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; @@ -1170,11 +1185,7 @@ 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, self)) @@ -1193,12 +1204,13 @@ string Item_Model(string item_mdl) } void StartItemA (entity a) -{ +{SELFPARAM(); self.itemdef = a; 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) @@ -1206,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; } @@ -1224,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) @@ -1232,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; @@ -1241,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; } @@ -1259,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) @@ -1269,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) @@ -1279,7 +1296,8 @@ 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) @@ -1289,7 +1307,8 @@ void spawnfunc_item_armor_big (void) { 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) @@ -1299,7 +1318,8 @@ void spawnfunc_item_armor_large (void) { 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) @@ -1309,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) @@ -1319,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) @@ -1329,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) @@ -1340,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; @@ -1386,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; @@ -1439,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"); } } @@ -1511,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; @@ -1520,23 +1545,23 @@ void spawnfunc_item_fuel(void) StartItemA (ITEM_JetpackFuel); } -void spawnfunc_item_fuel_regen(void) +spawnfunc(item_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 & ITEM_Jetpack.m_itemid) { - spawnfunc_item_fuel(); + spawnfunc_item_fuel(this); return; } StartItemA (ITEM_Jetpack); @@ -1652,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; @@ -1799,7 +1824,7 @@ 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;