Fixes (by Buggler)

- Added notification in message log when mercs cannot climb with backpack
- Reorganized hotkeys code in alphabetical order for easy reference
- Moved item transformation hotkey from 'Y' to 'Shift + T' due to hotkey being used to call up chatbox in networked game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-06-20 12:33:03 +00:00
parent 981c81b4b4
commit 68717329fc
3 changed files with 625 additions and 589 deletions
+18 -16
View File
@@ -6975,6 +6975,19 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
HandlePlayerPauseUnPauseOfGame( ); HandlePlayerPauseUnPauseOfGame( );
break; break;
case SPACE:
if( fShowUpdateBox )
{
EndUpdateBox( TRUE ); // restart time compression
}
else
{
// toggle time compression
if ( CommonTimeCompressionChecks() == FALSE )
RequestToggleTimeCompression();
}
break;
case LEFTARROW: case LEFTARROW:
// previous character // previous character
fResetMapCoords = TRUE; fResetMapCoords = TRUE;
@@ -7016,8 +7029,6 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
MapScreenMsgScrollDown( MAX_MESSAGES_ON_MAP_BOTTOM ); MapScreenMsgScrollDown( MAX_MESSAGES_ON_MAP_BOTTOM );
break; break;
case HOME: case HOME:
// jump to top of message list // jump to top of message list
ChangeCurrentMapscreenMessageIndex( 0 ); ChangeCurrentMapscreenMessageIndex( 0 );
@@ -7190,19 +7201,6 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
RequestDecreaseInTimeCompression(); RequestDecreaseInTimeCompression();
break; break;
case SPACE:
if( fShowUpdateBox )
{
EndUpdateBox( TRUE ); // restart time compression
}
else
{
// toggle time compression
if ( CommonTimeCompressionChecks() == FALSE )
RequestToggleTimeCompression();
}
break;
case '`': case '`':
#ifdef JA2TESTVERSION #ifdef JA2TESTVERSION
if( fCtrl ) if( fCtrl )
@@ -7718,6 +7716,8 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
} }
} }
break; break;
case 'g':
break;
case 'h': case 'h':
#ifdef JA2TESTVERSION #ifdef JA2TESTVERSION
if( fAlt ) if( fAlt )
@@ -7779,6 +7779,8 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
ToggleItemsFilter(); ToggleItemsFilter();
} }
break; break;
case 'j':
break;
case 'K': case 'K':
//CHRISL: Swap gunsling //CHRISL: Swap gunsling
if ( bSelectedInfoChar != -1 && fShowInventoryFlag && UsingNewInventorySystem() == true ) if ( bSelectedInfoChar != -1 && fShowInventoryFlag && UsingNewInventorySystem() == true )
@@ -7910,7 +7912,7 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
} }
break; break;
case 'p': case 'p':
#ifdef JA2TESTVERSION #ifdef JA2TESTVERSION
if( fCtrl ) if( fCtrl )
{ {
+1 -1
View File
@@ -1007,7 +1007,7 @@ public:
INT8 bBreath; // current breath value INT8 bBreath; // current breath value
INT8 bBreathMax; // max breath, affected by fatigue/sleep INT8 bBreathMax; // max breath, affected by fatigue/sleep
INT8 bStealthMode; INT8 bStealthMode;
INT16 sBreathRed; // current breath value INT16 sBreathRed; // current breath loss value
UINT8 ubWaitActionToDo; UINT8 ubWaitActionToDo;
File diff suppressed because it is too large Load Diff