Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24958/include/sim
Modified Files:
tcLauncher.h tcPlatformObject.h tcStores.h
Log Message:
Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** tcLauncher.h 27 Mar 2006 01:08:30 -0000 1.26
--- tcLauncher.h 5 Sep 2006 01:04:24 -0000 1.27
***************
*** 139,142 ****
--- 139,143 ----
bool IsLoading() const;
bool IsEffective(unsigned int targetClassification) const;
+ bool IsChildFireAndForget();
void SetErrorCode(int code) {errorCode = code;}
Index: tcStores.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStores.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcStores.h 22 Mar 2006 01:23:29 -0000 1.8
--- tcStores.h 5 Sep 2006 01:04:24 -0000 1.9
***************
*** 87,90 ****
--- 87,97 ----
};
+ struct AutomationOperation
+ {
+ std::string type; ///< "Empty", "AAW", "ASuW", "ASW", "Strike"
+ tcGameObject* obj; ///< 0 for local platform, otherwise child obj
+ int stage; ///< 0 not started, 1 waiting for unload to finish
+ };
+
bool AddItems(const std::string& item, unsigned long quantity);
unsigned long CurrentItemQuantity(const std::string& item) const;
***************
*** 111,114 ****
--- 118,128 ----
void Update(double t);
+ void AddAutomationOp(const std::string& type, tcGameObject* child = 0);
+ bool AllLaunchersEmpty(tcGameObject* child);
+ bool AllLaunchersReady(tcGameObject* child);
+
+ bool HasActiveOp(tcGameObject* child) const;
+ bool HasStoresForThisObject(tcGameObject* obj);
+
tcCommandStream& operator<<(tcCommandStream& stream);
tcCreateStream& operator<<(tcCreateStream& stream);
***************
*** 130,133 ****
--- 144,149 ----
std::vector<StoreItem> stores;
std::vector<StoreOperation> ops;
+ std::vector<AutomationOperation> automationOps;
+
int errorCode; ///< used in multiplayer to pass error code to client
double lastUpdate;
***************
*** 150,153 ****
--- 166,174 ----
tcGameObject* GetChildOrParent(tcGameObject* child);
bool ValidateOpObject(tcGameObject* obj);
+
+ void UpdateAutomation();
+ bool UnloadPlatform(tcGameObject* child);
+ bool LoadPlatform(tcGameObject* child, const std::string& type);
+ void GetWeaponInfo(const std::string& name, float& range_km, int& targetFlags) const;
};
#endif
\ No newline at end of file
Index: tcPlatformObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** tcPlatformObject.h 27 Mar 2006 01:08:30 -0000 1.35
--- tcPlatformObject.h 5 Sep 2006 01:04:24 -0000 1.36
***************
*** 120,124 ****
tcStores* GetMagazine(unsigned int idx);
unsigned int GetMagazineQuantity(const std::string& item);
!
virtual bool IsInterceptingTrack(long id);
bool IsRefueling() const;
--- 120,126 ----
tcStores* GetMagazine(unsigned int idx);
unsigned int GetMagazineQuantity(const std::string& item);
! void SetLoadoutTag(const std::string& s);
! const std::string& GetLoadoutTag() const;
!
virtual bool IsInterceptingTrack(long id);
bool IsRefueling() const;
***************
*** 159,162 ****
--- 161,165 ----
float lastHeadingDelta; // a workaround to smooth heading rate changes
bool isRefueling; ///< true if refuel is in progress
+ std::string loadoutTag; ///< string to identify current loadout type
virtual void ApplyRestrictions();
|
