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

Obliterate hsBool

Browse Source
This commit is contained in:
Adam Johnson
2012-07-11 01:28:00 -04:00
parent 5f78b33db4
commit a709e17069
1041 changed files with 7889 additions and 8070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/NucleusLib/pnMessage/plAudioSysMsg.h
View File

@ -53,7 +53,7 @@ class plAudioSysMsg : public plMessage
{
int fAudFlag;
plKey pObj;
hsBool fBoolFlag;
bool fBoolFlag;
public:
enum
{
@ -87,8 +87,8 @@ public:
plKey GetSceneObject() { return pObj; }
void SetSceneObject(plKey &k) { pObj = k; }
hsBool GetBoolFlag() { return fBoolFlag; }
void SetBoolFlag( hsBool b ) { fBoolFlag = b; }
bool GetBoolFlag() { return fBoolFlag; }
void SetBoolFlag( bool b ) { fBoolFlag = b; }
// IO
void Read(hsStream* stream, hsResMgr* mgr)

46
Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h
View File

@ -79,9 +79,9 @@ public:
kFOV = 0x0004,
};
int fType;
int fType;
hsPoint3 fOffset;
hsPoint3 fOffset;
float fAccel;
float fDecel;
float fVel;
@ -89,7 +89,7 @@ public:
float fFPDecel;
float fFPVel;
float fFOVw, fFOVh;
hsBool fWorldspace;
bool fWorldspace;
void Read(hsStream* stream);
void Write(hsStream* stream);
@ -101,15 +101,15 @@ class plCameraTargetFadeMsg : public plMessage
protected:
plKey fSubject;
hsBool fFadeOut;
bool fFadeOut;
public:
plKey GetSubjectKey() { return fSubject; }
plKey GetSubjectKey() const { return fSubject; }
void SetSubjectKey(const plKey &x) { fSubject = x; }
hsBool FadeOut() { return fFadeOut; }
void SetFadeOut(hsBool b) { fFadeOut = b; }
bool FadeOut() const { return fFadeOut; }
void SetFadeOut(bool b) { fFadeOut = b; }
plCameraTargetFadeMsg(){;}
@ -136,16 +136,16 @@ protected:
plPipeline* fPipe;
plCameraConfig fConfig;
hsBool fActivated;
bool fActivated;
public:
plKey GetNewCam() { return fNewCam; }
plKey GetTriggerer() { return fTriggerer; }
double GetTransTime() { return fTransTime; }
plSceneObject* GetSubject() { return fSubject; }
plPipeline* GetPipeline() { return fPipe; }
hsBool GetActivated() { return fActivated; }
plKey GetNewCam() const { return fNewCam; }
plKey GetTriggerer() const { return fTriggerer; }
double GetTransTime() const { return fTransTime; }
plSceneObject* GetSubject() const { return fSubject; }
plPipeline* GetPipeline() const { return fPipe; }
bool GetActivated() const { return fActivated; }
plCameraConfig* GetConfig() { return &fConfig; }
void SetNewCam(const plKey &x) { fNewCam = x; }
@ -153,7 +153,7 @@ public:
void SetTransTime(double x) { fTransTime = x; }
void SetSubject(plSceneObject* x) { fSubject = x; }
void SetPipeline(plPipeline* x) { fPipe = x; }
void SetActivated(hsBool x) { fActivated = x; }
void SetActivated(bool x) { fActivated = x; }
plCameraMsg();
plCameraMsg(const plKey &s,
@ -212,7 +212,7 @@ public:
hsBitVector fCmd;
hsBool Cmd(int n) { return fCmd.IsBitSet(n); }
bool Cmd(int n) const { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd() { fCmd.Clear(); }
void ClearCmd(int n) { fCmd.ClearBit(n); }
@ -230,20 +230,20 @@ class plIfaceFadeAvatarMsg : public plMessage
protected:
plKey fSubject;
hsBool fFadeOut;
hsBool fEnable, fDisable;
bool fFadeOut;
bool fEnable, fDisable;
public:
plKey GetSubjectKey() { return fSubject; }
plKey GetSubjectKey() const { return fSubject; }
void SetSubjectKey(const plKey &x) { fSubject = x; }
hsBool FadeOut() { return fFadeOut; }
void SetFadeOut(hsBool b) { fFadeOut = b; }
bool FadeOut() const { return fFadeOut; }
void SetFadeOut(bool b) { fFadeOut = b; }
void Enable() { fEnable = true; }
void Disable() { fDisable = true; }
hsBool GetEnable() { return fEnable; }
hsBool GetDisable() { return fDisable; }
bool GetEnable() const { return fEnable; }
bool GetDisable() const { return fDisable; }
plIfaceFadeAvatarMsg() : fEnable(false),fDisable(false){;}
plIfaceFadeAvatarMsg(const plKey &s,

4
Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h
View File

@ -70,10 +70,10 @@ class plClientMsg : public plMessage
int fWidth;
int fHeight;
int fColorDepth;
hsBool fWindowed;
bool fWindowed;
int fNumAASamples;
int fMaxAnisoSamples;
hsBool fVSync;
bool fVSync;
};

2
Sources/Plasma/NucleusLib/pnMessage/plCmdIfaceModMsg.h
View File

@ -83,7 +83,7 @@ public:
uint32_t fControlCode;
int fIndex;
hsBool Cmd(int n) { return fCmd.IsBitSet(n); }
bool Cmd(int n) { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd() { fCmd.Clear(); }
void ClearCmd(int n) { fCmd.ClearBit(n); }

4
Sources/Plasma/NucleusLib/pnMessage/plCorrectionMsg.h
View File

@ -50,7 +50,7 @@ class plCorrectionMsg : public plMessage
{
public:
plCorrectionMsg() : plMessage(nil, nil, nil) { }
plCorrectionMsg(plKey &r, const hsMatrix44& l2w, const hsMatrix44& w2l, hsBool dirtySynch = false)
plCorrectionMsg(plKey &r, const hsMatrix44& l2w, const hsMatrix44& w2l, bool dirtySynch = false)
: plMessage(nil, r, nil),
fLocalToWorld(l2w),
fWorldToLocal(w2l),
@ -63,7 +63,7 @@ public:
hsMatrix44 fLocalToWorld;
hsMatrix44 fWorldToLocal;
hsBool fDirtySynch;
bool fDirtySynch;
// IO
void Read(hsStream* stream, hsResMgr* mgr)

4
Sources/Plasma/NucleusLib/pnMessage/plEnableMsg.h
View File

@ -66,13 +66,13 @@ public:
hsBitVector fCmd;
hsBitVector fTypes;
hsBool Cmd(int n) const { return fCmd.IsBitSet(n); }
bool Cmd(int n) const { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd() { fCmd.Clear(); }
void AddType(uint16_t t) { fTypes.SetBit(t); }
void RemoveType(uint16_t t) { fTypes.ClearBit(t); }
hsBool Type(uint16_t t) const { return fTypes.IsBitSet(t); }
bool Type(uint16_t t) const { return fTypes.IsBitSet(t); }
const hsBitVector& Types() const { return fTypes; }
plEnableMsg() { }

2
Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h
View File

@ -72,7 +72,7 @@ public:
hsBitVector fCmd;
hsBool Cmd(int n) { return fCmd.IsBitSet(n); }
bool Cmd(int n) const { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd() { fCmd.Clear(); }
void ClearCmd(int n) { fCmd.ClearBit(n); }

4
Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp
View File

@ -100,14 +100,14 @@ plMessage& plMessage::AddReceivers(const hsTArray<plKey>& rList)
return *this;
}
hsBool plMessage::Send(const plKey r, hsBool async)
bool plMessage::Send(const plKey r, bool async)
{
if( r )
AddReceiver(r);
return plgDispatch::MsgSend(this,async);
}
hsBool plMessage::SendAndKeep(const plKey r, hsBool async)
bool plMessage::SendAndKeep(const plKey r, bool async)
{
Ref();
return Send(r, async);

8
Sources/Plasma/NucleusLib/pnMessage/plMessage.h
View File

@ -132,14 +132,14 @@ public:
plMessage& AddReceiver(const plKey &r);
plMessage& AddReceivers(const hsTArray<plKey>& rList);
hsBool Send(const plKey r=nil, hsBool async=false); // Message will self-destruct after send.
hsBool SendAndKeep(const plKey r=nil, hsBool async=false); // Message won't self-destruct after send.
bool Send(const plKey r=nil, bool async=false); // Message will self-destruct after send.
bool SendAndKeep(const plKey r=nil, bool async=false); // Message won't self-destruct after send.
double GetTimeStamp() const { return fTimeStamp; }
plMessage& SetTimeStamp(double t) { fTimeStamp = t; return *this; }
hsBool HasBCastFlag(uint32_t f) const { return 0 != (fBCastFlags & f); }
plMessage& SetBCastFlag(uint32_t f, hsBool on=true) { if( on )fBCastFlags |= f; else fBCastFlags &= ~f; return *this; }
bool HasBCastFlag(uint32_t f) const { return 0 != (fBCastFlags & f); }
plMessage& SetBCastFlag(uint32_t f, bool on=true) { if( on )fBCastFlags |= f; else fBCastFlags &= ~f; return *this; }
void SetAllBCastFlags(uint32_t f) { fBCastFlags=f; }
uint32_t GetAllBCastFlags() const { return fBCastFlags; }

2
Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.h
View File

@ -75,7 +75,7 @@ public:
#if 0
// returns true if ok to send in a networked situations
static hsBool NetOKToSend(plSynchedObject* sender, plEventCallbackMsg* cbmsg);
static bool NetOKToSend(plSynchedObject* sender, plEventCallbackMsg* cbmsg);
#endif
// IO

2
Sources/Plasma/NucleusLib/pnMessage/plMultiModMsg.h
View File

@ -70,7 +70,7 @@ public:
hsBitVector fCmd;
hsBool Cmd(int n) { return fCmd.IsBitSet(n); }
bool Cmd(int n) { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd() { fCmd.Clear(); }

12
Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp
View File

@ -226,7 +226,7 @@ void plNotifyMsg::AddEvent( proEventData* ed )
// NOTE: To test for duplicate record, it only checks for records of the same type
// : Eventually, it might be wise to check if the same 'self' key also?
//
void plNotifyMsg::AddCollisionEvent( hsBool enter, const plKey &other, const plKey &self, hsBool onlyOneCollision )
void plNotifyMsg::AddCollisionEvent( bool enter, const plKey &other, const plKey &self, bool onlyOneCollision )
{
// if this is the normal case of there can only be one collision, then get rid of any others
if ( onlyOneCollision )
@ -376,7 +376,7 @@ void plNotifyMsg::AddSpawnedEvent (const plKey &spawner, const plKey &spawnee)
// NOTE: To test for duplicate record, it only checks for records of the same type
// : Eventually, it might be wise to check if the same 'self' key also?
//
void plNotifyMsg::AddActivateEvent( hsBool activate )
void plNotifyMsg::AddActivateEvent( bool activate )
{
// remove records that are like the one being added
int num_recs = fEvents.GetCount();
@ -417,7 +417,7 @@ void plNotifyMsg::AddActivateEvent( hsBool activate )
// NOTE: To test for duplicate record, it only checks for records of the same type
// : Eventually, it might be wise to check if the same 'self' key also?
//
void plNotifyMsg::AddPickEvent( const plKey &other, const plKey& self, hsBool enabled, hsPoint3 hitPoint )
void plNotifyMsg::AddPickEvent( const plKey &other, const plKey& self, bool enabled, hsPoint3 hitPoint )
{
// remove records that are like the one being added
@ -462,7 +462,7 @@ void plNotifyMsg::AddPickEvent( const plKey &other, const plKey& self, hsBool en
// NOTE: To test for duplicate record, it only checks for records of the same type
// : Eventually, it might be wise to check if the same 'self' key also?
//
void plNotifyMsg::AddContainerEvent( const plKey &container, const plKey &contained, hsBool entering )
void plNotifyMsg::AddContainerEvent( const plKey &container, const plKey &contained, bool entering )
{
// remove records that are like the one being added
@ -508,7 +508,7 @@ void plNotifyMsg::AddContainerEvent( const plKey &container, const plKey &contai
// NOTE: To test for duplicate record, it only checks for records of the same type
// : Eventually, it might be wise to check if the same 'self' key also?
//
void plNotifyMsg::AddFacingEvent( const plKey &other, const plKey &self, float dot, hsBool enabled )
void plNotifyMsg::AddFacingEvent( const plKey &other, const plKey &self, float dot, bool enabled )
{
// remove records that are like the one being added
@ -552,7 +552,7 @@ void plNotifyMsg::AddFacingEvent( const plKey &other, const plKey &self, float d
// NOTE: To test for duplicate record, it only checks for records of the same type
// : Eventually, it might be wise to check if the same 'self' key also?
//
void plNotifyMsg::AddControlKeyEvent( int32_t key, hsBool down )
void plNotifyMsg::AddControlKeyEvent( int32_t key, bool down )
{
// remove records that are like the one being added
int num_recs = fEvents.GetCount();

26
Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h
View File

@ -128,7 +128,7 @@ protected:
#define proEventType(type) class pro##type##EventData : public proEventData { public: pro##type##EventData() : proEventData( k##type ) {IInit();} virtual ~pro##type##EventData(){IDestruct();}
proEventType(Collision)
hsBool fEnter; // entering? (false is exit)
bool fEnter; // entering? (false is exit)
plKey fHitter; // collision hitter (other probably player)
plKey fHittee; // collision hittee (probably us)
@ -143,7 +143,7 @@ protected:
proEventType(Picked)
plKey fPicker; // who picked it (problably player)
plKey fPicked; // object that was picked
hsBool fEnabled; // pick (true) or un-pick (false)
bool fEnabled; // pick (true) or un-pick (false)
hsPoint3 fHitPoint; // where on the picked object that it was picked on
protected:
@ -168,7 +168,7 @@ protected:
proEventType(ControlKey)
int32_t fControlKey; // what control key was hit
hsBool fDown; // was the key going down (false if going up)
bool fDown; // was the key going down (false if going up)
protected:
virtual void IRead(hsStream* stream, hsResMgr* mgr);
@ -207,7 +207,7 @@ proEventType(Facing)
plKey fFacer; // what was facing
plKey fFacee; // what was being faced
float dot; // the dot prod of their view vectors
hsBool enabled; // Now meets facing requirement (true) or no longer meets requirement (false)
bool enabled; // Now meets facing requirement (true) or no longer meets requirement (false)
protected:
virtual void IRead(hsStream* stream, hsResMgr* mgr);
@ -220,7 +220,7 @@ protected:
proEventType(Contained)
plKey fContained; // who's inside of
plKey fContainer; // this containing volume
hsBool fEntering; // entering volume (true) or exiting (false)
bool fEntering; // entering volume (true) or exiting (false)
protected:
virtual void IRead(hsStream* stream, hsResMgr* mgr);
@ -231,8 +231,8 @@ protected:
};
proEventType(Activate)
hsBool fActive; // Whether or not to use the data in this field
hsBool fActivate; // the data
bool fActive; // Whether or not to use the data in this field
bool fActivate; // the data
protected:
virtual void IRead(hsStream* stream, hsResMgr* mgr);
@ -372,16 +372,16 @@ public:
// event records for the notify message
void AddEvent( proEventData* ed);
void AddCollisionEvent( hsBool enter, const plKey &other, const plKey &self, hsBool onlyOneCollision=true );
void AddPickEvent( const plKey &other, const plKey& self, hsBool enabled, hsPoint3 hitPoint );
void AddControlKeyEvent( int32_t key, hsBool down );
void AddCollisionEvent( bool enter, const plKey &other, const plKey &self, bool onlyOneCollision=true );
void AddPickEvent( const plKey &other, const plKey& self, bool enabled, hsPoint3 hitPoint );
void AddControlKeyEvent( int32_t key, bool down );
void AddVariableEvent( const char* name, float number );
void AddVariableEvent( const char* name, int number );
void AddVariableEvent( const char* name );
void AddVariableEvent( const char *name, const plKey &key );
void AddFacingEvent( const plKey &other, const plKey &self, float dot, hsBool enabled);
void AddContainerEvent( const plKey &container, const plKey &contained, hsBool entering);
void AddActivateEvent( hsBool activate );
void AddFacingEvent( const plKey &other, const plKey &self, float dot, bool enabled);
void AddContainerEvent( const plKey &container, const plKey &contained, bool entering);
void AddActivateEvent( bool activate );
void AddCallbackEvent( int32_t event );
void AddResponderStateEvent( int32_t state );
void AddMultiStageEvent( int32_t stage, int32_t event, const plKey& avatar );

4
Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h
View File

@ -83,14 +83,14 @@ class plPipeGeoMakeMsg : public plPipeResMakeMsg
{
public:
plPipeGeoMakeMsg() : plPipeResMakeMsg(), fDefault(false) { }
plPipeGeoMakeMsg(plPipeline* pipe, hsBool def) : plPipeResMakeMsg(pipe), fDefault(def) { }
plPipeGeoMakeMsg(plPipeline* pipe, bool def) : plPipeResMakeMsg(pipe), fDefault(def) { }
~plPipeGeoMakeMsg() {}
CLASSNAME_REGISTER( plPipeGeoMakeMsg );
GETINTERFACE_ANY( plPipeGeoMakeMsg, plPipeResMakeMsg );
hsBool fDefault;
bool fDefault;
};
class plPipeTexMakeMsg : public plPipeResMakeMsg

6
Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h
View File

@ -64,10 +64,10 @@ public:
plKey fPlayer;
hsBool fLocallyOriginated;
hsBool fUnload;
bool fLocallyOriginated;
bool fUnload;
int fClientID;
hsBool fLastOut;
bool fLastOut;
// IO
void Read(hsStream* stream, hsResMgr* mgr)

2
Sources/Plasma/NucleusLib/pnMessage/plSingleModMsg.h
View File

@ -70,7 +70,7 @@ public:
hsBitVector fCmd;
hsBool Cmd(int n) { return fCmd.IsBitSet(n); }
bool Cmd(int n) { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd() { fCmd.Clear(); }

6
Sources/Plasma/NucleusLib/pnMessage/plSoundMsg.h
View File

@ -91,18 +91,18 @@ public:
hsBitVector fCmd;
hsBool Cmd(int n) const { return fCmd.IsBitSet(n); }
bool Cmd(int n) const { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd();
double fBegin;
double fEnd;
hsBool fLoop;
bool fLoop;
float fSpeed;
double fTime;
int fIndex;
int fRepeats;
hsBool fPlaying;
bool fPlaying;
uint32_t fNameStr;
float fVolume; // Range: 0 - silence, 1.f - loudest