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

Fix inefficiency in AI plist loader - helps with #90

Browse Source
This commit is contained in:
cim 2014-05-18 21:09:18 +01:00
parent 84befd6bfb
commit 8218ab5c1a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/AI.m
View File

@ -28,6 +28,7 @@ MA 02110-1301, USA.
#import "OOWeakReference.h" #import "OOWeakReference.h"
#import "OOCacheManager.h" #import "OOCacheManager.h"
#import "OOCollectionExtractors.h" #import "OOCollectionExtractors.h"
#import "OOPListParsing.h"
#import "ShipEntity.h" #import "ShipEntity.h"
#import "ShipEntityAI.h" #import "ShipEntityAI.h"
@ -306,7 +307,7 @@ extern void GenerateGraphVizForAIStateMachine(NSDictionary *stateMachine, NSStri
- (void) setStateMachine:(NSString *)smName withJSScript:(NSString *)script - (void) setStateMachine:(NSString *)smName withJSScript:(NSString *)script
{ {
NSDictionary *newSM = [self loadStateMachine:smName jsName:script]; NSDictionary *newSM = [self loadStateMachine:smName jsName:script];
if (newSM) if (newSM)
{ {
[self preserveCurrentStateMachine]; [self preserveCurrentStateMachine];
@ -327,7 +328,6 @@ extern void GenerateGraphVizForAIStateMachine(NSDictionary *stateMachine, NSStri
// refresh name // refresh name
[self refreshOwnerDesc]; [self refreshOwnerDesc];
} }
} }
@ -825,7 +825,11 @@ static AIStackElement *sStack = NULL;
@try @try
{ {
// Load state machine and validate against whitelist. // Load state machine and validate against whitelist.
newSM = [ResourceManager dictionaryFromFilesNamed:smName inFolder:@"AIs" mergeMode:MERGE_NONE cache:NO]; NSString *aiPath = [ResourceManager pathForFileNamed:smName inFolder:@"AIs"];
if (aiPath != nil)
{
newSM = OODictionaryFromFile(aiPath);
}
if (newSM == nil) if (newSM == nil)
{ {
[cacheMgr setObject:@"nil" forKey:smName inCache:@"AIs"]; [cacheMgr setObject:@"nil" forKey:smName inCache:@"AIs"];