aboutsummaryrefslogtreecommitdiffstats
path: root/src/ui.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-10-23 08:41:08 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-10-23 08:41:08 -0400
commitf3693157df0217d9dde1638a46a69b37e997c8fb (patch)
treeecbaa00de6a5b9038664b8d9c09c24ec5d5585cb /src/ui.cpp
parent19ba40a368b06c38365fe861b6de9403044096a7 (diff)
fixed everything
Diffstat (limited to 'src/ui.cpp')
-rw-r--r--src/ui.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ui.cpp b/src/ui.cpp
index f36edeb..9d7de8a 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -6,7 +6,7 @@ extern Player *player; // 'player' should be (must be) defined in main.cpp
extern World *currentWorld; // should/must also be defined in main.cpp
extern std::vector<int (*)(NPC *)> AIpreload; // see entities.cpp
-extern std::vector<void *> AIpreaddr; //
+extern std::vector<NPC *> AIpreaddr; //
extern bool gameRunning;
@@ -261,12 +261,12 @@ namespace ui {
}
unsigned int i;
- if(!dialogBoxExists&&AIpreaddr.size()){ // Flush preloaded AI functions if necessary
- for(i=0;i<AIpreaddr.size();i++){
- NPCp(AIpreaddr.front())->addAIFunc(AIpreload.front(),false);
- AIpreaddr.erase(AIpreaddr.begin());
- AIpreload.erase(AIpreload.begin());
- }
- }
+ //if(!dialogBoxExists&&AIpreaddr.size()){ // Flush preloaded AI functions if necessary
+ //for(i=0;i<AIpreaddr.size();i++){
+ //AIpreaddr.front()->addAIFunc(AIpreload.front(),false);
+ //AIpreaddr.erase(AIpreaddr.begin());
+ //AIpreload.erase(AIpreload.begin());
+ //}
+ //}
}
}