[Gcblue-commits] gcb_wx/include/scriptinterface tcGroupInterface.h,1.1,1.2 tcSimPythonInterface.h,1.18,1.19

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

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

Modified Files:
	tcGroupInterface.h tcSimPythonInterface.h 
Log Message:
Fixed group commands

Index: tcGroupInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcGroupInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcGroupInterface.h	16 Aug 2004 01:43:30 -0000	1.1
--- tcGroupInterface.h	10 Jan 2005 00:30:20 -0000	1.2
***************
*** 49,54 ****
  		/// unit id of unit <idx> in group, -1 for error
  		long GetUnitId(int idx);
  		/// sets id vector for units in group
! 		void SetUnits(std::vector<long>& units);
  
          static void AttachSimState(tcSimState* ss) {simState = ss;}
--- 49,58 ----
  		/// unit id of unit <idx> in group, -1 for error
  		long GetUnitId(int idx);
+         /// vector of unit ids
+         std::vector<long>& GetUnits();
+ 		/// sets id vector for single unit in group
+ 		void SetUnit(long unit);
  		/// sets id vector for units in group
! 		void SetUnits(const std::vector<long>& units);
  
          static void AttachSimState(tcSimState* ss) {simState = ss;}

Index: tcSimPythonInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcSimPythonInterface.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcSimPythonInterface.h	11 Dec 2004 01:09:05 -0000	1.18
--- tcSimPythonInterface.h	10 Jan 2005 00:30:20 -0000	1.19
***************
*** 101,108 ****
          void GetObjectStringByMode(char *str); // gets name of python object to pass to python function
          void LoadScenario(const char *filePath, const char *fileName); ///< loads scenario from Python script file
!         void ProcessCommand(std::string command, long id, int param = -1, std::string textParam = "");
!         void ProcessCallback(std::string command, long id, float afData, int param);
!         void ProcessCallback(std::string command, long id, float afData1, float afData2, int param);
!         void ProcessCallback(std::string command, long id, long anData, int param);
          void ProcessHotKey(unsigned int key, unsigned int flags);
          void ProcessSecondaryHook(long id);
--- 101,112 ----
          void GetObjectStringByMode(char *str); // gets name of python object to pass to python function
          void LoadScenario(const char *filePath, const char *fileName); ///< loads scenario from Python script file
!         void ProcessCommand(std::string command, const std::vector<long>& id, 
!             int param = -1, std::string textParam = "");
!         void ProcessCallback(std::string command, const std::vector<long>& id, 
!             float afData, int param);
!         void ProcessCallback(std::string command, const std::vector<long>& id, 
!             float afData1, float afData2, int param);
!         void ProcessCallback(std::string command, const std::vector<long>& id, 
!             long anData, int param);
          void ProcessHotKey(unsigned int key, unsigned int flags);
          void ProcessSecondaryHook(long id);
***************
*** 115,119 ****
  		void SelectGroupMenu(); ///< change to group menu
          void SetMenuPlatform(long anID);
! 		void SetMenuGroup(std::vector<long>& unitIds);
  
          tcSimPythonInterface();
--- 119,123 ----
  		void SelectGroupMenu(); ///< change to group menu
          void SetMenuPlatform(long anID);
! 		void SetMenuGroup(const std::vector<long>& unitIds);
  
          tcSimPythonInterface();
***************
*** 143,147 ****
          tcPlatformObject *mpHookedObj;
          tcSoundConsole *mpConsole;
!         long menuPlatformID;
          enum teInterfaceMode 
  		{
--- 147,151 ----
          tcPlatformObject *mpHookedObj;
          tcSoundConsole *mpConsole;
! 
          enum teInterfaceMode 
  		{
***************
*** 154,158 ****
          bool isModePushed; ///< true if mode is pushed and available for recall with PopMode
          teInterfaceMode pushedMode;
!         long pushedPlatformID;
  
          tcFlightPort* GetHookedObjFlightPort();
--- 158,162 ----
          bool isModePushed; ///< true if mode is pushed and available for recall with PopMode
          teInterfaceMode pushedMode;
!         std::vector<long> pushedPlatformIds;
  
          tcFlightPort* GetHookedObjFlightPort();