case "ons-cp-atck-blue": return 2;
case "ons-cp-dfnd-red": return 0.5;
case "ons-cp-dfnd-blue": return 0.5;
+ case "item_health_mega": return 2;
+ case "item_armor_large": return 2;
case "item-invis": return 2;
case "item-extralife": return 2;
case "item-speed": return 2;
case "item-shield": return 2;
case "item-fuelregen": return 2;
case "item-jetpack": return 2;
+ case "wpn-fireball": return 2; // superweapon
+ case "wpn-minstanex": return 2; // superweapon
+ case "wpn-porto": return 2; // superweapon
case "tagged-target": return 2;
default: return 1;
}
case "dom-blue": return _("Control point");
case "dom-yellow": return _("Control point");
case "dom-pink": return _("Control point");
+ case "item_health_mega": return _("Mega health");
+ case "item_armor_large": return _("Large armor");
case "item-invis": return _("Invisibility");
case "item-extralife": return _("Extra life");
case "item-speed": return _("Speed");
case "item-strength": return _("Strength");
case "item-shield": return _("Shield");
- case "item-fuelregen": return _("Fuel regen");
- case "item-jetpack": return _("Jet Pack");
+ case "item-fuelregen": return _("Fuel regenerator");
+ case "item-jetpack": return _("Jet pack");
case "freezetag_frozen": return _("Frozen!");
case "tagged-target": return _("Tagged");
case "vehicle": return _("Vehicle");
// choose the sprite
switch(self.rule)
{
+ case SPRITERULE_SPECTATOR:
+ if not(autocvar_g_waypointsprite_itemstime == 1 && t == COLOR_SPECTATOR + 1
+ || autocvar_g_waypointsprite_itemstime == 2 && (t == COLOR_SPECTATOR + 1 || warmup_stage))
+ return;
+ spriteimage = self.netname;
+ break;
case SPRITERULE_DEFAULT:
if(self.team)
{
spriteimage = self.netname;
break;
case SPRITERULE_TEAMPLAY:
- if(t == FL_SPECTATOR + 1)
+ if(t == NUM_SPECTATOR + 1)
spriteimage = self.netname3;
else if(self.team == t)
spriteimage = self.netname2;
self.draw2d = Draw_WaypointSprite;
InterpolateOrigin_Undo();
+ self.iflags |= IFLAG_ORIGIN;
if(sendflags & 0x80)
{
self.origin_x = ReadCoord();
self.origin_y = ReadCoord();
self.origin_z = ReadCoord();
+ setorigin(self, self.origin);
}
if(sendflags & 1)