summaryrefslogtreecommitdiff
path: root/source/q_shared.h
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2009-05-23 13:09:36 +0000
committerAndrey Nazarov <skuller@skuller.net>2009-05-23 13:09:36 +0000
commit454fc2e2eb975e359696850f07c071aa0736aac7 (patch)
treecaccd779d07d3e30dc3a7cac85ea8969d670519b /source/q_shared.h
parentd7423ceb1f3f699ce36bbd405f240d45f3dda4d4 (diff)
Fixed scrolling in MVD clients menu.
Implemented automatic chasecam hack for MVD observers. Correctly handle ICMP errors resluting in sendto() failing on Linux. Added ‘--disable-icmp’ option to configure script. Implemented ‘net_stats’ console command.
Diffstat (limited to 'source/q_shared.h')
-rw-r--r--source/q_shared.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/source/q_shared.h b/source/q_shared.h
index b63cca7..a377e80 100644
--- a/source/q_shared.h
+++ b/source/q_shared.h
@@ -184,18 +184,8 @@ extern vec3_t vec3_origin;
extern const vec3_t bytedirs[NUMVERTEXNORMALS];
#if USE_CLIENT
-extern const color_t colorBlack;
-extern const color_t colorRed;
-extern const color_t colorGreen;
-extern const color_t colorYellow;
-extern const color_t colorBlue;
-extern const color_t colorCyan;
-extern const color_t colorMagenta;
-extern const color_t colorWhite;
-
-extern const color_t colorTable[8];
-
-extern const char colorNames[10][8];
+extern const color_t colorTable[8];
+extern const char colorNames[10][8];
#endif
typedef struct vrect_s {
@@ -378,6 +368,15 @@ void ByteToDir( int index, vec3_t dir );
#define S_COLOR_ALT Q_COLOR_ESCAPE_STRING "8"
#define S_COLOR_RESET Q_COLOR_ESCAPE_STRING "9"
+#define colorBlack colorTable[ColorIndex(COLOR_BLACK)]
+#define colorRed colorTable[ColorIndex(COLOR_RED)]
+#define colorGreen colorTable[ColorIndex(COLOR_GREEN)]
+#define colorYellow colorTable[ColorIndex(COLOR_YELLOW)]
+#define colorBlue colorTable[ColorIndex(COLOR_BLUE)]
+#define colorCyan colorTable[ColorIndex(COLOR_CYAN)]
+#define colorMagenta colorTable[ColorIndex(COLOR_MAGENTA)]
+#define colorWhite colorTable[ColorIndex(COLOR_WHITE)]
+
#define MAKERGB(v,r,g,b) ((v)[0]=(r),(v)[1]=(g),(v)[2]=(b))
#define MAKERGBA(v,r,g,b,a) ((v)[0]=(r),(v)[1]=(g),(v)[2]=(b),(v)[3]=(a))