[Gcblue-commits] gcb_wx/include/sim Game.h,1.66,1.67 tcAirfieldObject.h,1.5,1.6 tcCarrierObject.h,1.
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/include/sim Game.h,1.66,1.67 tcAirfieldObject.h,1.5,1.6 tcCarrierObject.h,1.14,1.15 tcFlightOpsObject.h,1.9,1.10 tcGameObject.h,1.45,1.46 tcLauncher.h,1.25,1.26 tcPlatformObject.h,1.34,1.35 tcSimState.h,1.47,1.48
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18413/include/sim Modified Files: Game.h tcAirfieldObject.h tcCarrierObject.h tcFlightOpsObject.h tcGameObject.h tcLauncher.h tcPlatformObject.h tcSimState.h Log Message: Index: tcSimState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** tcSimState.h 23 Mar 2006 01:12:11 -0000 1.47 --- tcSimState.h 27 Mar 2006 01:08:30 -0000 1.48 *************** *** 191,195 **** void Update(); void UpdateAI(double afSimTime); - void UpdateScoreForDamage(tcGameObject* damager, tcGameObject* damagee, float priorDamage); void UpdateLandings(double afSimTime); void UpdateLandingState(double afSimTime); --- 191,194 ---- Index: tcAirfieldObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirfieldObject.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcAirfieldObject.h 22 Mar 2006 01:23:29 -0000 1.5 --- tcAirfieldObject.h 27 Mar 2006 01:08:30 -0000 1.6 *************** *** 49,53 **** { public: ! virtual void ApplyDamage(float damage); virtual void Clear(); --- 49,53 ---- { public: ! virtual void ApplyDamage(float damage, tcGameObject* damager); virtual void Clear(); Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** tcPlatformObject.h 22 Mar 2006 01:23:29 -0000 1.34 --- tcPlatformObject.h 27 Mar 2006 01:08:30 -0000 1.35 *************** *** 102,106 **** tcCommandObject commandObj; ! virtual void ApplyDamage(float damage); virtual void ApplyRepairs(float repair); ///< called when repairs occur (damage removed) virtual void Clear(); --- 102,106 ---- tcCommandObject commandObj; ! virtual void ApplyDamage(float damage, tcGameObject* damager); virtual void ApplyRepairs(float repair); ///< called when repairs occur (damage removed) virtual void Clear(); Index: tcGameObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** tcGameObject.h 22 Mar 2006 01:23:29 -0000 1.45 --- tcGameObject.h 27 Mar 2006 01:08:30 -0000 1.46 *************** *** 117,125 **** tcKinematics mcKin; ///< position, motion, etc parameters tcTerrainInfo mcTerrain; ///< ground height ASL, water depth - float mfDamageLevel; ///< 0 is no damage, 1 is fully damaged ! virtual void ApplyDamage(float damage); ///< called when new damage occurs virtual void ApplyRepairs(float repair); ///< called when repairs occur (damage removed) ! float RangeTo(tcGameObject& p) const; float BearingTo(tcGameObject& p) const; --- 117,127 ---- tcKinematics mcKin; ///< position, motion, etc parameters tcTerrainInfo mcTerrain; ///< ground height ASL, water depth ! virtual void ApplyDamage(float damage, tcGameObject* damager); ///< called when new damage occurs virtual void ApplyRepairs(float repair); ///< called when repairs occur (damage removed) ! void SelfDestruct(); ! void UpdateScoreForDamage(tcGameObject* damager, float priorDamage); ! float GetDamageLevel() const; ! float RangeTo(tcGameObject& p) const; float BearingTo(tcGameObject& p) const; *************** *** 140,143 **** --- 142,146 ---- GeoPoint RelPosToLatLonAlt(const tsRelativePosition& rel_pos) const; GeoPoint RelPosToLatLonAlt(const float& dx, const float& dy, const float& dz) const; + virtual void PrintToFile(tcFile&); virtual void SaveToFile(tcFile& file); *************** *** 199,202 **** --- 202,206 ---- virtual ~tcGameObject(); protected: + float mfDamageLevel; ///< 0 is no damage, 1 is fully damaged bool recreateFlag; ///< workaround, true to resend create request for obj (multiplayer client only) static tcMapData *mapData; *************** *** 208,212 **** bool IsHooked() const; - void SelfDestruct(); }; #endif \ No newline at end of file --- 212,215 ---- Index: tcLauncher.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** tcLauncher.h 22 Mar 2006 01:23:29 -0000 1.25 --- tcLauncher.h 27 Mar 2006 01:08:30 -0000 1.26 *************** *** 157,160 **** --- 157,162 ---- unsigned char GetStatus() const; void UpdateStatus(); + + void UpdateScoreForDamage(tcGameObject* damager); static void AttachSimState(tcSimState* ss); Index: tcFlightOpsObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightOpsObject.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcFlightOpsObject.h 22 Mar 2006 01:23:29 -0000 1.9 --- tcFlightOpsObject.h 27 Mar 2006 01:08:30 -0000 1.10 *************** *** 75,78 **** --- 75,79 ---- void RandInitNear(float afLon_deg, float afLat_deg); + void DestroyAllChildrenAndUpdateScore(tcGameObject* damager); virtual void SetFlightportDefaults(); virtual void Update(double afStatusTime); Index: Game.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** Game.h 22 Mar 2006 01:23:29 -0000 1.66 --- Game.h 27 Mar 2006 01:08:30 -0000 1.67 *************** *** 73,76 **** --- 73,77 ---- class tcMapData; class tcBriefingView; + class tcDatabaseViewer; using namespace scriptinterface; *************** *** 103,106 **** --- 104,108 ---- CREDIT, SCENARIOSELECT, + DATABASEVIEW, MESSAGES, NETWORK, *************** *** 181,185 **** tcChatBox* chatBox; ///< popup for multiplayer chat tcDraggedIconDisplay* draggedIconDisplay; ///< display of drag-drop icons ! // interfaces for START game mode (unloaded when game is started) --- 183,187 ---- tcChatBox* chatBox; ///< popup for multiplayer chat tcDraggedIconDisplay* draggedIconDisplay; ///< display of drag-drop icons ! tcDatabaseViewer* databaseViewer; ///< browse database // interfaces for START game mode (unloaded when game is started) *************** *** 285,288 **** --- 287,291 ---- void SwitchToBriefing(wxCommandEvent& event); void SwitchToCredit(wxCommandEvent& event); + void SwitchToDatabaseView(wxCommandEvent& event); void SwitchToDisplaySettings(wxCommandEvent& event); void SwitchToNetwork(wxCommandEvent& event); *************** *** 302,308 **** void InitializeBriefingConsoles(); void InitializeCreditView(); void InitializeDirector(); ! void InitializeDisplaySettingsView(); ! void InitializeGameWindow(); void InitializeMessageCenter(); void InitializeNetworkView(); --- 305,312 ---- void InitializeBriefingConsoles(); void InitializeCreditView(); + void InitializeDatabaseViewer(); void InitializeDirector(); ! void InitializeDisplaySettingsView(); ! void InitializeGameWindow(); void InitializeMessageCenter(); void InitializeNetworkView(); Index: tcCarrierObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCarrierObject.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcCarrierObject.h 22 Mar 2006 01:23:29 -0000 1.14 --- tcCarrierObject.h 27 Mar 2006 01:08:30 -0000 1.15 *************** *** 49,53 **** { public: ! virtual void ApplyDamage(float damage); virtual void Clear(); --- 49,53 ---- { public: ! virtual void ApplyDamage(float damage, tcGameObject* damager); virtual void Clear(); |
