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

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.h
View File

@ -96,7 +96,7 @@ public:
virtual void SetMuted( hsBool muted, int index = -1 ) {;}
virtual void ToggleMuted( int index = -1 ) {;}
virtual void SetTalkIcon(int index, UInt32 str){;}
virtual void SetTalkIcon(int index, uint32_t str){;}
virtual void ClearTalkIcon(){;}
virtual void SetFadeIn( const int type, const float length, int index = -1 ) {}

14
Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp
View File

@ -227,7 +227,7 @@ hsBool plWinAudible::AddSound( plSound *pSnd, int index, hsBool is3D )
}
/* Unused
int plWinAudible::AddSoundFromResource(plSound *pSnd, void* addr, Int32 size, hsBool is3D )
int plWinAudible::AddSoundFromResource(plSound *pSnd, void* addr, int32_t size, hsBool is3D )
{
//plWin32Sound* pSnd = TRACKED_NEW plWin32Sound;
//IAssignSoundKey( pSnd, GetKey() ? GetKeyName() : "", fSoundObjs.Count() - 1 );
@ -471,7 +471,7 @@ void plWinAudible::Read(hsStream* s, hsResMgr* mgr)
mgr->AddViaNotify(GetKey(), refMsg, plRefFlags::kPassiveRef);
}
void plWinAudible::IAssignSoundKey( plSound *sound, const char *name, UInt32 i )
void plWinAudible::IAssignSoundKey( plSound *sound, const char *name, uint32_t i )
{
char keyName[ 256 ];
@ -621,7 +621,7 @@ plSound* plWinAudible::GetSound(int i) const
}
// Visualization
plDrawableSpans* plWinAudible::CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo)
plDrawableSpans* plWinAudible::CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
{
plDrawableSpans* myDraw = addTo;
int i;
@ -739,14 +739,14 @@ void pl2WayWinAudible::Read(hsStream* s, hsResMgr* mgr)
plgDispatch::Dispatch()->RegisterForExactType(plEvalMsg::Index(), GetKey());
}
void pl2WayWinAudible::PlayNetworkedSpeech(const char* addr, Int32 size, int numFrames, unsigned char flags)
void pl2WayWinAudible::PlayNetworkedSpeech(const char* addr, int32_t size, int numFrames, unsigned char flags)
{
if (fVoicePlayer)
{
if (!(flags & VOICE_ENCODED))
fVoicePlayer->PlaybackUncompressedVoiceMessage((UInt8*)addr, size);
fVoicePlayer->PlaybackUncompressedVoiceMessage((uint8_t*)addr, size);
else
fVoicePlayer->PlaybackVoiceMessage((UInt8*)addr, size, numFrames);
fVoicePlayer->PlaybackVoiceMessage((uint8_t*)addr, size, numFrames);
}
}
@ -773,7 +773,7 @@ void pl2WayWinAudible::SetVelocity(const hsVector3 vel,int index)
fVoicePlayer->SetVelocity( vel );
}
void pl2WayWinAudible::SetTalkIcon(int index, UInt32 str)
void pl2WayWinAudible::SetTalkIcon(int index, uint32_t str)
{
if (fVoicePlayer)
fVoicePlayer->SetTalkIcon(index,str);

12
Sources/Plasma/PubUtilLib/plAudible/plWinAudible.h
View File

@ -98,7 +98,7 @@ public:
void RemoveCallbacks(plSoundMsg* pMsg);
void AddCallbacks(plSoundMsg* pMsg);
hsBool AddSound(plSound *pSnd, int index,hsBool is3D);
int AddSoundFromResource(plSound *pSnd, void* addr, Int32 size, hsBool is3D);
int AddSoundFromResource(plSound *pSnd, void* addr, int32_t size, hsBool is3D);
virtual void GetStatus(plSoundMsg* pMsg);
virtual int GetNumSounds() const {return fSoundObjs.Count();}
virtual plSound* GetSound(int i) const;
@ -106,7 +106,7 @@ public:
virtual void SetVolume(const float volume,int index = -1);
virtual void SetMuted( hsBool muted, int index = -1 );
virtual void ToggleMuted( int index = -1 );
virtual void SetTalkIcon(int index, UInt32 str){;}
virtual void SetTalkIcon(int index, uint32_t str){;}
virtual void ClearTalkIcon(){;}
void SetFilename(int index, const char *filename, hsBool isCompressed);
@ -122,7 +122,7 @@ public:
virtual void Write(hsStream* s, hsResMgr* mgr);
// Visualization
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo);
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo);
private:
hsTArray<plSound *> fSoundObjs;
@ -131,7 +131,7 @@ private:
hsMatrix44 fLocalToWorld;
plSoundSDLModifier* fSDLMod;
plKey fSceneObj;
void IAssignSoundKey( plSound *sound, const char *name, UInt32 i );
void IAssignSoundKey( plSound *sound, const char *name, uint32_t i );
};
@ -150,11 +150,11 @@ public:
virtual void Activate();
virtual void DeActivate();
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void PlayNetworkedSpeech(const char* addr, Int32 size, int numFrames, unsigned char flags);
virtual void PlayNetworkedSpeech(const char* addr, int32_t size, int numFrames, unsigned char flags);
virtual plAudible& SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l, int index = -1);
virtual void SetVelocity(const hsVector3 vel,int index = -1);
virtual void SetTalkIcon(int index, UInt32 str);
virtual void SetTalkIcon(int index, uint32_t str);
virtual void ClearTalkIcon();
protected:

2
Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp
View File

@ -72,7 +72,7 @@ plKey plWinAudibleProxy::IGetNode() const
return fOwner ? fOwner->GetSceneNode() : nil;
}
plDrawableSpans* plWinAudibleProxy::ICreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo)
plDrawableSpans* plWinAudibleProxy::ICreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
{
if( fOwner )
{

2
Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h
View File

@ -56,7 +56,7 @@ public:
protected:
plWinAudible* fOwner;
virtual plDrawableSpans* ICreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo=nil);
virtual plDrawableSpans* ICreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo=nil);
virtual plKey IGetNode() const;
};