Update of /cvsroot/gcblue/gcb_wx/include/scriptinterface
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv722/include/scriptinterface
Modified Files:
tcPlatformInterface.h tcScenarioInterface.h
tcSimPythonInterface.h
Log Message:
Index: tcPlatformInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPlatformInterface.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** tcPlatformInterface.h 29 Apr 2005 18:52:02 -0000 1.39
--- tcPlatformInterface.h 5 May 2005 02:14:19 -0000 1.40
***************
*** 298,301 ****
--- 298,302 ----
bool IsAvailable() const;
bool IsMultiplayerActive() const;
+ void ReleaseControl();
void TakeControl();
Index: tcScenarioInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcScenarioInterface.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcScenarioInterface.h 31 Mar 2005 03:51:12 -0000 1.16
--- tcScenarioInterface.h 5 May 2005 02:14:19 -0000 1.17
***************
*** 150,155 ****
tcDestroyGoal DestroyGoal(std::string target);
! // Interface class management functions
static object GetInterface();
static void InitPythonClasses(void);
--- 150,157 ----
tcDestroyGoal DestroyGoal(std::string target);
+ // non-python methods
+ tcGameObject* GetLastObjectAdded() const;
! // Interface class management methods
static object GetInterface();
static void InitPythonClasses(void);
***************
*** 160,165 ****
static void AttachSimState(tcSimState *apSS) {simState = apSS;}
! protected:
double eventTime; ///< start time for briefing event functions
static tcDirector* director;
static tcMapData* mapData;
--- 162,169 ----
static void AttachSimState(tcSimState *apSS) {simState = apSS;}
! private:
double eventTime; ///< start time for briefing event functions
+ tcGameObject* lastObjectAdded; ///< last object added to sim
+
static tcDirector* director;
static tcMapData* mapData;
Index: tcSimPythonInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcSimPythonInterface.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcSimPythonInterface.h 29 Apr 2005 18:52:02 -0000 1.22
--- tcSimPythonInterface.h 5 May 2005 02:14:19 -0000 1.23
***************
*** 50,53 ****
--- 50,55 ----
class tcCommandQueue;
class tcMapOverlay;
+ class tcStream;
+ class tcCommandStream;
using namespace Sensor;
***************
*** 61,64 ****
--- 63,67 ----
using ai::ScriptedTaskInterface;
+
/**
* Embedded python scripting interface code.
***************
*** 131,134 ****
--- 134,138 ----
void ProcessCallback(std::string command, const std::vector<long>& id,
long anData, int param);
+ void ProcessCallbackString(const std::string& command, const std::vector<long>& id);
void ProcessHotKey(unsigned int key, unsigned int flags);
void ProcessSecondaryHook(long id);
***************
*** 143,146 ****
--- 147,156 ----
void SetMenuGroup(const std::vector<long>& unitIds);
+ tcCommandStream& operator<<(tcCommandStream& stream);
+ tcCommandStream& operator>>(tcCommandStream& stream);
+
+ void ClearNewCommand();
+ bool HasNewCommand() const;
+
static tcSimPythonInterface* Get(); ///< singleton accessor
***************
*** 190,193 ****
--- 200,210 ----
std::vector<long> pushedPlatformIds;
+ struct ClientCommand
+ {
+ std::vector<long> idList;
+ std::string commandText;
+ };
+ std::vector<ClientCommand> clientCommands; ///< commands to send to server
+
tcFlightPort* GetHookedObjFlightPort();
};
|
