Merge branch 'master' into gren_dev_master

Author: newbytf

csqc/status.qc

@@ -1157,7 +1157,7 @@ var FO_Hud_Panel Hud_Panels[] = {
     {"gun6","Grenade Launcher",           '-4 -90',  '36 24',  0.8,1.4,1,0, drawInvIconPanel, {return getGunIcon(IT_GRENADE_LAUNCHER);}, 0, 36},
     {"gun7","Rocket Launcher",            '-4 -70',  '36 24',  0.8,1.4,1,0, drawInvIconPanel, {return getGunIcon(IT_ROCKET_LAUNCHER);}, 0, 36},
     {"gun8","Lighning Gun",               '-4 -50',  '36 24',  0.8,1.4,1,0, drawInvIconPanel, {return getGunIcon(IT_LIGHTNING);}, 0, 36},
-    {"speed","Speed",                     '4 15',    '26 26',  1,1.4,0,0, drawTextPanel, {CVARF(fo_fte_hud) ? sprintf("%3.1f UPS", speed) : "";}, 0, 4},
+    {"speed","Speed",                     '4 15',    '26 26',  1,1.4,0,0, drawTextPanel, {return CVARF(fo_fte_hud) ? sprintf("%3.1f UPS", speed) : "";}, 0, 4},
 };
 
 //var FO_Hud_Panel Hud_ExtraPanels[] = {

share/fteextensions.qc

@@ -8,26 +8,26 @@ void () Admin_CountPlayers = {
 
     nump = TeamFortress_GetNoPlayers();
     st = ftos(nump);
-    sprint3(self, PRINT_HIGH, "Players in game: ", st, "\n");
+    sprint(self, PRINT_HIGH, "Players in game: ", st, "\n");
     if (number_of_teams > 0) {
         nump = TeamFortress_TeamGetNoPlayers(1);
         st = ftos(nump);
-        sprint3(self, PRINT_HIGH, "Players in blue team: ", st, "\n");
+        sprint(self, PRINT_HIGH, "Players in blue team: ", st, "\n");
     }
     if (number_of_teams > 1) {
         nump = TeamFortress_TeamGetNoPlayers(2);
         st = ftos(nump);
-        sprint3(self, PRINT_HIGH, "Players in red team: ", st, "\n");
+        sprint(self, PRINT_HIGH, "Players in red team: ", st, "\n");
     }
     if (number_of_teams > 2) {
         nump = TeamFortress_TeamGetNoPlayers(3);
         st = ftos(nump);
-        sprint3(self, PRINT_HIGH, "Players in yellow team: ", st, "\n");
+        sprint(self, PRINT_HIGH, "Players in yellow team: ", st, "\n");
     }
     if (number_of_teams > 3) {
         nump = TeamFortress_TeamGetNoPlayers(4);
         st = ftos(nump);
-        sprint3(self, PRINT_HIGH, "Players in green team: ", st, "\n");
+        sprint(self, PRINT_HIGH, "Players in green team: ", st, "\n");
     }
 };
 
@@ -103,21 +103,21 @@ void () Admin_CycleDeal = {
 };
 
 void () Admin_DoKick = {
-    bprint4(PRINT_HIGH, self.admin_use.netname, " was kicked by ", self.netname, "\n");
+    bprint(PRINT_HIGH, self.admin_use.netname, " was kicked by ", self.netname, "\n");
     KickCheater(self.admin_use);
     self.admin_mode = 0;
     self.admin_use = world;
 };
 
 void () Admin_DoBan = {
-    bprint4(PRINT_HIGH, self.admin_use.netname, " was banned by ", self.netname, "\n");
+    bprint(PRINT_HIGH, self.admin_use.netname, " was banned by ", self.netname, "\n");
     BanCheater(self.admin_use);
     self.admin_mode = 0;
     self.admin_use = world;
 };
 
 void () Admin_ForceSpectator = {
-    bprint4(PRINT_HIGH, self.admin_use.netname, " was made spectator by ", self.netname, ". There's probably a good reason for this.\n");
+    bprint(PRINT_HIGH, self.admin_use.netname, " was made spectator by ", self.netname, ". There's probably a good reason for this.\n");
     clientcommand(self.admin_use, "observe");
     self.admin_mode = 0;
     self.admin_use = world;
@@ -195,10 +195,10 @@ void () Admin_Pause = {
         pause_actor = self.netname;
         if (cb_prematch && is_countdown) {
             StopTimer();
-            bprint2(2, pause_actor, " stops the countdown\n");
+            bprint(2, pause_actor, " stops the countdown\n");
             return;
         }
-        bprint2(2, pause_actor, " paused the game\n");
+        bprint(2, pause_actor, " paused the game\n");
     }
     else {
         if (cb_prematch) {
@@ -213,11 +213,11 @@ void () Admin_Pause = {
         }
         pause_actor = self.netname;
         if (!unpause_requested) {                        
-            bprint2(2, pause_actor, " has requested to unpause the game in 5 seconds\n");     
+            bprint(2, pause_actor, " has requested to unpause the game in 5 seconds\n");     
             unpause_requested = 1;
         }
         else {
-            bprint2(2, pause_actor, " cancels unpause request\n"); 
+            bprint(2, pause_actor, " cancels unpause request\n"); 
             unpause_requested = 0;
             unpause_countdown = 0;
             unpause_lastcountnumber = 0;
@@ -230,7 +230,7 @@ void (entity p) CheckAutoKick = {
     local entity te;
 
     if ((p.teamkills >= autokick_kills) && (autokick_kills != 0)) {
-        bprint2(PRINT_HIGH, p.netname,
+        bprint(PRINT_HIGH, p.netname,
                 " was kicked for killing teammates\n");
         sprint(p, PRINT_HIGH, "You were kicked for killing teammates\n");
         KickCheater(p);
@@ -274,7 +274,7 @@ void (string cl_pwd) Admin_Check =
         if (st2 != string_null && cl_pwd == st2) {
             self.is_admin = TRUE;
             forceinfokey(self,"*admin", ftos(self.is_admin));
-            bprint2(2, self.netname, "\s gains full admin status!\s\n");
+            bprint(2, self.netname, "\s gains full admin status!\s\n");
             sprint(self, 2, "Type \scmd list\s for admin commands.\n");
             sprint(self, 2, "You can also use the \sadminmenu\s command for adjusting some settings.\n");  
         }