[Gcblue-commits] gcb_wx/include/sim tcControllableObject.h, 1.3, 1.4 tcFlightPort.h, 1.16, 1.17 tcG
Status: Alpha
Brought to you by:
ddcforge
From: Dewitt C. <ddc...@us...> - 2006-10-24 01:34:08
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8449/include/sim Modified Files: tcControllableObject.h tcFlightPort.h tcGameObject.h tcPlatformObject.h tcStores.h Log Message: Index: tcGameObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** tcGameObject.h 17 Aug 2006 01:27:11 -0000 1.48 --- tcGameObject.h 24 Oct 2006 01:34:01 -0000 1.49 *************** *** 101,105 **** tsRelativePosition rel_pos; ///< if parent is not NULL, this contains relative position std::vector<tcGameObject*> children; ! std::vector<tcGameObject*> toLaunch; ///< list of ex-childrent to launch tc3DModel* model; ///< 3D model UINT mnModelType; ///< class MTYPE_ identifier --- 101,105 ---- tsRelativePosition rel_pos; ///< if parent is not NULL, this contains relative position std::vector<tcGameObject*> children; ! std::vector<tcGameObject*> toLaunch; ///< list of ex-children to launch tc3DModel* model; ///< 3D model UINT mnModelType; ///< class MTYPE_ identifier Index: tcStores.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStores.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcStores.h 6 Sep 2006 01:28:20 -0000 1.10 --- tcStores.h 24 Oct 2006 01:34:01 -0000 1.11 *************** *** 78,82 **** struct StoreOperation { ! enum {UNLOAD = 0, LOAD = 1, REFUEL = 2}; std::string item; ///< item type to transfer unsigned long quantity; ///< quantity of item --- 78,82 ---- struct StoreOperation { ! enum {UNLOAD = 0, LOAD = 1, REFUEL = 2, AUTOMATION = 3}; std::string item; ///< item type to transfer unsigned long quantity; ///< quantity of item *************** *** 154,161 **** { short int id; ///< id of unit that command applies to, -1 for local unit ! unsigned char op; ///< UNLOAD = 0, LOAD = 1, REFUEL = 2 long itemId; ///< database id of item (if applicable) unsigned long quantity; unsigned char launcherIdx; }; std::vector<CommandInfo> commandList; --- 154,162 ---- { short int id; ///< id of unit that command applies to, -1 for local unit ! unsigned char op; ///< UNLOAD = 0, LOAD = 1, REFUEL = 2, AUTOMATION = 3 long itemId; ///< database id of item (if applicable) unsigned long quantity; unsigned char launcherIdx; + std::string type; ///< for automation only }; std::vector<CommandInfo> commandList; Index: tcControllableObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcControllableObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcControllableObject.h 22 Mar 2006 01:23:29 -0000 1.3 --- tcControllableObject.h 24 Oct 2006 01:34:00 -0000 1.4 *************** *** 53,57 **** const std::string& GetController() const; ! void SetController(const std::string& username); bool IsAvailable() const; --- 53,57 ---- const std::string& GetController() const; ! virtual void SetController(const std::string& username); bool IsAvailable() const; Index: tcFlightPort.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** tcFlightPort.h 1 Oct 2006 21:07:40 -0000 1.16 --- tcFlightPort.h 24 Oct 2006 01:34:01 -0000 1.17 *************** *** 36,40 **** class tcUpdateStream; ! class tcMissionManager; namespace database --- 36,43 ---- class tcUpdateStream; ! namespace ai ! { ! class tcMissionManager; ! } namespace database *************** *** 150,154 **** void UpdateUnitKin(tcAirState *airstate); // update unit kinematics based on parent info and rel_pos ! tcMissionManager* GetMissionManager(); tcCommandStream& operator<<(tcCommandStream& stream); --- 153,157 ---- void UpdateUnitKin(tcAirState *airstate); // update unit kinematics based on parent info and rel_pos ! ai::tcMissionManager* GetMissionManager(); tcCommandStream& operator<<(tcCommandStream& stream); *************** *** 184,188 **** }; std::vector<CommandInfo> commandList; ! tcMissionManager* missionManager; teLocation GetNextStop(teLocation current, teLocation destination); --- 187,191 ---- }; std::vector<CommandInfo> commandList; ! ai::tcMissionManager* missionManager; teLocation GetNextStop(teLocation current, teLocation destination); Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** tcPlatformObject.h 1 Oct 2006 21:07:40 -0000 1.38 --- tcPlatformObject.h 24 Oct 2006 01:34:01 -0000 1.39 *************** *** 145,148 **** --- 145,150 ---- virtual void Update(double afStatusTime); + virtual void SetController(const std::string& username); + void PrintToFile(tcFile&); void SaveToFile(tcFile& file); |