summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_slidemove.c4
-rw-r--r--src/game/g_admin.c11
-rw-r--r--src/game/g_buildable.c2
-rw-r--r--src/game/g_combat.c2
-rw-r--r--src/game/g_main.c10
-rw-r--r--src/game/g_maprotation.c4
-rw-r--r--src/game/g_weapon.c38
7 files changed, 24 insertions, 47 deletions
diff --git a/src/game/bg_slidemove.c b/src/game/bg_slidemove.c
index aa32a6a..646475e 100644
--- a/src/game/bg_slidemove.c
+++ b/src/game/bg_slidemove.c
@@ -290,7 +290,6 @@ PM_StepSlideMove
qboolean PM_StepSlideMove( qboolean gravity, qboolean predictive )
{
vec3_t start_o, start_v;
- vec3_t down_o, down_v;
trace_t trace;
vec3_t normal;
vec3_t step_v, step_vNormal;
@@ -339,9 +338,6 @@ qboolean PM_StepSlideMove( qboolean gravity, qboolean predictive )
return stepped;
}
- VectorCopy( pm->ps->origin, down_o );
- VectorCopy( pm->ps->velocity, down_v );
-
VectorCopy( start_o, up );
VectorMA( up, STEPSIZE, normal, up );
diff --git a/src/game/g_admin.c b/src/game/g_admin.c
index 90e33c4..481f957 100644
--- a/src/game/g_admin.c
+++ b/src/game/g_admin.c
@@ -646,7 +646,6 @@ static void admin_writeconfig( void )
fileHandle_t f;
int len, i;
int t;
- char levels[ MAX_STRING_CHARS ] = {""};
if( !g_admin.string[ 0 ] )
{
@@ -724,7 +723,6 @@ static void admin_writeconfig( void )
}
for( i = 0; i < MAX_ADMIN_COMMANDS && g_admin_commands[ i ]; i++ )
{
- levels[ 0 ] = '\0';
trap_FS_Write( "[command]\n", 10, f );
trap_FS_Write( "command = ", 10, f );
admin_writeconfig_string( g_admin_commands[ i ]->command, f );
@@ -2108,9 +2106,8 @@ qboolean G_admin_readconfig( gentity_t *ent, int skiparg )
qboolean G_admin_time( gentity_t *ent, int skiparg )
{
qtime_t qt;
- int t;
- t = trap_RealTime( &qt );
+ trap_RealTime( &qt );
ADMP( va( "^3!time: ^7local time is %02i:%02i:%02i\n",
qt.tm_hour, qt.tm_min, qt.tm_sec ) );
return qtrue;
@@ -4422,7 +4419,6 @@ qboolean G_admin_mute( gentity_t *ent, int skiparg )
char command[ MAX_ADMIN_CMD_LEN ], *cmd;
gentity_t *vic;
char secs[ 7 ];
- qboolean usageDuration = qfalse;
int seconds = 0;
G_SayArgv( skiparg, command, sizeof( command ) );
@@ -4493,7 +4489,6 @@ qboolean G_admin_mute( gentity_t *ent, int skiparg )
qboolean G_admin_cp( gentity_t *ent, int skiparg )
{
int minargc;
- char *s;
minargc = 2 + skiparg;
@@ -4503,7 +4498,6 @@ qboolean G_admin_cp( gentity_t *ent, int skiparg )
return qfalse;
}
- s = G_SayConcatArgs( 1 + skiparg );
G_CP(ent);
return qtrue;
}
@@ -8110,7 +8104,7 @@ qboolean G_admin_L0(gentity_t *ent, int skiparg ){
qboolean G_admin_L1(gentity_t *ent, int skiparg ){
int pids[ MAX_CLIENTS ];
- char name[ MAX_NAME_LENGTH ], *reason, err[ MAX_STRING_CHARS ];
+ char name[ MAX_NAME_LENGTH ], err[ MAX_STRING_CHARS ];
int minargc;
minargc = 2 + skiparg;
@@ -8121,7 +8115,6 @@ qboolean G_admin_L1(gentity_t *ent, int skiparg ){
return qfalse;
}
G_SayArgv( 1 + skiparg, name, sizeof( name ) );
- reason = G_SayConcatArgs( 2 + skiparg );
if( G_ClientNumbersFromString( name, pids ) != 1 )
{
G_MatchOnePlayer( pids, err, sizeof( err ) );
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 4b89c82..b8ecad4 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -3390,7 +3390,6 @@ itemBuildError_t G_CanBuild( gentity_t *ent, buildable_t buildable, int distance
qboolean invert;
int contents;
playerState_t *ps = &ent->client->ps;
- int buildPoints;
itemBuildError_t tempReason;
// Stop all buildables from interacting with traces
@@ -3421,7 +3420,6 @@ itemBuildError_t G_CanBuild( gentity_t *ent, buildable_t buildable, int distance
reason = IBE_PERMISSION;
contents = trap_PointContents( entity_origin, -1 );
- buildPoints = BG_FindBuildPointsForBuildable( buildable );
if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
{
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 6fe40b7..a992c17 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1248,7 +1248,6 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
{
gclient_t *client;
int take;
- int save;
int asave = 0;
int knockback;
float damagemodifier=0.0;
@@ -1442,7 +1441,6 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
}
take = damage;
- save = 0;
// add to the damage inflicted on a player this frame
// the total will be turned into screen blends and view angle kicks
diff --git a/src/game/g_main.c b/src/game/g_main.c
index d7cc6d4..d9dcd66 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -838,7 +838,6 @@ void G_InitGame( int levelTime, int randomSeed, int restart )
{
char serverinfo[ MAX_INFO_STRING ];
qtime_t qt;
- int t;
trap_GetServerinfo( serverinfo, sizeof( serverinfo ) );
@@ -846,7 +845,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart )
G_LogPrintf( "------------------------------------------------------------\n" );
G_LogPrintf( "InitGame: %s\n", serverinfo );
- t = trap_RealTime( &qt );
+ trap_RealTime( &qt );
G_LogPrintf("RealTime: %04i/%02i/%02i %02i:%02i:%02i\n",
qt.tm_year+1900, qt.tm_mon+1, qt.tm_mday,
qt.tm_hour, qt.tm_min, qt.tm_sec );
@@ -3311,7 +3310,6 @@ void G_RunFrame( int levelTime )
int i;
gentity_t *ent;
int msec;
- int start, end;
// if we are waiting for the level to restart, do nothing
if( level.restarted )
@@ -3348,7 +3346,6 @@ void G_RunFrame( int levelTime )
//
// go through all allocated objects
//
- start = trap_Milliseconds( );
ent = &g_entities[ 0 ];
for( i = 0; i < level.num_entities; i++, ent++ )
@@ -3427,9 +3424,6 @@ void G_RunFrame( int levelTime )
G_RunThink( ent );
}
- end = trap_Milliseconds();
-
- start = trap_Milliseconds();
// perform final fixups on the players
ent = &g_entities[ 0 ];
@@ -3445,8 +3439,6 @@ void G_RunFrame( int levelTime )
// save position information for all active clients
G_UnlaggedStore( );
- end = trap_Milliseconds();
-
//TA:
G_CountSpawns( );
G_CalculateBuildPoints( );
diff --git a/src/game/g_maprotation.c b/src/game/g_maprotation.c
index eb76d70..2438ebc 100644
--- a/src/game/g_maprotation.c
+++ b/src/game/g_maprotation.c
@@ -1054,10 +1054,10 @@ static int G_GetMapVoteWinner( int *winvotes, int *totalvotes, int *resultorder
qboolean G_IntermissionMapVoteWinner( void )
{
- int winner, winvotes, totalvotes;
+ int winvotes, totalvotes;
int nonvotes;
- winner = G_GetMapVoteWinner( &winvotes, &totalvotes, NULL );
+ G_GetMapVoteWinner( &winvotes, &totalvotes, NULL );
if( winvotes * 2 > level.numConnectedClients )
return qtrue;
nonvotes = level.numConnectedClients - totalvotes;
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index ea4e290..7d3449e 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -442,9 +442,9 @@ LOCKBLOB
void lockBlobLauncherFire( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = fire_lockblob( ent, muzzle, forward );
+ fire_lockblob( ent, muzzle, forward );
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
@@ -459,9 +459,9 @@ HIVE
void hiveFire( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = fire_hive( ent, muzzle, forward );
+ fire_hive( ent, muzzle, forward );
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
@@ -476,9 +476,9 @@ BLASTER PISTOL
void blasterFire( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = fire_blaster( ent, muzzle, forward );
+ fire_blaster( ent, muzzle, forward );
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
@@ -493,9 +493,9 @@ PULSE RIFLE
void pulseRifleFire( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = fire_pulseRifle( ent, muzzle, forward );
+ fire_pulseRifle( ent, muzzle, forward );
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
@@ -510,9 +510,9 @@ FLAME THROWER
void flamerFire( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = fire_flamer( ent, muzzle, forward );
+ fire_flamer( ent, muzzle, forward );
}
/*
@@ -525,9 +525,9 @@ GRENADE
void throwGrenade( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = launch_grenade( ent, muzzle, forward );
+ launch_grenade( ent, muzzle, forward );
}
/*
@@ -657,17 +657,17 @@ LCChargeFire
*/
void LCChargeFire( gentity_t *ent, qboolean secondary )
{
- gentity_t *m;
+// gentity_t *m;
if( secondary )
{
- m = fire_luciferCannon( ent, muzzle, forward, LCANNON_SECONDARY_DAMAGE,
+ fire_luciferCannon( ent, muzzle, forward, LCANNON_SECONDARY_DAMAGE,
LCANNON_SECONDARY_RADIUS );
ent->client->ps.weaponTime = LCANNON_REPEAT;
}
else
{
- m = fire_luciferCannon( ent, muzzle, forward, ent->client->ps.stats[ STAT_MISC ], LCANNON_RADIUS );
+ fire_luciferCannon( ent, muzzle, forward, ent->client->ps.stats[ STAT_MISC ], LCANNON_RADIUS );
ent->client->ps.weaponTime = LCANNON_CHARGEREPEAT;
}
@@ -854,9 +854,9 @@ void buildFire( gentity_t *ent, dynMenu_t menu )
void slowBlobFire( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = fire_slowBlob( ent, muzzle, forward );
+ fire_slowBlob( ent, muzzle, forward );
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
@@ -1411,9 +1411,9 @@ qboolean CheckPounceAttack( gentity_t *ent )
void bounceBallFire( gentity_t *ent )
{
- gentity_t *m;
+// gentity_t *m =
- m = fire_bounceBall( ent, muzzle, forward );
+ fire_bounceBall( ent, muzzle, forward );
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
generated by cgit (git 2.34.1) at 2024-12-27 06:35:20 +0000