From d37536edf4660f3c46e4876b6d72e9a200549ffe Mon Sep 17 00:00:00 2001 From: tma Date: Wed, 5 Sep 2007 18:17:46 +0000 Subject: * Merge unified-sdl to trunk * Bump Q3_VERSION to 1.35 git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/cgame/cg_draw.c | 10 +++++----- code/cgame/cg_drawtools.c | 8 ++------ code/cgame/cg_event.c | 2 +- code/cgame/cg_local.h | 2 +- code/cgame/cg_main.c | 6 +++--- code/cgame/cg_newdraw.c | 11 ++++------- code/cgame/cg_players.c | 4 ++-- code/cgame/cg_servercmds.c | 4 ++-- 8 files changed, 20 insertions(+), 27 deletions(-) (limited to 'code/cgame') diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c index b4fe564..a525e5c 100644 --- a/code/cgame/cg_draw.c +++ b/code/cgame/cg_draw.c @@ -1596,18 +1596,18 @@ static void CG_DrawDisconnect( void ) { int cmdNum; usercmd_t cmd; const char *s; - int w; // bk010215 - FIXME char message[1024]; + int w; // draw the phone jack if we are completely past our buffers cmdNum = trap_GetCurrentCmdNumber() - CMD_BACKUP + 1; trap_GetUserCmd( cmdNum, &cmd ); if ( cmd.serverTime <= cg.snap->ps.commandTime - || cmd.serverTime > cg.time ) { // special check for map_restart // bk 0102165 - FIXME + || cmd.serverTime > cg.time ) { // special check for map_restart return; } // also add text in center of screen - s = "Connection Interrupted"; // bk 010215 - FIXME + s = "Connection Interrupted"; w = CG_DrawStrlen( s ) * BIGCHAR_WIDTH; CG_DrawBigString( 320 - w/2, 100, s, 1.0F); @@ -1786,8 +1786,8 @@ static void CG_DrawCenterString( void ) { char *start; int l; int x, y, w; -#ifdef MISSIONPACK // bk010221 - unused else - int h; +#ifdef MISSIONPACK + int h; #endif float *color; diff --git a/code/cgame/cg_drawtools.c b/code/cgame/cg_drawtools.c index 1409ec1..2651d98 100644 --- a/code/cgame/cg_drawtools.c +++ b/code/cgame/cg_drawtools.c @@ -431,10 +431,6 @@ void CG_ColorForHealth( vec4_t hcolor ) { } - - -// bk001205 - code below duplicated in q3_ui/ui-atoms.c -// bk001205 - FIXME: does this belong in ui_shared.c? /* ================= UI_DrawProportionalString2 @@ -594,7 +590,7 @@ UI_DrawBannerString static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color ) { const char* s; - unsigned char ch; // bk001204 : array subscript + unsigned char ch; float ax; float ay; float aw; @@ -704,7 +700,7 @@ int UI_ProportionalStringWidth( const char* str ) { static void UI_DrawProportionalString2( int x, int y, const char* str, vec4_t color, float sizeScale, qhandle_t charset ) { const char* s; - unsigned char ch; // bk001204 - unsigned + unsigned char ch; float ax; float ay; float aw; diff --git a/code/cgame/cg_event.c b/code/cgame/cg_event.c index af1f359..7467cb6 100644 --- a/code/cgame/cg_event.c +++ b/code/cgame/cg_event.c @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "cg_local.h" // for the voice chats -#ifdef MISSIONPACK // bk001205 +#ifdef MISSIONPACK #include "../../ui/menudef.h" #endif //========================================================================== diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h index 9a5d1de..71598a6 100644 --- a/code/cgame/cg_local.h +++ b/code/cgame/cg_local.h @@ -1635,7 +1635,7 @@ typedef enum { SYSTEM_PRINT, CHAT_PRINT, TEAMCHAT_PRINT -} q3print_t; // bk001201 - warning: useless keyword or type name in empty declaration +} q3print_t; int trap_CIN_PlayCinematic( const char *arg0, int xpos, int ypos, int width, int height, int bits); diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index 8f1f46c..3740bca 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -204,7 +204,7 @@ typedef struct { int cvarFlags; } cvarTable_t; -static cvarTable_t cvarTable[] = { // bk001129 +static cvarTable_t cvarTable[] = { { &cg_ignore, "cg_ignore", "0", 0 }, // used for debugging { &cg_autoswitch, "cg_autoswitch", "1", CVAR_ARCHIVE }, { &cg_drawGun, "cg_drawGun", "1", CVAR_ARCHIVE }, @@ -1357,7 +1357,7 @@ qboolean CG_Asset_Parse(int handle) { continue; } } - return qfalse; // bk001204 - why not? + return qfalse; } void CG_ParseMenu(const char *menuFile) { @@ -1690,7 +1690,7 @@ static void CG_FeederSelection(float feederID, int index) { } #endif -#ifdef MISSIONPACK // bk001204 - only needed there +#ifdef MISSIONPACK static float CG_Cvar_Get(const char *cvar) { char buff[128]; memset(buff, 0, sizeof(buff)); diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c index c2ca9d5..25dc342 100644 --- a/code/cgame/cg_newdraw.c +++ b/code/cgame/cg_newdraw.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#ifndef MISSIONPACK // bk001204 +#ifndef MISSIONPACK #error This file not be used for classic Q3A. #endif @@ -172,7 +172,7 @@ static void CG_DrawPlayerArmorIcon( rectDef_t *rect, qboolean draw2D ) { cent = &cg_entities[cg.snap->ps.clientNum]; ps = &cg.snap->ps; - if ( draw2D || ( !cg_draw3dIcons.integer && cg_drawIcons.integer) ) { // bk001206 - parentheses + if ( draw2D || ( !cg_draw3dIcons.integer && cg_drawIcons.integer) ) { CG_DrawPic( rect->x, rect->y + rect->h/2 + 1, rect->w, rect->h, cgs.media.armorIcon ); } else if (cg_draw3dIcons.integer) { VectorClear( angles ); @@ -209,10 +209,9 @@ static void CG_DrawPlayerArmorValue(rectDef_t *rect, float scale, vec4_t color, } } -#ifndef MISSIONPACK // bk001206 +#ifndef MISSIONPACK static float healthColors[4][4] = { // { 0.2, 1.0, 0.2, 1.0 } , { 1.0, 0.2, 0.2, 1.0 }, {0.5, 0.5, 0.5, 1} }; - // bk0101016 - float const { 1.0f, 0.69f, 0.0f, 1.0f } , // normal { 1.0f, 0.2f, 0.2f, 1.0f }, // low health { 0.5f, 0.5f, 0.5f, 1.0f}, // weapon firing @@ -228,7 +227,7 @@ static void CG_DrawPlayerAmmoIcon( rectDef_t *rect, qboolean draw2D ) { cent = &cg_entities[cg.snap->ps.clientNum]; ps = &cg.snap->ps; - if ( draw2D || (!cg_draw3dIcons.integer && cg_drawIcons.integer) ) { // bk001206 - parentheses + if ( draw2D || (!cg_draw3dIcons.integer && cg_drawIcons.integer) ) { qhandle_t icon; icon = cg_weapons[ cg.predictedPlayerState.weapon ].ammoIcon; if ( icon ) { @@ -1214,8 +1213,6 @@ static void CG_Text_Paint_Limit(float *maxX, float x, float y, float scale, vec4 vec4_t newColor; glyphInfo_t *glyph; if (text) { -// TTimo: FIXME -// const unsigned char *s = text; // bk001206 - unsigned const char *s = text; float max = *maxX; float useScale; diff --git a/code/cgame/cg_players.c b/code/cgame/cg_players.c index c221a59..61e26c7 100644 --- a/code/cgame/cg_players.c +++ b/code/cgame/cg_players.c @@ -1752,7 +1752,7 @@ static void CG_PlayerFlag( centity_t *cent, qhandle_t hSkin, refEntity_t *torso } -#ifdef MISSIONPACK // bk001204 +#ifdef MISSIONPACK /* =============== CG_PlayerTokens @@ -2025,7 +2025,7 @@ static qboolean CG_PlayerShadow( centity_t *cent, float *shadowPlane ) { // fade the shadow out with height alpha = 1.0 - trace.fraction; - // bk0101022 - hack / FPE - bogus planes? + // hack / FPE - bogus planes? //assert( DotProduct( trace.plane.normal, trace.plane.normal ) != 0.0f ) // add the mark as a temporary, so it goes directly to the renderer diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c index 94cf332..185a068 100644 --- a/code/cgame/cg_servercmds.c +++ b/code/cgame/cg_servercmds.c @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // be a valid snapshot this frame #include "cg_local.h" -#include "../../ui/menudef.h" // bk001205 - for Q3_ui as well +#include "../../ui/menudef.h" typedef struct { const char *order; @@ -46,7 +46,7 @@ static const orderTask_t validOrders[] = { static const int numValidOrders = sizeof(validOrders) / sizeof(orderTask_t); -#ifdef MISSIONPACK // bk001204 +#ifdef MISSIONPACK static int CG_ValidOrder(const char *p) { int i; for (i = 0; i < numValidOrders; i++) { -- cgit v1.2.3