summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_draw.c47
-rw-r--r--src/cgame/cg_local.h23
-rw-r--r--src/cgame/cg_main.c4
-rw-r--r--src/cgame/cg_servercmds.c83
4 files changed, 0 insertions, 157 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 43f5e0fc..3cb74ab0 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -36,9 +36,6 @@ int drawTeamOverlayModificationCount = -1;
int sortedTeamPlayers[ TEAM_MAXOVERLAY ];
int numSortedTeamPlayers;
-char systemChat[ 256 ];
-char teamChat1[ 256 ];
-char teamChat2[ 256 ];
//TA UI
int CG_Text_Width( const char *text, float scale, int limit )
@@ -523,26 +520,6 @@ static void CG_DrawProgressBar( rectDef_t *rect, vec4_t color, float scale,
//=============== TA: was cg_newdraw.c
-void CG_InitTeamChat( void )
-{
- memset( teamChat1, 0, sizeof( teamChat1 ) );
- memset( teamChat2, 0, sizeof( teamChat2 ) );
- memset( systemChat, 0, sizeof( systemChat ) );
-}
-
-void CG_SetPrintString( int type, const char *p )
-{
- if( type == SYSTEM_PRINT )
- {
- strcpy( systemChat, p );
- }
- else
- {
- strcpy( teamChat2, teamChat1 );
- strcpy( teamChat1, p );
- }
-}
-
#define NO_CREDITS_TIME 2000
static void CG_DrawPlayerCreditsValue( rectDef_t *rect, vec4_t color, qboolean padding )
@@ -1477,21 +1454,6 @@ float CG_GetValue( int ownerDraw )
return -1;
}
-static void CG_DrawAreaSystemChat( rectDef_t *rect, float scale, vec4_t color, qhandle_t shader )
-{
- CG_Text_Paint( rect->x, rect->y + rect->h, scale, color, systemChat, 0, 0, 0 );
-}
-
-static void CG_DrawAreaTeamChat( rectDef_t *rect, float scale, vec4_t color, qhandle_t shader )
-{
- CG_Text_Paint( rect->x, rect->y + rect->h, scale, color,teamChat1, 0, 0, 0 );
-}
-
-static void CG_DrawAreaChat(rectDef_t *rect, float scale, vec4_t color, qhandle_t shader)
-{
- CG_Text_Paint(rect->x, rect->y + rect->h, scale, color, teamChat2, 0, 0, 0);
-}
-
const char *CG_GetKillerText( )
{
const char *s = "";
@@ -2712,15 +2674,6 @@ void CG_OwnerDraw( float x, float y, float w, float h, float text_x,
case CG_PLAYER_USABLE_BUILDABLE:
CG_DrawUsableBuildable( &rect, shader, color );
break;
- case CG_AREA_SYSTEMCHAT:
- CG_DrawAreaSystemChat( &rect, scale, color, shader );
- break;
- case CG_AREA_TEAMCHAT:
- CG_DrawAreaTeamChat( &rect, scale, color, shader );
- break;
- case CG_AREA_CHAT:
- CG_DrawAreaChat( &rect, scale, color, shader );
- break;
case CG_KILLER:
CG_DrawKiller( &rect, scale, color, shader, textStyle );
break;
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 613dc98a..80581e8d 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -70,9 +70,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define CHAR_HEIGHT 48
#define TEXT_ICON_SPACE 4
-#define TEAMCHAT_WIDTH 80
-#define TEAMCHAT_HEIGHT 8
-
// very large characters
#define GIANT_WIDTH 32
#define GIANT_HEIGHT 48
@@ -1347,12 +1344,6 @@ typedef struct
//TA: corpse info
clientInfo_t corpseinfo[ MAX_CLIENTS ];
- // teamchat width is *3 because of embedded color codes
- char teamChatMsgs[ TEAMCHAT_HEIGHT ][ TEAMCHAT_WIDTH * 3 + 1 ];
- int teamChatMsgTimes[ TEAMCHAT_HEIGHT ];
- int teamChatPos;
- int teamLastChatPos;
-
int cursorX;
int cursorY;
qboolean eventHandling;
@@ -1443,8 +1434,6 @@ extern vmCvar_t cg_stereoSeparation;
extern vmCvar_t cg_lagometer;
extern vmCvar_t cg_drawAttacker;
extern vmCvar_t cg_synchronousClients;
-extern vmCvar_t cg_teamChatTime;
-extern vmCvar_t cg_teamChatHeight;
extern vmCvar_t cg_stats;
extern vmCvar_t cg_forceModel;
extern vmCvar_t cg_buildScript;
@@ -1583,9 +1572,6 @@ qboolean CG_WorldToScreen( vec3_t point, float *x, float *y );
//
extern int sortedTeamPlayers[ TEAM_MAXOVERLAY ];
extern int numSortedTeamPlayers;
-extern char systemChat[ 256 ];
-extern char teamChat1[ 256 ];
-extern char teamChat2[ 256 ];
void CG_AddLagometerFrameInfo( void );
void CG_AddLagometerSnapshotInfo( snapshot_t *snap );
@@ -1600,7 +1586,6 @@ int CG_Text_Height( const char *text, float scale, int limit );
float CG_GetValue(int ownerDraw);
void CG_RunMenuScript(char **args);
void CG_SetPrintString( int type, const char *p );
-void CG_InitTeamChat( void );
void CG_GetTeamColor( vec4_t *color );
const char *CG_GetKillerText( void );
void CG_Text_PaintChar( float x, float y, float width, float height, float scale,
@@ -2027,14 +2012,6 @@ void trap_Key_KeynumToStringBuf( int keynum, char *buf, int buflen );
void trap_Key_GetBindingBuf( int keynum, char *buf, int buflen );
void trap_Key_SetBinding( int keynum, const char *binding );
-typedef enum
-{
- SYSTEM_PRINT,
- CHAT_PRINT,
- TEAMCHAT_PRINT
-} q3print_t;
-
-
int trap_CIN_PlayCinematic( const char *arg0, int xpos, int ypos, int width, int height, int bits );
e_status trap_CIN_StopCinematic( int handle );
e_status trap_CIN_RunCinematic( int handle );
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index db4134c0..7c868b56 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -167,8 +167,6 @@ vmCvar_t cg_stereoSeparation;
vmCvar_t cg_lagometer;
vmCvar_t cg_drawAttacker;
vmCvar_t cg_synchronousClients;
-vmCvar_t cg_teamChatTime;
-vmCvar_t cg_teamChatHeight;
vmCvar_t cg_stats;
vmCvar_t cg_buildScript;
vmCvar_t cg_forceModel;
@@ -309,8 +307,6 @@ static cvarTable_t cvarTable[ ] =
{ &cg_thirdPersonRange, "cg_thirdPersonRange", "40", CVAR_CHEAT },
{ &cg_thirdPersonAngle, "cg_thirdPersonAngle", "0", CVAR_CHEAT },
{ &cg_thirdPerson, "cg_thirdPerson", "0", CVAR_CHEAT },
- { &cg_teamChatTime, "cg_teamChatTime", "3000", CVAR_ARCHIVE },
- { &cg_teamChatHeight, "cg_teamChatHeight", "0", CVAR_ARCHIVE },
{ &cg_forceModel, "cg_forceModel", "0", CVAR_ARCHIVE },
{ &cg_predictItems, "cg_predictItems", "1", CVAR_ARCHIVE },
{ &cg_deferPlayers, "cg_deferPlayers", "1", CVAR_ARCHIVE },
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index b30cae4d..60d6deba 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -385,88 +385,6 @@ static void CG_ConfigStringModified( void )
/*
-=======================
-CG_AddToTeamChat
-
-=======================
-*/
-static void CG_AddToTeamChat( const char *str )
-{
- int len;
- char *p, *ls;
- int lastcolor;
- int chatHeight;
-
- if( cg_teamChatHeight.integer < TEAMCHAT_HEIGHT )
- chatHeight = cg_teamChatHeight.integer;
- else
- chatHeight = TEAMCHAT_HEIGHT;
-
- if( chatHeight <= 0 || cg_teamChatTime.integer <= 0 )
- {
- // team chat disabled, dump into normal chat
- cgs.teamChatPos = cgs.teamLastChatPos = 0;
- return;
- }
-
- len = 0;
-
- p = cgs.teamChatMsgs[cgs.teamChatPos % chatHeight];
- *p = 0;
-
- lastcolor = '7';
-
- ls = NULL;
- while( *str )
- {
- if( len > TEAMCHAT_WIDTH - 1 )
- {
- if( ls )
- {
- str -= ( p - ls );
- str++;
- p -= ( p - ls );
- }
-
- *p = 0;
-
- cgs.teamChatMsgTimes[ cgs.teamChatPos % chatHeight ] = cg.time;
-
- cgs.teamChatPos++;
- p = cgs.teamChatMsgs[ cgs.teamChatPos % chatHeight ];
- *p = 0;
- *p++ = Q_COLOR_ESCAPE;
- *p++ = lastcolor;
- len = 0;
- ls = NULL;
- }
-
- if( Q_IsColorString( str ) )
- {
- *p++ = *str++;
- lastcolor = *str;
- *p++ = *str++;
- continue;
- }
-
- if( *str == ' ' )
- ls = p;
-
- *p++ = *str++;
- len++;
- }
- *p = 0;
-
- cgs.teamChatMsgTimes[ cgs.teamChatPos % chatHeight ] = cg.time;
- cgs.teamChatPos++;
-
- if( cgs.teamChatPos - cgs.teamLastChatPos > chatHeight )
- cgs.teamLastChatPos = cgs.teamChatPos - chatHeight;
-}
-
-
-
-/*
===============
CG_MapRestart
@@ -905,7 +823,6 @@ static void CG_ServerCommand( void )
Q_strncpyz( text, CG_Argv( 1 ), MAX_SAY_TEXT );
CG_RemoveChatEscapeChar( text );
- CG_AddToTeamChat( text );
CG_Printf( "%s\n", text );
return;
}
generated by cgit (git 2.34.1) at 2025-04-09 00:59:46 +0000