[Gcblue-commits] gcb_wx/include/scriptinterface tcPlatformInterface.h,1.29,1.30 tcSimPythonInterface.h,1.17,1.18

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

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

Modified Files:
	tcPlatformInterface.h tcSimPythonInterface.h 
Log Message:
Sonar work, passive sonar, torpedoes

Index: tcPlatformInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPlatformInterface.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** tcPlatformInterface.h	7 Dec 2004 03:59:14 -0000	1.29
--- tcPlatformInterface.h	11 Dec 2004 01:09:05 -0000	1.30
***************
*** 1,5 ****
! /*  @file tcPlatformInterface.h
! **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,6 ----
! /**
! **  @file tcPlatformInterface.h
! */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcSimPythonInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcSimPythonInterface.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcSimPythonInterface.h	2 Dec 2004 04:17:24 -0000	1.17
--- tcSimPythonInterface.h	11 Dec 2004 01:09:05 -0000	1.18
***************
*** 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 SetMenuPlatform(long anID);
! 		void SetMenuGroup(std::vector<long>& unitIds);
!         void ProcessCommand(std::string command, int param = -1, std::string textParam = "");
!         void ProcessCallback(std::string command, float afData, int param);
!         void ProcessCallback(std::string command, float afData1, float afData2, int param);
!         void ProcessCallback(std::string command, long anData, int param);
          void ProcessHotKey(unsigned int key, unsigned int flags);
          void ProcessSecondaryHook(long id);
          void ReportError(const char* text);
          void SelectFlightInterface(); ///< change to flightport menu
--- 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, 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);
+         void PushMode();
+         void PopMode();
          void ReportError(const char* text);
          void SelectFlightInterface(); ///< change to flightport menu
***************
*** 114,117 ****
--- 114,119 ----
          void SelectUnitMenu(); ///< change to unit menu
  		void SelectGroupMenu(); ///< change to group menu
+         void SetMenuPlatform(long anID);
+ 		void SetMenuGroup(std::vector<long>& unitIds);
  
          tcSimPythonInterface();
***************
*** 141,144 ****
--- 143,147 ----
          tcPlatformObject *mpHookedObj;
          tcSoundConsole *mpConsole;
+         long menuPlatformID;
          enum teInterfaceMode 
  		{
***************
*** 149,153 ****
          } meMenuMode;
  
!         tcFlightPort* GetHookedObjFlightPort(void);
      };
  }
--- 152,160 ----
          } meMenuMode;
  
!         bool isModePushed; ///< true if mode is pushed and available for recall with PopMode
!         teInterfaceMode pushedMode;
!         long pushedPlatformID;
! 
!         tcFlightPort* GetHookedObjFlightPort();
      };
  }