summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_consolecmds.c3
-rw-r--r--src/cgame/cg_draw.c19
-rw-r--r--src/cgame/cg_local.h29
-rw-r--r--src/cgame/cg_main.c18
-rw-r--r--src/cgame/cg_scanner.c2
-rw-r--r--src/cgame/cg_snapshot.c3
6 files changed, 21 insertions, 53 deletions
diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index 68aab6c1..3dc7ef4d 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -91,7 +91,6 @@ qboolean CG_RequestScores( void )
// the scores are more than two seconds out of data,
// so request new ones
cg.scoresRequestTime = cg.time;
- //TA: added \n SendClientCommand doesn't call flush( )?
trap_SendClientCommand( "score\n" );
return qtrue;
@@ -239,7 +238,7 @@ qboolean CG_ConsoleCommand( void )
cmd = CG_Argv( 0 );
- //TA: ugly hacky special case
+ // ugly hacky special case
if( !Q_stricmp( cmd, "ui_menu" ) )
{
arg1 = CG_Argv( 1 );
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index ef15b798..61745111 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -74,8 +74,6 @@ int CG_Text_Width( const char *text, float scale, int limit )
else
{
glyph = &font->glyphs[ (int)*s ];
- //TTimo: FIXME: getting nasty warnings without the cast,
- //hopefully this doesn't break the VM build
out += glyph->xSkip;
s++;
count++;
@@ -92,8 +90,6 @@ int CG_Text_Height( const char *text, float scale, int limit )
float max;
glyphInfo_t *glyph;
float useScale;
-// TTimo: FIXME
-// const unsigned char *s = text;
const char *s = text;
fontInfo_t *font = &cgDC.Assets.textFont;
@@ -122,8 +118,6 @@ int CG_Text_Height( const char *text, float scale, int limit )
else
{
glyph = &font->glyphs[ (int)*s ];
- //TTimo: FIXME: getting nasty warnings without the cast,
- //hopefully this doesn't break the VM build
if( max < glyph->height )
max = glyph->height;
@@ -163,8 +157,7 @@ void CG_Text_Paint( float x, float y, float scale, vec4_t color, const char *tex
useScale = scale * font->glyphScale;
if( text )
{
-// TTimo: FIXME
-// const unsigned char *s = text;
+
const char *s = text;
trap_R_SetColor( color );
@@ -178,8 +171,6 @@ void CG_Text_Paint( float x, float y, float scale, vec4_t color, const char *tex
while( s && *s && count < len )
{
glyph = &font->glyphs[ (int)*s ];
- //TTimo: FIXME: getting nasty warnings without the cast,
- //hopefully this doesn't break the VM build
if( Q_IsColorString( s ) )
{
@@ -1481,8 +1472,6 @@ static void CG_Text_Paint_Limit( float *maxX, float x, float y, float scale,
if( text )
{
-// TTimo: FIXME
-// const unsigned char *s = text; // bk001206 - unsigned
const char *s = text;
float max = *maxX;
float useScale;
@@ -1505,8 +1494,6 @@ static void CG_Text_Paint_Limit( float *maxX, float x, float y, float scale,
while( s && *s && count < len )
{
glyph = &font->glyphs[ (int)*s ];
- //TTimo: FIXME: getting nasty warnings without the cast,
- //hopefully this doesn't break the VM build
if( Q_IsColorString( s ) )
{
@@ -1574,7 +1561,7 @@ static void CG_DrawTeamSpectators( rectDef_t *rect, float scale, vec4_t color, q
{
if( cg.spectatorOffset < cg.spectatorLen )
{
- //TA: skip colour directives
+ // skip colour directives
if( Q_IsColorString( &cg.spectatorList[ cg.spectatorOffset ] ) )
cg.spectatorOffset += 2;
else
@@ -1704,7 +1691,6 @@ static void CG_DrawStageReport( rectDef_t *rect, float text_x, float text_y,
CG_DrawFPS
==================
*/
-//TA: personally i think this should be longer - it should really be a cvar
#define FPS_FRAMES 20
#define FPS_STRING "fps"
static void CG_DrawFPS( rectDef_t *rect, float text_x, float text_y,
@@ -3282,7 +3268,6 @@ static void CG_Draw2D( void )
return;
}
- //TA: draw the lighting effects e.g. nvg
CG_DrawLighting( );
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 38ee43e9..dba61fd3 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -551,7 +551,7 @@ typedef struct trailBeam_s
// because corpses after respawn are outside the normal
// client numbering range
-//TA: smoothing of view and model for WW transitions
+// smoothing of view and model for WW transitions
#define MAXSMOOTHS 32
typedef struct
@@ -634,7 +634,6 @@ typedef struct centity_s
lerpFrame_t lerpFrame;
- //TA:
buildableAnimNumber_t buildableAnim; //persistant anim number
buildableAnimNumber_t oldBuildableAnim; //to detect when new anims are set
particleSystem_t *buildablePS;
@@ -869,7 +868,6 @@ typedef struct
//======================================================================
-//TA:
typedef struct
{
vec3_t alienBuildablePos[ MAX_GENTITIES ];
@@ -1099,10 +1097,10 @@ typedef struct
char testModelBarrelName[MAX_QPATH];
qboolean testGun;
- int spawnTime; //TA: fovwarp
- int weapon1Time; //TA: time when BUTTON_ATTACK went t->f f->t
- int weapon2Time; //TA: time when BUTTON_ATTACK2 went t->f f->t
- int weapon3Time; //TA: time when BUTTON_USE_HOLDABLE went t->f f->t
+ int spawnTime; // fovwarp
+ int weapon1Time; // time when BUTTON_ATTACK went t->f f->t
+ int weapon2Time; // time when BUTTON_ATTACK2 went t->f f->t
+ int weapon3Time; // time when BUTTON_USE_HOLDABLE went t->f f->t
qboolean weapon1Firing;
qboolean weapon2Firing;
qboolean weapon3Firing;
@@ -1110,15 +1108,15 @@ typedef struct
int boostedTime;
int poisonedTime;
- vec3_t lastNormal; //TA: view smoothage
- vec3_t lastVangles; //TA: view smoothage
- smooth_t sList[ MAXSMOOTHS ]; //TA: WW smoothing
+ vec3_t lastNormal; // view smoothage
+ vec3_t lastVangles; // view smoothage
+ smooth_t sList[ MAXSMOOTHS ]; // WW smoothing
- int forwardMoveTime; //TA: for struggling
+ int forwardMoveTime; // for struggling
int rightMoveTime;
int upMoveTime;
- float charModelFraction; //TA: loading percentages
+ float charModelFraction; // loading percentages
float mediaFraction;
float buildablesFraction;
@@ -1368,7 +1366,7 @@ typedef struct
clientInfo_t clientinfo[ MAX_CLIENTS ];
- //TA: corpse info
+ // corpse info
clientInfo_t corpseinfo[ MAX_CLIENTS ];
int cursorX;
@@ -1392,13 +1390,9 @@ extern cgs_t cgs;
extern cg_t cg;
extern centity_t cg_entities[ MAX_GENTITIES ];
-//TA: weapon limit expanded:
-//extern weaponInfo_t cg_weapons[MAX_WEAPONS];
extern weaponInfo_t cg_weapons[ 32 ];
-//TA: upgrade infos:
extern upgradeInfo_t cg_upgrades[ 32 ];
-//TA: buildable infos:
extern buildableInfo_t cg_buildables[ BA_NUM_BUILDABLES ];
extern markPoly_t cg_markPolys[ MAX_MARK_POLYS ];
@@ -1518,7 +1512,6 @@ extern vmCvar_t cg_painBlendMax;
extern vmCvar_t cg_painBlendScale;
extern vmCvar_t cg_painBlendZoom;
-//TA: hack to get class an carriage through to UI module
extern vmCvar_t ui_currentClass;
extern vmCvar_t ui_carriage;
extern vmCvar_t ui_stages;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index eab3d0f2..3f20ce20 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -101,8 +101,6 @@ cg_t cg;
cgs_t cgs;
centity_t cg_entities[ MAX_GENTITIES ];
-//TA: weapons limit expanded:
-//weaponInfo_t cg_weapons[MAX_WEAPONS];
weaponInfo_t cg_weapons[ 32 ];
upgradeInfo_t cg_upgrades[ 32 ];
@@ -225,7 +223,6 @@ vmCvar_t cg_painBlendMax;
vmCvar_t cg_painBlendScale;
vmCvar_t cg_painBlendZoom;
-//TA: hack to get class and carriage through to UI module
vmCvar_t ui_currentClass;
vmCvar_t ui_carriage;
vmCvar_t ui_stages;
@@ -785,7 +782,7 @@ static void CG_RegisterGraphics( void )
cgs.media.backTileShader = trap_R_RegisterShader( "console" );
- //TA: building shaders
+ // building shaders
cgs.media.greenBuildShader = trap_R_RegisterShader("gfx/misc/greenbuild" );
cgs.media.redBuildShader = trap_R_RegisterShader("gfx/misc/redbuild" );
cgs.media.humanSpawningShader = trap_R_RegisterShader("models/buildables/telenode/rep_cyl" );
@@ -1221,7 +1218,7 @@ qboolean CG_Asset_Parse( int handle )
}
}
- return qfalse; // bk001204 - why not?
+ return qfalse;
}
void CG_ParseMenu( const char *menuFile )
@@ -1614,7 +1611,7 @@ static void CG_RunCinematicFrame( int handle )
trap_CIN_RunCinematic( handle );
}
-//TA: hack to prevent warning
+// hack to prevent warning
static qboolean CG_OwnerDrawVisible( int parameter )
{
return qfalse;
@@ -1737,24 +1734,22 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
//inform UI to repress cursor whilst loading
trap_Cvar_Set( "ui_loading", "1" );
- //TA: load overrides
+ // load overrides
BG_InitClassOverrides( );
BG_InitBuildableOverrides( );
BG_InitAllowedGameElements( );
- //TA: dyn memory
+ // Dynamic memory
CG_InitMemory( );
CG_RegisterCvars( );
CG_InitConsoleCommands( );
- //TA: moved up for LoadHudMenu
String_Init( );
- //TA: TA UI
CG_AssetCache( );
- CG_LoadHudMenu( ); // load new hud stuff
+ CG_LoadHudMenu( );
cg.weaponSelect = WP_NONE;
cg.boostedTime = -1;
@@ -1803,7 +1798,6 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
CG_InitUpgrades( );
CG_UpdateMediaFraction( 1.0f );
- //TA:
CG_InitBuildables( );
CG_RegisterClients( ); // if low on memory, some clients will be deferred
diff --git a/src/cgame/cg_scanner.c b/src/cgame/cg_scanner.c
index ab98b23c..0711c1db 100644
--- a/src/cgame/cg_scanner.c
+++ b/src/cgame/cg_scanner.c
@@ -60,7 +60,7 @@ void CG_UpdateEntityPositions( void )
if( cent->currentState.eType == ET_BUILDABLE )
{
- //TA: add to list of item positions (for creep)
+ // add to list of item positions (for creep)
if( cent->currentState.modelindex2 == BIT_ALIENS )
{
VectorCopy( cent->lerpOrigin, entityPositions.alienBuildablePos[
diff --git a/src/cgame/cg_snapshot.c b/src/cgame/cg_snapshot.c
index f439a699..bb5ec858 100644
--- a/src/cgame/cg_snapshot.c
+++ b/src/cgame/cg_snapshot.c
@@ -142,9 +142,6 @@ static void CG_TransitionSnapshot( void )
// execute any server string commands before transitioning entities
CG_ExecuteNewServerCommands( cg.nextSnap->serverCommandSequence );
- // if we had a map_restart, set everthing with initial
- if( !cg.snap ) { } //TA: ?
-
// clear the currentValid flag for all entities in the existing snapshot
for( i = 0; i < cg.snap->numEntities; i++ )
{
generated by cgit (git 2.34.1) at 2024-11-15 07:29:25 +0000