OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 02:51:27 +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

16
Sources/Plasma/NucleusLib/pnFactory/plCreatable.h
View File

@ -57,8 +57,8 @@ public:
virtual const char* ClassName() const = 0;
virtual plCreatable* GetInterface(uint16_t hClass) { return nil; }
virtual const plCreatable* GetConstInterface(uint16_t hClass) const { return nil; }
static hsBool HasBaseClass(uint16_t hBase) { return false; }
virtual uint16_t ClassIndex() const = 0;
static bool HasBaseClass(uint16_t hBase) { return false; }
virtual uint16_t ClassIndex() const = 0;
virtual void Read(hsStream* s, hsResMgr* mgr) {}
virtual void Write(hsStream* s, hsResMgr* mgr) {}
@ -194,13 +194,13 @@ public: \
hsRefCnt_SafeRef(retVal); \
return retVal; \
} \
static hsBool HasDerivedClass(uint16_t hDer) { \
static bool HasDerivedClass(uint16_t hDer) { \
return plFactory::DerivesFrom(plClassName##ClassIndex, hDer); \
} \
friend class plClassName##__Creator;
#define GETINTERFACE_ANY( plClassName, plBaseName ) \
static hsBool HasBaseClass(uint16_t hBaseClass) { \
static bool HasBaseClass(uint16_t hBaseClass) { \
if( hBaseClass == plClassName##ClassIndex ) \
return true; \
else \
@ -220,7 +220,7 @@ virtual const plCreatable* GetConstInterface(uint16_t hClass) const { \
}
#define GETINTERFACE_EXACT( plClassName ) \
static hsBool HasBaseClass(uint16_t hBaseClass) { \
static bool HasBaseClass(uint16_t hBaseClass) { \
return hBaseClass == plClassName##ClassIndex; \
} \
virtual plCreatable* GetInterface(uint16_t hClass) { \
@ -231,7 +231,7 @@ virtual const plCreatable* GetConstInterface(uint16_t hClass) const { \
}
#define GETINTERFACE_NONE( plClassName ) \
static hsBool HasBaseClass(uint16_t hBaseClass) { return false; } \
static bool HasBaseClass(uint16_t hBaseClass) { return false; } \
virtual plCreatable* GetInterface(uint16_t hClass) { \
return nil; \
} \
@ -243,7 +243,7 @@ virtual const plCreatable* GetConstInterface(uint16_t hClass) const { \
// Macro for converting to base class OR a class member
//
#define GETINTERFACE_ANY_AUX( plClassName, plBaseName, plAuxClassName, plAuxClassMember ) \
static hsBool HasBaseClass(uint16_t hBaseClass) { \
static bool HasBaseClass(uint16_t hBaseClass) { \
if( hBaseClass == plClassName##ClassIndex ) \
return true; \
else \
@ -269,7 +269,7 @@ virtual const plCreatable* GetConstInterface(uint16_t hClass) const { \
}
#define plBeginInterfaceMap( plClassName, plBaseName ) \
static hsBool HasBaseClass(uint16_t hBaseClass) { \
static bool HasBaseClass(uint16_t hBaseClass) { \
if( hBaseClass == plClassName##ClassIndex ) \
return true; \
else \

16
Sources/Plasma/NucleusLib/pnFactory/plCreator.h
View File

@ -58,10 +58,10 @@ public:
plCreator() { }
virtual ~plCreator() { }
virtual plCreatable* Create() const = 0;
virtual uint16_t ClassIndex() = 0;
virtual const char* ClassName() const = 0;
virtual hsBool HasBaseClass(uint16_t hBase) = 0;
virtual plCreatable* Create() const = 0;
virtual uint16_t ClassIndex() = 0;
virtual const char* ClassName() const = 0;
virtual bool HasBaseClass(uint16_t hBase) = 0;
friend class plFactory;
};
@ -81,7 +81,7 @@ public:
plFactory::UnRegister(CLASS_INDEX_SCOPED(plClassName), this); \
} \
\
virtual hsBool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
virtual bool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
\
virtual uint16_t ClassIndex() { return CLASS_INDEX_SCOPED(plClassName); } \
virtual const char* ClassName() const { return #plClassName; } \
@ -107,7 +107,7 @@ public:
plFactory::UnRegister(CLASS_INDEX_SCOPED(plClassName), this); \
} \
\
virtual hsBool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
virtual bool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
\
virtual uint16_t ClassIndex() { return CLASS_INDEX_SCOPED(plClassName); } \
virtual const char* ClassName() const { return #plClassName; } \
@ -140,7 +140,7 @@ public:
plFactory::UnRegister(EXTERN_CLASS_INDEX_SCOPED(plClassName), this); \
} \
\
virtual hsBool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
virtual bool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
\
virtual uint16_t ClassIndex() { return EXTERN_CLASS_INDEX_SCOPED(plClassName); } \
virtual const char* ClassName() const { return #plClassName; } \
@ -172,7 +172,7 @@ public:
plFactory::UnRegister(EXTERN_CLASS_INDEX_SCOPED(plClassName), this); \
} \
\
virtual hsBool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
virtual bool HasBaseClass(uint16_t hBase) { return plClassName::HasBaseClass(hBase); } \
\
virtual uint16_t ClassIndex() { return EXTERN_CLASS_INDEX_SCOPED(plClassName); } \
virtual const char* ClassName() const { return #plClassName; } \

12
Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp
View File

@ -63,7 +63,7 @@ plFactory::~plFactory()
{
}
hsBool plFactory::ICreateTheFactory()
bool plFactory::ICreateTheFactory()
{
if( theFactory )
return true;
@ -178,7 +178,7 @@ uint16_t plFactory::GetNumClasses()
return theFactory->IGetNumClasses();
}
hsBool plFactory::IDerivesFrom(uint16_t hBase, uint16_t hDer)
bool plFactory::IDerivesFrom(uint16_t hBase, uint16_t hDer)
{
if( hDer >= fCreators.GetCount() )
return false;
@ -186,7 +186,7 @@ hsBool plFactory::IDerivesFrom(uint16_t hBase, uint16_t hDer)
return fCreators[hDer] ? fCreators[hDer]->HasBaseClass(hBase) : false;
}
hsBool plFactory::DerivesFrom(uint16_t hBase, uint16_t hDer)
bool plFactory::DerivesFrom(uint16_t hBase, uint16_t hDer)
{
if( !theFactory && !ICreateTheFactory() )
return 0;
@ -214,12 +214,12 @@ uint16_t plFactory::FindClassIndex(const char* className)
}
hsBool plFactory::IIsValidClassIndex(uint16_t hClass)
bool plFactory::IIsValidClassIndex(uint16_t hClass)
{
return ( hClass < fCreators.GetCount() );
}
hsBool plFactory::IsValidClassIndex(uint16_t hClass)
bool plFactory::IsValidClassIndex(uint16_t hClass)
{
return theFactory->IIsValidClassIndex(hClass);
}
@ -316,7 +316,7 @@ void plFactory::IValidate(uint16_t keyIndex)
int FactoryIndex = GetNumClasses();
hsBool bogus = false;
bool bogus = false;
for(int iter=0; iter < FactoryIndex; iter++)
{

12
Sources/Plasma/NucleusLib/pnFactory/plFactory.h
View File

@ -63,13 +63,13 @@ private:
void IForceShutdown();
void IUnRegister(uint16_t hClass);
uint16_t IRegister(uint16_t hClass, plCreator* worker);
hsBool IIsEmpty();
bool IIsEmpty();
uint16_t IGetNumClasses();
plCreatable* ICreate(uint16_t hClass);
hsBool IDerivesFrom(uint16_t hBase, uint16_t hDer);
hsBool IIsValidClassIndex(uint16_t hClass);
bool IDerivesFrom(uint16_t hBase, uint16_t hDer);
bool IIsValidClassIndex(uint16_t hClass);
static hsBool ICreateTheFactory();
static bool ICreateTheFactory();
static void IShutdown();
plFactory();
@ -88,13 +88,13 @@ public:
static bool CanCreate(uint16_t hClass); // return true if creator exists. doesn't assert
static plCreatable* Create(uint16_t hClass);
static hsBool DerivesFrom(uint16_t hBase, uint16_t hDer);
static bool DerivesFrom(uint16_t hBase, uint16_t hDer);
static uint16_t GetNumClasses();
static uint16_t FindClassIndex(const char* className); // slow lookup for things like console
static hsBool IsValidClassIndex(uint16_t hClass);
static bool IsValidClassIndex(uint16_t hClass);
// Don't call this unless you're a DLL being initialized.
static void SetTheFactory(plFactory* fac);