summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_local.h18
-rw-r--r--src/cgame/cg_main.c4
-rw-r--r--src/cgame/cg_servercmds.c2
3 files changed, 12 insertions, 12 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index f571f0bf..702af342 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -73,15 +73,15 @@
//TA: ripped from wolf source
// Ridah, trails
-#define STYPE_STRETCH 0
-#define STYPE_REPEAT 1
+#define STYPE_STRETCH 0
+#define STYPE_REPEAT 1
-#define TJFL_FADEIN (1<<0)
-#define TJFL_CROSSOVER (1<<1)
-#define TJFL_NOCULL (1<<2)
-#define TJFL_FIXDISTORT (1<<3)
+#define TJFL_FADEIN (1<<0)
+#define TJFL_CROSSOVER (1<<1)
+#define TJFL_NOCULL (1<<2)
+#define TJFL_FIXDISTORT (1<<3)
#define TJFL_SPARKHEADFLARE (1<<4)
-#define TJFL_NOPOLYMERGE (1<<5)
+#define TJFL_NOPOLYMERGE (1<<5)
// done.
#define TEAM_OVERLAY_MAXNAME_WIDTH 12
@@ -923,7 +923,7 @@ typedef struct
sfxHandle_t hgrenb2aSound;
//TA: for wolf trail effects
- qhandle_t sparkFlareShader;
+ qhandle_t sparkFlareShader;
} cgMedia_t;
@@ -1142,7 +1142,7 @@ extern vmCvar_t ui_loading;
const char *CG_ConfigString( int index );
const char *CG_Argv( int arg );
-void TAUIConsole( const char *text );
+void CG_TAUIConsole( const char *text );
void QDECL CG_Printf( const char *msg, ... );
void QDECL CG_Error( const char *msg, ... );
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index cc7ec184..ae295975 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -446,7 +446,7 @@ void CG_RemoveConsoleLine( void )
}
//TA: team arena UI based console
-void TAUIConsole( const char *text )
+void CG_TAUIConsole( const char *text )
{
if( cg.numConsoleLines == MAX_CONSOLE_LINES )
CG_RemoveConsoleLine( );
@@ -470,7 +470,7 @@ void QDECL CG_Printf( const char *msg, ... )
vsprintf( text, msg, argptr );
va_end( argptr );
- TAUIConsole( text );
+ CG_TAUIConsole( text );
trap_Print( text );
}
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index 04c591cb..13059813 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -605,7 +605,7 @@ static void CG_ServerCommand( void )
{
if( trap_Argc( ) == 2 )
{
- TAUIConsole( CG_Argv( 1 ) );
+ CG_TAUIConsole( CG_Argv( 1 ) );
return;
}
}