[Gcblue-commits] gcb_wx/include/sim Game.h,1.60,1.61 commandlist.h,1.7,1.8 tcLauncher.h,1.21,1.22 tc
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-09-10 21:48:17
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1435/include/sim Modified Files: Game.h commandlist.h tcLauncher.h tcPlatformObject.h Log Message: GCB 0.8.0 release Index: tcLauncher.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tcLauncher.h 30 Jun 2005 01:06:09 -0000 1.21 --- tcLauncher.h 10 Sep 2005 21:48:06 -0000 1.22 *************** *** 139,142 **** --- 139,143 ---- void SetChildQuantity(unsigned int quantity); void SetDamaged(bool state); + void SetDatum(double lon_rad, double lat_rad, float alt_m); void SetLaunch(unsigned int quantity); void SetLoadState(bool state); Index: Game.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Game.h 22 Jun 2005 01:21:26 -0000 1.60 --- Game.h 10 Sep 2005 21:48:06 -0000 1.61 *************** *** 72,75 **** --- 72,76 ---- class tcDraggedIconDisplay; class tcMapData; + class tcBriefingView; using namespace scriptinterface; *************** *** 105,108 **** --- 106,110 ---- NETWORK, DISPLAYSETTINGS, + SIMPLEBRIEF, TACTICAL, TACTICALBRIEF, *************** *** 155,158 **** --- 157,161 ---- tcSoundConsole* briefingConsoleLeft; ///< console object for briefing text tcSoundConsole* briefingConsoleBottom; ///< to fill space at bottom for now + tcBriefingView* briefingView; ///< full screen window for simple briefing tcTacticalMapView* tacticalMap; ///< tactical map object tcWorldMapView* worldMap; ///< world map object *************** *** 177,181 **** tcChatBox* chatBox; ///< popup for multiplayer chat tcDraggedIconDisplay* draggedIconDisplay; ///< display of drag-drop icons ! // interfaces for START game mode (unloaded when game is started) tcStartView* startView; --- 180,185 ---- tcChatBox* chatBox; ///< popup for multiplayer chat tcDraggedIconDisplay* draggedIconDisplay; ///< display of drag-drop icons ! ! // interfaces for START game mode (unloaded when game is started) tcStartView* startView; *************** *** 275,278 **** --- 279,283 ---- void StartGame(wxCommandEvent& event); + void SwitchToBriefing(wxCommandEvent& event); void SwitchToCredit(wxCommandEvent& event); void SwitchToDisplaySettings(wxCommandEvent& event); Index: commandlist.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/commandlist.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** commandlist.h 10 Jan 2005 00:30:21 -0000 1.7 --- commandlist.h 10 Sep 2005 21:48:06 -0000 1.8 *************** *** 45,48 **** --- 45,50 ---- GC_DISPLAYMESSAGE, GC_TEXTCOMMAND, + GC_SHOWBRIEFING, + GC_SHOWMISSIONSTATUS, PC_GETNEWHEADING, PC_CHANGEHEADING, Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** tcPlatformObject.h 22 Jun 2005 01:21:27 -0000 1.31 --- tcPlatformObject.h 10 Sep 2005 21:48:06 -0000 1.32 *************** *** 81,85 **** }; ! float fuel_kg; ///< current fuel tcLauncherState mcLauncherState; std::vector<tcStores*> magazines; --- 81,85 ---- }; ! double fuel_kg; ///< current fuel tcLauncherState mcLauncherState; std::vector<tcStores*> magazines; |