OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 04:09:16 +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

12
Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h
View File

@ -132,7 +132,7 @@ public:
plArmatureMod *GetLocalAvatar();
plKey GetLocalAvatarKey();
static plArmatureMod *FindAvatar(plKey& avatarKey); // Key of the sceneObject
plArmatureMod *FindAvatarByPlayerID(UInt32 pid);
plArmatureMod *FindAvatarByPlayerID(uint32_t pid);
plArmatureMod *FindAvatarByModelName(char *name); // Probably only useful for custom NPCs. All players are
// either "Male" or "Female".
void FindAllAvatarsByModelName(const char* name, plArmatureModPtrVec& outVec);
@ -149,9 +149,9 @@ public:
int NumSpawnPoints() { return fSpawnPoints.size(); }
int FindSpawnPoint( const char *name ) const;
// \}
static int WarpPlayerToAnother(hsBool iMove, UInt32 remoteID);
static int WarpPlayerToXYZ(hsScalar x, hsScalar y, hsScalar z);
static int WarpPlayerToXYZ(int pid, hsScalar x, hsScalar y, hsScalar z);
static int WarpPlayerToAnother(hsBool iMove, uint32_t remoteID);
static int WarpPlayerToXYZ(float x, float y, float z);
static int WarpPlayerToXYZ(int pid, float x, float y, float z);
static plAvatarMgr *GetInstance();
static void ShutDown();
@ -160,7 +160,7 @@ public:
hsBool MsgReceive(plMessage *msg);
hsBool HandleCoopMsg(plAvCoopMsg *msg);
hsBool HandleNotifyMsg(plNotifyMsg *msg);
hsBool IPassMessageToActiveCoop(plMessage *msg, UInt32 id, UInt16 serial);
hsBool IPassMessageToActiveCoop(plMessage *msg, uint32_t id, uint16_t serial);
// similar to a spawn point, maintainers markers are used
// to generate your position in Dni coordinates
@ -224,7 +224,7 @@ protected:
// ID. By using a multimap, however, we can still handle a few different coops
// for the same user by just iterating from the first match forward until
// we run out of matches.
typedef std::multimap<UInt32, plCoopCoordinator *> plCoopMap;
typedef std::multimap<uint32_t, plCoopCoordinator *> plCoopMap;
plCoopMap fActiveCoops;
hsTArray<plLoadCloneMsg*> fCloneMsgQueue;