From 6e60e823ac94aeed888abbe15ea99f6ede3cc535 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Wed, 14 Oct 2009 18:25:11 +0000
Subject: * Fix cross-compiling (early merge from ioq3 r1667) * Prevent crash
when using % in chats, caused by r1784 (Ensiform, Rezyn) * Change default hud
color of location text to white, so it doesn't mess up color schemes of maps
that have such things on their location ents
---
Makefile | 4 +++-
assets/ui/tremulous_common_hud.h | 2 +-
src/qcommon/msg.c | 8 ++++----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index fbb833f2..c533f577 100644
--- a/Makefile
+++ b/Makefile
@@ -429,7 +429,9 @@ ifeq ($(PLATFORM),mingw32)
# Some MinGW installations define CC to cc, but don't actually provide cc,
# so explicitly use gcc instead (which is the only option anyway)
- CC=gcc
+ ifeq ($(shell which $(CC) > /dev/null; echo $$?),1)
+ CC=gcc
+ endif
ifndef WINDRES
WINDRES=windres
diff --git a/assets/ui/tremulous_common_hud.h b/assets/ui/tremulous_common_hud.h
index acdf5120..51e5d62f 100644
--- a/assets/ui/tremulous_common_hud.h
+++ b/assets/ui/tremulous_common_hud.h
@@ -115,7 +115,7 @@ itemDef
aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
- forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1
+ forecolor 1 1 1 1
textalign ALIGN_RIGHT
textscale 0.3
ownerdraw CG_PLAYER_LOCATION
diff --git a/src/qcommon/msg.c b/src/qcommon/msg.c
index 9893a65a..f79d6b59 100644
--- a/src/qcommon/msg.c
+++ b/src/qcommon/msg.c
@@ -312,9 +312,9 @@ void MSG_WriteString( msg_t *sb, const char *s ) {
}
Q_strncpyz( string, s, sizeof( string ) );
- // get rid of 0x80+ and '%' chars, because old clients don't like them
+ // get rid of 0x80+ chars, because old clients don't like them
for ( i = 0 ; i < l ; i++ ) {
- if ( ((byte *)string)[i] > 127 || string[i] == '%' ) {
+ if ( ((byte *)string)[i] > 127 ) {
string[i] = '.';
}
}
@@ -338,9 +338,9 @@ void MSG_WriteBigString( msg_t *sb, const char *s ) {
}
Q_strncpyz( string, s, sizeof( string ) );
- // get rid of 0x80+ and '%' chars, because old clients don't like them
+ // get rid of 0x80+ chars, because old clients don't like them
for ( i = 0 ; i < l ; i++ ) {
- if ( ((byte *)string)[i] > 127 || string[i] == '%' ) {
+ if ( ((byte *)string)[i] > 127 ) {
string[i] = '.';
}
}
--
cgit