X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fbot%2Fhavocbot%2Fhavocbot.qc;h=fb79a3318c37748721e5da4bcf4e7beff7990629;hb=0ee74987765518ffed584a790f90607c3f3f8e71;hp=7e23903ed27548a2c3df90d821b84fd5cfbdfb82;hpb=49af10f3413b96e52055359d42288dbf5ec6972b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 7e23903ed..fb79a3318 100644
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -20,7 +20,7 @@ void havocbot_ai()
 		}
 		else
 		{
-			if not(self.jumppadcount)
+			if (!self.jumppadcount)
 				self.havocbot_role();
 		}
 
@@ -92,7 +92,7 @@ void havocbot_ai()
 
 		if(self.weapons)
 		{
-			weapon_action(self.weapon, WR_AIM);
+			WEP_ACTION(self.weapon, WR_AIM);
 			if (autocvar_bot_nofire || IS_INDEPENDENT_PLAYER(self))
 			{
 				self.BUTTON_ATCK = FALSE;
@@ -146,7 +146,7 @@ void havocbot_ai()
 	havocbot_movetogoal();
 
 	// if the bot is not attacking, consider reloading weapons
-	if not(self.aistatus & AI_STATUS_ATTACKING)
+	if (!(self.aistatus & AI_STATUS_ATTACKING))
 	{
 		float i;
 		entity e;
@@ -316,7 +316,7 @@ void havocbot_bunnyhop(vector dir)
 
 					if(self.aistatus & AI_STATUS_ROAMING)
 					if(self.goalcurrent.classname=="waypoint")
-					if not(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL)
+					if (!(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL))
 					if(fabs(gco_z - self.origin_z) < self.maxs_z - self.mins_z)
 					if(self.goalstack01!=world)
 					{
@@ -422,7 +422,7 @@ void havocbot_movetogoal()
 		}
 
 		// Take off
-		if not(self.aistatus & AI_STATUS_JETPACK_FLYING)
+		if (!(self.aistatus & AI_STATUS_JETPACK_FLYING))
 		{
 			// Brake almost completely so it can get a good direction
 			if(vlen(self.velocity)>10)
@@ -544,9 +544,9 @@ void havocbot_movetogoal()
 	else if(self.aistatus & AI_STATUS_OUT_JUMPPAD)
 		self.aistatus &= ~AI_STATUS_OUT_JUMPPAD;
 
-	// If there is a trigger_hurt right below try to use the jetpack or make a rocketjump
+	// If there is a trigger_hurt right below try to use the jetpack or make a rocketjump // WEAPONTODO: move this to bot think!
 	if(skill>6)
-	if not(self.flags & FL_ONGROUND)
+	if (!(self.flags & FL_ONGROUND))
 	{
 		tracebox(self.origin, self.mins, self.maxs, self.origin + '0 0 -65536', MOVE_NOMONSTERS, self);
 		if(tracebox_hits_trigger_hurt(self.origin, self.mins, self.maxs, trace_endpos ))
@@ -590,10 +590,10 @@ void havocbot_movetogoal()
 
 			return;
 		}
-		else if(self.health>autocvar_g_balance_rocketlauncher_damage*0.5)
+		else if(self.health>WEP_CVAR(devastator, damage)*0.5)
 		{
 			if(self.velocity_z < 0)
-			if(client_hasweapon(self, WEP_ROCKET_LAUNCHER, TRUE, FALSE))
+			if(client_hasweapon(self, WEP_DEVASTATOR, TRUE, FALSE))
 			{
 				self.movement_x = maxspeed;
 
@@ -607,10 +607,10 @@ void havocbot_movetogoal()
 					return;
 				}
 
-				self.switchweapon = WEP_ROCKET_LAUNCHER;
+				self.switchweapon = WEP_DEVASTATOR;
 				self.v_angle_x = 90;
 				self.BUTTON_ATCK = TRUE;
-				self.rocketjumptime = time + autocvar_g_balance_rocketlauncher_detonatedelay;
+				self.rocketjumptime = time + WEP_CVAR(devastator, detonatedelay);
 				return;
 			}
 		}
@@ -956,7 +956,7 @@ float havocbot_chooseweapon_checkreload(float new_weapon)
 		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 		{
 			// if we are out of ammo for all other weapons, it's an emergency to switch to anything else
-			if (weapon_action(i, WR_CHECKAMMO1) + weapon_action(i, WR_CHECKAMMO2))
+			if (WEP_ACTION(i, WR_CHECKAMMO1) + WEP_ACTION(i, WR_CHECKAMMO2))
 				other_weapon_available = TRUE;
 		}
 		if(other_weapon_available)