Browse Source

Fix more clang warnings.

Darryl Pogue 12 years ago
parent
commit
c71bff3f21
  1. 1
      Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp
  2. 3
      Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp
  3. 2
      Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
  4. 3
      Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp
  5. 4
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
  6. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
  7. 5
      Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp
  8. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp
  9. 2
      Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp

1
Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp

@ -785,6 +785,7 @@ void plAudioSystem::IUpdateSoftSounds( const hsPoint3 &newPosition )
case plSound::kStreamFromDisk: color = plStatusLog::kYellow; break; case plSound::kStreamFromDisk: color = plStatusLog::kYellow; break;
case plSound::kStreamFromRAM: color = plStatusLog::kWhite; break; case plSound::kStreamFromRAM: color = plStatusLog::kWhite; break;
case plSound::kStreamCompressed: color = plStatusLog::kRed; break; case plSound::kStreamCompressed: color = plStatusLog::kRed; break;
default: break;
} }
if(sound->GetType() == plgAudioSys::kVoice) color = 0xffff8800; if(sound->GetType() == plgAudioSys::kVoice) color = 0xffff8800;
if(sound->IsPropertySet(plSound::kPropIncidental)) color = 0xff00ffff; if(sound->IsPropertySet(plSound::kPropIncidental)) color = 0xff00ffff;

3
Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp

@ -193,7 +193,6 @@ plSoundEvent::Types plSoundEvent::GetTypeFromCallbackMsg( plEventCallbackMsg *ms
case ::kTime: return kTime; case ::kTime: return kTime;
case ::kStop: return kStop; case ::kStop: return kStop;
case ::kLoop: return kLoop; case ::kLoop: return kLoop;
default: return kStop;
} }
return kStop;
} }

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

@ -737,7 +737,7 @@ void plDynaDecalMgr::IAllocAuxSpan(plAuxSpan* aux, uint32_t maxNumVerts, uint32_
uint16_t* dataPtr = nil; uint16_t* dataPtr = nil;
grp->ReserveIndexStorage(maxNumIdx, &aux->fIBufferIdx, &aux->fIStartIdx, &dataPtr); grp->ReserveIndexStorage(maxNumIdx, &aux->fIBufferIdx, &aux->fIStartIdx, &dataPtr);
aux->fIStartIdx /* should be assigning something? */; //aux->fIStartIdx /* should be assigning something? */;
aux->fILength = 0; aux->fILength = 0;

3
Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp

@ -960,7 +960,6 @@ uint16_t plDynSurfaceWriter::CalcStringWidth( const char *text, uint16_t *h
IEnsureSurfaceUpdated(); IEnsureSurfaceUpdated();
#if HS_BUILD_FOR_WIN32 #if HS_BUILD_FOR_WIN32
SIZE size; SIZE size;
::GetTextExtentPoint32( fRGBSurface.fDC, text, strlen( text ), &size ); ::GetTextExtentPoint32( fRGBSurface.fDC, text, strlen( text ), &size );
@ -968,6 +967,8 @@ uint16_t plDynSurfaceWriter::CalcStringWidth( const char *text, uint16_t *h
*height = (uint16_t)size.cy; *height = (uint16_t)size.cy;
return (uint16_t)size.cx; return (uint16_t)size.cx;
#else
return 0;
#endif #endif
} }

4
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp

@ -608,7 +608,7 @@ int plNetClientMgr::Update(double secs)
// //
void plNetClientMgr::ICheckPendingStateLoad(double secs) void plNetClientMgr::ICheckPendingStateLoad(double secs)
{ {
if (!fPendingLoads.empty() && GetFlagsBit( kPlayingGame ) || (GetFlagsBit(kLoadingInitialAgeState) && !GetFlagsBit(kNeedInitialAgeStateCount))) if ((!fPendingLoads.empty() && GetFlagsBit(kPlayingGame)) || (GetFlagsBit(kLoadingInitialAgeState) && !GetFlagsBit(kNeedInitialAgeStateCount)))
{ {
PendingLoadsList::iterator it = fPendingLoads.begin(); PendingLoadsList::iterator it = fPendingLoads.begin();
while ( it!=fPendingLoads.end() ) while ( it!=fPendingLoads.end() )
@ -1198,7 +1198,7 @@ plString plNetClientMgr::GetPlayerNameById (unsigned playerId) const {
unsigned plNetClientMgr::GetPlayerIdByName (const plString & name) const { unsigned plNetClientMgr::GetPlayerIdByName (const plString & name) const {
// local case // local case
if (0 == name.Compare(NetCommGetPlayer()->playerNameAnsi)) if (0 == name.Compare(NetCommGetPlayer()->playerNameAnsi))
NetCommGetPlayer()->playerInt; return NetCommGetPlayer()->playerInt;
unsigned n = TransportMgr().GetNumMembers(); unsigned n = TransportMgr().GetNumMembers();
for (unsigned i = 0; i < n; ++i) for (unsigned i = 0; i < n; ++i)

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp

@ -157,7 +157,7 @@ void plNetClientMgr::ISendCCRPetition(plCCRPetitionMsg* petMsg)
info.AddValue( "Petition", "Language", plLocalization::GetLanguageName( plLocalization::GetLanguage() ) ); info.AddValue( "Petition", "Language", plLocalization::GetLanguageName( plLocalization::GetLanguage() ) );
info.AddValue( "Petition", "AcctName", NetCommGetAccount()->accountNameAnsi ); info.AddValue( "Petition", "AcctName", NetCommGetAccount()->accountNameAnsi );
char buffy[20]; char buffy[20];
sprintf( buffy, "%lu", GetPlayerID() ); sprintf(buffy, "%u", GetPlayerID());
info.AddValue( "Petition", "PlayerID", buffy ); info.AddValue( "Petition", "PlayerID", buffy );
info.AddValue( "Petition", "PlayerName", GetPlayerName() ); info.AddValue( "Petition", "PlayerName", GetPlayerName() );

5
Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp

@ -263,6 +263,9 @@ void plNetLinkingMgr::ExecNextOp () {
); );
} }
break; break;
default:
break;
} }
s_opqueue.remove(op); s_opqueue.remove(op);
@ -1091,7 +1094,7 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
info, info,
&childLink)) &childLink))
{ {
case hsFail: case static_cast<uint8_t>(hsFail):
success = kLinkFailed; success = kLinkFailed;
break; break;
case false: case false:

2
Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp

@ -293,7 +293,7 @@ void plNetObjectDebugger::LogMsgIfMatch(const char* msg) const
objName[i]=0; objName[i]=0;
DebugObjectList::const_iterator it = fDebugObjects.begin(); DebugObjectList::const_iterator it = fDebugObjects.begin();
for( objName[0]; it != fDebugObjects.end(); it++) for(; it != fDebugObjects.end(); it++)
{ {
if ((*it) && (*it)->StringMatches(objName)) if ((*it) && (*it)->StringMatches(objName))
{ {

2
Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp

@ -319,7 +319,7 @@ void plAgeInfoStruct::SetAgeDescription( const char * v )
void plAgeInfoStruct::SetAgeLanguage( uint32_t v ) void plAgeInfoStruct::SetAgeLanguage( uint32_t v )
{ {
if ( v >= 0 ) if (v != static_cast<uint32_t>(-1))
{ {
SetFlag( kHasAgeLanguage ); SetFlag( kHasAgeLanguage );
fAgeLanguage = v; fAgeLanguage = v;

Loading…
Cancel
Save