From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Aug 2015 05:38:53 +0000 (+1000)
Subject: Rename the default bot role
X-Git-Tag: xonotic-v0.8.2~1982
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=9bea58d550db5b4e207770da8f20cae2cb871e0d;p=xonotic%2Fxonotic-data.pk3dir.git

Rename the default bot role
---

diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index 593488e44..c56f70598 100644
--- a/qcsrc/server/bot/havocbot/roles.qc
+++ b/qcsrc/server/bot/havocbot/roles.qc
@@ -211,12 +211,9 @@ void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradi
 	}
 }
 
-// choose a role according to the situation
-void havocbot_role_dm();
-
-//DM:
-//go to best items
-void havocbot_role_dm()
+// legacy bot role for standard gamemodes
+// go to best items
+void havocbot_role_generic()
 {
 	if(self.deadflag != DEAD_NO)
 		return;
@@ -232,9 +229,9 @@ void havocbot_role_dm()
 	}
 }
 
-void havocbot_chooserole_dm()
+void havocbot_chooserole_generic()
 {
-	self.havocbot_role = havocbot_role_dm;
+	self.havocbot_role = havocbot_role_generic;
 }
 
 void havocbot_chooserole()
@@ -245,6 +242,6 @@ void havocbot_chooserole()
 		return;
 	else if (g_keyhunt)
 		havocbot_chooserole_kh();
-	else // assume anything else is deathmatch
-		havocbot_chooserole_dm();
+	else
+		havocbot_chooserole_generic();
 }