[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.112,1.113 gcb.cpp,1.16,1.17
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-12-28 23:51:37
|
Update of /cvsroot/gcblue/gcb_wx/src/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4432/src/sim Modified Files: Game.cpp gcb.cpp Log Message: Group selection Ctrl and Alt+number commands Index: gcb.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/gcb.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** gcb.cpp 8 Aug 2004 00:31:34 -0000 1.16 --- gcb.cpp 28 Dec 2004 23:51:25 -0000 1.17 *************** *** 72,77 **** /** * Key down event handler. ! * ! * Skip this event. * * @param event wxKeyEvent object. --- 72,76 ---- /** * Key down event handler. ! * Route to gameFrame * * @param event wxKeyEvent object. *************** *** 79,83 **** void GcbApp::OnKeyDown(wxKeyEvent& event) { ! event.Skip(); } --- 78,82 ---- void GcbApp::OnKeyDown(wxKeyEvent& event) { ! gameFrame->OnKeyDown(event); } Index: Game.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** Game.cpp 28 Dec 2004 00:40:16 -0000 1.112 --- Game.cpp 28 Dec 2004 23:51:25 -0000 1.113 *************** *** 1963,1966 **** --- 1963,1967 ---- if (meGameMode == GM_START) { + event.Skip(); return; } *************** *** 1977,1983 **** groupCtrl->SetGroup(val, hookedUnits); } ! } } --- 1978,1986 ---- groupCtrl->SetGroup(val, hookedUnits); + s = wxString::Format("Formed group %d (%d units)\n", val, hookedUnits.size()); } ! return; } + event.Skip(); } *************** *** 2027,2032 **** } ! ! //tacticalMap->SetHookID(primaryHook); // why commented? hookInfo->SetHookID(primaryHook); oobView->SetHookID(primaryHook); --- 2030,2034 ---- } ! tacticalMap->SetGroupHook(groupUnits); hookInfo->SetHookID(primaryHook); oobView->SetHookID(primaryHook); *************** *** 2121,2125 **** } ! // first check for control key or priority game command key --- 2123,2130 ---- } ! if (controlDown) ! { ! int xx = 0; ! } // first check for control key or priority game command key |