add hotkeybuild1

Author: Rampoina

docs/README.txt

@@ -149,7 +149,7 @@ the default keyboard values).
 
 * Camera keyboard controls *
 
-f                                => toggle free camera mode
+y                                => toggle free camera mode
 w                                => move camera up (free camera mode only)
 s                                => move camera down (free camera mode only)
 a                                => rotate camera left (free camera mode only)
@@ -185,21 +185,34 @@ n                                => show network status
 
 * Hotkeys (game camera mode only) *
 
-a                                => activate attack command for selection
-s                                => issue stop command to selection
+,                                => activate attack command for selection
+;                                => issue stop command to selection
 i                                => select next idle harvester
 b                                => select next building
-d                                => select next damaged unit
+u                                => select next damaged unit
 t                                => select next storage unit
 r                                => rotate building before placement
 
+Unit commands can be activated using the keyboard by pressing corresponding
+keys in the grid layout:
+
++---+---+---+---+
+| q | w | e | r |
++---+---+---+---+
+| a | s | d | f |
++---+---+---+---+
+| z | x | c | v |
++---+---+---+---+
+
+The position of the command for the selected unit (or group) in the UI
+button grid corresponds to the key in the same position in the grid above.
 
 * Other Keys *
 
 - +                              => adjust game speed (disabled in multiplayer)
 p                                => pause game (disabled in multiplayer)
-e                                => save screen shot to file
-c                                => toggle ingame font color (and font shadow)
+j                                => save screen shot to file
+o                                => toggle ingame font color (and font shadow)
 m                                => show faded mesages again
 ?                                => when DebugMode=true, display debug info
 /                                => toggle mouse pointer rendering mode (OS/MG)

mk/shared/glestkeys.ini

@@ -3,15 +3,15 @@
 RenderInGamePerformance=`
 RenderNetworkStatus=N
 ShowFullConsole=M
-Screenshot=E
-FreeCameraMode=F
+Screenshot=J
+FreeCameraMode=Y
 ResetCameraMode=space
 CameraModeLeft=left
 CameraModeRight=right
 CameraModeUp=up
 CameraModeDown=down
 PauseGame=P
-ChangeFontColor=C
+ChangeFontColor=O
 GameSpeedIncrease='+'
 GameSpeedDecrease='-'
 ExitKey=escape
@@ -30,16 +30,28 @@ CameraRotateLeft=A
 CameraRotateRight=D
 CameraRotateUp=S
 CameraRotateDown=W
+CommandKey1=Q
+CommandKey2=W
+CommandKey3=E
+CommandKey4=R
+CommandKey5=A
+CommandKey6=S
+CommandKey7=D
+CommandKey8=F
+CommandKey9=Z
+CommandKey10=X
+CommandKey11=C
+CommandKey12=V
 HotKeyCenterCameraOnSelection=G
 HotKeySelectIdleHarvesterUnit=I
 HotKeySelectBuiltBuilding=B
 HotKeyShowDebug=?
 HotKeyDumpWorldToLog=\
 HotKeyRotateUnitDuringPlacement=R
-HotKeySelectDamagedUnit=D
+HotKeySelectDamagedUnit=U
 HotKeySelectStoreUnit=T
-HotKeySelectedUnitsAttack=A
-HotKeySelectedUnitsStop=S
+HotKeySelectedUnitsAttack=,
+HotKeySelectedUnitsStop=;
 HotKeyToggleOSMouseEnabled=/
 ChatTeamMode=H
 ToggleHealthbars=#

source/glest_game/gui/gui.cpp

@@ -38,7 +38,7 @@ namespace Glest {
 namespace Game {
 
 // =====================================================
-// 	class Mouse3d
+//	class Mouse3d
 // =====================================================
 
 const float Mouse3d::fadeSpeed = 1.f / 50.f;
@@ -65,7 +65,7 @@ void Mouse3d::update() {
 }
 
 // ===============================
-// 	class SelectionQuad
+//	class SelectionQuad
 // ===============================
 
 SelectionQuad::SelectionQuad() {
@@ -89,7 +89,7 @@ void SelectionQuad::disable() {
 }
 
 // =====================================================
-// 	class Gui
+//	class Gui
 // =====================================================
 
 // constructor

source/glest_game/gui/gui.h

@@ -84,7 +84,7 @@ class SelectionQuad {
 };
 
 // =====================================================
-// 	class Gui
+//	class Gui
 //
 ///	In game GUI
 // =====================================================

source/glest_game/types/unit_type.h

@@ -194,6 +194,7 @@ class UnitType : public ProducibleType, public ValueCheckerVault {
     // info
     SkillTypes skillTypes;
     CommandTypes commandTypes;
+    CommandTypes commandTypesSorted;
     StoredResources storedResources;
     Levels levels;
     LootableResources lootableResources;
@@ -334,6 +335,7 @@ class UnitType : public ProducibleType, public ValueCheckerVault {
   private:
     void computeFirstStOfClass();
     void computeFirstCtOfClass();
+    void sortCommandTypes(CommandTypes cts);
 };
 
 /**