OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Python file names and SynchedObj SDL state names => plString

Browse Source
This commit is contained in:
Michael Hansen
2014-01-11 11:33:45 -08:00
parent f370c65ad3
commit a783642515
25 changed files with 97 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plAudio/plSound.cpp
View File

@ -1480,7 +1480,7 @@ plDrawableSpans* plSound::CreateProxy(const hsMatrix44& l2w, hsGMaterial* mat, h
// call when state has changed
bool plSound::DirtySynchState(const char* sdlName /* kSDLSound */, uint32_t sendFlags)
bool plSound::DirtySynchState(const plString& sdlName /* kSDLSound */, uint32_t sendFlags)
{
/*
if( sdlName == nil )

2
Sources/Plasma/PubUtilLib/plAudio/plSound.h
View File

@ -239,7 +239,7 @@ public:
virtual void UpdateSoftVolume( bool enable, bool firstTime = false );
virtual bool MsgReceive( plMessage* pMsg );
virtual bool DirtySynchState( const char *sdlName = nil, uint32_t sendFlags = 0 ); // call when state has changed
virtual bool DirtySynchState( const plString &sdlName = "", uint32_t sendFlags = 0 ); // call when state has changed
// Tests whether this sound is within range of the given position, not counting soft regions
bool IsWithinRange( const hsPoint3 &listenerPos, float *distSquared );

2
Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp
View File

@ -799,7 +799,7 @@ bool plAGMasterMod::HasRunningAnims()
//
// Send SDL sendState msg to object's plAGMasterSDLModifier
//
bool plAGMasterMod::DirtySynchState(const char* SDLStateName, uint32_t synchFlags)
bool plAGMasterMod::DirtySynchState(const plString& SDLStateName, uint32_t synchFlags)
{
if(GetNumTargets() > 0 && (!fIsGrouped || fIsGroupMaster))
{

2
Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h
View File

@ -206,7 +206,7 @@ public:
virtual void Read(hsStream * stream, hsResMgr *mgr);
bool HasRunningAnims();
bool DirtySynchState(const char* SDLStateName, uint32_t synchFlags);
bool DirtySynchState(const plString& SDLStateName, uint32_t synchFlags);
CLASSNAME_REGISTER( plAGMasterMod );
GETINTERFACE_ANY( plAGMasterMod, plModifier );

4
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
View File

@ -1836,10 +1836,10 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
plgDispatch::Dispatch()->RegisterForExactType(plAvatarStealthModeMsg::Index(), GetKey());
}
bool plArmatureMod::DirtySynchState(const char* SDLStateName, uint32_t synchFlags)
bool plArmatureMod::DirtySynchState(const plString& SDLStateName, uint32_t synchFlags)
{
// skip requests to synch non-avatar state
if (SDLStateName && stricmp(SDLStateName, kSDLAvatar))
if (SDLStateName.CompareI(kSDLAvatar) != 0)
{
return false;
}

2
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h
View File

@ -283,7 +283,7 @@ public:
void SynchIfLocal(double timeNow, int force); // Just physical state
void SynchInputState(uint32_t rcvID = kInvalidPlayerID);
bool DirtySynchState(const char* SDLStateName, uint32_t synchFlags );
bool DirtySynchState(const plString& SDLStateName, uint32_t synchFlags );
bool DirtyPhysicalSynchState(uint32_t synchFlags);
plClothingOutfit *GetClothingOutfit() const { return fClothingOutfit; }
plClothingSDLModifier *GetClothingSDLMod() const { return fClothingSDLMod; }

2
Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
View File

@ -1405,7 +1405,7 @@ bool plClothingOutfit::MsgReceive(plMessage* msg)
// TESTING SDL
// Send clothing sendState msg to object's plClothingSDLModifier
//
bool plClothingOutfit::DirtySynchState(const char* SDLStateName, uint32_t synchFlags)
bool plClothingOutfit::DirtySynchState(const plString& SDLStateName, uint32_t synchFlags)
{
plSynchEnabler ps(true); // make sure synching is enabled, since this happens during load
synchFlags |= plSynchedObject::kForceFullSend; // TEMP

2
Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h
View File

@ -195,7 +195,7 @@ public:
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);
bool DirtySynchState(const char* SDLStateName, uint32_t synchFlags);
bool DirtySynchState(const plString& SDLStateName, uint32_t synchFlags);
void StripAccessories();
void WearDefaultClothing();

2
Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp
View File

@ -1010,7 +1010,7 @@ void plPXPhysical::Write(hsStream* stream, hsResMgr* mgr)
// TESTING SDL
// Send phys sendState msg to object's plPhysicalSDLModifier
//
bool plPXPhysical::DirtySynchState(const char* SDLStateName, uint32_t synchFlags )
bool plPXPhysical::DirtySynchState(const plString& SDLStateName, uint32_t synchFlags )
{
if (GetObjectKey())
{

2
Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h
View File

@ -210,7 +210,7 @@ protected:
/////////////////////////////////////////////////////////////
/** Remember that we need to do a synch soon. */
bool DirtySynchState(const char* SDLStateName, uint32_t synchFlags );
bool DirtySynchState(const plString& SDLStateName, uint32_t synchFlags);
double GetLastSyncTime() { return fLastSyncTime; }

2
Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h
View File

@ -173,7 +173,7 @@ public:
// NEVER!
// If you think it should... talk to Bob. He will explain why it can't be, and beat you up.
// If he can't remember, beat him up until he does (or ask Moose).
virtual bool DirtySynchState(const char* sdlName, uint32_t sendFlags) { return false; } // don't send link state
virtual bool DirtySynchState(const plString& sdlName, uint32_t sendFlags) { return false; } // don't send link state
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);