mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 18:59:09 +00:00
Fix more clang warnings.
This commit is contained in:
@ -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;
|
||||||
|
@ -190,10 +190,9 @@ plSoundEvent::Types plSoundEvent::GetTypeFromCallbackMsg( plEventCallbackMsg *ms
|
|||||||
switch( msg->fEvent )
|
switch( msg->fEvent )
|
||||||
{
|
{
|
||||||
case ::kStart: return kStart;
|
case ::kStart: return kStart;
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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,8 +1198,8 @@ 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)
|
||||||
if (plNetTransportMember * member = TransportMgr().GetMember(i))
|
if (plNetTransportMember * member = TransportMgr().GetMember(i))
|
||||||
|
@ -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() );
|
||||||
|
|
||||||
|
@ -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:
|
||||||
|
@ -286,14 +286,14 @@ void plNetObjectDebugger::LogMsgIfMatch(const char* msg) const
|
|||||||
|
|
||||||
char objName[128];
|
char objName[128];
|
||||||
int i=0;
|
int i=0;
|
||||||
|
|
||||||
// copy objName token
|
// copy objName token
|
||||||
while(*c && *c != ',' && *c != ' ' && i<127)
|
while(*c && *c != ',' && *c != ' ' && i<127)
|
||||||
objName[i++] = *c++;
|
objName[i++] = *c++;
|
||||||
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))
|
||||||
{
|
{
|
||||||
|
@ -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;
|
||||||
|
Reference in New Issue
Block a user