[Gcblue-commits] gcb_wx/include/sim Game.h,1.43,1.44 tcLauncherState.h,1.8,1.9 tcMapView.h,1.23,1.24
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-08-16 01:43:39
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3228/include/sim Modified Files: Game.h tcLauncherState.h tcMapView.h tcPopupControl.h Log Message: Index: tcPopupControl.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPopupControl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcPopupControl.h 8 Aug 2004 00:31:33 -0000 1.4 --- tcPopupControl.h 16 Aug 2004 01:43:30 -0000 1.5 *************** *** 1,6 **** ! /* ! ** tcPopupControl.h ! ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tcPopupControl.h ! */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 48,51 **** --- 48,52 ---- MENUMODE_GAME, MENUMODE_PLATFORM, + MENUMODE_GROUP, MENUMODE_TRACK, MENUMODE_GAMEEDIT, *************** *** 64,73 **** void AttachPythonInterface(tcSimPythonInterface *apIF) {mpPythonInterface = apIF;} void SetMenu(teMenuMode mode); ! void SetMenu(void); bool Track(wxPoint point); void OnLButtonDown(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event); ! int Draw(void); ! void UpdateRegions(void); void InitMenu(); tcPopupControl(wxWindow *parent, --- 65,74 ---- void AttachPythonInterface(tcSimPythonInterface *apIF) {mpPythonInterface = apIF;} void SetMenu(teMenuMode mode); ! void SetMenu(); ///< this shouldn't be an override? bool Track(wxPoint point); void OnLButtonDown(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event); ! int Draw(); ! void UpdateRegions(); void InitMenu(); tcPopupControl(wxWindow *parent, Index: Game.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Game.h 8 Aug 2004 00:31:33 -0000 1.43 --- Game.h 16 Aug 2004 01:43:30 -0000 1.44 *************** *** 222,226 **** void ConsoleMessage(const char *s); ///< print string to info console void HookSomethingFriendly(); ///< used to avoid blank 3D screen in rand scenario ! void NewHook(wxCommandEvent& event); void NewHook(long hookID); void OnChar(wxKeyEvent& event); --- 222,227 ---- void ConsoleMessage(const char *s); ///< print string to info console void HookSomethingFriendly(); ///< used to avoid blank 3D screen in rand scenario ! void NewGroupHook(wxCommandEvent& event); ///< event for group of units hooked ! void NewHook(wxCommandEvent& event); ///< event for single unit hooked (deprecated) void NewHook(long hookID); void OnChar(wxKeyEvent& event); Index: tcMapView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** tcMapView.h 8 Aug 2004 00:31:33 -0000 1.23 --- tcMapView.h 16 Aug 2004 01:43:30 -0000 1.24 *************** *** 260,264 **** void UpdateNavPoints(std::vector<tcPoint> *mpPoints); ! int GetClosest(wxPoint pscreen); void GetMapCmdDatum(tcPoint& p) {p=mpointGeoDatum;} --- 260,265 ---- void UpdateNavPoints(std::vector<tcPoint> *mpPoints); ! /// returns id of closest unit to <pscreen> within fixed dist or -1 if none ! long GetClosest(wxPoint pscreen); void GetMapCmdDatum(tcPoint& p) {p=mpointGeoDatum;} *************** *** 286,291 **** --- 287,294 ---- long GetHookID(size_t idx = 0); long Hook(wxPoint pscreen); + void HookAnother(wxPoint pscreen); void HookGroup(wxRect& region); long HookSecondary(wxPoint pscreen); + bool IsFirstHook(long id); bool IsHooked(long id); bool IsMapCmdActive() {return meMapCmd != MC_NONE;} *************** *** 343,348 **** Gdiplus::Graphics* GetGraphicsFromImage(Gdiplus::Image* apImage); ! ! void UpdateScreenNavPoints(void); }; --- 346,351 ---- Gdiplus::Graphics* GetGraphicsFromImage(Gdiplus::Image* apImage); ! ! void UpdateScreenNavPoints(); }; Index: tcLauncherState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcLauncherState.h 19 Jul 2004 00:52:27 -0000 1.8 --- tcLauncherState.h 16 Aug 2004 01:43:30 -0000 1.9 *************** *** 83,86 **** --- 83,87 ---- void AddFullLauncher(tnPoolIndex anKey, float azimuth_rad); + float EstimateInterceptTimeForLauncher(unsigned nLauncher, tcTrack& track); const char* GetFireControlSensorClass(unsigned nLauncher) const; tcLauncher* GetLauncher(unsigned int nLauncher); |