From 4b4de0e135ccf01b6bb31136c77b82cdfe1d31bc Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sun, 12 Jul 2015 22:38:50 -0700 Subject: [PATCH] Remove a few unused vars --- Sources/Plasma/CoreLib/hsBounds.cpp | 4 ---- Sources/Plasma/CoreLib/hsStream.cpp | 14 ++++++-------- .../Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp | 1 - 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Sources/Plasma/CoreLib/hsBounds.cpp b/Sources/Plasma/CoreLib/hsBounds.cpp index 95d28211..a9a2bd50 100644 --- a/Sources/Plasma/CoreLib/hsBounds.cpp +++ b/Sources/Plasma/CoreLib/hsBounds.cpp @@ -1493,7 +1493,6 @@ bool hsBounds3Ext::ISectBB(const hsBounds3Ext &other, const hsVector3 &myVel, hs if( !(other.fExtFlags & (kDistsSet|kAxisAligned)) ) other.IMakeDists(); - const float kRealBig = 1.e30f; float tstDepths[9]; hsVector3 tstAxes[9]; float totDepth = 0; @@ -1644,9 +1643,6 @@ bool hsBounds3Ext::ISectBB(const hsBounds3Ext &other, const hsVector3 &myVel, hs bool hsBounds3Ext::ISectABB(const hsBounds3Ext &other, const hsVector3 &myVel) const { - hsPoint3 effMaxs = fMaxs; - hsPoint3 effMins = fMins; - int i; for( i = 0; i < 3; i++ ) { diff --git a/Sources/Plasma/CoreLib/hsStream.cpp b/Sources/Plasma/CoreLib/hsStream.cpp index 33656ee4..895ac474 100644 --- a/Sources/Plasma/CoreLib/hsStream.cpp +++ b/Sources/Plasma/CoreLib/hsStream.cpp @@ -369,8 +369,8 @@ bool hsStream::GetToken(char *s, uint32_t maxLen, const char beginComment, const while( true ) { while( !AtEnd() && IsTokenSeparator(c = ReadByte()) ) - c = c; - ; + /* empty */; + if( AtEnd() ) return false; @@ -379,8 +379,7 @@ bool hsStream::GetToken(char *s, uint32_t maxLen, const char beginComment, const // skip to end of comment while( !AtEnd() && (endCom != (c = ReadByte())) ) - c= c; - ; + /* empty */; } s[0] = c; @@ -419,8 +418,8 @@ bool hsStream::ReadLn(char *s, uint32_t maxLen, const char beginComment, const c while( true ) { while( !AtEnd() && strchr("\r\n",c = ReadByte()) ) - c = c; - ; + /* empty */; + if( AtEnd() ) return false; @@ -429,8 +428,7 @@ bool hsStream::ReadLn(char *s, uint32_t maxLen, const char beginComment, const c // skip to end of comment while( !AtEnd() && (endCom != (c = ReadByte())) ) - c= c; - ; + /* empty */; } s[0] = c; diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp index 6acd87bb..407e134e 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp @@ -97,7 +97,6 @@ void pfMarkerInfo::Spawn(MarkerType type) { if (!fMarkerUoid.IsValid()) { - plResManager* resMgr = (plResManager*)hsgResMgr::ResMgr(); plLocation markerLoc = plKeyFinder::Instance().FindLocation("GlobalMarkers", "Markers"); if (markerLoc.IsValid())