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

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/FeatureLib/pfConditional/plANDConditionalObject.cpp
View File

@ -58,7 +58,7 @@ plANDConditionalObject::~plANDConditionalObject()
delete (fChildren[i]);
}
hsBool plANDConditionalObject::MsgReceive(plMessage* msg)
bool plANDConditionalObject::MsgReceive(plMessage* msg)
{
plCondRefMsg* pCondMsg = plCondRefMsg::ConvertNoRef(msg);
if (pCondMsg)

2
Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h
View File

@ -62,7 +62,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void Evaluate();
void Reset();

8
Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp
View File

@ -52,7 +52,7 @@ plActivatorConditionalObject::plActivatorConditionalObject()
SetFlag(kLocalElement); // since it relies on user input
}
hsBool plActivatorConditionalObject::MsgReceive(plMessage* msg)
bool plActivatorConditionalObject::MsgReceive(plMessage* msg)
{
plActivatorMsg* pDetectorMsg = plActivatorMsg::ConvertNoRef(msg);
if (pDetectorMsg)
@ -130,7 +130,7 @@ hsBool plActivatorConditionalObject::MsgReceive(plMessage* msg)
fLogicMod->GetNotify()->AddCollisionEvent(true, pDetectorMsg->fHitterObj, pDetectorMsg->fHiteeObj);
}
SetSatisfied(true);
//hsBool netRequest = msg->HasBCastFlag(plMessage::kNetNonLocal);
//bool netRequest = msg->HasBCastFlag(plMessage::kNetNonLocal);
//fLogicMod->RequestTrigger(netRequest);
fLogicMod->RequestTrigger(false);
}
@ -166,7 +166,7 @@ void plActivatorConditionalObject::SetActivatorKey(plKey k)
// plActivatorActivatorConditional
//
hsBool plActivatorActivatorConditionalObject::MsgReceive(plMessage* msg)
bool plActivatorActivatorConditionalObject::MsgReceive(plMessage* msg)
{
plNotifyMsg* pDetectorMsg = plNotifyMsg::ConvertNoRef(msg);
if (pDetectorMsg)
@ -190,7 +190,7 @@ hsBool plActivatorActivatorConditionalObject::MsgReceive(plMessage* msg)
}
hsBool plVolActivatorConditionalObject::MsgReceive(plMessage* msg)
bool plVolActivatorConditionalObject::MsgReceive(plMessage* msg)
{
plActivatorMsg* pDetectorMsg = plActivatorMsg::ConvertNoRef(msg);
if (pDetectorMsg)

6
Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h
View File

@ -62,7 +62,7 @@ public:
CLASSNAME_REGISTER( plActivatorConditionalObject );
GETINTERFACE_ANY( plActivatorConditionalObject, plConditionalObject );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void SetActivatorKey(plKey k);
@ -83,7 +83,7 @@ public:
CLASSNAME_REGISTER( plActivatorActivatorConditionalObject );
GETINTERFACE_ANY( plActivatorActivatorConditionalObject, plActivatorConditionalObject );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
};
@ -98,7 +98,7 @@ public:
CLASSNAME_REGISTER( plVolActivatorConditionalObject );
GETINTERFACE_ANY( plVolActivatorConditionalObject, plActivatorConditionalObject );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
};

2
Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp
View File

@ -54,7 +54,7 @@ fAction(kEventEnd)
{
}
hsBool plAnimationEventConditionalObject::MsgReceive(plMessage* msg)
bool plAnimationEventConditionalObject::MsgReceive(plMessage* msg)
{
plEventCallbackMsg* pMsg = plEventCallbackMsg::ConvertNoRef(msg);
if (pMsg)

2
Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h
View File

@ -66,7 +66,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void Reset() { SetSatisfied(false); }

2
Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp
View File

@ -50,7 +50,7 @@ plControlEventConditionalObject::plControlEventConditionalObject()
}
hsBool plControlEventConditionalObject::MsgReceive(plMessage* msg)
bool plControlEventConditionalObject::MsgReceive(plMessage* msg)
{
plControlEventMsg* pControlMsg = plControlEventMsg::ConvertNoRef(msg);
if( pControlMsg )

2
Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h
View File

@ -64,7 +64,7 @@ public:
virtual void Write(hsStream* stream, hsResMgr* mgr);
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void Reset() { SetSatisfied(false); }

4
Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp
View File

@ -58,7 +58,7 @@ fDirectional(false)
SetSatisfied(true);
}
hsBool plFacingConditionalObject::MsgReceive(plMessage* msg)
bool plFacingConditionalObject::MsgReceive(plMessage* msg)
{
return plConditionalObject::MsgReceive(msg);
}
@ -78,7 +78,7 @@ void plFacingConditionalObject::Read(hsStream* stream, hsResMgr* mgr)
fDirectional = stream->ReadBool();
}
hsBool plFacingConditionalObject::Verify(plMessage* msg)
bool plFacingConditionalObject::Verify(plMessage* msg)
{
plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg);
if (pActivateMsg && pActivateMsg->fHitterObj)

8
Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h
View File

@ -51,7 +51,7 @@ class plFacingConditionalObject : public plConditionalObject
{
protected:
float fTolerance;
hsBool fDirectional;
bool fDirectional;
public:
@ -61,12 +61,12 @@ public:
CLASSNAME_REGISTER( plFacingConditionalObject );
GETINTERFACE_ANY( plFacingConditionalObject, plConditionalObject );
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void SetTolerance(float d) { fTolerance = d; }
void SetDirectional(hsBool d) { fDirectional = d; }
void SetDirectional(bool d) { fDirectional = d; }
virtual hsBool Verify(plMessage* msg);
virtual bool Verify(plMessage* msg);
void Evaluate(){;}
void Reset() { SetSatisfied(true); }

2
Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp
View File

@ -50,7 +50,7 @@ plKeyPressConditionalObject::plKeyPressConditionalObject()
SetFlag(kLocalElement); // since it relies on user input
}
hsBool plKeyPressConditionalObject::MsgReceive(plMessage* msg)
bool plKeyPressConditionalObject::MsgReceive(plMessage* msg)
{
plKeyEventMsg* pKeyMsg = plKeyEventMsg::ConvertNoRef(msg);
if( pKeyMsg )

2
Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h
View File

@ -64,7 +64,7 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void Reset() { SetSatisfied(false); }

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp
View File

@ -50,7 +50,7 @@ plLocalPlayerInBoxConditionalObject::plLocalPlayerInBoxConditionalObject()
SetFlag(kLocalElement); // since it relies on the local player
}
hsBool plLocalPlayerInBoxConditionalObject::MsgReceive(plMessage* msg)
bool plLocalPlayerInBoxConditionalObject::MsgReceive(plMessage* msg)
{
/*

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h
View File

@ -61,7 +61,7 @@ public:
CLASSNAME_REGISTER( plLocalPlayerInBoxConditionalObject );
GETINTERFACE_ANY( plLocalPlayerInBoxConditionalObject, plConditionalObject );
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void SetBox(plKey pKey) { fBox = pKey; }

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp
View File

@ -49,7 +49,7 @@ plLocalPlayerIntersectPlaneConditionalObject::plLocalPlayerIntersectPlaneConditi
SetFlag(kLocalElement); // since it relies on the local player
}
hsBool plLocalPlayerIntersectPlaneConditionalObject::MsgReceive(plMessage* msg)
bool plLocalPlayerIntersectPlaneConditionalObject::MsgReceive(plMessage* msg)
{
/*

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h
View File

@ -61,7 +61,7 @@ public:
CLASSNAME_REGISTER( plLocalPlayerIntersectPlaneConditionalObject );
GETINTERFACE_ANY( plLocalPlayerIntersectPlaneConditionalObject, plConditionalObject );
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void SetTarget(plKey pKey) { fTarget = pKey; }
void SetPlane(plKey pKey) { fPlane = pKey; }

4
Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp
View File

@ -58,7 +58,7 @@ plORConditionalObject::~plORConditionalObject()
fChildren.SetCountAndZero(0);
}
hsBool plORConditionalObject::MsgReceive(plMessage* msg)
bool plORConditionalObject::MsgReceive(plMessage* msg)
{
plCondRefMsg* pCondMsg = plCondRefMsg::ConvertNoRef(msg);
if (pCondMsg)
@ -81,7 +81,7 @@ void plORConditionalObject::SetLogicMod(plLogicModBase* pMod)
}
}
hsBool plORConditionalObject::Satisfied()
bool plORConditionalObject::Satisfied()
{
for (int i = 0; i < fChildren.Count(); i++)
{

4
Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h
View File

@ -62,9 +62,9 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
virtual hsBool Satisfied();
virtual bool Satisfied();
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void Reset();

10
Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp
View File

@ -58,7 +58,7 @@ fCurrentTrigger(nil)
SetSatisfied(true);
}
hsBool plObjectInBoxConditionalObject::MsgReceive(plMessage* msg)
bool plObjectInBoxConditionalObject::MsgReceive(plMessage* msg)
{
plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg);
if (pActivateMsg)
@ -92,7 +92,7 @@ hsBool plObjectInBoxConditionalObject::MsgReceive(plMessage* msg)
return plConditionalObject::MsgReceive(msg);
}
hsBool plObjectInBoxConditionalObject::Verify(plMessage* msg)
bool plObjectInBoxConditionalObject::Verify(plMessage* msg)
{
plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg);
if (pActivateMsg)
@ -135,7 +135,7 @@ fIgnoreExtraEnters(true)
}
hsBool plVolumeSensorConditionalObject::MsgReceive(plMessage* msg)
bool plVolumeSensorConditionalObject::MsgReceive(plMessage* msg)
{
plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg);
if (pActivateMsg)
@ -256,7 +256,7 @@ hsBool plVolumeSensorConditionalObject::MsgReceive(plMessage* msg)
return plConditionalObject::MsgReceive(msg);
}
hsBool plVolumeSensorConditionalObject::Satisfied()
bool plVolumeSensorConditionalObject::Satisfied()
{
if (fType == kTypeExit && fFirst && !fTriggered)
{
@ -295,7 +295,7 @@ void plVolumeSensorConditionalObject::Write(hsStream* stream, hsResMgr* mgr)
}
#include "pnMessage/plPlayerPageMsg.h"
#include "plgDispatch.h"
hsBool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
bool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
{
plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg);
if (pActivateMsg)

22
Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h
View File

@ -63,12 +63,12 @@ public:
CLASSNAME_REGISTER( plObjectInBoxConditionalObject );
GETINTERFACE_ANY( plObjectInBoxConditionalObject, plConditionalObject );
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void Reset() { SetSatisfied(false); }
virtual hsBool Satisfied() { return true; }
virtual hsBool Verify(plMessage* msg);
virtual bool Satisfied() { return true; }
virtual bool Verify(plMessage* msg);
};
@ -80,9 +80,9 @@ protected:
hsTArray<plKey> fInside;
int fTrigNum;
int fType;
hsBool fFirst;
hsBool fTriggered;
hsBool fIgnoreExtraEnters;
bool fFirst;
bool fTriggered;
bool fIgnoreExtraEnters;
public:
static bool makeBriceHappyVar;
@ -99,17 +99,17 @@ public:
CLASSNAME_REGISTER( plVolumeSensorConditionalObject );
GETINTERFACE_ANY( plVolumeSensorConditionalObject, plConditionalObject );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void Reset() { SetSatisfied(false); }
virtual hsBool Satisfied();
virtual bool Satisfied();
void SetType(int i) { fType = i; }
void SetTrigNum(int i) { fTrigNum = i; }
void SetFirst(hsBool b) { fFirst = b; }
void SetFirst(bool b) { fFirst = b; }
void IgnoreExtraEnters(hsBool ignore = true) {fIgnoreExtraEnters = ignore;}
void IgnoreExtraEnters(bool ignore = true) {fIgnoreExtraEnters = ignore;}
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
@ -122,7 +122,7 @@ public:
~plVolumeSensorConditionalObjectNoArbitration (){;}
CLASSNAME_REGISTER( plVolumeSensorConditionalObjectNoArbitration );
GETINTERFACE_ANY( plVolumeSensorConditionalObjectNoArbitration, plConditionalObject );
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void Read(hsStream* stream, hsResMgr* mgr);
protected:
plKey fHittee;

2
Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp
View File

@ -49,7 +49,7 @@ plObjectIntersectPlaneConditionalObject::plObjectIntersectPlaneConditionalObject
}
hsBool plObjectIntersectPlaneConditionalObject::MsgReceive(plMessage* msg)
bool plObjectIntersectPlaneConditionalObject::MsgReceive(plMessage* msg)
{
/*

2
Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h
View File

@ -61,7 +61,7 @@ public:
CLASSNAME_REGISTER( plObjectIntersectPlaneConditionalObject );
GETINTERFACE_ANY( plObjectIntersectPlaneConditionalObject, plConditionalObject );
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void SetTarget(plKey pKey) { fTarget = pKey; }
void SetPlane(plKey pKey) { fPlane = pKey; }

2
Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp
View File

@ -51,7 +51,7 @@ plPickedConditionalObject::plPickedConditionalObject()
SetFlag(kLocalElement); // since it relies on user input
}
hsBool plPickedConditionalObject::MsgReceive(plMessage* msg)
bool plPickedConditionalObject::MsgReceive(plMessage* msg)
{
plActivatorMsg* pDetectorMsg = plActivatorMsg::ConvertNoRef(msg);
if (pDetectorMsg && pDetectorMsg->TriggerType() == plActivatorMsg::kPickedTrigger )

2
Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h
View File

@ -60,7 +60,7 @@ public:
CLASSNAME_REGISTER( plPickedConditionalObject );
GETINTERFACE_ANY( plPickedConditionalObject, plConditionalObject );
hsBool MsgReceive(plMessage* msg);
bool MsgReceive(plMessage* msg);
void Evaluate(){;}
void Reset() { SetSatisfied(false); }