Browse Source

Remove a few unused vars

Michael Hansen 10 years ago
parent
commit
4b4de0e135
  1. 4
      Sources/Plasma/CoreLib/hsBounds.cpp
  2. 14
      Sources/Plasma/CoreLib/hsStream.cpp
  3. 1
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp

4
Sources/Plasma/CoreLib/hsBounds.cpp

@ -1493,7 +1493,6 @@ bool hsBounds3Ext::ISectBB(const hsBounds3Ext &other, const hsVector3 &myVel, hs
if( !(other.fExtFlags & (kDistsSet|kAxisAligned)) ) if( !(other.fExtFlags & (kDistsSet|kAxisAligned)) )
other.IMakeDists(); other.IMakeDists();
const float kRealBig = 1.e30f;
float tstDepths[9]; float tstDepths[9];
hsVector3 tstAxes[9]; hsVector3 tstAxes[9];
float totDepth = 0; 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 bool hsBounds3Ext::ISectABB(const hsBounds3Ext &other, const hsVector3 &myVel) const
{ {
hsPoint3 effMaxs = fMaxs;
hsPoint3 effMins = fMins;
int i; int i;
for( i = 0; i < 3; i++ ) for( i = 0; i < 3; i++ )
{ {

14
Sources/Plasma/CoreLib/hsStream.cpp

@ -369,8 +369,8 @@ bool hsStream::GetToken(char *s, uint32_t maxLen, const char beginComment, const
while( true ) while( true )
{ {
while( !AtEnd() && IsTokenSeparator(c = ReadByte()) ) while( !AtEnd() && IsTokenSeparator(c = ReadByte()) )
c = c; /* empty */;
;
if( AtEnd() ) if( AtEnd() )
return false; return false;
@ -379,8 +379,7 @@ bool hsStream::GetToken(char *s, uint32_t maxLen, const char beginComment, const
// skip to end of comment // skip to end of comment
while( !AtEnd() && (endCom != (c = ReadByte())) ) while( !AtEnd() && (endCom != (c = ReadByte())) )
c= c; /* empty */;
;
} }
s[0] = c; s[0] = c;
@ -419,8 +418,8 @@ bool hsStream::ReadLn(char *s, uint32_t maxLen, const char beginComment, const c
while( true ) while( true )
{ {
while( !AtEnd() && strchr("\r\n",c = ReadByte()) ) while( !AtEnd() && strchr("\r\n",c = ReadByte()) )
c = c; /* empty */;
;
if( AtEnd() ) if( AtEnd() )
return false; return false;
@ -429,8 +428,7 @@ bool hsStream::ReadLn(char *s, uint32_t maxLen, const char beginComment, const c
// skip to end of comment // skip to end of comment
while( !AtEnd() && (endCom != (c = ReadByte())) ) while( !AtEnd() && (endCom != (c = ReadByte())) )
c= c; /* empty */;
;
} }
s[0] = c; s[0] = c;

1
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp

@ -97,7 +97,6 @@ void pfMarkerInfo::Spawn(MarkerType type)
{ {
if (!fMarkerUoid.IsValid()) if (!fMarkerUoid.IsValid())
{ {
plResManager* resMgr = (plResManager*)hsgResMgr::ResMgr();
plLocation markerLoc = plKeyFinder::Instance().FindLocation("GlobalMarkers", "Markers"); plLocation markerLoc = plKeyFinder::Instance().FindLocation("GlobalMarkers", "Markers");
if (markerLoc.IsValid()) if (markerLoc.IsValid())

Loading…
Cancel
Save