OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Merge pull request #273 from 'paradox/clang'

Browse Source 
Conflicts:
	Sources/Tools/MaxConvert/Pch.h
	Sources/Tools/MaxConvert/hsControlConverter.cpp
This commit is contained in:
Adam Johnson
2013-01-31 19:14:57 -05:00
parent a8b2509736 e98a95fc94
commit f5abe4ab15
103 changed files with 211 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
View File

@ -559,7 +559,7 @@ int plNetClientMgr::Update(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();
while ( it!=fPendingLoads.end() )
@ -1135,8 +1135,8 @@ plString plNetClientMgr::GetPlayerNameById (unsigned playerId) const {
unsigned plNetClientMgr::GetPlayerIdByName (const plString & name) const {
// local case
if (0 == name.Compare(NetCommGetPlayer()->playerNameAnsi))
NetCommGetPlayer()->playerInt;
return NetCommGetPlayer()->playerInt;
unsigned n = TransportMgr().GetNumMembers();
for (unsigned i = 0; i < n; ++i)
if (plNetTransportMember * member = TransportMgr().GetMember(i))

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

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

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp
View File

@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include <algorithm>
#include <float.h>
#include <cfloat>
#include "hsMatrix44.h"
#include "hsGeometry3.h"
#include "plNetClientMgr.h"

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

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

6
Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp
View File

@ -286,14 +286,14 @@ void plNetObjectDebugger::LogMsgIfMatch(const char* msg) const
char objName[128];
int i=0;
// copy objName token
while(*c && *c != ',' && *c != ' ' && i<127)
objName[i++] = *c++;
objName[i++] = *c++;
objName[i]=0;
DebugObjectList::const_iterator it = fDebugObjects.begin();
for( objName[0]; it != fDebugObjects.end(); it++)
for(; it != fDebugObjects.end(); it++)
{
if ((*it) && (*it)->StringMatches(objName))
{