diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 6eadeec43..04fb8cda0 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -621,16 +621,6 @@ CG_DrawTeamInfo static void CG_DrawTeamInfo(void) { int chatHeight = TEAMCHAT_HEIGHT; - /* - if ( cg_smallFont.integer & SMALLFONT_CHATS ) - { - lineHeight = 7.5f; - scale = 0.16f; - icon_width = 11.f; - icon_height = 9.f; - x_offset = 2; - } - */ // no need to adjust chat height for intermission here - CG_DrawTeamInfo is called from CG_Draw2D if (cg_teamChatHeight.integer < TEAMCHAT_HEIGHT) diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 34c85807c..bfa7f3099 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -697,8 +697,6 @@ typedef struct float damageX, damageY, damageValue; } viewDamage_t; -#define MAX_REWARDSTACK 5 - //====================================================================== // all cg.stepTime, cg.duckTime, cg.landTime, etc are set to cg.time when the action @@ -713,7 +711,6 @@ typedef struct #define MAX_SPAWNDESC 128 #define MAX_BUFFERED_SOUNDSCRIPTS 16 - #define MAX_SOUNDSCRIPT_SOUNDS 16 typedef struct soundScriptHandle_s @@ -2036,8 +2033,6 @@ extern vmCvar_t pmove_fixed; extern vmCvar_t pmove_msec; extern vmCvar_t cg_timescale; -extern vmCvar_t cg_smallFont; -extern vmCvar_t cg_bigFont; extern vmCvar_t cg_voiceSpriteTime; @@ -2348,13 +2343,8 @@ void CG_MissileHitWallSmall(int weapon, int clientNum, vec3_t origin, vec3_t dir void CG_DrawTracer(vec3_t start, vec3_t finish); void CG_MG42EFX(centity_t *cent); - -void CG_FLAKEFX(centity_t *cent, int whichgun); - void CG_MortarEFX(centity_t *cent); -qboolean CG_MonsterUsingWeapon(centity_t *cent, int aiChar, int weaponNum); - void CG_MissileHitWall2(int weapon, int clientNum, vec3_t origin, vec3_t dir); void CG_MissileHitPlayer(centity_t *cent, int weapon, vec3_t origin, vec3_t dir, int entityNum); @@ -2451,7 +2441,6 @@ char *CG_GetLocationMsg(int clientNum, vec3_t origin); char *CG_BuildLocationString(int clientNum, vec3_t origin, int flag); void CG_LoadLocations(void); - // cg_effects.c int CG_GetOriginForTag(centity_t * cent, refEntity_t * parent, char *tagName, int startIndex, vec3_t org, vec3_t axis[3]); localEntity_t *CG_SmokePuff(const vec3_t p, @@ -2634,9 +2623,6 @@ void CG_AddAtmosphericEffects(void); // system traps // These functions are how the cgame communicates with the main game system -// no engine implementation -void trap_PumpEventLoop(void); - // print message on the local console void trap_Print(const char *fmt); @@ -2740,7 +2726,7 @@ void trap_S_UpdateEntityPosition(int entityNum, const vec3_t origin); // talking animations int trap_S_GetVoiceAmplitude(int entityNum); -// repatialize recalculates the volumes of sound as they should be heard by the +// respatialize recalculates the volumes of sound as they should be heard by the // given entityNum and position void trap_S_Respatialize(int entityNum, const vec3_t origin, vec3_t axis[3], int inwater); sfxHandle_t trap_S_RegisterSound(const char *sample, qboolean compressed); // returns blank if not found diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 5d131bf6f..07954642c 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -203,8 +203,6 @@ vmCvar_t cg_messageType; vmCvar_t cg_messagePlayer; vmCvar_t cg_timescale; -vmCvar_t cg_smallFont; -vmCvar_t cg_bigFont; vmCvar_t cg_voiceSpriteTime; @@ -394,9 +392,6 @@ cvarTable_t cvarTable[] = { &cg_voiceSpriteTime, "cg_voiceSpriteTime", "6000", CVAR_ARCHIVE }, - { &cg_smallFont, "ui_smallFont", "0.25", CVAR_ARCHIVE }, - { &cg_bigFont, "ui_bigFont", "0.4", CVAR_ARCHIVE }, - { &cg_teamChatsOnly, "cg_teamChatsOnly", "0", CVAR_ARCHIVE }, { &cg_noVoiceChats, "cg_noVoiceChats", "0", CVAR_ARCHIVE }, { &cg_noVoiceText, "cg_noVoiceText", "0", CVAR_ARCHIVE }, diff --git a/src/ui/ui_local.h b/src/ui/ui_local.h index 7570abf24..b83e56e94 100644 --- a/src/ui/ui_local.h +++ b/src/ui/ui_local.h @@ -68,8 +68,6 @@ extern vmCvar_t ui_server14; extern vmCvar_t ui_server15; extern vmCvar_t ui_server16; -extern vmCvar_t ui_smallFont; -extern vmCvar_t ui_bigFont; extern vmCvar_t ui_selectedPlayer; extern vmCvar_t ui_selectedPlayerName; extern vmCvar_t ui_netSource;