[Gcblue-commits] gcb_wx/include/sim tcLauncher.h,1.17,1.18 tcPlatformObject.h,1.29,1.30 tcStores.h,1
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-06-12 20:46:43
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv593/include/sim Modified Files: tcLauncher.h tcPlatformObject.h tcStores.h Log Message: Drag and drop icon gui updates Index: tcLauncher.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tcLauncher.h 11 Jun 2005 21:01:43 -0000 1.17 --- tcLauncher.h 12 Jun 2005 20:46:28 -0000 1.18 *************** *** 140,144 **** unsigned int GetCapacityForItem(const std::string& item) const; unsigned int GetCompatibleCount() const; ! std::string GetCompatibleName(unsigned int idx) const; bool IsItemCompatible(const std::string& item) const; --- 140,145 ---- unsigned int GetCapacityForItem(const std::string& item) const; unsigned int GetCompatibleCount() const; ! const std::string& GetCompatibleName(unsigned int idx) const; ! unsigned int GetCompatibleQuantity(unsigned int idx) const; bool IsItemCompatible(const std::string& item) const; Index: tcStores.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStores.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcStores.h 11 Jun 2005 21:01:43 -0000 1.4 --- tcStores.h 12 Jun 2005 20:46:33 -0000 1.5 *************** *** 58,62 **** public: std::string className; ! unsigned int quantity; tcDatabaseObject* GetDatabaseObject() const; --- 58,62 ---- public: std::string className; ! unsigned long quantity; tcDatabaseObject* GetDatabaseObject() const; *************** *** 64,68 **** StoreItem(); StoreItem(const StoreItem& src); ! StoreItem(const std::string& name, unsigned int qty); private: tcDatabaseObject* databaseObj; --- 64,68 ---- StoreItem(); StoreItem(const StoreItem& src); ! StoreItem(const std::string& name, unsigned long qty); private: tcDatabaseObject* databaseObj; *************** *** 73,79 **** struct StoreOperation { ! enum {UNLOAD = 0, LOAD = 1}; std::string item; ///< item type to transfer ! unsigned int quantity; ///< quantity of item float timeToComplete; ///< time left for op to complete [s] unsigned int launcherIdx; ///< launcher idx to transfer to/from --- 73,79 ---- struct StoreOperation { ! enum {UNLOAD = 0, LOAD = 1, REFUEL = 2}; std::string item; ///< item type to transfer ! unsigned long quantity; ///< quantity of item float timeToComplete; ///< time left for op to complete [s] unsigned int launcherIdx; ///< launcher idx to transfer to/from *************** *** 82,92 **** }; ! bool AddItems(const std::string& item, unsigned int quantity); ! unsigned int CurrentItemQuantity(const std::string& item) const; ! unsigned int CurrentQuantity() const; ! unsigned int IncomingQuantity() const; tcStoresDBObject* GetDatabaseObject() const; tcDatabaseObject* GetDatabaseObjectForItem(const std::string& item) const; ! /// name of <idx> type const std::string& GetItemName(unsigned int idx) const; --- 82,92 ---- }; ! bool AddItems(const std::string& item, unsigned long quantity); ! unsigned long CurrentItemQuantity(const std::string& item) const; ! unsigned long CurrentQuantity() const; ! unsigned long IncomingQuantity() const; tcStoresDBObject* GetDatabaseObject() const; tcDatabaseObject* GetDatabaseObjectForItem(const std::string& item) const; ! const std::string& GetDisplayName() const; /// name of <idx> type const std::string& GetItemName(unsigned int idx) const; *************** *** 100,103 **** --- 100,104 ---- bool LoadLauncher(unsigned int idx, const std::string& item, tcGameObject* child = 0); + bool LoadOther(const std::string& item, tcGameObject* child = 0); void SetParent(tcPlatformObject* obj); bool UnloadLauncher(unsigned int idx, tcGameObject* child = 0); Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** tcPlatformObject.h 1 Jun 2005 00:13:28 -0000 1.29 --- tcPlatformObject.h 12 Jun 2005 20:46:33 -0000 1.30 *************** *** 112,123 **** tcStores* GetMagazine(unsigned int idx); unsigned int GetMagazineQuantity(const std::string& item); ! ! virtual bool IsInterceptingTrack(long id); ! virtual void Launch(tnPoolIndex& rnKey, unsigned& rnLauncher); virtual void RandInitNear(float afLon_deg, float afLat_deg); virtual void SetAltitude(float new_altitude_m); virtual void SetHeading(float afNewHeading); virtual void SetSpeed(float afNewSpeed); virtual int SetLaunch(int anLauncher, int anQuantity); --- 112,124 ---- tcStores* GetMagazine(unsigned int idx); unsigned int GetMagazineQuantity(const std::string& item); ! virtual bool IsInterceptingTrack(long id); ! bool IsRefueling() const; ! virtual void Launch(tnPoolIndex& rnKey, unsigned& rnLauncher); virtual void RandInitNear(float afLon_deg, float afLat_deg); virtual void SetAltitude(float new_altitude_m); virtual void SetHeading(float afNewHeading); + void SetRefueling(bool state); virtual void SetSpeed(float afNewSpeed); virtual int SetLaunch(int anLauncher, int anQuantity); *************** *** 148,151 **** --- 149,153 ---- protected: float lastHeadingDelta; // a workaround to smooth heading rate changes + bool isRefueling; ///< true if refuel is in progress virtual void ApplyRestrictions(); |