Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion game/Game_local.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5142,7 +5142,6 @@ void idGameLocal::SetPersistentTriggerInt( const char *type, const char *var, co
void idGameLocal::SavePersistentMoveables(void) {
idEntity* ent;
idStr tmp,name_str,st,name;
int nt=0;
// idVec3 vc;
idAngles ag;

Expand Down
2 changes: 1 addition & 1 deletion game/Misc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2689,7 +2689,7 @@ void idLiquid::TouchEntities( void ) { //Z.TODO: this is getting messy, maybe sp
float b = spawnArgs.GetFloat( "tinyObjectMass" );
float c = spawnArgs.GetFloat( "smallObjectMass" );
float d = spawnArgs.GetFloat( "bigObjectMass" );
float e = spawnArgs.GetFloat( "largeObjectMass" );
// float e = spawnArgs.GetFloat( "largeObjectMass" );

if (m <= a ) {
maxPrt = 0;
Expand Down
2 changes: 0 additions & 2 deletions game/Player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3575,8 +3575,6 @@ bool idPlayer::GivePowerUp( int powerup, int time ) {
}
inventory.GivePowerUp( this, powerup, time );

const idDeclEntityDef *def = NULL;

if ( hud ) {
hud->HandleNamedEvent( "itemPickup" );
}
Expand Down
2 changes: 0 additions & 2 deletions game/ai/AI_Veloxite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ float idAI_Veloxite::checkSurfaces() {
}

bool idAI_Veloxite::checkWall() {
int asd=0;

if (( (float) gameLocal.time / 1000 ) < nextWallCheck) {
return false;
}
Expand Down
5 changes: 1 addition & 4 deletions game/gamesys/SysCmds.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,15 @@ void Cmd_ClearPLI_f( const idCmdArgs &args ) {

// HEXEN : Zeroth - set up video mode
void Cmd_VidRestart_f( const idCmdArgs &args ) {
bool doit=false;

// DG: initialized these variables to appease the compiler
int ratio = 0;
int width = 0;
int height = 0;

int eoc_cvarmode = r_vmode.GetInteger();

idPlayer *localplayer = gameLocal.GetLocalPlayer();

/// if you click too fast, doom3 doesnt register that you've unclicked when it resets video. let's try to find the best way to go about this...
//idPlayer *localplayer = gameLocal.GetLocalPlayer();
//float wait=gameLocal.time+500;
//while ( gameLocal.time < wait ) {
// sys.wait(
Expand Down
3 changes: 0 additions & 3 deletions game/objects/LeafEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ void idEntity_LeafEmitter::Spawn() {

void idEntity_LeafEmitter::Think() {
if ( ( gameLocal.time / 1000 ) > nextLeaf) {

float i = gameLocal.random.RandomFloat() * 4;

if (gameLocal.random.RandomInt(1) > 1) {
leaf.Set("classname", "object_leaf_lg");
} else {
Expand Down
2 changes: 0 additions & 2 deletions game/physics/Physics_Player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,6 @@ void idPhysics_Player::DropTimers( void ) {
void idPhysics_Player::EvalGravity( void ) {
const int transitions = 8;
const float transitionTime = 0.10f;
idVec3 curOrigin = clipModel->GetOrigin();
idVec3 curGrav = gravityVector;

float curTime = MS2SEC( gameLocal.realClientTime );
Expand All @@ -1423,7 +1422,6 @@ void idPhysics_Player::EvalGravity( void ) {
idVec3 gravDir = TransitionToGravity * curTransition +
TransitionFromGravity * (transitions-curTransition);
gravDir.Normalize();
idActor * owner=static_cast< idActor * >(masterEntity);

if (curTransition == transitions) {
SetGravity(TransitionToGravity * gravAmount);
Expand Down
4 changes: 2 additions & 2 deletions game/projectiles/Wraithverge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void idProj_Wraith::Launch( const idVec3 &start, const idVec3 &dir, const idVec3
}

void idProj_Wraith::SpawnSubWraiths( int num ) {
idProj_HomingWraith *newWraith = NULL;
//idProj_HomingWraith *newWraith = NULL;
idEntity *ent = NULL;
idVec3 rnd;
idVec3 dir2;
Expand Down Expand Up @@ -124,7 +124,7 @@ void idProj_Wraith::SpawnSubWraiths( int num ) {
if ( !ent ) {
return;
}
newWraith = static_cast< idProj_HomingWraith* >( ent );
//newWraith = static_cast< idProj_HomingWraith* >( ent );
}
}

Expand Down
4 changes: 1 addition & 3 deletions game/script/Script_Thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1966,14 +1966,12 @@ void idThread::Event_GetEntityNumFromName( const idStr entName ) {

void idThread::Event_TraceSurfaceNormal( const idVec3 &A, const idVec3 &B, const float clipMask, const idEntity *pass ) {
trace_t trace;
idEntity *ent;

gameLocal.clip.TracePoint( trace, A, B, MASK_PLAYERSOLID, pass );

// if near a surface
if ( trace.fraction < 1.0f ) {
idVec3 bub=trace.c.normal;
ent = gameLocal.GetTraceEntity(trace);
gameLocal.GetTraceEntity(trace);

idThread::ReturnVector( trace.c.normal );
}else{
Expand Down