X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Faim.qc;h=cb42aa5c2c4b0b158697b4122a51c27e88543d7d;hb=58b8eafbf5e2ff9147477e115292246458c4c5eb;hp=8a728437ac48a066798a0188058317670503b5cb;hpb=3846c9bd40c2b3c1aa220c1eeef9198b1912aab4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc
index 8a728437a..cb42aa5c2 100644
--- a/qcsrc/server/bot/aim.qc
+++ b/qcsrc/server/bot/aim.qc
@@ -78,7 +78,7 @@ float findtrajectorywithleading(vector org, vector m1, vector m2, entity targ, f
 	// leave a valid one even if it won't reach
 	findtrajectory_velocity = normalize(end - org) * shotspeed + shotspeedupward * '0 0 1';
 	return FALSE;
-};
+}
 
 void lag_update()
 {
@@ -87,7 +87,7 @@ void lag_update()
 	if (self.lag3_time) if (time > self.lag3_time) {self.lag_func(self.lag3_time, self.lag3_float1, self.lag3_float2, self.lag3_entity1, self.lag3_vec1, self.lag3_vec2, self.lag3_vec3, self.lag3_vec4);self.lag3_time = 0;}
 	if (self.lag4_time) if (time > self.lag4_time) {self.lag_func(self.lag4_time, self.lag4_float1, self.lag4_float2, self.lag4_entity1, self.lag4_vec1, self.lag4_vec2, self.lag4_vec3, self.lag4_vec4);self.lag4_time = 0;}
 	if (self.lag5_time) if (time > self.lag5_time) {self.lag_func(self.lag5_time, self.lag5_float1, self.lag5_float2, self.lag5_entity1, self.lag5_vec1, self.lag5_vec2, self.lag5_vec3, self.lag5_vec4);self.lag5_time = 0;}
-};
+}
 
 float lag_additem(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4)
 {
@@ -98,7 +98,7 @@ float lag_additem(float t, float f1, float f2, entity e1, vector v1, vector v2,
 	if (self.lag5_time == 0) {self.lag5_time = t;self.lag5_float1 = f1;self.lag5_float2 = f2;self.lag5_entity1 = e1;self.lag5_vec1 = v1;self.lag5_vec2 = v2;self.lag5_vec3 = v3;self.lag5_vec4 = v4;return TRUE;}
 	// no room for it (what is the best thing to do here??)
 	return FALSE;
-};
+}
 
 float bot_shouldattack(entity e)
 {
@@ -111,9 +111,8 @@ float bot_shouldattack(entity e)
 			return FALSE;
 	}
 
-	if(g_freezetag)
-		if(e.freezetag_frozen)
-			return FALSE;
+	if(e.freezetag_frozen)
+		return FALSE;
 
 	// If neither player has ball then don't attack unless the ball is on the
 	// ground.
@@ -142,7 +141,7 @@ float bot_shouldattack(entity e)
 	if(e.flags & FL_NOTARGET)
 		return FALSE;
 	return TRUE;
-};
+}
 
 void bot_lagfunc(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4)
 {
@@ -165,7 +164,7 @@ void bot_lagfunc(float t, float f1, float f2, entity e1, vector v1, vector v2, v
 		self.bot_canfire = (random() < 0.95);
 	else
 		self.bot_canfire = 1;
-};
+}
 
 float bot_aimdir(vector v, float maxfiredeviation)
 {
@@ -310,13 +309,13 @@ float bot_aimdir(vector v, float maxfiredeviation)
 	//dprint(" diff:", vtos(diffang), "\n");
 
 	return self.bot_canfire && (time < self.bot_firetimer);
-};
+}
 
 vector bot_shotlead(vector targorigin, vector targvelocity, float shotspeed, float shotdelay)
 {
 	// Try to add code here that predicts gravity effect here, no clue HOW to though ... well not yet atleast...
 	return targorigin + targvelocity * (shotdelay + vlen(targorigin - shotorg) / shotspeed);
-};
+}
 
 float bot_aim(float shotspeed, float shotspeedupward, float maxshottime, float applygravity)
 {
@@ -387,4 +386,4 @@ float bot_aim(float shotspeed, float shotspeedupward, float maxshottime, float a
 	//	return FALSE;
 	self.dphitcontentsmask = hf;
 	return TRUE;
-};
+}