summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_draw.c37
-rw-r--r--src/cgame/cg_ents.c153
-rw-r--r--src/cgame/cg_event.c10
-rw-r--r--src/cgame/cg_local.h10
-rw-r--r--src/cgame/cg_main.c25
-rw-r--r--src/cgame/cg_view.c89
-rw-r--r--src/cgame/cg_weapons.c19
7 files changed, 163 insertions, 180 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 6befbcd0..7674df5c 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -1451,8 +1451,12 @@ static void CG_DrawConsole( rectDef_t *rect, float text_x, float text_y, vec4_t
float scale, int align, int textStyle )
{
float x, y, w, h;
- menuDef_t dummyParent;
- itemDef_t textItem;
+
+ //for some reason if these are stored locally occasionally rendering fails
+ //even though they are both live until the end of the function, hence static
+ //possible compiler bug??
+ static menuDef_t dummyParent;
+ static itemDef_t textItem;
//offset the text
x = rect->x;
@@ -1780,14 +1784,8 @@ static void CG_DrawLighting( void )
cent = &cg_entities[cg.snap->ps.clientNum];
- if( cg.snap->ps.stats[ STAT_PCLASS ] == PCL_H_BASE )
- {
- if( BG_activated( UP_NVG, cg.snap->ps.stats ) )
- CG_DrawPic( 0, 0, 640, 480, cgs.media.humanNV );
- }
-
//fade to black if stamina is low
- if( ( cg.snap->ps.stats[ STAT_STAMINA ] < -800 ) &&
+ if( ( cg.snap->ps.stats[ STAT_STAMINA ] < -800 ) &&
( cg.snap->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) )
{
vec4_t black = { 0, 0, 0, 0 };
@@ -2393,8 +2391,9 @@ CG_Draw2D
*/
static void CG_Draw2D( void )
{
- vec4_t color;
- float w;
+ vec4_t color;
+ float w;
+ menuDef_t *menu, *defaultMenu;
color[ 0 ] = color[ 1 ] = color[ 2 ] = color[ 3 ] = 1.0f;
@@ -2414,23 +2413,23 @@ static void CG_Draw2D( void )
//TA: draw the lighting effects e.g. nvg
CG_DrawLighting( );
+ menu = Menus_FindByName( BG_FindHudNameForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ] ) );
+ defaultMenu = Menus_FindByName( "default_hud" );
+
if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR )
{
w = CG_Text_Width( SPECTATOR_STRING, 0.7f, 0 );
CG_Text_Paint( 320 - w / 2, 440, 0.7f, color, SPECTATOR_STRING, 0, 0, ITEM_TEXTSTYLE_SHADOWED );
}
- else if( !( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) &&
- !( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) )
+
+ if( !( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) &&
+ !( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) && menu )
{
// don't draw any status if dead or the scoreboard is being explicitly shown
if( !cg.showScores && cg.snap->ps.stats[ STAT_HEALTH ] > 0 )
{
if( cg_drawStatus.integer )
- {
- Menu_Paint(
- Menus_FindByName(
- BG_FindHudNameForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ] ) ), qtrue );
- }
+ Menu_Paint( menu, qtrue );
CG_DrawAmmoWarning( );
CG_DrawCrosshair( );
@@ -2442,6 +2441,8 @@ static void CG_Draw2D( void )
CG_AlienSense( );
}
}
+ else if( cg_drawStatus.integer )
+ Menu_Paint( defaultMenu, qtrue );
CG_DrawVote( );
CG_DrawTeamVote( );
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index 8578ab08..f0e10574 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -132,7 +132,7 @@ static void CG_EntityEffects( centity_t *cent ) {
// constant light glow
- if ( cent->currentState.constantLight && cent->currentState.eType != ET_TORCH )
+ if ( cent->currentState.constantLight )
{
int cl;
int i, r, g, b;
@@ -484,154 +484,6 @@ static void CG_Portal( centity_t *cent ) {
//============================================================================
-#define MAX_MARK_FRAGMENTS 128
-#define MAX_MARK_POINTS 384
-#define TORCH_R 0.2f
-#define TORCH_G 0.25f
-#define TORCH_B 0.3f
-
-/*
-===============
-CG_TorchLight
-===============
-*/
-static void CG_TorchLight( centity_t *cent )
-{
- int i, j, lum, numFragments;
- polyVert_t verts[ 4 ];
- float size, texCoordScale, veclength;
- trace_t tr;
- vec2_t tex[ 4 ];
- vec3_t temp, origin, normal, projection, angles;
- vec3_t to, from, forward, length;
- vec3_t markPoints[ MAX_MARK_POINTS ];
- vec3_t square[ 4 ];
- vec4_t axis[ 3 ], color;
- vec3_t mins = { -15, -15, -15 };
- vec3_t maxs = { 15, 15, 15 };
- markFragment_t markFragments[ MAX_MARK_FRAGMENTS ], *mf;
-
- if( cent->currentState.clientNum == cg.predictedPlayerState.clientNum )
- {
- VectorCopy( cg.predictedPlayerState.origin, from );
- VectorCopy( cg.refdefViewAngles, angles );
- }
- else
- {
- VectorCopy( cent->lerpOrigin, from );
- VectorCopy( cent->lerpAngles, angles );
- }
-
- from[2] += cg.predictedPlayerState.viewheight;
-
- AngleVectors( angles, forward, NULL, NULL );
- VectorMA( from, 4096, forward, to );
-
- CG_Trace( &tr, from, mins, maxs, to, -1, MASK_SOLID );
-
- VectorSubtract( tr.endpos, from, length );
- veclength = VectorLength( length );
-
- size = veclength / 2.0f;
- if( size > 255 ) size = 255;
- if( size < 0 ) size = 0;
-
- VectorCopy( tr.endpos, origin );
- VectorCopy( tr.plane.normal, normal );
-
- //slightly above surface
- VectorMA( origin, 1, normal, origin );
-
-#if 1
- trap_R_AddLightToScene( origin, size * 2, 1, 1, 1 );
- trap_R_AddAdditiveLightToScene( origin, size * 2, ( ( 512 - size ) / 512 ) * TORCH_R,
- ( ( 512 - size ) / 512 ) * TORCH_G,
- ( ( 512 - size ) / 512 ) * TORCH_B );
-#else
- texCoordScale = 0.5f / size;
-
- //decide where the corners of the poly go
- VectorNormalize2( normal, axis[0] );
- PerpendicularVector( axis[1], axis[0] );
- CrossProduct( axis[0], axis[1], axis[2] );
-
- for ( i = 0 ; i < 3 ; i++ )
- {
- square[0][i] = origin[i] - size * axis[1][i] - size * axis[2][i];
- square[1][i] = origin[i] - size * axis[1][i] + size * axis[2][i];
- square[2][i] = origin[i] + size * axis[1][i] + size * axis[2][i];
- square[3][i] = origin[i] + size * axis[1][i] - size * axis[2][i];
- }
-
- //set texture coordinates
- Vector2Set( tex[ 0 ], 0, 0 );
- Vector2Set( tex[ 1 ], 0, 1 );
- Vector2Set( tex[ 2 ], 1, 1 );
- Vector2Set( tex[ 3 ], 1, 0 );
-
- VectorScale( normal, -32, projection );
- numFragments = trap_CM_MarkFragments( 4, (void *)square,
- projection, MAX_MARK_POINTS, markPoints[0],
- MAX_MARK_FRAGMENTS, markFragments );
-
- color[ 0 ] = color[ 1 ] = color[ 2 ] = color[ 3 ] = 255;
-
- VectorCopy( origin, temp );
- VectorMA( temp, 48, normal, temp );
- lum = CG_AmbientLight( temp );
-
- lum += (int)( ( size / 255.0f ) * 24 );
-
- if( lum > 255 )
- lum = 255;
-
- for ( i = 0, mf = markFragments ; i < numFragments ; i++, mf++ )
- {
- polyVert_t *v;
- polyVert_t verts[MAX_VERTS_ON_POLY];
- markPoly_t *mark;
-
- // we have an upper limit on the complexity of polygons
- // that we store persistantly
- if ( mf->numPoints > MAX_VERTS_ON_POLY )
- mf->numPoints = MAX_VERTS_ON_POLY;
-
- for ( j = 0, v = verts ; j < mf->numPoints ; j++, v++ )
- {
- vec3_t delta;
-
- VectorCopy( markPoints[ mf->firstPoint + j ], v->xyz );
- VectorMA( v->xyz, 0.1f, normal, v->xyz );
-
- VectorSubtract( v->xyz, origin, delta );
- v->st[0] = 0.5 + DotProduct( delta, axis[1] ) * texCoordScale;
- v->st[1] = 0.5 + DotProduct( delta, axis[2] ) * texCoordScale;
- *(int *)v->modulate = *(int *)color;
- }
-
- if( lum < 64 )
- {
- if( lum < 10 )
- trap_R_AddPolyToScene( cgs.media.humanTorch8, mf->numPoints, verts );
- else if( lum >= 10 && lum < 16 )
- trap_R_AddPolyToScene( cgs.media.humanTorch7, mf->numPoints, verts );
- else if( lum >= 16 && lum < 22 )
- trap_R_AddPolyToScene( cgs.media.humanTorch6, mf->numPoints, verts );
- else if( lum >= 22 && lum < 28 )
- trap_R_AddPolyToScene( cgs.media.humanTorch5, mf->numPoints, verts );
- else if( lum >= 28 && lum < 34 )
- trap_R_AddPolyToScene( cgs.media.humanTorch4, mf->numPoints, verts );
- else if( lum >= 34 && lum < 40 )
- trap_R_AddPolyToScene( cgs.media.humanTorch3, mf->numPoints, verts );
- else if( lum >= 40 && lum < 46 )
- trap_R_AddPolyToScene( cgs.media.humanTorch2, mf->numPoints, verts );
- else if( lum >= 46 )
- trap_R_AddPolyToScene( cgs.media.humanTorch1, mf->numPoints, verts );
- }
- }
-#endif
-}
-
/*
=========================
CG_LightFlare
@@ -846,9 +698,6 @@ static void CG_AddCEntity( centity_t *cent ) {
case ET_MISSILE:
CG_Missile( cent );
break;
- case ET_TORCH:
- CG_TorchLight( cent );
- break;
case ET_MOVER:
CG_Mover( cent );
break;
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 27d8ada8..2637528b 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -1159,6 +1159,16 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
cg.firstPoisonedTime = cg.time;
break;
+ case EV_KNOCKOVER:
+ DEBUGNAME("EV_KNOCKOVER");
+ cg.firstKnockedTime = cg.time;
+ break;
+
+ case EV_GETUP:
+ DEBUGNAME("EV_GETUP");
+ cg.firstGetUpTime = cg.time;
+ break;
+
case EV_PLAYER_RESPAWN:
DEBUGNAME("EV_PLAYER_RESPAWN");
if( es->number == cg.clientNum )
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 2bd676a2..a1ae20bc 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -725,8 +725,12 @@ typedef struct {
int rightMoveTime;
int upMoveTime;
- int poisonedTime; //TA: poison cloud
- int firstPoisonedTime; //TA: poison cloud
+ int poisonedTime; //TA: poison cloud
+ int firstPoisonedTime; //TA: poison cloud
+ int lastRumbleTime; //TA: knocked over time
+ vec3_t rumbleVector; //TA: vertical displacement whilst rumbling
+ int firstKnockedTime; //TA: knocked over time
+ int firstGetUpTime; //TA: getting up time
float charModelFraction; //TA: loading percentages
float mediaFraction;
@@ -739,6 +743,8 @@ typedef struct {
char consoleText[ MAX_CONSOLE_TEXT ];
consoleLine_t consoleLines[ MAX_CONSOLE_LINES ];
int numConsoleLines;
+ qboolean consoleValid;
+
} cg_t;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index a5ffec50..29984b33 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -445,10 +445,13 @@ void QDECL CG_Printf( const char *msg, ... ) {
if( cg.numConsoleLines == MAX_CONSOLE_LINES )
CG_RemoveConsoleLine( );
- strcat( cg.consoleText, text );
- cg.consoleLines[ cg.numConsoleLines ].time = cg.time;
- cg.consoleLines[ cg.numConsoleLines ].length = strlen( text );
- cg.numConsoleLines++;
+ if( cg.consoleValid )
+ {
+ strcat( cg.consoleText, text );
+ cg.consoleLines[ cg.numConsoleLines ].time = cg.time;
+ cg.consoleLines[ cg.numConsoleLines ].length = strlen( text );
+ cg.numConsoleLines++;
+ }
trap_Print( text );
}
@@ -486,6 +489,18 @@ void QDECL Com_Printf( const char *msg, ... ) {
vsprintf (text, msg, argptr);
va_end (argptr);
+ //TA: team arena UI based console
+ if( cg.numConsoleLines == MAX_CONSOLE_LINES )
+ CG_RemoveConsoleLine( );
+
+ if( cg.consoleValid )
+ {
+ strcat( cg.consoleText, text );
+ cg.consoleLines[ cg.numConsoleLines ].time = cg.time;
+ cg.consoleLines[ cg.numConsoleLines ].length = strlen( text );
+ cg.numConsoleLines++;
+ }
+
CG_Printf ("%s", text);
}
@@ -1744,6 +1759,8 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) {
CG_ShaderStateChanged();
trap_S_ClearLoopingSounds( qtrue );
+
+ cg.consoleValid = qtrue;
}
/*
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index ce49d68a..6c5d2ad3 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -356,7 +356,7 @@ static void CG_OffsetFirstPersonView( void ) {
vec3_t predictedVelocity;
int timeDelta;
float bob2;
- vec3_t normal;
+ vec3_t normal, baseOrigin;
playerState_t *ps = &cg.predictedPlayerState;
if( ps->stats[ STAT_STATE ] & SS_WALLCLIMBING )
@@ -377,6 +377,8 @@ static void CG_OffsetFirstPersonView( void ) {
origin = cg.refdef.vieworg;
angles = cg.refdefViewAngles;
+ VectorCopy( origin, baseOrigin );
+
// if dead, fix the angle and don't add any kick
if ( cg.snap->ps.stats[STAT_HEALTH] <= 0 ) {
angles[ROLL] = 40;
@@ -553,6 +555,89 @@ static void CG_OffsetFirstPersonView( void ) {
}
}
+#define KNOCK_ROLL 70.0f
+#define KNOCK_SHAKE_HEIGHT 10
+#define KNOCK_RUMBLE_TIME 60
+
+ if( cg.predictedPlayerState.stats[ STAT_STATE ] & SS_KNOCKEDOVER )
+ {
+ int deltaTime;
+ float deltaSecs;
+ trace_t tr;
+ vec3_t mins, maxs;
+ float rollFraction;
+
+ BG_FindBBoxForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ], NULL, NULL, NULL, mins, maxs );
+
+ //bit closer to the ground
+ mins[ 2 ] = -1.0f;
+
+ deltaTime = cg.time - ( cg.firstKnockedTime + (int)( (float)KOVER_TIME / 5.0f ) );
+
+ if( deltaTime < 0 )
+ {
+ if( cg.time > cg.lastRumbleTime )
+ {
+ cg.rumbleVector[ 0 ] = rand( ) % KNOCK_SHAKE_HEIGHT;
+ cg.rumbleVector[ 1 ] = rand( ) % KNOCK_SHAKE_HEIGHT;
+ cg.rumbleVector[ 2 ] = rand( ) % KNOCK_SHAKE_HEIGHT;
+
+ cg.lastRumbleTime = cg.time + KNOCK_RUMBLE_TIME;
+ }
+
+ VectorAdd( origin, cg.rumbleVector, origin );
+ }
+ else
+ {
+ deltaSecs = deltaTime * 0.001; // milliseconds to seconds
+ origin[ 2 ] -= 0.5 * DEFAULT_GRAVITY * deltaSecs * deltaSecs; // FIXME: local gravity...
+
+ CG_Trace( &tr, baseOrigin, mins, maxs, origin, cg.predictedPlayerState.clientNum, MASK_SOLID );
+ VectorCopy( tr.endpos, origin );
+
+ rollFraction = (float)deltaTime / ( (float)KOVER_TIME / 6.0f );
+
+ if( rollFraction > 1.0f )
+ rollFraction = 1.0f;
+
+ angles[ ROLL ] -= rollFraction * KNOCK_ROLL;
+ VectorSet( cg.rumbleVector, 0.0f, 0.0f, 0.0f );
+ }
+ }
+
+ if( cg.predictedPlayerState.stats[ STAT_STATE ] & SS_GETTINGUP )
+ {
+ int deltaTime;
+ trace_t tr;
+ vec3_t mins, maxs, ground, pushUp;
+ float rollFraction;
+
+ BG_FindBBoxForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ], NULL, NULL, NULL, mins, maxs );
+
+ //bit closer to the ground
+ mins[ 2 ] = -1.0f;
+
+ VectorCopy( baseOrigin, ground );
+ ground[ 2 ] -= 64.0f;
+
+ CG_Trace( &tr, baseOrigin, mins, maxs, ground, cg.predictedPlayerState.clientNum, MASK_SOLID );
+ VectorSubtract( baseOrigin, tr.endpos, pushUp );
+
+ deltaTime = cg.time - cg.firstGetUpTime;
+
+ rollFraction = (float)deltaTime / (float)GETUP_TIME;
+
+ if( rollFraction > 1.0f )
+ rollFraction = 1.0f;
+
+ rollFraction = 1.0f - rollFraction;
+
+ VectorScale( pushUp, rollFraction, pushUp );
+ VectorSubtract( origin, pushUp, origin );
+
+ angles[ ROLL ] -= rollFraction * KNOCK_ROLL;
+ }
+
//TA: this *feels* more realisitic for humans
if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_HUMANS )
{
@@ -1237,7 +1322,7 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demo
/*CG_PowerupTimerSounds();*/
//remove expired console lines
- if( cg.consoleLines[ 0 ].time + cg_consoleLatency.integer < cg.time )
+ if( cg.consoleLines[ 0 ].time + cg_consoleLatency.integer < cg.time && cg_consoleLatency.integer > 0 )
CG_RemoveConsoleLine( );
// update audio positions
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index a2e1bf3e..8f83e288 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -782,6 +782,11 @@ void CG_RegisterWeapon( int weaponNum )
weaponInfo->missileModel = trap_R_RegisterModel( "models/ammo/grenade1.md3" );
break;
+ case WP_GROUND_POUND:
+ MAKERGB( weaponInfo->flashDlightColor, 0, 0, 0 );
+ weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/melee/fstatck.wav", qfalse );
+ break;
+
case WP_ABUILD:
case WP_ABUILD2:
case WP_HBUILD:
@@ -1437,6 +1442,17 @@ void CG_AddViewWeapon( playerState_t *ps ) {
VectorMA( hand.origin, random( ) * fraction, cg.refdef.viewaxis[1], hand.origin );
}
+ if( cg.predictedPlayerState.stats[ STAT_STATE ] & SS_KNOCKEDOVER )
+ {
+ vec3_t weaponRumble;
+
+ VectorCopy( cg.rumbleVector, weaponRumble );
+ VectorInverse( weaponRumble );
+ VectorScale( weaponRumble, 0.1f, weaponRumble );
+
+ VectorAdd( hand.origin, weaponRumble, hand.origin );
+ }
+
AnglesToAxis( angles, hand.axis );
// map torso animations to weapon animations
@@ -1456,8 +1472,7 @@ void CG_AddViewWeapon( playerState_t *ps ) {
hand.renderfx = RF_DEPTHHACK | RF_FIRST_PERSON | RF_MINLIGHT;
// add everything onto the hand
- CG_AddPlayerWeapon( &hand, ps, &cg.predictedPlayerEntity );
-}
+ CG_AddPlayerWeapon( &hand, ps, &cg.predictedPlayerEntity );}
/*
==============================================================================
generated by cgit (git 2.34.1) at 2025-04-03 23:07:12 +0000