Browse Source

Clean up several more unused local variables

Michael Hansen 10 years ago
parent
commit
7a9c1308be
  1. 1
      Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp
  2. 1
      Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp
  3. 2
      Sources/Plasma/PubUtilLib/plAnimation/plMatrixChannel.cpp
  4. 2
      Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp
  5. 2
      Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
  6. 1
      Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp
  7. 1
      Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp
  8. 4
      Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
  9. 1
      Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp
  10. 4
      Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp
  11. 1
      Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp

1
Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp

@ -972,7 +972,6 @@ std::vector<PyObject*> cyAvatar::GetAllWithSameMesh(const plString& clothing_nam
PyObject* cyAvatar::GetMatchingClothingItem(const plString& clothing_name) PyObject* cyAvatar::GetMatchingClothingItem(const plString& clothing_name)
{ {
// Get all the clothes that we can wear // Get all the clothes that we can wear
hsTArray<plClothingItem*> clothingList;
plClothingItem* match = plClothingMgr::GetClothingMgr()->GetLRMatch(plClothingMgr::GetClothingMgr()->FindItemByName(clothing_name)); plClothingItem* match = plClothingMgr::GetClothingMgr()->GetLRMatch(plClothingMgr::GetClothingMgr()->FindItemByName(clothing_name));
if ( match ) if ( match )
{ {

1
Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp

@ -120,7 +120,6 @@ bool plTimerCallbackManager::CancelCallback(plTimerCallback* pTimer)
bool plTimerCallbackManager::CancelCallbacksToKey(const plKey& key) bool plTimerCallbackManager::CancelCallbacksToKey(const plKey& key)
{ {
const plKey rKey;
bool removed = false; bool removed = false;
for (int i = fCallbacks.Count() - 1; i >= 0 ; i--) for (int i = fCallbacks.Count() - 1; i >= 0 ; i--)

2
Sources/Plasma/PubUtilLib/plAnimation/plMatrixChannel.cpp

@ -903,7 +903,7 @@ bool CompareMatrices2(const hsMatrix44 &matA, const hsMatrix44 &matB, float tole
bool c32 = fabs(matA.fMap[3][2] - matB.fMap[3][2]) < tolerance; bool c32 = fabs(matA.fMap[3][2] - matB.fMap[3][2]) < tolerance;
bool c33 = fabs(matA.fMap[3][3] - matB.fMap[3][3]) < tolerance; bool c33 = fabs(matA.fMap[3][3] - matB.fMap[3][3]) < tolerance;
return c00 && c01 && c02 && c03 && c11 && c12 && c13 && c20 && c21 && c22 && c23 && c30 && c31 && c32 && c33; return c00 && c01 && c02 && c03 && c10 && c11 && c12 && c13 && c20 && c21 && c22 && c23 && c30 && c31 && c32 && c33;
} }
// IAPPLY // IAPPLY

2
Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp

@ -177,8 +177,6 @@ plSoundBuffer::ELoadReturnVal plWin32StreamingSound::IPreLoadBuffer( bool playWh
{ {
plAudioCore::ChannelSelect select = buffer->GetReaderSelect(); plAudioCore::ChannelSelect select = buffer->GetReaderSelect();
bool streamCompressed = (buffer->HasFlag(plSoundBuffer::kStreamCompressed) != 0);
/// Open da file /// Open da file
plFileName strPath = plFileSystem::GetCWD(); plFileName strPath = plFileSystem::GetCWD();

2
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp

@ -150,8 +150,6 @@ plArmatureModBase::~plArmatureModBase()
bool plArmatureModBase::MsgReceive(plMessage* msg) bool plArmatureModBase::MsgReceive(plMessage* msg)
{ {
bool result = false;
plArmatureBrain *curBrain = nil; plArmatureBrain *curBrain = nil;
if (fBrains.size() > 0) if (fBrains.size() > 0)
{ {

1
Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp

@ -152,7 +152,6 @@ void plSwimCircularCurrentRegion::GetCurrent(plPhysicalControllerCore *physical,
physical->GetPositionSim(pos); physical->GetPositionSim(pos);
bool applyPull = true;
hsVector3 pos2Center(center.fX - pos.fX, center.fY - pos.fY, 0.f); hsVector3 pos2Center(center.fX - pos.fX, center.fY - pos.fY, 0.f);
float pullVel; float pullVel;
float distSq = pos2Center.MagnitudeSquared(); float distSq = pos2Center.MagnitudeSquared();

1
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp

@ -1967,7 +1967,6 @@ void plDrawableSpans::SortVisibleSpans(const hsTArray<int16_t>& visList, plPipel
memset(newStarts, 0, kMaxBufferGroups * kMaxIndexBuffers * sizeof(int16_t)); memset(newStarts, 0, kMaxBufferGroups * kMaxIndexBuffers * sizeof(int16_t));
uint32_t start = 0;
for( i = 0; i < visList.GetCount(); i++ ) for( i = 0; i < visList.GetCount(); i++ )
{ {
plIcicle* span = (plIcicle*)fSpans[visList[i]]; plIcicle* span = (plIcicle*)fSpans[visList[i]];

4
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp

@ -1450,9 +1450,7 @@ bool plDynaDecalMgr::ICutoutObject(plSceneObject* so, double secs)
return retVal; return retVal;
plProfile_BeginTiming(Total); plProfile_BeginTiming(Total);
int numGot = 0; for (int j = 0; j < di->GetNumDrawables(); j++)
int j;
for( j = 0; j < di->GetNumDrawables(); j++ )
{ {
plDrawableSpans* dr = plDrawableSpans::ConvertNoRef(di->GetDrawable(j)); plDrawableSpans* dr = plDrawableSpans::ConvertNoRef(di->GetDrawable(j));
// Nil dr - it hasn't loaded yet or something. // Nil dr - it hasn't loaded yet or something.

1
Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp

@ -149,7 +149,6 @@ void plPhysicsSoundMgr::IStopCollision(const CollidePair& cp)
void plPhysicsSoundMgr::IUpdateCollision(const CollidePair& cp) void plPhysicsSoundMgr::IUpdateCollision(const CollidePair& cp)
{ {
const float slideThreshhold = 0.f;
hsVector3 v1, v2; hsVector3 v1, v2;
plPhysical* physicalA = cp.FirstPhysical(); plPhysical* physicalA = cp.FirstPhysical();
plPhysical* physicalB = cp.SecondPhysical(); plPhysical* physicalB = cp.SecondPhysical();

4
Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp

@ -127,8 +127,6 @@ void plCubicRenderTargetModifier::ICreateRenderRequest( int face )
bool plCubicRenderTargetModifier::IEval( double secs, float del, uint32_t dirty ) bool plCubicRenderTargetModifier::IEval( double secs, float del, uint32_t dirty )
{ {
hsPoint3 center; hsPoint3 center;
hsMatrix44 mtx, invMtx;
int i;
plRenderRequestMsg *msg; plRenderRequestMsg *msg;
@ -150,7 +148,7 @@ bool plCubicRenderTargetModifier::IEval( double secs, float del, uint32_t dir
fCubic->SetCameraMatrix(center); fCubic->SetCameraMatrix(center);
/// Submit render requests! /// Submit render requests!
for( i = 0; i < 6; i++ ) for (int i = 0; i < 6; i++)
{ {
if( fRequests[ i ] != nil ) if( fRequests[ i ] != nil )
{ {

1
Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp

@ -1902,7 +1902,6 @@ hsRef<RelVaultNode> VaultCreateNodeAndWait (
plVault::NodeTypes nodeType, plVault::NodeTypes nodeType,
ENetError * result ENetError * result
) { ) {
hsRef<RelVaultNode> node;
hsRef<RelVaultNode> templateNode = new RelVaultNode; hsRef<RelVaultNode> templateNode = new RelVaultNode;
templateNode->SetNodeType(nodeType); templateNode->SetNodeType(nodeType);

Loading…
Cancel
Save