dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-23 04:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix -Wunused-but-set-variable warnings

Browse source 
variable set but not used

Removes some CollisionModel code under _DEBUG which was probably a
leftover, since it was completely useless (its done later anyways).
This commit is contained in:
dhewg 2011-12-02 19:54:23 +01:00
parent e4771f3a5f
commit 3f5c14ef5f
51 changed files with 70 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
neo/cm/CollisionModel_rotate.cpp
View file

@ -1610,10 +1610,6 @@ void idCollisionModelManagerLocal::Rotation180( trace_t *results, const idVec3 &
idCollisionModelManagerLocal::Rotation
================
*/
#ifdef _DEBUG
static int entered = 0;
#endif
void idCollisionModelManagerLocal::Rotation( trace_t *results, const idVec3 &start, const idRotation &rotation,
const idTraceModel *trm, const idMat3 &trmAxis, int contentMask,
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis ) {
@ -1631,21 +1627,6 @@ void idCollisionModelManagerLocal::Rotation( trace_t *results, const idVec3 &sta
return;
}
#ifdef _DEBUG
bool startsolid = false;
// test whether or not stuck to begin with
if ( cm_debugCollision.GetBool() ) {
if ( !entered ) {
entered = 1;
// if already messed up to begin with
if ( idCollisionModelManagerLocal::Contents( start, trm, trmAxis, -1, model, modelOrigin, modelAxis ) & contentMask ) {
startsolid = true;
}
entered = 0;
}
}
#endif
if ( rotation.GetAngle() >= 180.0f || rotation.GetAngle() <= -180.0f) {
if ( rotation.GetAngle() >= 360.0f ) {
maxa = 360.0f;
@ -1674,20 +1655,16 @@ void idCollisionModelManagerLocal::Rotation( trace_t *results, const idVec3 &sta
idCollisionModelManagerLocal::Rotation180( results, rotation.GetOrigin(), rotation.GetVec(), 0.0f, rotation.GetAngle(), start, trm, trmAxis, contentMask, model, modelOrigin, modelAxis );
#ifdef _DEBUG
// test for missed collisions
// test for collisions
if ( cm_debugCollision.GetBool() ) {
if ( !entered ) {
entered = 1;
// if the trm is stuck in the model
if ( idCollisionModelManagerLocal::Contents( results->endpos, trm, results->endAxis, -1, model, modelOrigin, modelAxis ) & contentMask ) {
trace_t tr;
// if the trm is stuck in the model
if ( idCollisionModelManagerLocal::Contents( results->endpos, trm, results->endAxis, -1, model, modelOrigin, modelAxis ) & contentMask ) {
trace_t tr;
// test where the trm is stuck in the model
idCollisionModelManagerLocal::Contents( results->endpos, trm, results->endAxis, -1, model, modelOrigin, modelAxis );
// re-run collision detection to find out where it failed
idCollisionModelManagerLocal::Rotation( &tr, start, rotation, trm, trmAxis, contentMask, model, modelOrigin, modelAxis );
}
entered = 0;
// test where the trm is stuck in the model
idCollisionModelManagerLocal::Contents( results->endpos, trm, results->endAxis, -1, model, modelOrigin, modelAxis );
// re-run collision detection to find out where it failed
idCollisionModelManagerLocal::Rotation( &tr, start, rotation, trm, trmAxis, contentMask, model, modelOrigin, modelAxis );
}
}
#endif

25
neo/cm/CollisionModel_translate.cpp
View file

@ -759,10 +759,6 @@ void idCollisionModelManagerLocal::SetupTranslationHeartPlanes( cm_traceWork_t *
idCollisionModelManagerLocal::Translation
================
*/
#ifdef _DEBUG
static int entered = 0;
#endif
void idCollisionModelManagerLocal::Translation( trace_t *results, const idVec3 &start, const idVec3 &end,
const idTraceModel *trm, const idMat3 &trmAxis, int contentMask,
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis ) {
@ -798,21 +794,6 @@ void idCollisionModelManagerLocal::Translation( trace_t *results, const idVec3 &
return;
}
#ifdef _DEBUG
bool startsolid = false;
// test whether or not stuck to begin with
if ( cm_debugCollision.GetBool() ) {
if ( !entered && !idCollisionModelManagerLocal::getContacts ) {
entered = 1;
// if already messed up to begin with
if ( idCollisionModelManagerLocal::Contents( start, trm, trmAxis, -1, model, modelOrigin, modelAxis ) & contentMask ) {
startsolid = true;
}
entered = 0;
}
}
#endif
idCollisionModelManagerLocal::checkCount++;
tw.trace.fraction = 1.0f;
@ -1100,10 +1081,9 @@ void idCollisionModelManagerLocal::Translation( trace_t *results, const idVec3 &
}
#ifdef _DEBUG
// test for missed collisions
// test for collisions
if ( cm_debugCollision.GetBool() ) {
if ( !entered && !idCollisionModelManagerLocal::getContacts ) {
entered = 1;
if (!idCollisionModelManagerLocal::getContacts ) {
// if the trm is stuck in the model
if ( idCollisionModelManagerLocal::Contents( results->endpos, trm, trmAxis, -1, model, modelOrigin, modelAxis ) & contentMask ) {
trace_t tr;
@ -1113,7 +1093,6 @@ void idCollisionModelManagerLocal::Translation( trace_t *results, const idVec3 &
// re-run collision detection to find out where it failed
idCollisionModelManagerLocal::Translation( &tr, start, end, trm, trmAxis, contentMask, model, modelOrigin, modelAxis );
}
entered = 0;
}
}
#endif

3
neo/d3xp/Fx.cpp
View file

@ -814,9 +814,6 @@ idTeleporter::Event_DoAction
================
*/
void idTeleporter::Event_DoAction( idEntity *activator ) {
float angle;
angle = spawnArgs.GetFloat( "angle" );
idAngles a( 0, spawnArgs.GetFloat( "angle" ), 0 );
activator->Teleport( GetPhysics()->GetOrigin(), a, NULL );
}

7
neo/d3xp/Player.cpp
View file

@ -3290,13 +3290,11 @@ idPlayer::UpdateConditions
*/
void idPlayer::UpdateConditions( void ) {
idVec3 velocity;
float fallspeed;
float forwardspeed;
float sidespeed;
// minus the push velocity to avoid playing the walking animation and sounds when riding a mover
velocity = physicsObj.GetLinearVelocity() - physicsObj.GetPushedLinearVelocity();
fallspeed = velocity * physicsObj.GetGravityNormal();
if ( influenceActive ) {
AI_FORWARD = false;
@ -5305,7 +5303,6 @@ void idPlayer::UpdateFocus( void ) {
idUserInterface *oldUI;
idAI *oldChar;
int oldTalkCursor;
idAFEntity_Vehicle *oldVehicle;
int i, j;
idVec3 start, end;
bool allowFocus;
@ -5332,7 +5329,6 @@ void idPlayer::UpdateFocus( void ) {
oldUI = focusUI;
oldChar = focusCharacter;
oldTalkCursor = talkCursor;
oldVehicle = focusVehicle;
if ( focusTime <= gameLocal.time ) {
ClearFocus();
@ -7712,11 +7708,10 @@ idPlayer::RouteGuiMouse
*/
void idPlayer::RouteGuiMouse( idUserInterface *gui ) {
sysEvent_t ev;
const char *command;
if ( usercmd.mx != oldMouseX || usercmd.my != oldMouseY ) {
ev = sys->GenerateMouseMoveEvent( usercmd.mx - oldMouseX, usercmd.my - oldMouseY );
command = gui->HandleEvent( &ev, gameLocal.time );
gui->HandleEvent( &ev, gameLocal.time );
oldMouseX = usercmd.mx;
oldMouseY = usercmd.my;
}

3
neo/d3xp/PlayerView.cpp
View file

@ -1756,7 +1756,6 @@ FullscreenFXManager::Process
*/
void FullscreenFXManager::Process( const renderView_t *view ) {
bool allpass = false;
bool atLeastOneFX = false;
if ( g_testFullscreenFX.GetInteger() == -2 ) {
allpass = true;
@ -1808,8 +1807,6 @@ void FullscreenFXManager::Process( const renderView_t *view ) {
// do the actual drawing
if ( drawIt ) {
atLeastOneFX = true;
// we need to dump to _currentRender
CaptureCurrentRender();

4
neo/d3xp/Projectile.cpp
View file

@ -305,7 +305,6 @@ idProjectile::Launch
*/
void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3 &pushVelocity, const float timeSinceFire, const float launchPower, const float dmgPower ) {
float fuse;
float startthrust;
float endthrust;
idVec3 velocity;
idAngles angular_velocity;
@ -319,7 +318,6 @@ void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3
idVec3 gravVec;
idVec3 tmp;
idMat3 axis;
int thrust_start;
int contents;
int clipMask;
@ -331,7 +329,6 @@ void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3
}
thrust = spawnArgs.GetFloat( "thrust" );
startthrust = spawnArgs.GetFloat( "thrust_start" );
endthrust = spawnArgs.GetFloat( "thrust_end" );
spawnArgs.GetVector( "velocity", "0 0 0", velocity );
@ -359,7 +356,6 @@ void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3
}
thrust *= mass;
thrust_start = SEC2MS( startthrust ) + gameLocal.time;
thrust_end = SEC2MS( endthrust ) + gameLocal.time;
lightStartTime = 0;

3
neo/d3xp/ai/AAS_pathing.cpp
View file

@ -137,7 +137,7 @@ idAASLocal::WalkPathValid
============
*/
bool idAASLocal::WalkPathValid( int areaNum, const idVec3 &origin, int goalAreaNum, const idVec3 &goalOrigin, int travelFlags, idVec3 &endPos, int &endAreaNum ) const {
int curAreaNum, lastAreaNum, lastAreas[4], lastAreaIndex;
int curAreaNum, lastAreas[4], lastAreaIndex;
idPlane pathPlane, frontPlane, farPlane;
idReachability *reach;
const aasArea_t *area;
@ -164,7 +164,6 @@ bool idAASLocal::WalkPathValid( int areaNum, const idVec3 &origin, int goalAreaN
farPlane.FitThroughPoint( goalOrigin );
curAreaNum = areaNum;
lastAreaNum = curAreaNum;
while ( 1 ) {

9
neo/d3xp/ai/AI.cpp
View file

@ -2707,16 +2707,12 @@ idAI::DeadMove
*/
void idAI::DeadMove( void ) {
idVec3 delta;
monsterMoveResult_t moveResult;
idVec3 org = physicsObj.GetOrigin();
GetMoveDelta( viewAxis, viewAxis, delta );
physicsObj.SetDelta( delta );
RunPhysics();
moveResult = physicsObj.GetMoveResult();
AI_ONGROUND = physicsObj.OnGround();
}
@ -2730,7 +2726,6 @@ void idAI::AnimMove( void ) {
idVec3 delta;
idVec3 goalDelta;
float goalDist;
monsterMoveResult_t moveResult;
idVec3 newDest;
idVec3 oldorigin = physicsObj.GetOrigin();
@ -2797,7 +2792,6 @@ void idAI::AnimMove( void ) {
gameRenderWorld->DebugLine( colorCyan, oldorigin, physicsObj.GetOrigin(), 5000 );
}
moveResult = physicsObj.GetMoveResult();
if ( !af_push_moveables && attack.Length() && TestMelee() ) {
DirectDamage( attack, enemy.GetEntity() );
} else {
@ -2852,11 +2846,9 @@ void idAI::SlideMove( void ) {
idVec3 delta;
idVec3 goalDelta;
float goalDist;
monsterMoveResult_t moveResult;
idVec3 newDest;
idVec3 oldorigin = physicsObj.GetOrigin();
idMat3 oldaxis = viewAxis;
AI_BLOCKED = false;
@ -2926,7 +2918,6 @@ void idAI::SlideMove( void ) {
gameRenderWorld->DebugLine( colorCyan, oldorigin, physicsObj.GetOrigin(), 5000 );
}
moveResult = physicsObj.GetMoveResult();
if ( !af_push_moveables && attack.Length() && TestMelee() ) {
DirectDamage( attack, enemy.GetEntity() );
} else {

4
neo/d3xp/anim/Anim_Testmodel.cpp
View file

@ -526,14 +526,14 @@ idTestModel::TestAnim
void idTestModel::TestAnim( const idCmdArgs &args ) {
idStr name;
int animNum;
const idAnim *newanim;
//const idAnim *newanim;
if ( args.Argc() < 2 ) {
gameLocal.Printf( "usage: testanim <animname>\n" );
return;
}
newanim = NULL;
//newanim = NULL;
name = args.Argv( 1 );
#if 0

5
neo/d3xp/script/Script_Compiler.cpp
View file

@ -2009,7 +2009,6 @@ void idCompiler::ParseObjectDef( const char *objname ) {
const char *fieldname;
idTypeDef newtype( ev_field, NULL, "", 0, NULL );
idVarDef *oldscope;
int num;
int i;
oldscope = scope;
@ -2037,7 +2036,6 @@ void idCompiler::ParseObjectDef( const char *objname ) {
scope = objtype->def;
// inherit all the functions
num = parentType->NumFunctions();
for( i = 0; i < parentType->NumFunctions(); i++ ) {
const function_t *func = parentType->GetFunction( i );
objtype->AddFunction( func );
@ -2114,7 +2112,6 @@ idCompiler::ParseFunctionDef
void idCompiler::ParseFunctionDef( idTypeDef *returnType, const char *name ) {
idTypeDef *type;
idVarDef *def;
const idVarDef *parm;
idVarDef *oldscope;
int i;
int numParms;
@ -2169,7 +2166,7 @@ void idCompiler::ParseFunctionDef( idTypeDef *returnType, const char *name ) {
if ( gameLocal.program.GetDef( type->GetParmType( i ), type->GetParmName( i ), def ) ) {
Error( "'%s' defined more than once in function parameters", type->GetParmName( i ) );
}
parm = gameLocal.program.AllocDef( type->GetParmType( i ), type->GetParmName( i ), def, false );
gameLocal.program.AllocDef( type->GetParmType( i ), type->GetParmName( i ), def, false );
}
oldscope = scope;

2
neo/d3xp/script/Script_Program.cpp
View file

@ -1718,7 +1718,6 @@ called after all files are compiled to report memory usage.
void idProgram::CompileStats( void ) {
int memused;
int memallocated;
int numdefs;
int stringspace;
int funcMem;
int i;
@ -1733,7 +1732,6 @@ void idProgram::CompileStats( void ) {
}
stringspace += fileList.Size();
numdefs = varDefs.Num();
memused = varDefs.Num() * sizeof( idVarDef );
memused += types.Num() * sizeof( idTypeDef );
memused += stringspace;

3
neo/d3xp/script/Script_Thread.cpp
View file

@ -945,9 +945,6 @@ idThread::Event_TerminateThread
================
*/
void idThread::Event_TerminateThread( int num ) {
idThread *thread;
thread = GetThread( num );
KillThread( num );
}

3
neo/framework/CmdSystem.cpp
View file

@ -223,7 +223,6 @@ idCmdSystemLocal::Exec_f
*/
void idCmdSystemLocal::Exec_f( const idCmdArgs &args ) {
char * f;
int len;
idStr filename;
if ( args.Argc () != 2 ) {
@ -233,7 +232,7 @@ void idCmdSystemLocal::Exec_f( const idCmdArgs &args ) {
filename = args.Argv(1);
filename.DefaultFileExtension( ".cfg" );
len = fileSystem->ReadFile( filename, reinterpret_cast<void **>(&f), NULL );
fileSystem->ReadFile( filename, reinterpret_cast<void **>(&f), NULL );
if ( !f ) {
common->Printf( "couldn't exec %s\n", args.Argv(1) );
return;

3
neo/framework/Common.cpp
View file

@ -817,10 +817,9 @@ idCommonLocal::ParseCommandLine
==================
*/
void idCommonLocal::ParseCommandLine( int argc, const char **argv ) {
int i, current_count;
int i;
com_numConsoleLines = 0;
current_count = 0;
// API says no program path
for ( i = 0; i < argc; i++ ) {
if ( argv[ i ][ 0 ] == '+' ) {

3
neo/framework/File.cpp
View file

@ -259,11 +259,10 @@ idFile::Printf
*/
int idFile::Printf( const char *fmt, ... ) {
char buf[MAX_PRINT_MSG];
int length;
va_list argptr;
va_start( argptr, fmt );
length = idStr::vsnPrintf( buf, MAX_PRINT_MSG-1, fmt, argptr );
idStr::vsnPrintf( buf, MAX_PRINT_MSG-1, fmt, argptr );
va_end( argptr );
// so notepad formats the lines correctly

7
neo/framework/Session_menu.cpp
View file

@ -87,8 +87,6 @@ idSessionLocal::SetGUI
=================
*/
void idSessionLocal::SetGUI( idUserInterface *gui, HandleGuiCommand_t handle ) {
const char *cmd;
guiActive = gui;
guiHandle = handle;
if ( guiMsgRestore ) {
@ -110,7 +108,7 @@ void idSessionLocal::SetGUI( idUserInterface *gui, HandleGuiCommand_t handle ) {
memset( &ev, 0, sizeof( ev ) );
ev.evType = SE_NONE;
cmd = guiActive->HandleEvent( &ev, com_frameTime );
guiActive->HandleEvent( &ev, com_frameTime );
guiActive->Activate( true, com_frameTime );
}
@ -1106,8 +1104,7 @@ void idSessionLocal::HandleInGameCommands( const char *menuCommand ) {
if ( guiActive ) {
sysEvent_t ev;
ev.evType = SE_NONE;
const char *cmd;
cmd = guiActive->HandleEvent( &ev, com_frameTime );
guiActive->HandleEvent( &ev, com_frameTime );
guiActive->Activate( false, com_frameTime );
guiActive = NULL;
}

3
neo/game/Fx.cpp
View file

@ -784,9 +784,6 @@ idTeleporter::Event_DoAction
================
*/
void idTeleporter::Event_DoAction( idEntity *activator ) {
float angle;
angle = spawnArgs.GetFloat( "angle" );
idAngles a( 0, spawnArgs.GetFloat( "angle" ), 0 );
activator->Teleport( GetPhysics()->GetOrigin(), a, NULL );
}

7
neo/game/Player.cpp
View file

@ -2695,13 +2695,11 @@ idPlayer::UpdateConditions
*/
void idPlayer::UpdateConditions( void ) {
idVec3 velocity;
float fallspeed;
float forwardspeed;
float sidespeed;
// minus the push velocity to avoid playing the walking animation and sounds when riding a mover
velocity = physicsObj.GetLinearVelocity() - physicsObj.GetPushedLinearVelocity();
fallspeed = velocity * physicsObj.GetGravityNormal();
if ( influenceActive ) {
AI_FORWARD = false;
@ -4335,7 +4333,6 @@ void idPlayer::UpdateFocus( void ) {
idUserInterface *oldUI;
idAI *oldChar;
int oldTalkCursor;
idAFEntity_Vehicle *oldVehicle;
int i, j;
idVec3 start, end;
bool allowFocus;
@ -4362,7 +4359,6 @@ void idPlayer::UpdateFocus( void ) {
oldUI = focusUI;
oldChar = focusCharacter;
oldTalkCursor = talkCursor;
oldVehicle = focusVehicle;
if ( focusTime <= gameLocal.time ) {
ClearFocus();
@ -6403,11 +6399,10 @@ idPlayer::RouteGuiMouse
*/
void idPlayer::RouteGuiMouse( idUserInterface *gui ) {
sysEvent_t ev;
const char *command;
if ( usercmd.mx != oldMouseX || usercmd.my != oldMouseY ) {
ev = sys->GenerateMouseMoveEvent( usercmd.mx - oldMouseX, usercmd.my - oldMouseY );
command = gui->HandleEvent( &ev, gameLocal.time );
gui->HandleEvent( &ev, gameLocal.time );
oldMouseX = usercmd.mx;
oldMouseY = usercmd.my;
}

4
neo/game/Projectile.cpp
View file

@ -274,7 +274,6 @@ idProjectile::Launch
*/
void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3 &pushVelocity, const float timeSinceFire, const float launchPower, const float dmgPower ) {
float fuse;
float startthrust;
float endthrust;
idVec3 velocity;
idAngles angular_velocity;
@ -288,7 +287,6 @@ void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3
idVec3 gravVec;
idVec3 tmp;
idMat3 axis;
int thrust_start;
int contents;
int clipMask;
@ -300,7 +298,6 @@ void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3
}
thrust = spawnArgs.GetFloat( "thrust" );
startthrust = spawnArgs.GetFloat( "thrust_start" );
endthrust = spawnArgs.GetFloat( "thrust_end" );
spawnArgs.GetVector( "velocity", "0 0 0", velocity );
@ -328,7 +325,6 @@ void idProjectile::Launch( const idVec3 &start, const idVec3 &dir, const idVec3
}
thrust *= mass;
thrust_start = SEC2MS( startthrust ) + gameLocal.time;
thrust_end = SEC2MS( endthrust ) + gameLocal.time;
lightStartTime = 0;

3
neo/game/ai/AAS_pathing.cpp
View file

@ -137,7 +137,7 @@ idAASLocal::WalkPathValid
============
*/
bool idAASLocal::WalkPathValid( int areaNum, const idVec3 &origin, int goalAreaNum, const idVec3 &goalOrigin, int travelFlags, idVec3 &endPos, int &endAreaNum ) const {
int curAreaNum, lastAreaNum, lastAreas[4], lastAreaIndex;
int curAreaNum, lastAreas[4], lastAreaIndex;
idPlane pathPlane, frontPlane, farPlane;
idReachability *reach;
const aasArea_t *area;
@ -164,7 +164,6 @@ bool idAASLocal::WalkPathValid( int areaNum, const idVec3 &origin, int goalAreaN
farPlane.FitThroughPoint( goalOrigin );
curAreaNum = areaNum;
lastAreaNum = curAreaNum;
while ( 1 ) {

9
neo/game/ai/AI.cpp
View file

@ -2625,16 +2625,12 @@ idAI::DeadMove
*/
void idAI::DeadMove( void ) {
idVec3 delta;
monsterMoveResult_t moveResult;
idVec3 org = physicsObj.GetOrigin();
GetMoveDelta( viewAxis, viewAxis, delta );
physicsObj.SetDelta( delta );
RunPhysics();
moveResult = physicsObj.GetMoveResult();
AI_ONGROUND = physicsObj.OnGround();
}
@ -2648,7 +2644,6 @@ void idAI::AnimMove( void ) {
idVec3 delta;
idVec3 goalDelta;
float goalDist;
monsterMoveResult_t moveResult;
idVec3 newDest;
idVec3 oldorigin = physicsObj.GetOrigin();
@ -2712,7 +2707,6 @@ void idAI::AnimMove( void ) {
gameRenderWorld->DebugLine( colorCyan, oldorigin, physicsObj.GetOrigin(), 5000 );
}
moveResult = physicsObj.GetMoveResult();
if ( !af_push_moveables && attack.Length() && TestMelee() ) {
DirectDamage( attack, enemy.GetEntity() );
} else {
@ -2767,11 +2761,9 @@ void idAI::SlideMove( void ) {
idVec3 delta;
idVec3 goalDelta;
float goalDist;
monsterMoveResult_t moveResult;
idVec3 newDest;
idVec3 oldorigin = physicsObj.GetOrigin();
idMat3 oldaxis = viewAxis;
AI_BLOCKED = false;
@ -2841,7 +2833,6 @@ void idAI::SlideMove( void ) {
gameRenderWorld->DebugLine( colorCyan, oldorigin, physicsObj.GetOrigin(), 5000 );
}
moveResult = physicsObj.GetMoveResult();
if ( !af_push_moveables && attack.Length() && TestMelee() ) {
DirectDamage( attack, enemy.GetEntity() );
} else {

5
neo/game/anim/Anim_Testmodel.cpp
View file

@ -526,17 +526,16 @@ idTestModel::TestAnim
void idTestModel::TestAnim( const idCmdArgs &args ) {
idStr name;
int animNum;
const idAnim *newanim;
if ( args.Argc() < 2 ) {
gameLocal.Printf( "usage: testanim <animname>\n" );
return;
}
newanim = NULL;
name = args.Argv( 1 );
#if 0
const idAnim *newanim = NULL;
if ( strstr( name, ".ma" ) || strstr( name, ".mb" ) ) {
const idMD5Anim *md5anims[ ANIM_MaxSyncedAnims ];
idModelExport exporter;

5
neo/game/script/Script_Compiler.cpp
View file

@ -2009,7 +2009,6 @@ void idCompiler::ParseObjectDef( const char *objname ) {
const char *fieldname;
idTypeDef newtype( ev_field, NULL, "", 0, NULL );
idVarDef *oldscope;
int num;
int i;
oldscope = scope;
@ -2037,7 +2036,6 @@ void idCompiler::ParseObjectDef( const char *objname ) {
scope = objtype->def;
// inherit all the functions
num = parentType->NumFunctions();
for( i = 0; i < parentType->NumFunctions(); i++ ) {
const function_t *func = parentType->GetFunction( i );
objtype->AddFunction( func );
@ -2114,7 +2112,6 @@ idCompiler::ParseFunctionDef
void idCompiler::ParseFunctionDef( idTypeDef *returnType, const char *name ) {
idTypeDef *type;
idVarDef *def;
const idVarDef *parm;
idVarDef *oldscope;
int i;
int numParms;
@ -2169,7 +2166,7 @@ void idCompiler::ParseFunctionDef( idTypeDef *returnType, const char *name ) {
if ( gameLocal.program.GetDef( type->GetParmType( i ), type->GetParmName( i ), def ) ) {
Error( "'%s' defined more than once in function parameters", type->GetParmName( i ) );
}
parm = gameLocal.program.AllocDef( type->GetParmType( i ), type->GetParmName( i ), def, false );
gameLocal.program.AllocDef( type->GetParmType( i ), type->GetParmName( i ), def, false );
}
oldscope = scope;

2
neo/game/script/Script_Program.cpp
View file

@ -1718,7 +1718,6 @@ called after all files are compiled to report memory usage.
void idProgram::CompileStats( void ) {
int memused;
int memallocated;
int numdefs;
int stringspace;
int funcMem;
int i;
@ -1733,7 +1732,6 @@ void idProgram::CompileStats( void ) {
}
stringspace += fileList.Size();
numdefs = varDefs.Num();
memused = varDefs.Num() * sizeof( idVarDef );
memused += types.Num() * sizeof( idTypeDef );
memused += stringspace;

3
neo/game/script/Script_Thread.cpp
View file

@ -923,9 +923,6 @@ idThread::Event_TerminateThread
================
*/
void idThread::Event_TerminateThread( int num ) {
idThread *thread;
thread = GetThread( num );
KillThread( num );
}

17
neo/idlib/MapFile.cpp
View file

@ -46,10 +46,8 @@ StringCRC
*/
ID_INLINE unsigned int StringCRC( const char *str ) {
unsigned int i, crc;
const unsigned char *ptr;
crc = 0;
ptr = reinterpret_cast<const unsigned char*>(str);
for ( i = 0; str[i]; i++ ) {
crc ^= str[i] << (i & 3);
}
@ -407,8 +405,7 @@ idMapBrush::ParseQ3
=================
*/
idMapBrush *idMapBrush::ParseQ3( idLexer &src, const idVec3 &origin ) {
int i, shift[2], rotate;
float scale[2];
int i;
idVec3 planepts[3];
idToken token;
idList<idMapBrushSide*> sides;
@ -448,12 +445,12 @@ idMapBrush *idMapBrush::ParseQ3( idLexer &src, const idVec3 &origin ) {
// we have an implicit 'textures/' in the old format
side->material = "textures/" + token;
// read the texture shift, rotate and scale
shift[0] = src.ParseInt();
shift[1] = src.ParseInt();
rotate = src.ParseInt();
scale[0] = src.ParseFloat();
scale[1] = src.ParseFloat();
// skip the texture shift, rotate and scale
src.ParseInt();
src.ParseInt();
src.ParseInt();
src.ParseFloat();
src.ParseFloat();
side->texMat[0] = idVec3( 0.03125f, 0.0f, 0.0f );
side->texMat[1] = idVec3( 0.0f, 0.03125f, 0.0f );
side->origin = origin;

2
neo/idlib/Parser.cpp
View file

@ -1377,7 +1377,6 @@ int idParser::EvaluateTokens( idToken *tokens, signed long int *intvalue, double
int questmarkintvalue = 0;
double questmarkfloatvalue = 0;
int gotquestmarkvalue = false;
int lastoperatortype = 0;
//
operator_t operator_heap[MAX_OPERATORS];
int numoperators = 0;
@ -1736,7 +1735,6 @@ int idParser::EvaluateTokens( idToken *tokens, signed long int *intvalue, double
#endif //DEBUG_EVAL
if (error)
break;
lastoperatortype = o->op;
//if not an operator with arity 1
if (o->op != P_LOGIC_NOT && o->op != P_BIN_NOT) {
//remove the second value if not question mark operator

3
neo/idlib/geometry/Winding2D.cpp
View file

@ -149,7 +149,6 @@ int idWinding2D::Split( const idVec3 &plane, const float epsilon, idWinding2D **
idVec2 mid;
idWinding2D * f;
idWinding2D * b;
int maxpts;
counts[0] = counts[1] = counts[2] = 0;
@ -181,8 +180,6 @@ int idWinding2D::Split( const idVec3 &plane, const float epsilon, idWinding2D **
return SIDE_FRONT;
}
maxpts = numPoints+4; // cant use counts[0]+2 because of fp grouping errors
*front = f = new idWinding2D;
*back = b = new idWinding2D;

3
neo/idlib/math/Matrix.cpp
View file

@ -5392,7 +5392,7 @@ idMatX::Cholesky_UpdateRowColumn
bool idMatX::Cholesky_UpdateRowColumn( const idVecX &v, int r ) {
int i, j;
double sum;
float *original, *y;
float *original;
idVecX addSub;
assert( numRows == numColumns );
@ -5421,7 +5421,6 @@ bool idMatX::Cholesky_UpdateRowColumn( const idVecX &v, int r ) {
} else {
original = (float *) _alloca16( numColumns * sizeof( float ) );
y = (float *) _alloca16( numColumns * sizeof( float ) );
// calculate original row/column of matrix
for ( i = 0; i < numRows; i++ ) {

11
neo/idlib/math/Simd_Generic.cpp
View file

@ -2616,8 +2616,11 @@ void VPCALL idSIMD_Generic::DeriveUnsmoothedTangents( idDrawVert *verts, const d
for ( i = 0; i < numVerts; i++ ) {
idDrawVert *a, *b, *c;
float d0, d1, d2, d3, d4;
float d5, d6, d7, d8, d9;
#ifndef DERIVE_UNSMOOTHED_BITANGENT
float d3, d8;
#endif
float d0, d1, d2, d4;
float d5, d6, d7, d9;
float s0, s1, s2;
float n0, n1, n2;
float t0, t1, t2;
@ -2632,13 +2635,17 @@ void VPCALL idSIMD_Generic::DeriveUnsmoothedTangents( idDrawVert *verts, const d
d0 = b->xyz[0] - a->xyz[0];
d1 = b->xyz[1] - a->xyz[1];
d2 = b->xyz[2] - a->xyz[2];
#ifndef DERIVE_UNSMOOTHED_BITANGENT
d3 = b->st[0] - a->st[0];
#endif
d4 = b->st[1] - a->st[1];
d5 = c->xyz[0] - a->xyz[0];
d6 = c->xyz[1] - a->xyz[1];
d7 = c->xyz[2] - a->xyz[2];
#ifndef DERIVE_UNSMOOTHED_BITANGENT
d8 = c->st[0] - a->st[0];
#endif
d9 = c->st[1] - a->st[1];
s0 = dt.normalizationScale[0];

3
neo/renderer/Image_process.cpp
View file

@ -308,7 +308,6 @@ byte *R_MipMapWithAlphaSpecularity( const byte *in, int width, int height ) {
int i, j, c, x, y, sx, sy;
const byte *in_p;
byte *out, *out_p;
int row;
int newWidth, newHeight;
float *fbuf, *fbuf_p;
@ -328,8 +327,6 @@ byte *R_MipMapWithAlphaSpecularity( const byte *in, int width, int height ) {
fbuf_p[3] = ( in_p[3] / 255.0 ); // filtered divegence / specularity
}
row = width * 4;
newWidth = width >> 1;
newHeight = height >> 1;
if ( !newWidth ) {

4
neo/renderer/Image_program.cpp
View file

@ -93,13 +93,13 @@ static void R_HeightmapToNormalMap( byte *data, int width, int height, float sca
for ( i = 0 ; i < height ; i++ ) {
for ( j = 0 ; j < width ; j++ ) {
int d1, d2, d3, d4;
int a1, a2, a3, a4;
int a1, a3, a4;
// FIXME: look at five points?
// look at three points to estimate the gradient
a1 = d1 = depth[ ( i * width + j ) ];
a2 = d2 = depth[ ( i * width + ( ( j + 1 ) & ( width - 1 ) ) ) ];
d2 = depth[ ( i * width + ( ( j + 1 ) & ( width - 1 ) ) ) ];
a3 = d3 = depth[ ( ( ( i + 1 ) & ( height - 1 ) ) * width + j ) ];
a4 = d4 = depth[ ( ( ( i + 1 ) & ( height - 1 ) ) * width + ( ( j + 1 ) & ( width - 1 ) ) ) ];

3
neo/renderer/Material.cpp
View file

@ -1782,14 +1782,11 @@ If there is any error during parsing, defaultShader will be set.
*/
void idMaterial::ParseMaterial( idLexer &src ) {
idToken token;
int s;
char buffer[1024];
const char *str;
idLexer newSrc;
int i;
s = 0;
numOps = 0;
numRegisters = EXP_REG_NUM_PREDEFINED; // leave space for the parms to be copied in
for ( i = 0 ; i < numRegisters ; i++ ) {

3
neo/renderer/MegaTexture.cpp
View file

@ -650,7 +650,7 @@ Incrementally load a giant tga file and process into the mega texture block form
====================
*/
void idMegaTexture::MakeMegaTexture_f( const idCmdArgs &args ) {
int columns, rows, fileSize, numBytes;
int columns, fileSize, numBytes;
byte *pixbuf;
int row, column;
TargaHeader targa_header;
@ -713,7 +713,6 @@ void idMegaTexture::MakeMegaTexture_f( const idCmdArgs &args ) {
}
columns = targa_header.width;
rows = targa_header.height;
// skip TARGA image comment
if ( targa_header.id_length != 0 ) {

5
neo/renderer/Model_liquid.cpp
View file

@ -179,7 +179,8 @@ idRenderModelLiquid::IntersectBounds
void idRenderModelLiquid::IntersectBounds( const idBounds &bounds, float displacement ) {
int cx, cy;
int left,top,right,bottom;
float up, down;
//float up;
float down;
float *pos;
left = ( int )( bounds[ 0 ].x / scale_x );
@ -187,7 +188,7 @@ void idRenderModelLiquid::IntersectBounds( const idBounds &bounds, float displac
top = ( int )( bounds[ 0 ].y / scale_y );
bottom = ( int )( bounds[ 1 ].y / scale_y );
down = bounds[ 0 ].z;
up = bounds[ 1 ].z;
//up = bounds[ 1 ].z;
if ( ( right < 1 ) || ( left >= verts_x ) || ( bottom < 1 ) || ( top >= verts_x ) ) {
return;

2
neo/renderer/RenderSystem_init.cpp
View file

@ -1595,7 +1595,6 @@ void R_MakeAmbientMap_f( const idCmdArgs &args ) {
idStr fullname;
const char *baseName;
int i;
int downSample;
const char *extensions[6] = { "_px.tga", "_nx.tga", "_py.tga", "_ny.tga",
"_pz.tga", "_nz.tga" };
int outSize;
@ -1608,7 +1607,6 @@ void R_MakeAmbientMap_f( const idCmdArgs &args ) {
}
baseName = args.Argv( 1 );
downSample = 0;
if ( args.Argc() == 3 ) {
outSize = atoi( args.Argv( 2 ) );
} else {

1
neo/renderer/RenderWorld_portals.cpp
View file

@ -444,7 +444,6 @@ prelight, because shadows are cast from back side which may not be in visible ar
void idRenderWorldLocal::FlowLightThroughPortals( idRenderLightLocal *light ) {
portalStack_t ps;
int i;
const idVec3 origin = light->globalLightOrigin;
// if the light origin areaNum is not in a valid area,
// the light won't have any area refs

3
neo/renderer/draw_arb2.cpp
View file

@ -244,7 +244,6 @@ RB_ARB2_DrawInteractions
*/
void RB_ARB2_DrawInteractions( void ) {
viewLight_t *vLight;
const idMaterial *lightShader;
GL_SelectTexture( 0 );
qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
@ -268,8 +267,6 @@ void RB_ARB2_DrawInteractions( void ) {
continue;
}
lightShader = vLight->lightShader;
// clear the stencil buffer if needed
if ( vLight->globalShadows || vLight->localShadows ) {
backEnd.currentScissor = vLight->scissorRect;

6
neo/renderer/tr_orderIndexes.cpp
View file

@ -36,6 +36,7 @@ If you have questions concerning this license or the applicable additional terms
R_MeshCost
===============
*/
#if 0
#define CACHE_SIZE 24
#define STALL_SIZE 8
int R_MeshCost( int numIndexes, glIndex_t *indexes ) {
@ -71,6 +72,7 @@ int R_MeshCost( int numIndexes, glIndex_t *indexes ) {
return c_loads;
}
#endif
typedef struct vertRef_s {
@ -98,7 +100,7 @@ void R_OrderIndexes( int numIndexes, glIndex_t *indexes ) {
int numVerts;
int v1, v2;
int c_starts;
int c_cost;
//int c_cost;
if ( !r_orderIndexes.GetBool() ) {
return;
@ -192,7 +194,7 @@ void R_OrderIndexes( int numIndexes, glIndex_t *indexes ) {
} while ( 1 );
}
c_cost = R_MeshCost( numIndexes, indexes );
//c_cost = R_MeshCost( numIndexes, indexes );
}

2
neo/renderer/tr_shadowbounds.cpp
View file

@ -532,7 +532,7 @@ idScreenRect R_CalcIntersectionScissor( const idRenderLightLocal * lightDef,
const viewDef_t * viewDef ) {
idMat4 omodel = make_idMat4( entityDef->modelMatrix );
idMat4 lmodel = make_idMat4( lightDef->modelMatrix );
//idMat4 lmodel = make_idMat4( lightDef->modelMatrix );
// compute light polyhedron
polyhedron lvol = PolyhedronFromBounds( lightDef->frustumTris->bounds );

3
neo/renderer/tr_subview.cpp
View file

@ -108,7 +108,6 @@ OPTIMIZE: we could also take exact portal passing into consideration
*/
bool R_PreciseCullSurface( const drawSurf_t *drawSurf, idBounds &ndcBounds ) {
const srfTriangles_t *tri;
int numTriangles;
idPlane clip, eye;
int i, j;
unsigned int pointOr;
@ -150,8 +149,6 @@ bool R_PreciseCullSurface( const drawSurf_t *drawSurf, idBounds &ndcBounds ) {
}
// backface and frustum cull
numTriangles = tri->numIndexes / 3;
R_GlobalPointToLocal( drawSurf->space->modelMatrix, tr.viewDef->renderView.vieworg, localView );
for ( i = 0; i < tri->numIndexes; i += 3 ) {

3
neo/sound/snd_emitter.cpp
View file

@ -1147,7 +1147,7 @@ idSlowChannel::GenerateSlowChannel
void idSlowChannel::GenerateSlowChannel( FracTime& playPos, int sampleCount44k, float* finalBuffer ) {
idSoundWorldLocal *sw = static_cast<idSoundWorldLocal*>( soundSystemLocal.GetPlayingSoundWorld() );
float in[MIXBUFFER_SAMPLES+3], out[MIXBUFFER_SAMPLES+3], *src, *spline, slowmoSpeed;
int i, neededSamples, orgTime, zeroedPos, count = 0;
int i, neededSamples, zeroedPos, count = 0;
src = in + 2;
spline = out + 2;
@ -1160,7 +1160,6 @@ void idSlowChannel::GenerateSlowChannel( FracTime& playPos, int sampleCount44k,
}
neededSamples = sampleCount44k * slowmoSpeed + 4;
orgTime = playPos.time;
// get the channel's samples
chan->GatherChannelSamples( playPos.time * 2, neededSamples, src );

17
neo/tools/compilers/aas/AASReach.cpp
View file

@ -286,10 +286,10 @@ idAASReach::Reachability_Step_Barrier_WaterJump_WalkOffLedge
*/
bool idAASReach::Reachability_Step_Barrier_WaterJump_WalkOffLedge( int area1num, int area2num ) {
int i, j, k, l, edge1Num, edge2Num, areas[10];
int floor_bestArea1FloorEdgeNum, floor_bestArea2FloorEdgeNum, floor_foundReach;
int water_bestArea1FloorEdgeNum, water_bestArea2FloorEdgeNum, water_foundReach;
int floor_bestArea1FloorEdgeNum, floor_foundReach;
int water_foundReach;
int side1, faceSide1, floorFace1Num;
float dist, dist1, dist2, diff, invGravityDot, orthogonalDot;
float dist, dist1, dist2, diff, /*invGravityDot, */ orthogonalDot;
float x1, x2, x3, x4, y1, y2, y3, y4, tmp, y;
float length, floor_bestLength, water_bestLength, floor_bestDist, water_bestDist;
idVec3 v1, v2, v3, v4, tmpv, p1area1, p1area2, p2area1, p2area2;
@ -299,7 +299,7 @@ bool idAASReach::Reachability_Step_Barrier_WaterJump_WalkOffLedge( int area1num,
idVec3 testPoint;
idPlane *plane;
aasArea_t *area1, *area2;
aasFace_t *floorFace1, *floorFace2, *floor_bestFace1, *water_bestFace1;
aasFace_t *floorFace1, *floorFace2;
aasEdge_t *edge1, *edge2;
idReachability_Walk *walkReach;
idReachability_BarrierJump *barrierJumpReach;
@ -332,12 +332,10 @@ bool idAASReach::Reachability_Step_Barrier_WaterJump_WalkOffLedge( int area1num,
floor_foundReach = false;
floor_bestDist = 99999;
floor_bestLength = 0;
floor_bestArea2FloorEdgeNum = 0;
water_foundReach = false;
water_bestDist = 99999;
water_bestLength = 0;
water_bestArea2FloorEdgeNum = 0;
for ( i = 0; i < area1->numFaces; i++ ) {
floorFace1Num = file->faceIndex[area1->firstFace + i];
@ -411,7 +409,7 @@ bool idAASReach::Reachability_Step_Barrier_WaterJump_WalkOffLedge( int area1num,
// edges if they overlap in the direction orthogonal to
// the gravity direction
orthogonal = file->settings.invGravityDir.Cross( normal );
invGravityDot = file->settings.invGravityDir * file->settings.invGravityDir;
//invGravityDot = file->settings.invGravityDir * file->settings.invGravityDir;
orthogonalDot = orthogonal * orthogonal;
// projection into the step plane
// NOTE: since gravity is vertical this is just the z coordinate
@ -521,8 +519,6 @@ bool idAASReach::Reachability_Step_Barrier_WaterJump_WalkOffLedge( int area1num,
floor_bestLength = length;
floor_foundReach = true;
floor_bestArea1FloorEdgeNum = edge1Num;
floor_bestArea2FloorEdgeNum = edge2Num;
floor_bestFace1 = floorFace1;
floor_bestStart = start;
floor_bestNormal = normal;
floor_bestEnd = end;
@ -537,9 +533,6 @@ bool idAASReach::Reachability_Step_Barrier_WaterJump_WalkOffLedge( int area1num,
water_bestDist = dist;
water_bestLength = length;
water_foundReach = true;
water_bestArea1FloorEdgeNum = edge1Num;
water_bestArea2FloorEdgeNum = edge2Num;
water_bestFace1 = floorFace1;
water_bestStart = start; // best start point in area1
water_bestNormal = normal; // normal is pointing into area2
water_bestEnd = end; // best point towards area2

3
neo/tools/compilers/dmap/map.cpp
View file

@ -93,13 +93,11 @@ static void SetBrushContents( uBrush_t *b ) {
int contents, c2;
side_t *s;
int i;
bool mixed;
s = &b->sides[0];
contents = s->material->GetContentFlags();
b->contentShader = s->material;
mixed = false;
// a brush is only opaque if all sides are opaque
b->opaque = true;
@ -113,7 +111,6 @@ static void SetBrushContents( uBrush_t *b ) {
c2 = s->material->GetContentFlags();
if (c2 != contents) {
mixed = true;
contents |= c2;
}

4
neo/tools/compilers/dmap/optimize.cpp
View file

@ -608,7 +608,7 @@ static void RemoveIfColinear( optVertex_t *ov, optIsland_t *island ) {
optEdge_t *e, *e1, *e2;
optVertex_t *v1, *v2, *v3;
idVec3 dir1, dir2;
float len, dist;
float dist;
idVec3 point;
idVec3 offset;
float off;
@ -674,7 +674,7 @@ static void RemoveIfColinear( optVertex_t *ov, optIsland_t *island ) {
// see if they are colinear
VectorSubtract( v3->v.xyz, v1->v.xyz, dir1 );
len = dir1.Normalize();
dir1.Normalize();
VectorSubtract( v2->v.xyz, v1->v.xyz, dir2 );
dist = DotProduct( dir2, dir1 );
VectorMA( v1->v.xyz, dist, dir1, point );

3
neo/tools/compilers/dmap/tritjunction.cpp
View file

@ -298,7 +298,7 @@ on an edge of the given mapTri, otherwise returns NULL.
*/
static mapTri_t *FixTriangleAgainstHashVert( const mapTri_t *a, const hashVert_t *hv ) {
int i;
const idDrawVert *v1, *v2, *v3;
const idDrawVert *v1, *v2;
idDrawVert split;
idVec3 dir;
float len;
@ -323,7 +323,6 @@ static mapTri_t *FixTriangleAgainstHashVert( const mapTri_t *a, const hashVert_t
for ( i = 0 ; i < 3 ; i++ ) {
v1 = &a->v[i];
v2 = &a->v[(i+1)%3];
v3 = &a->v[(i+2)%3];
VectorSubtract( v2->xyz, v1->xyz, dir );
len = dir.Normalize();

2
neo/tools/compilers/renderbump/renderbump.cpp
View file

@ -1349,13 +1349,11 @@ void RenderBumpFlat_f( const idCmdArgs &args ) {
int i;
idBounds bounds;
srfTriangles_t *mesh;
float boundsScale;
// update the screen as we print
common->SetRefreshOnPrint( true );
width = height = 256;
boundsScale = 0;
// check options
for ( i = 1 ; i < args.Argc() - 1; i++ ) {

20
neo/tools/compilers/roqvq/codec.cpp
View file

@ -113,7 +113,7 @@ void codec::Sort( float *list, int *intIndex, int numElements )
void codec::Segment( int *alist, float *flist, int numElements, float rmse)
{
int x, y, yy, xx, numc, onf, index, temp, best, a0, a1, a2, a3, bpp, i, len;
int x, y, yy, xx, numc, onf, index, temp, best, bpp, i, len;
byte find[16], *lineout, *cbook, *src, *dst;
float fy, fcr, fcb;
idFile *fpcb;
@ -122,7 +122,6 @@ void codec::Segment( int *alist, float *flist, int numElements, float rmse)
float y0,y1,y2,y3,cr,cb;
doopen = false;
a0 = a1 = a2 = a3 = 0;
sprintf( tempcb, "%s.cb", theRoQ->CurrentFilename());
sprintf( temptb, "%s.tb", theRoQ->CurrentFilename());
@ -708,9 +707,8 @@ int i, best, bpp;
void codec::VqData2( byte *cel, quadcel *pquad )
{
byte tempImage[16], tempOut[64];
int i, j, best,x,y,xx,yy,bpp;
int i, j, best,x,y,xx,yy;
if (dimension4 == 64) bpp = 4; else bpp = 3;
j = 1;
for(yy=0;yy<4;yy+=2) {
for(xx=0;xx<4;xx+=2) {
@ -788,7 +786,7 @@ int i,j,snr;
void codec::FvqData( byte *bitmap, int size, int realx, int realy, quadcel *pquad, bool clamp)
{
int x, y, xLen, yLen, mblur0, ripl, bpp, fabort, temp1;
int lowX, lowY, onx, ony, sX, sY, depthx, depthy, breakHigh;
int lowX, lowY, sX, sY, depthx, depthy, breakHigh;
float lowestSNR, fmblur0;
byte *scale1;
byte *bitma2;
@ -808,9 +806,6 @@ void codec::FvqData( byte *bitmap, int size, int realx, int realy, quadcel *pqu
return;
}
ony = realy - (realy & 0xfff0);
onx = realx - (realx & 0xfff0);
xLen = previousImage[0]->pixelsWide();
yLen = previousImage[0]->pixelsHigh();
ripl = xLen-size;
@ -1017,15 +1012,15 @@ double totalbits;
int codec::AddQuad( quadcel *pquad, int lownum )
{
int i, nx, nsize;
float newsnr, cmul;
float newsnr;
byte *idataA, *idataB;
if (lownum != -1) {
if (pquad[lownum].size == 8) {
nx = 1; nsize = 4; cmul = 1;
nx = 1; nsize = 4;
} else {
nx = 5; nsize = 8; cmul = 4;
nx = 5; nsize = 8;
}
newsnr = 0;
idataA = (byte *)Mem_Alloc(8*8*4);
@ -1090,7 +1085,7 @@ int codec::MotMeanY( void )
void codec::SparseEncode( void )
{
int i, j, osize, fsize, num[DEAD+1], *ilist, onf, ong, wtype, temp;
float *flist, sRMSE, numredo;
float *flist, sRMSE;
byte *idataA, *idataB;
osize = 8;
@ -1193,7 +1188,6 @@ byte *idataA, *idataB;
*/
common->Printf("sparseEncode: dx/dy mean is %d,%d\n", dxMean, dyMean);
numredo = 0;
detail = false;
if (codebookmade && whichFrame>4) fsize -= 256;
temp = 0;

3
neo/tools/compilers/roqvq/roqParam.cpp
View file

@ -41,7 +41,7 @@ void roqParam::InitFromFile( const char *fileName )
{
idParser *src;
idToken token;
int i, readarg;
int readarg;
src = new idParser( fileName, LEXFL_NOSTRINGCONCAT | LEXFL_NOSTRINGESCAPECHARS | LEXFL_ALLOWPATHNAMES );
@ -157,7 +157,6 @@ void roqParam::InitFromFile( const char *fileName )
if (token.Icmp( "filename") == 0) {
src->ReadToken( &token );
outputFilename = token;
i = strlen(outputFilename);
// common->Printf(" + output file is %s\n", outputFilename );
readarg++;
continue;

2
neo/ui/GameSSDWindow.cpp
View file

@ -280,8 +280,6 @@ void SSDEntity::Draw(idDeviceContext *dc) {
persize.x = idMath::Fabs(screenBounds[1].x - screenBounds[0].x);
persize.y = idMath::Fabs(screenBounds[1].y - screenBounds[0].y);
idVec3 center = screenBounds.GetCenter();
x = screenBounds[0].x;
y = screenBounds[1].y;
dc->DrawMaterialRotated(x, y, persize.x, persize.y, material, matColor, 1.0f, 1.0f, DEG2RAD(rotation));

2
neo/ui/UserInterface.cpp
View file

@ -272,8 +272,6 @@ bool idUserInterfaceLocal::InitFromFile( const char *qpath, bool rebuild, bool c
return false;
}
int sz = sizeof( idWindow );
sz = sizeof( idSimpleWindow );
loading = true;
if ( rebuild ) {