Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fast-case short-circuit to -[ShipEntity hasEquipmentItem:includeWeapons:]. Also experimenting with adaptively using fast enumeration when available. If this commit breaks a build, ensure you're building with -std=g99. If it still doesn't work, tell me.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4224 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2011-02-04 13:53:02 +00:00
parent b6b00ab89a
commit e3548464a8
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Core/Entities/ShipEntity.m
View File

@ -2199,19 +2199,33 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
}
#if OOLITE_LEOPARD
#define foreach(VAR,ARR) for(VAR in ARR)
#define foreachkey(VAR,DICT) for(VAR in DICT)
#else
#define foreach(VAR,OBJ) for (NSEnumerator *ooForEachEnum = [(OBJ) objectEnumerator]; ((VAR) = [ooForEachEnum nextObject]); )
#define foreachkey(VAR,DICT) for (NSEnumerator *ooForEachEnum = [(DICT) keyEnumerator]; ((VAR) = [ooForEachEnum nextObject]); )
#endif
- (BOOL) hasEquipmentItem:(id)equipmentKeys includeWeapons:(BOOL)includeWeapons
{
// this function is also used internally to find out if an equipped item is undamaged.
NSEnumerator *keyEnum = nil;
id key = nil;
// Make sure it's an array or set, using a single-object set if it's a string.
if ([equipmentKeys isKindOfClass:[NSString class]]) equipmentKeys = [NSArray arrayWithObject:equipmentKeys];
else if (![equipmentKeys isKindOfClass:[NSArray class]] && ![equipmentKeys isKindOfClass:[NSSet class]]) return NO;
for (keyEnum = [equipmentKeys objectEnumerator]; (key = [keyEnum nextObject]); )
if ([equipmentKeys isKindOfClass:[NSString class]])
{
if ([self hasOneEquipmentItem:key includeWeapons:includeWeapons]) return YES;
return [self hasOneEquipmentItem:key includeWeapons:includeWeapons];
}
else
{
NSParameterAssert([equipmentKeys isKindOfClass:[NSArray class]] || [equipmentKeys isKindOfClass:[NSSet class]]);
foreach (key, equipmentKeys)
{
if ([self hasOneEquipmentItem:key includeWeapons:includeWeapons]) return YES;
}
}
return NO;