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 remote-tracking branch 'origin/master' into plString

Browse Source 
Conflicts:
	Sources/Plasma/CoreLib/hsStream.h
	Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
	Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
	Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
	Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
	Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
	Sources/Plasma/FeatureLib/pfPython/cyMisc.h
	Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp
	Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
	Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
	Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
	Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp
	Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
	Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.h
	Sources/Plasma/NucleusLib/pnMessage/plMessage.h
	Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
	Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
	Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
	Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
	Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
	Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp
	Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h
	Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
	Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h
	Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.h
	Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp
	Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h
	Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp
This commit is contained in:
Michael Hansen
2012-01-28 17:20:01 -08:00
parent e34414889f 7c2cb067ad
commit c339f947ba
1722 changed files with 24149 additions and 27599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp
View File

@ -259,7 +259,7 @@ void plNetTransport::ClearMembers()
//
// return array index or -1
//
int plNetTransport::FindMember(UInt32 playerID) const
int plNetTransport::FindMember(uint32_t playerID) const
{
int i;
for( i=0 ;i<GetNumMembers() ;i++ )
@ -349,8 +349,8 @@ int compare( const void* arg1, const void *arg2 )
{
plNetTransportMember** m1 = (plNetTransportMember**)arg1;
plNetTransportMember** m2 = (plNetTransportMember**)arg2;
float d1=m1 ? (*m1)->GetDistSq() : hsScalarMax;
float d2=m2 ? (*m2)->GetDistSq() : hsScalarMax;
float d1=m1 ? (*m1)->GetDistSq() : FLT_MAX;
float d2=m2 ? (*m2)->GetDistSq() : FLT_MAX;
return (int)(d1-d2);
}
@ -361,7 +361,7 @@ int compare( const void* arg1, const void *arg2 )
void plNetTransport::GetMemberListDistSorted(plNetTransportMember**& listIn) const
{
// copy members list
listIn = TRACKED_NEW plNetTransportMember* [fMembers.size()];
listIn = new plNetTransportMember* [fMembers.size()];
int i;
for (i=0; i<fMembers.size(); i++)
listIn[i]=fMembers[i];

4
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h
View File

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plNetTransport_h
#define plNetTransport_h
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsStlUtils.h"
//
@ -73,7 +73,7 @@ public:
// master list ops
void GetMemberListDistSorted(plNetTransportMember**& listPtr) const; // allocates and sorts array
int FindMember(const plKey avKey) const; // return array index or -1
int FindMember(UInt32 playerID) const; // return array index or -1
int FindMember(uint32_t playerID) const; // return array index or -1
int FindMember(const plNetTransportMember* mbr); // return array index or -1
int AddMember(plNetTransportMember* mbr); // to master list, if not there
hsBool RemoveMember(plNetTransportMember* mbr); // from master list and all channels

20
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
View File

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plNetTransportMember_h
#define plNetTransportMember_h
#include "hsConfig.h"
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include "plNetCommon/plNetMember.h"
#include "pnKeyedObject/plKey.h"
@ -66,11 +66,11 @@ public:
protected:
plKey fAvatarKey;
plString fPlayerName;
UInt32 fPlayerID;
uint32_t fPlayerID;
std::vector<int> fSubscriptions; // list of channelGrp subscriptions
UInt32 fTransportFlags;
uint32_t fTransportFlags;
float fDistSq; // from local player, temp
UInt8 fCCRLevel;
uint8_t fCCRLevel;
public:
CLASSNAME_REGISTER( plNetTransportMember);
GETINTERFACE_ANY( plNetTransportMember, plNetMember);
@ -91,8 +91,8 @@ public:
}
void SetPlayerName(const plString & value) { fPlayerName=value;}
plString GetPlayerName() const { return fPlayerName;}
void SetPlayerID(UInt32 value) { fPlayerID=value;}
UInt32 GetPlayerID() const { return fPlayerID;}
void SetPlayerID(uint32_t value) { fPlayerID=value;}
uint32_t GetPlayerID() const { return fPlayerID;}
void SetIsServer(bool value) { (value)?SetFlags(GetFlags()|kIsServer):SetFlags(GetFlags()&!kIsServer);}
bool IsServer() const { return (GetFlags()&kIsServer)?true:false;}
@ -105,8 +105,8 @@ public:
void CopySubscriptions(std::vector<int>* channels) { *channels = fSubscriptions; }
void SetTransportFlags(UInt32 f) { fTransportFlags=f; }
UInt32 GetTransportFlags() const { return fTransportFlags; }
void SetTransportFlags(uint32_t f) { fTransportFlags=f; }
uint32_t GetTransportFlags() const { return fTransportFlags; }
bool IsPeerToPeer() const { return hsCheckBits(fFlags, kRequestP2P); }
plString AsString() const;
@ -118,8 +118,8 @@ public:
}
bool IsCCR() const { return (fCCRLevel>0); }
UInt8 GetCCRLevel() const { return fCCRLevel; }
void SetCCRLevel(UInt8 cl) { fCCRLevel=cl; }
uint8_t GetCCRLevel() const { return fCCRLevel; }
void SetCCRLevel(uint8_t cl) { fCCRLevel=cl; }
};
#endif // plNetTransportMember_h