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/plPhysical/plCollisionDetector.cpp
View File

@ -1075,7 +1075,7 @@ hsBool plSimpleRegionSensor::MsgReceive(plMessage *msg)
}
// IEVAL
hsBool plSimpleRegionSensor::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plSimpleRegionSensor::IEval(double secs, hsScalar del, uint32_t dirty)
{
return false;
}

8
Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h
View File

@ -56,7 +56,7 @@ class plEvalMsg;
class plCollisionDetector : public plDetectorModifier
{
protected:
Int8 fType;
int8_t fType;
hsBool fBumped, fTriggered;
plArmatureMod* IGetAvatarModifier(plKey key);
@ -81,7 +81,7 @@ public:
CLASSNAME_REGISTER( plCollisionDetector );
GETINTERFACE_ANY( plCollisionDetector, plDetectorModifier );
virtual void SetType(Int8 i) { fType |= i; }
virtual void SetType(int8_t i) { fType |= i; }
void Read(hsStream* stream, hsResMgr* mgr);
void Write(hsStream* stream, hsResMgr* mgr);
@ -130,7 +130,7 @@ public:
fWaitingForEval=false;fSavedActivatorMsg=nil;
}
plObjectInVolumeDetector(Int8 i){fType = i;fWaitingForEval=false;fSavedActivatorMsg=nil;}
plObjectInVolumeDetector(int8_t i){fType = i;fWaitingForEval=false;fSavedActivatorMsg=nil;}
virtual ~plObjectInVolumeDetector(){;}
virtual hsBool MsgReceive(plMessage* msg);
@ -271,7 +271,7 @@ public:
virtual void Write(hsStream *stream, hsResMgr *mgr);
virtual void Read(hsStream *stream, hsResMgr *mgr);
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
protected:
plMessage *fEnterMsg;
plMessage *fExitMsg;

4
Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h
View File

@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
class plDetectorModifier : public plSingleModifier
{
protected:
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty){ return true; }
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty){ return true; }
hsTArray<plKey> fReceivers;
plModifier* fRemoteMod;
@ -68,7 +68,7 @@ public:
void AddLogicObj(plKey pKey) { fReceivers.Append(pKey); }
void SetRemote(plModifier* p) { fRemoteMod = p; }
plModifier* RemoteMod() { return fRemoteMod; }
virtual void SetType(Int8 i) {;}
virtual void SetType(int8_t i) {;}
int GetNumReceivers() const { return fReceivers.Count(); }
plKey GetReceiver(int i) const { return fReceivers[i]; }
void SetProxyKey(const plKey &k) { fProxyKey = k; }

2
Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp
View File

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

2
Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h
View File

@ -63,7 +63,7 @@ protected:
plPhysical* fOwner;
plPXPhysicalControllerCore* fController;
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;
};

2
Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp
View File

@ -194,7 +194,7 @@ static void IGetVars(plStateDataRecord::SimpleVarsList& vars,
}
}
void plPhysicalSDLModifier::ILogState(const plStateDataRecord* state, bool useDirty, const char* prefix, UInt32 color)
void plPhysicalSDLModifier::ILogState(const plStateDataRecord* state, bool useDirty, const char* prefix, uint32_t color)
{
hsPoint3 pos;
bool isPosSet;

2
Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h
View File

@ -66,7 +66,7 @@ public:
protected:
static int fLogLevel;
static plStatusLog* IGetLog();
void ILogState(const plStateDataRecord* state, bool useDirty, const char* prefix, UInt32 color);
void ILogState(const plStateDataRecord* state, bool useDirty, const char* prefix, uint32_t color);
plPhysical* IGetPhysical();
virtual void IPutCurrentStateIn(plStateDataRecord* dstState);

22
Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp
View File

@ -61,7 +61,7 @@ plPhysicalSndGroup::plPhysicalSndGroup() : fPlayingSlideSound(false)
fGroup = kNone;
}
plPhysicalSndGroup::plPhysicalSndGroup( UInt32 grp ) : fPlayingSlideSound(false)
plPhysicalSndGroup::plPhysicalSndGroup( uint32_t grp ) : fPlayingSlideSound(false)
{
fGroup = grp;
}
@ -70,12 +70,12 @@ plPhysicalSndGroup::~plPhysicalSndGroup()
{
}
bool plPhysicalSndGroup::HasSlideSound(UInt32 against)
bool plPhysicalSndGroup::HasSlideSound(uint32_t against)
{
return against < fSlideSounds.GetCount();
}
bool plPhysicalSndGroup::HasImpactSound(UInt32 against)
bool plPhysicalSndGroup::HasImpactSound(uint32_t against)
{
return against < fImpactSounds.GetCount();
}
@ -91,7 +91,7 @@ void plPhysicalSndGroup::Read( hsStream *s, hsResMgr *mgr )
s->ReadLE( &fGroup );
UInt32 i, count = s->ReadLE32();
uint32_t i, count = s->ReadLE32();
fImpactSounds.Reset();
for( i = 0; i < count; i++ )
@ -110,7 +110,7 @@ void plPhysicalSndGroup::Write( hsStream *s, hsResMgr *mgr )
s->WriteLE( fGroup );
UInt32 i;
uint32_t i;
s->WriteLE32( fImpactSounds.GetCount() );
for( i = 0; i < fImpactSounds.GetCount(); i++ )
mgr->WriteKey( s, fImpactSounds[ i ] );
@ -120,7 +120,7 @@ void plPhysicalSndGroup::Write( hsStream *s, hsResMgr *mgr )
mgr->WriteKey( s, fSlideSounds[ i ] );
}
void plPhysicalSndGroup::AddImpactSound( UInt32 against, plKey receiver )
void plPhysicalSndGroup::AddImpactSound( uint32_t against, plKey receiver )
{
if( fImpactSounds.GetCount() <= against )
{
@ -131,7 +131,7 @@ void plPhysicalSndGroup::AddImpactSound( UInt32 against, plKey receiver )
fImpactSounds[ against ] = receiver;
}
void plPhysicalSndGroup::AddSlideSound( UInt32 against, plKey receiver )
void plPhysicalSndGroup::AddSlideSound( uint32_t against, plKey receiver )
{
if( fSlideSounds.GetCount() <= against )
{
@ -142,7 +142,7 @@ void plPhysicalSndGroup::AddSlideSound( UInt32 against, plKey receiver )
fSlideSounds[ against ] = receiver;
}
void plPhysicalSndGroup::PlaySlideSound(UInt32 against)
void plPhysicalSndGroup::PlaySlideSound(uint32_t against)
{
if(against >= fSlideSounds.Count())
return;
@ -152,7 +152,7 @@ void plPhysicalSndGroup::PlaySlideSound(UInt32 against)
fPlayingSlideSound = true;
}
void plPhysicalSndGroup::StopSlideSound(UInt32 against)
void plPhysicalSndGroup::StopSlideSound(uint32_t against)
{
if(against >= fSlideSounds.Count())
return;
@ -162,7 +162,7 @@ void plPhysicalSndGroup::StopSlideSound(UInt32 against)
fPlayingSlideSound = false;
}
void plPhysicalSndGroup::PlayImpactSound(UInt32 against)
void plPhysicalSndGroup::PlayImpactSound(uint32_t against)
{
if(against >= fImpactSounds.Count())
return;
@ -171,7 +171,7 @@ void plPhysicalSndGroup::PlayImpactSound(UInt32 against)
animMsg->Send(fImpactSounds[against]);
}
void plPhysicalSndGroup::SetSlideSoundVolume(UInt32 against, hsScalar volume)
void plPhysicalSndGroup::SetSlideSoundVolume(uint32_t against, hsScalar volume)
{
if(against >= fSlideSounds.Count())
return;

22
Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h
View File

@ -73,7 +73,7 @@ public:
};
plPhysicalSndGroup();
plPhysicalSndGroup( UInt32 grp );
plPhysicalSndGroup( uint32_t grp );
virtual ~plPhysicalSndGroup();
CLASSNAME_REGISTER( plPhysicalSndGroup );
@ -85,18 +85,18 @@ public:
virtual void Read( hsStream *s, hsResMgr *mgr );
virtual void Write( hsStream *s, hsResMgr *mgr );
void PlaySlideSound(UInt32 against);
void StopSlideSound(UInt32 against);
void PlayImpactSound(UInt32 against);
void SetSlideSoundVolume(UInt32 against, hsScalar volume);
bool HasSlideSound(UInt32 against);
bool HasImpactSound(UInt32 against);
void PlaySlideSound(uint32_t against);
void StopSlideSound(uint32_t against);
void PlayImpactSound(uint32_t against);
void SetSlideSoundVolume(uint32_t against, hsScalar volume);
bool HasSlideSound(uint32_t against);
bool HasImpactSound(uint32_t against);
UInt32 GetGroup( void ) const { return fGroup; }
uint32_t GetGroup( void ) const { return fGroup; }
// Export only
void AddImpactSound( UInt32 against, plKey receiver );
void AddSlideSound( UInt32 against, plKey receiver );
void AddImpactSound( uint32_t against, plKey receiver );
void AddSlideSound( uint32_t against, plKey receiver );
bool IsSliding() { return fPlayingSlideSound; }
protected:
@ -107,7 +107,7 @@ protected:
kRefSlideSound
};
UInt32 fGroup;
uint32_t fGroup;
bool fPlayingSlideSound;
// Sound key arrays for, well, our sounds!