OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Some compilers think "not" is a reserved word.

Browse Source
This commit is contained in:
Darryl Pogue
2011-08-06 14:36:43 -07:00
parent ee23f01736
commit ab68dc3af9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/Plasma/PubUtilLib/plScene/plVisMgr.cpp
View File

@ -60,13 +60,13 @@ void plVisMgr::Write(hsStream* s, hsResMgr* mgr)
hsKeyedObject::Write(s, mgr); hsKeyedObject::Write(s, mgr);
} }
void plVisMgr::Register(plVisRegion* reg, hsBool not) void plVisMgr::Register(plVisRegion* reg, hsBool bnot)
{ {
// This should happen pretty infrequently, or // This should happen pretty infrequently, or
// I wouldn't be doing it so cloth-headed-ly. // I wouldn't be doing it so cloth-headed-ly.
hsTArray<plVisRegion*>& regions = not ? fNotRegions : fRegions; hsTArray<plVisRegion*>& regions = bnot ? fNotRegions : fRegions;
hsBitVector& indices = not ? fIdxNot : fIdxSet; hsBitVector& indices = bnot ? fIdxNot : fIdxSet;
int& maxIdx = not ? fMaxNot : fMaxSet; int& maxIdx = bnot ? fMaxNot : fMaxSet;
int i; int i;
for( i = kNumReserved; ; i++ ) for( i = kNumReserved; ; i++ )
{ {
@ -84,14 +84,14 @@ void plVisMgr::Register(plVisRegion* reg, hsBool not)
hsAssert(false, "Infinite bitvector has all bits set?"); hsAssert(false, "Infinite bitvector has all bits set?");
} }
void plVisMgr::UnRegister(plVisRegion* reg, hsBool not) void plVisMgr::UnRegister(plVisRegion* reg, hsBool bnot)
{ {
// Mark our index for recycling // Mark our index for recycling
hsBitVector& indices= not ? fIdxNot : fIdxSet; hsBitVector& indices= bnot ? fIdxNot : fIdxSet;
indices.ClearBit(reg->GetIndex()); indices.ClearBit(reg->GetIndex());
// Nuke the region from our list. // Nuke the region from our list.
hsTArray<plVisRegion*>& regions = not ? fNotRegions : fRegions; hsTArray<plVisRegion*>& regions = bnot ? fNotRegions : fRegions;
int idx = regions.Find(reg); int idx = regions.Find(reg);
if( regions.kMissingIndex != idx ) if( regions.kMissingIndex != idx )
regions.Remove(idx); regions.Remove(idx);
@ -204,4 +204,4 @@ void plGlobalVisMgr::DeInit()
fInstance->UnRegisterAs(kGlobalVisMgr_KEY); fInstance->UnRegisterAs(kGlobalVisMgr_KEY);
fInstance = nil; fInstance = nil;
} }
} }

4
Sources/Plasma/PubUtilLib/plScene/plVisMgr.h
View File

@ -82,8 +82,8 @@ public:
virtual void Read(hsStream* stream, hsResMgr* mgr); virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr); virtual void Write(hsStream* stream, hsResMgr* mgr);
void Register(plVisRegion* reg, hsBool not); void Register(plVisRegion* reg, hsBool bnot);
void UnRegister(plVisRegion* reg, hsBool not); void UnRegister(plVisRegion* reg, hsBool bnot);
void Eval(const hsPoint3& pos); void Eval(const hsPoint3& pos);