[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.113,1.114

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1667/src/sim

Modified Files:
	Game.cpp 
Log Message:
Group selection Ctrl and Alt+number commands

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** Game.cpp	28 Dec 2004 23:51:25 -0000	1.113
--- Game.cpp	30 Dec 2004 17:26:07 -0000	1.114
***************
*** 1957,1961 ****
  {
  	int nChar = event.GetKeyCode();
! 	bool controlDown = event.ControlDown();
  	bool altDown = event.AltDown();
  
--- 1957,1961 ----
  {
  	int nChar = event.GetKeyCode();
! 	bool controlDown = (event.ControlDown() && (nChar != WXK_CONTROL));
  	bool altDown = event.AltDown();
  
***************
*** 1979,1982 ****
--- 1979,1983 ----
  			groupCtrl->SetGroup(val, hookedUnits);
              s = wxString::Format("Formed group %d (%d units)\n", val, hookedUnits.size());
+             DisplayMessage(s.c_str());
  		}
          return;