#include "../controlpoint.qh"
#include "../generator.qh"
-vector randompos(vector m1, vector m2)
-{
- vector v;
- m2 = m2 - m1;
- v_x = m2_x * random() + m1_x;
- v_y = m2_y * random() + m1_y;
- v_z = m2_z * random() + m1_z;
- return v;
-}
-
// =======================
// CaptureShield Functions
// =======================
onslaught_controlpoint_icon_link(e, ons_ControlPoint_Icon_BuildThink);
}
-string ons_ControlPoint_Waypoint(entity e)
+entity ons_ControlPoint_Waypoint(entity e)
{
if(e.team)
{
int a = ons_ControlPoint_Attackable(e, e.team);
- if(a == -2) { return "ons-cp-dfnd"; } // defend now
- if(a == -1 || a == 1 || a == 2) { return "ons-cp"; } // touch
- if(a == 3 || a == 4) { return "ons-cp-atck"; } // attack
+ if(a == -2) { return WP_OnsCPDefend; } // defend now
+ if(a == -1 || a == 1 || a == 2) { return WP_OnsCP; } // touch
+ if(a == 3 || a == 4) { return WP_OnsCPAttack; } // attack
}
else
- return "ons-cp";
+ return WP_OnsCP;
- return "";
+ return WP_Null;
}
void ons_ControlPoint_UpdateSprite(entity e)
{
- string s1;
- s1 = ons_ControlPoint_Waypoint(e);
+ entity s1 = ons_ControlPoint_Waypoint(e);
WaypointSprite_UpdateSprites(e.sprite, s1, s1, s1);
bool sh;
}
// waypointsprites
- WaypointSprite_SpawnFixed(string_null, self.origin + CPGEN_WAYPOINT_OFFSET, self, sprite, RADARICON_NONE, '0 0 0');
+ WaypointSprite_SpawnFixed(WP_Null, self.origin + CPGEN_WAYPOINT_OFFSET, self, sprite, RADARICON_NONE);
WaypointSprite_UpdateRule(self.sprite, self.team, SPRITERULE_TEAMPLAY);
InitializeEntity(cp, ons_DelayedControlPoint_Setup, INITPRIO_SETLOCATION);
// Main Generator Functions
// =========================
-string ons_Generator_Waypoint(entity e)
+entity ons_Generator_Waypoint(entity e)
{
- if(e.isshielded)
- return "ons-gen-shielded";
- return "ons-gen";
+ if (e.isshielded)
+ return WP_OnsGenShielded;
+ return WP_OnsGen;
}
void ons_Generator_UpdateSprite(entity e)
{
- string s1 = ons_Generator_Waypoint(e);
+ entity s1 = ons_Generator_Waypoint(e);
WaypointSprite_UpdateSprites(e.sprite, s1, s1, s1);
if(e.lastteam != e.team + 2 || e.lastshielded != e.isshielded)
droptofloor();
// waypointsprites
- WaypointSprite_SpawnFixed(string_null, self.origin + CPGEN_WAYPOINT_OFFSET, self, sprite, RADARICON_NONE, '0 0 0');
+ WaypointSprite_SpawnFixed(WP_Null, self.origin + CPGEN_WAYPOINT_OFFSET, self, sprite, RADARICON_NONE);
WaypointSprite_UpdateRule(self.sprite, self.team, SPRITERULE_TEAMPLAY);
WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health);
WaypointSprite_UpdateHealth(self.sprite, self.health);