diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-14 18:25:11 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:49 +0000 |
| commit | 6e60e823ac94aeed888abbe15ea99f6ede3cc535 (patch) | |
| tree | c8a21b0472a22b3d99fa74f4edeb534aa65cffc3 | |
| parent | 6efd4cef3cfcc44d6727cb0e54da26fbb74a7533 (diff) | |
* 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
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | assets/ui/tremulous_common_hud.h | 2 | ||||
| -rw-r--r-- | src/qcommon/msg.c | 8 |
3 files changed, 8 insertions, 6 deletions
@@ -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] = '.'; } } |