Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30667/include/sim
Modified Files:
tcCarrierObject.h tcFlightOpsObject.h tcFlightPort.h
Log Message:
Added join game button for multiplayer, started carrier and airfield multiplayer support
Index: tcFlightPort.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcFlightPort.h 14 Sep 2004 02:01:45 -0000 1.8
--- tcFlightPort.h 6 Apr 2005 02:19:48 -0000 1.9
***************
*** 98,111 ****
void AddSpot(teLocation loc, float x, float y, float z, float orientation = 0, float length = 0);
int CheckLanding(tcGameObject *obj);
! void Clear(void);
int FindAirState(tcAirState *airstate);
int FindEmptySpot(std::vector<tsSpotInfo> *loc_vector);
int FindEmptySpot(teLocation loc, std::vector<tsSpotInfo>*& loc_vector);
! const tcAirState* GetAirState(unsigned n);
int GetAirStateIdx(long id);
! size_t GetCount(void) {return units.size();}
tsSpotInfo* GetCurrentSpotInfo(tcAirState *airstate);
unsigned GetHangarCapacity() const {return hangarCapacity;}
tcTrack GetLandingData(const tcGameObject* obj);
std::vector<tsSpotInfo>* GetLocVector(teLocation loc);
--- 98,112 ----
void AddSpot(teLocation loc, float x, float y, float z, float orientation = 0, float length = 0);
int CheckLanding(tcGameObject *obj);
! void Clear();
int FindAirState(tcAirState *airstate);
int FindEmptySpot(std::vector<tsSpotInfo> *loc_vector);
int FindEmptySpot(teLocation loc, std::vector<tsSpotInfo>*& loc_vector);
! tcAirState* GetAirState(unsigned n);
int GetAirStateIdx(long id);
! size_t GetCount() {return units.size();}
tsSpotInfo* GetCurrentSpotInfo(tcAirState *airstate);
unsigned GetHangarCapacity() const {return hangarCapacity;}
tcTrack GetLandingData(const tcGameObject* obj);
+ tcGameObject* GetObject(unsigned n);
std::vector<tsSpotInfo>* GetLocVector(teLocation loc);
Index: tcCarrierObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCarrierObject.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcCarrierObject.h 17 Aug 2004 02:22:56 -0000 1.10
--- tcCarrierObject.h 6 Apr 2005 02:19:48 -0000 1.11
***************
*** 29,32 ****
--- 29,37 ----
#include "tcFlightOpsObject.h"
+ class tcStream;
+ class tcCommandStream;
+ class tcCreateStream;
+ class tcUpdateStream;
+
/**
* Models a Carrier
***************
*** 49,52 ****
--- 54,65 ----
virtual void Update(double afStatusTime);
+ virtual tcCommandStream& operator<<(tcCommandStream& stream);
+ virtual tcCreateStream& operator<<(tcCreateStream& stream);
+ virtual tcUpdateStream& operator<<(tcUpdateStream& stream);
+
+ virtual tcCommandStream& operator>>(tcCommandStream& stream);
+ virtual tcCreateStream& operator>>(tcCreateStream& stream);
+ virtual tcUpdateStream& operator>>(tcUpdateStream& stream);
+
tcCarrierObject();
tcCarrierObject(tcCarrierObject&);
Index: tcFlightOpsObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightOpsObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcFlightOpsObject.h 17 Aug 2004 02:22:56 -0000 1.3
--- tcFlightOpsObject.h 6 Apr 2005 02:19:48 -0000 1.4
***************
*** 34,37 ****
--- 34,42 ----
class tcGameObject;
+ class tcStream;
+ class tcCommandStream;
+ class tcCreateStream;
+ class tcUpdateStream;
+
namespace Database
{
***************
*** 56,59 ****
--- 61,65 ----
virtual bool AddChildToFlightDeck(std::string className, std::string unitName, teLocation loc);
+ virtual bool AddChildToFlightDeck(tcDatabaseObject* databaseObject, std::string unitName, teLocation loc);
virtual int CheckLanding(tcGameObject* obj);
virtual void Clear();
***************
*** 67,70 ****
--- 73,84 ----
virtual void UpdateLaunch();
+ virtual tcCommandStream& operator<<(tcCommandStream& stream);
+ virtual tcCreateStream& operator<<(tcCreateStream& stream);
+ virtual tcUpdateStream& operator<<(tcUpdateStream& stream);
+
+ virtual tcCommandStream& operator>>(tcCommandStream& stream);
+ virtual tcCreateStream& operator>>(tcCreateStream& stream);
+ virtual tcUpdateStream& operator>>(tcUpdateStream& stream);
+
tcFlightOpsObject(tcFlightportDBObject* dbObject, tcGameObject* gameObject);
virtual ~tcFlightOpsObject();
|
