From a1e7a4bd0512f35571b1a480bb24b35e0fdb3363 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 12:11:39 +0000 Subject: * Remove extra trailing newline from admin chat commands (oops) * Rename private message, admin message functions for consistency * Cancel a reload when switching weapons, and prevent reloading a full clip * Simplify admin command formatting and in doing so prevent some compiler warnings on OS X * Fix some admin messages (s/kicked/banned/, no bans to show, can't perm ban) * Have tremulous_alien_common_hud include tremulous_common_hud since they're always used together anyway * Remove some redundant uses of va() --- ui/tremulous_alien_builder_hud.menu | 1 - ui/tremulous_alien_common_hud.h | 1 + ui/tremulous_alien_general_hud.menu | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/tremulous_alien_builder_hud.menu b/ui/tremulous_alien_builder_hud.menu index e78eb0c4..4bbbb541 100644 --- a/ui/tremulous_alien_builder_hud.menu +++ b/ui/tremulous_alien_builder_hud.menu @@ -14,7 +14,6 @@ aspectBias ASPECT_NONE #include "ui/tremulous_alien_common_hud.h" -#include "ui/tremulous_common_hud.h" //BUILD TIMER itemDef diff --git a/ui/tremulous_alien_common_hud.h b/ui/tremulous_alien_common_hud.h index 466ed184..04ffb635 100644 --- a/ui/tremulous_alien_common_hud.h +++ b/ui/tremulous_alien_common_hud.h @@ -1,6 +1,7 @@ #define COMMON_HUD_R 1.0 #define COMMON_HUD_G 0.0 #define COMMON_HUD_B 0.0 +#include "ui/tremulous_common_hud.h" ////////////////// //STATIC OBJECTS// diff --git a/ui/tremulous_alien_general_hud.menu b/ui/tremulous_alien_general_hud.menu index 509a5993..8d1d19e7 100644 --- a/ui/tremulous_alien_general_hud.menu +++ b/ui/tremulous_alien_general_hud.menu @@ -14,7 +14,6 @@ aspectBias ASPECT_NONE #include "ui/tremulous_alien_common_hud.h" -#include "ui/tremulous_common_hud.h" //BLOB itemDef -- cgit