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

2
Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp
View File

@ -93,7 +93,7 @@ void plAnimEventModifier::Write(hsStream* stream, hsResMgr* mgr)
mgr->WriteCreatable(stream, fCallback);
}
hsBool plAnimEventModifier::MsgReceive(plMessage* msg)
bool plAnimEventModifier::MsgReceive(plMessage* msg)
{
// Assuming we only have one ref, the anim time convert. When it loads, we
// send our callback setup message.

6
Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h
View File

@ -54,10 +54,10 @@ protected:
hsTArray<plKey> fReceivers;// Keys to notify when the anim event happens
plMessage* fCallback; // The callback setup message we send when the anim loads
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return false; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return false; }
void ISendNotify(bool triggered);
hsBool fDisabled;
bool fDisabled;
public:
plAnimEventModifier();
virtual ~plAnimEventModifier();
@ -68,7 +68,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
// Export only
void SetReceivers(hsTArray<plKey>& receivers) { fReceivers = receivers; }

8
Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp
View File

@ -80,7 +80,7 @@ class plAxisInputInterface : public plInputInterface
plAxisInputInterface( plAxisAnimModifier *owner ) { fOwner = owner; SetEnabled( true ); }
virtual uint32_t GetPriorityLevel( void ) const { return kSceneInteractionPriority + 10; }
virtual hsBool InterpretInputEvent( plInputEventMsg *pMsg )
virtual bool InterpretInputEvent( plInputEventMsg *pMsg )
{
plMouseEventMsg* pMMsg = plMouseEventMsg::ConvertNoRef( pMsg );
if (pMMsg )
@ -100,7 +100,7 @@ class plAxisInputInterface : public plInputInterface
}
virtual uint32_t GetCurrentCursorID( void ) const { return kCursorGrab; }
virtual hsBool HasInterestingCursorID( void ) const { return true; }
virtual bool HasInterestingCursorID( void ) const { return true; }
};
plAxisAnimModifier::plAxisAnimModifier() :
@ -122,7 +122,7 @@ plAxisAnimModifier::~plAxisAnimModifier()
}
hsBool plAxisAnimModifier::IEval(double secs, float del, uint32_t dirty)
bool plAxisAnimModifier::IEval(double secs, float del, uint32_t dirty)
{
if (!fActive)
return true;
@ -138,7 +138,7 @@ void plAxisAnimModifier::SetTarget(plSceneObject* so)
plgDispatch::Dispatch()->RegisterForExactType(plEvalMsg::Index(), GetKey());
}
hsBool plAxisAnimModifier::MsgReceive(plMessage* msg)
bool plAxisAnimModifier::MsgReceive(plMessage* msg)
{
plEventCallbackMsg* pCall = plEventCallbackMsg::ConvertNoRef(msg);
if (pCall)

10
Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h
View File

@ -70,8 +70,8 @@ protected:
float fXPos;
float fYPos;
hsBool fActive;
hsBool fAllOrNothing;
bool fActive;
bool fAllOrNothing;
int fIface;
plNotifyMsg* fNotify;
@ -79,7 +79,7 @@ protected:
plAxisInputInterface *fInputIface;
virtual hsBool IEval(double secs, float del, uint32_t dirty);
virtual bool IEval(double secs, float del, uint32_t dirty);
public:
plAxisAnimModifier();
@ -88,10 +88,10 @@ public:
CLASSNAME_REGISTER( plAxisAnimModifier );
GETINTERFACE_ANY( plAxisAnimModifier, plSingleModifier );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void SetTarget(plSceneObject* so);
void SetAllOrNothing(hsBool b) { fAllOrNothing = b; }
void SetAllOrNothing(bool b) { fAllOrNothing = b; }
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);

2
Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h
View File

@ -50,7 +50,7 @@ protected:
char* fTemplateName;
bool fExportTime;
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return true; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return true; }
public:
plCloneSpawnModifier();

2
Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp
View File

@ -61,7 +61,7 @@ plDecalEnableMod::~plDecalEnableMod()
{
}
hsBool plDecalEnableMod::MsgReceive(plMessage* msg)
bool plDecalEnableMod::MsgReceive(plMessage* msg)
{
plCollideMsg* coll = plCollideMsg::ConvertNoRef(msg);
if( coll )

4
Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h
View File

@ -55,7 +55,7 @@ protected:
float fWetLength;
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return false; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return false; }
public:
plDecalEnableMod();
@ -64,7 +64,7 @@ public:
CLASSNAME_REGISTER( plDecalEnableMod );
GETINTERFACE_ANY( plDecalEnableMod, plSingleModifier );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);

2
Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp
View File

@ -136,7 +136,7 @@ void plExcludeRegionModifier::ISetPhysicalState(bool cleared)
}
}
hsBool plExcludeRegionModifier::MsgReceive(plMessage* msg)
bool plExcludeRegionModifier::MsgReceive(plMessage* msg)
{
plExcludeRegionMsg *exclMsg = plExcludeRegionMsg::ConvertNoRef(msg);
if (exclMsg)

6
Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h
View File

@ -62,9 +62,9 @@ protected:
std::vector<plKey> fSafePoints; // Safe positions to move avatars to
hsTArray<plKey> fContainedAvatars; // Avatars inside our volume
plExcludeRegionSDLModifier *fSDLModifier;
hsBool fSeek; // use smart seek or teleport?
bool fSeek; // use smart seek or teleport?
float fSeekTime; // how long to seek for
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return true; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return true; }
void ISetPhysicalState(bool cleared);
@ -84,7 +84,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void AddTarget(plSceneObject* so);
virtual void RemoveTarget( plSceneObject *so );

2
Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp
View File

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnMessage/plNotifyMsg.h"
#include "pnSceneObject/plSceneObject.h"
hsBool plGameMarkerModifier::MsgReceive(plMessage* msg)
bool plGameMarkerModifier::MsgReceive(plMessage* msg)
{
plCollideMsg *collideMsg = plCollideMsg::ConvertNoRef(msg);
if (collideMsg)

4
Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h
View File

@ -54,7 +54,7 @@ protected:
uint16_t fPlaceSndIdx;
uint16_t fHitSndIdx;
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return true; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return true; }
plKey IFindCloneKey(plKey baseKey);
@ -80,7 +80,7 @@ public:
void FixupAnimKeys();
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);

2
Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp
View File

@ -59,7 +59,7 @@ plImageLibMod::~plImageLibMod()
{
}
hsBool plImageLibMod::MsgReceive(plMessage* msg)
bool plImageLibMod::MsgReceive(plMessage* msg)
{
plGenRefMsg *refMsg = plGenRefMsg::ConvertNoRef( msg );
if( refMsg != nil )

4
Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h
View File

@ -54,7 +54,7 @@ protected:
hsTArray<plBitmap *> fImages;
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return false; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return false; }
public:
plImageLibMod();
@ -63,7 +63,7 @@ public:
CLASSNAME_REGISTER( plImageLibMod );
GETINTERFACE_ANY( plImageLibMod, plSingleModifier );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);

2
Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h
View File

@ -52,7 +52,7 @@ class plInterfaceInfoModifier : public plSingleModifier
protected:
hsTArray<plKey> fKeyList;
virtual hsBool IEval(double secs, float del, uint32_t dirty){ return true; }
virtual bool IEval(double secs, float del, uint32_t dirty){ return true; }
public:
plInterfaceInfoModifier();

14
Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp
View File

@ -75,7 +75,7 @@ plLogicModifier::~plLogicModifier()
// to be satisfied. Used by the activator condition
// to check that any special conditions (like players
// in boxes) are okay or not.
hsBool plLogicModifier::VerifyConditions(plMessage* msg)
bool plLogicModifier::VerifyConditions(plMessage* msg)
{
for (int i = 0; i < fConditionList.Count(); i++)
{
@ -85,9 +85,9 @@ hsBool plLogicModifier::VerifyConditions(plMessage* msg)
return true;
}
hsBool plLogicModifier::MsgReceive(plMessage* msg)
bool plLogicModifier::MsgReceive(plMessage* msg)
{
hsBool retVal = false;
bool retVal = false;
// read messages:
plCondRefMsg* pCondMsg = plCondRefMsg::ConvertNoRef(msg);
@ -110,7 +110,7 @@ hsBool plLogicModifier::MsgReceive(plMessage* msg)
plTimerCallbackMsg* pTMsg = plTimerCallbackMsg::ConvertNoRef(msg);
if (pTMsg)
{
hsBool netRequest = msg->HasBCastFlag(plMessage::kNetNonLocal);
bool netRequest = msg->HasBCastFlag(plMessage::kNetNonLocal);
Trigger(netRequest);
}
@ -125,7 +125,7 @@ hsBool plLogicModifier::MsgReceive(plMessage* msg)
}
// else
{
hsBool ignore=false;
bool ignore=false;
// Ignore collision activations by remote players
if (pActivateMsg->fTriggerType==plActivatorMsg::kCollideEnter ||
@ -203,7 +203,7 @@ hsBool plLogicModifier::MsgReceive(plMessage* msg)
return (plLogicModBase::MsgReceive(msg));
}
void plLogicModifier::RequestTrigger(hsBool netRequest)
void plLogicModifier::RequestTrigger(bool netRequest)
{
for (int i = 0; i < fConditionList.Count(); i++)
{
@ -214,7 +214,7 @@ void plLogicModifier::RequestTrigger(hsBool netRequest)
plLogicModBase::RequestTrigger(netRequest);
}
void plLogicModifier::PreTrigger(hsBool netRequest)
void plLogicModifier::PreTrigger(bool netRequest)
{
if (!IEvalCounter())
return;

8
Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h
View File

@ -51,7 +51,7 @@ protected:
hsTArray<plConditionalObject*> fConditionList;
virtual void PreTrigger(hsBool netRequest);
virtual void PreTrigger(bool netRequest);
public:
plLogicModifier();
~plLogicModifier();
@ -62,10 +62,10 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void RequestTrigger(hsBool netRequest=false);
virtual hsBool VerifyConditions(plMessage* msg);
virtual void RequestTrigger(bool netRequest=false);
virtual bool VerifyConditions(plMessage* msg);
void AddCondition(plConditionalObject* c);
virtual void Reset(bool bCounterReset);

4
Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h
View File

@ -57,7 +57,7 @@ public:
kCalibrated,
};
protected:
virtual hsBool IEval(double secs, float del, uint32_t dirty) {return true;}
virtual bool IEval(double secs, float del, uint32_t dirty) {return true;}
int fCalibrated;
public:
@ -68,7 +68,7 @@ public:
virtual void AddTarget(plSceneObject* so);
virtual void RemoveTarget(plSceneObject* so);
void SetCalibrated(hsBool b) {fCalibrated = b;}
void SetCalibrated(bool b) {fCalibrated = b;}
int GetCalibrated() { return fCalibrated; }
virtual void Read(hsStream *stream, hsResMgr *mgr);

10
Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp
View File

@ -91,13 +91,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
void plResponderEnableMsg::Read(hsStream* stream, hsResMgr* mgr)
{
plMessage::IMsgRead(stream, mgr);
fEnable = stream->Readbool();
fEnable = stream->ReadBool();
}
void plResponderEnableMsg::Write(hsStream* stream, hsResMgr* mgr)
{
plMessage::IMsgWrite(stream, mgr);
stream->Writebool(fEnable);
stream->WriteBool(fEnable);
}
/////////////////////////////////////////////////////
@ -127,7 +127,7 @@ plResponderModifier::~plResponderModifier()
}
}
hsBool plResponderModifier::MsgReceive(plMessage* msg)
bool plResponderModifier::MsgReceive(plMessage* msg)
{
plNotifyMsg* pNMsg = plNotifyMsg::ConvertNoRef(msg);
if (pNMsg)
@ -672,7 +672,7 @@ void plResponderModifier::Read(hsStream* stream, hsResMgr* mgr)
}
ISetResponderState(stream->ReadByte());
fEnabled = stream->Readbool();
fEnabled = stream->ReadBool();
fFlags = stream->ReadByte();
// attach responderSDLMod
@ -713,7 +713,7 @@ void plResponderModifier::Write(hsStream* stream, hsResMgr* mgr)
}
stream->WriteByte(fCurState);
stream->Writebool(fEnabled);
stream->WriteBool(fEnabled);
stream->WriteByte(fFlags);
}

6
Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h
View File

@ -83,7 +83,7 @@ protected:
bool fEnabled;
plKey fPlayerKey; // The player who triggered this last
plKey fTriggerer; // Whoever triggered us (for sending notify callbacks)
hsBool fEnter; // Is our current trigger a volume enter?
bool fEnter; // Is our current trigger a volume enter?
bool fGotFirstLoad; // Have we gotten our first SDL load?
plResponderSDLModifier* fResponderSDLMod; // handles saving and restoring state
@ -103,7 +103,7 @@ protected:
int8_t ICmdFromWait(int8_t waitIdx);
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return true; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return true; }
static bool fDebugAnimBox; // Draws a box on screen when an animation is started
static void IDebugAnimBox(bool start);
@ -133,7 +133,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
const plResponderSDLModifier* GetSDLModifier() const { return fResponderSDLMod; }

2
Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp
View File

@ -107,7 +107,7 @@ void plSDLModifier::ISendNetMsg(plStateDataRecord*& state, plKey senderKey, uint
//
// Process SDL msgs to send and recv state
//
hsBool plSDLModifier::MsgReceive(plMessage* msg)
bool plSDLModifier::MsgReceive(plMessage* msg)
{
plSDLModifierMsg* sdlMsg = plSDLModifierMsg::ConvertNoRef(msg);
if (sdlMsg && !stricmp(sdlMsg->GetSDLName(),GetSDLName()))

4
Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h
View File

@ -60,7 +60,7 @@ protected:
virtual void IPutCurrentStateIn(plStateDataRecord* dstState) = 0;
virtual void ISetCurrentStateFrom(const plStateDataRecord* srcState) = 0;
virtual void ISentState(const plStateDataRecord* sentState) {}
hsBool IEval(double secs, float del, uint32_t dirty) {return false;}
bool IEval(double secs, float del, uint32_t dirty) {return false;}
virtual uint32_t IApplyModFlags(uint32_t sendFlags);
@ -71,7 +71,7 @@ public:
plSDLModifier();
virtual ~plSDLModifier();
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void SendState(uint32_t sendFlags); // send a state update
void ReceiveState(const plStateDataRecord* srcState); // recv a state update
virtual const char* GetSDLName() const = 0; // return the string name of the type of state descriptor you handle

14
Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp
View File

@ -114,12 +114,12 @@ void plSimpleModifier::IEnd()
}
}
hsBool plSimpleModifier::IEval(double secs, float del, uint32_t dirty)
bool plSimpleModifier::IEval(double secs, float del, uint32_t dirty)
{
return IHandleTime(secs, del);
}
hsBool plSimpleModifier::MsgReceive(plMessage* msg)
bool plSimpleModifier::MsgReceive(plMessage* msg)
{
plRefMsg* refMsg = plRefMsg::ConvertNoRef(msg);
if( refMsg )
@ -134,7 +134,7 @@ hsBool plSimpleModifier::MsgReceive(plMessage* msg)
return plModifier::MsgReceive(msg);
}
hsBool plSimpleModifier::IHandleRef(plRefMsg* refMsg)
bool plSimpleModifier::IHandleRef(plRefMsg* refMsg)
{
if( refMsg->GetContext() & (plRefMsg::kOnCreate|plRefMsg::kOnRequest|plRefMsg::kOnReplace) )
AddTarget(plSceneObject::ConvertNoRef(refMsg->GetRef()));
@ -144,13 +144,13 @@ hsBool plSimpleModifier::IHandleRef(plRefMsg* refMsg)
return true;
}
hsBool plSimpleModifier::IHandleCmd(plAnimCmdMsg* modMsg)
bool plSimpleModifier::IHandleCmd(plAnimCmdMsg* modMsg)
{
hsBool wasStopped = fTimeConvert.IsStopped();
bool wasStopped = fTimeConvert.IsStopped();
fTimeConvert.HandleCmd(modMsg);
hsBool isStopped = fTimeConvert.IsStopped();
bool isStopped = fTimeConvert.IsStopped();
if( wasStopped != isStopped )
{
@ -180,7 +180,7 @@ hsBool plSimpleModifier::IHandleCmd(plAnimCmdMsg* modMsg)
return true;
}
hsBool plSimpleModifier::IHandleTime(double wSecs, float del)
bool plSimpleModifier::IHandleTime(double wSecs, float del)
{
if( !fTarget )

10
Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h
View File

@ -73,17 +73,17 @@ protected:
// The following are in animation time.
float fCurrentTime;
hsBool IHandleTime(double wSecs, float del);
bool IHandleTime(double wSecs, float del);
hsBool IHandleRef(plRefMsg* refMsg);
virtual hsBool IHandleCmd(plAnimCmdMsg* modMsg);
bool IHandleRef(plRefMsg* refMsg);
virtual bool IHandleCmd(plAnimCmdMsg* modMsg);
virtual void IApplyDynamic() = 0;
virtual void IBegin();
virtual void IEnd();
virtual hsBool IEval(double secs, float del, uint32_t dirty);
virtual bool IEval(double secs, float del, uint32_t dirty);
public:
plSimpleModifier();
@ -95,7 +95,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual int GetNumTargets() const { return fTarget ? 1 : 0; }
virtual plSceneObject* GetTarget(int w) const { /* hsAssert(w < GetNumTargets(), "Bad target"); */ return fTarget; }

2
Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp
View File

@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//#include "plMessage/plSpawnRequestMsg.h"
//#include "plMessage/plSpawnModMsg.h"
//hsBool plSpawnModifier::MsgReceive(plMessage* msg)
//bool plSpawnModifier::MsgReceive(plMessage* msg)
//{
// plSpawnRequestMsg* pSpawnMsg = plSpawnRequestMsg::ConvertNoRef(msg);
// if (pSpawnMsg)

4
Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h
View File

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
class plSpawnModifier : public plMultiModifier
{
protected:
virtual hsBool IEval(double secs, float del, uint32_t dirty) {return true;}
virtual bool IEval(double secs, float del, uint32_t dirty) {return true;}
public:
plSpawnModifier(){;}
@ -60,7 +60,7 @@ public:
virtual void AddTarget(plSceneObject* so);
virtual void RemoveTarget(plSceneObject* so);
// hsBool MsgReceive(plMessage* msg);
// bool MsgReceive(plMessage* msg);
//
virtual void Read(hsStream *stream, hsResMgr *mgr);
virtual void Write(hsStream *stream, hsResMgr *mgr);