[Gcblue-commits] gcb_wx/include/ai Brain.h,1.4,1.5 ScriptedTaskInterface.h,1.1,1.2 Task.h,1.3,1.4

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/ai
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11465/include/ai

Modified Files:
	Brain.h ScriptedTaskInterface.h Task.h 
Log Message:
More OpenAL++ changes and ai improvements

Index: Brain.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/Brain.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Brain.h	20 Feb 2005 18:20:18 -0000	1.4
--- Brain.h	24 Feb 2005 22:19:13 -0000	1.5
***************
*** 28,31 ****
--- 28,32 ----
  
  #include <map>
+ #include <queue>
  #include <string>
  #include <vector>
***************
*** 41,44 ****
--- 42,46 ----
  class Blackboard;
  class Task;
+ class Nav;
  
  
***************
*** 53,59 ****
      enum
      {
!         TEST_TASK = 0
      };
      void AddTask(const std::string& taskName, double priority_);
      std::vector<std::string> GetTaskList();
      double GetTaskPriority(const std::string& taskName) const;
--- 55,63 ----
      enum
      {
!         TEST_TASK = 0,
!         NAV_TASK = 1
      };
      void AddTask(const std::string& taskName, double priority_);
+     Nav* GetNavTask();
      std::vector<std::string> GetTaskList();
      double GetTaskPriority(const std::string& taskName) const;
***************
*** 77,83 ****
--- 81,91 ----
  	Blackboard board; ///< for inter-task communication
  	std::map<std::string, Task*> taskMap;
+     std::queue<std::string> removeList; ///< list of tasks to remove at next update
  
      static std::map<std::string, int> taskNameLookup;
  
+     void RemovePending();
+     void RemoveTaskNow(const std::string& taskName);
+ 
      static void InitTaskNameLookup();
  };

Index: ScriptedTaskInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/ScriptedTaskInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScriptedTaskInterface.h	16 Feb 2005 23:13:38 -0000	1.1
--- ScriptedTaskInterface.h	24 Feb 2005 22:19:13 -0000	1.2
***************
*** 50,53 ****
--- 50,54 ----
  {
  public:
+     void EndTask(); ///< deletes task
      BlackboardInterface GetBlackboardInterface();
      tcPlatformInterface GetPlatformInterface();

Index: Task.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/ai/Task.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Task.h	16 Feb 2005 23:13:38 -0000	1.3
--- Task.h	24 Feb 2005 22:19:13 -0000	1.4
***************
*** 55,59 ****
--- 55,61 ----
      tcPlatformInterface GetPlatformInterface();
      
+     void EndTask();
      void FinishUpdate(double t);
+     const std::string& GetTaskName() const;
      bool IsReadyForUpdate(double t) const;