1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Laptop features & Fixes (by Buggler)

Browse Source 
0 Fixed AIM starting gear 1-5 hotkey upon buying equipment
0 Standardized Hotkey 'Shift' + ArrowKeys/Buttons to jump 10 pages for AIM Members, BR Shopping Screen & MERC
0 Added Hotkey 'Ctrl' + ArrowKeys/Buttons go to first/last index for AIM Members, BR Shopping Screen & MERC
0 Added Hotkey 'Enter' for the most commonly-used button in AIM pages
0 Added Stat Color in MERCS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5758 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-01-03 10:17:21 +00:00
parent 7990b2e09b
commit 1b4fce2704
6 changed files with 166 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimFacialIndex.cpp
+3
View File
@@ -515,6 +515,9 @@ void HandleAimFacialIndexKeyBoardInput()
// back to AIM sorting screen // back to AIM sorting screen
guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS_SORTED_FILES; guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS_SORTED_FILES;
break; break;
case ENTER:
guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS;
break;
case LEFTARROW: case LEFTARROW:
// previous page // previous page
for(i=0; i<MAX_NUMBER_MERCS; i++) for(i=0; i<MAX_NUMBER_MERCS; i++)
Laptop/AimMembers.cpp
+135 -27
View File
@@ -1923,7 +1923,14 @@ BOOLEAN Stop = FALSE;
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex > 0) if( gbCurrentIndex > 0)
gbCurrentIndex--; {
if (_KeyDown( 17 ) ) // CTRL
gbCurrentIndex = 0;
else if (_KeyDown( 16 ) ) // SHIFT
gbCurrentIndex = __max(gbCurrentIndex - 10, 0);
else
gbCurrentIndex--;
}
else else
gbCurrentIndex = MAX_NUMBER_MERCS - 1; gbCurrentIndex = MAX_NUMBER_MERCS - 1;
@@ -1996,8 +2003,15 @@ BOOLEAN Stop = FALSE;
btn->uiFlags &= (~BUTTON_CLICKED_ON ); btn->uiFlags &= (~BUTTON_CLICKED_ON );
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex < MAX_NUMBER_MERCS -1 ) if( gbCurrentIndex < MAX_NUMBER_MERCS - 1 )
gbCurrentIndex++; {
if (_KeyDown( 17 ) ) // CTRL
gbCurrentIndex = MAX_NUMBER_MERCS - 1;
else if (_KeyDown( 16 ) ) // SHIFT
gbCurrentIndex = __min(MAX_NUMBER_MERCS - 1, gbCurrentIndex + 10);
else
gbCurrentIndex++;
}
else else
gbCurrentIndex = 0; gbCurrentIndex = 0;
@@ -2558,7 +2572,7 @@ INT8 AimMemberHireMerc()
HireMercStruct.ubInsertionCode = INSERTION_CODE_ARRIVING_GAME; HireMercStruct.ubInsertionCode = INSERTION_CODE_ARRIVING_GAME;
HireMercStruct.fCopyProfileItemsOver = gfBuyEquipment; HireMercStruct.fCopyProfileItemsOver = gfBuyEquipment;
//if the players is buyibng the equipment //if the players is buying the equipment
if( gfBuyEquipment ) if( gfBuyEquipment )
{ {
gMercProfiles[ ubCurrentSoldier ].usOptionalGearCost = 0; gMercProfiles[ ubCurrentSoldier ].usOptionalGearCost = 0;
@@ -5039,7 +5053,12 @@ void HandleAimMemberKeyBoardInput()
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex > 0) if( gbCurrentIndex > 0)
gbCurrentIndex--; {
if (_KeyDown( 17 ) ) // CTRL
gbCurrentIndex = 0;
else
gbCurrentIndex--;
}
else else
gbCurrentIndex = MAX_NUMBER_MERCS - 1; gbCurrentIndex = MAX_NUMBER_MERCS - 1;
@@ -5054,8 +5073,55 @@ void HandleAimMemberKeyBoardInput()
// next button // next button
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex < MAX_NUMBER_MERCS -1 ) if( gbCurrentIndex < MAX_NUMBER_MERCS - 1 )
gbCurrentIndex++; {
if (_KeyDown( 17 ) ) // CTRL
gbCurrentIndex = MAX_NUMBER_MERCS - 1;
else
gbCurrentIndex++;
}
else
gbCurrentIndex = 0;
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gbCurrentSoldierBio = gAimAvailability[AimMercArray[gbCurrentIndex]].AimBio;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
gfRedrawScreen = TRUE;
break;
case SHIFT_LEFTARROW:
// previous button
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex > 0)
{
if (_KeyDown( 17 ) ) // CTRL
gbCurrentIndex = 0;
else
gbCurrentIndex = __max(gbCurrentIndex - 10, 0);
}
else
gbCurrentIndex = MAX_NUMBER_MERCS - 1;
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gbCurrentSoldierBio = gAimAvailability[AimMercArray[gbCurrentIndex]].AimBio;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
gfRedrawScreen = TRUE;
break;
case SHIFT_RIGHTARROW:
// next button
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex < MAX_NUMBER_MERCS - 1 )
{
if (_KeyDown( 17 ) ) // CTRL
gbCurrentIndex = MAX_NUMBER_MERCS - 1;
else
gbCurrentIndex = __min(MAX_NUMBER_MERCS - 1, gbCurrentIndex + 10);
}
else else
gbCurrentIndex = 0; gbCurrentIndex = 0;
@@ -5113,10 +5179,12 @@ void HandleAimMemberKeyBoardInput()
// kit 1 // kit 1
//gbCurrentSoldier = AimMercArray[gbCurrentIndex]; //gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId; gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE; if (!(gMercProfiles[gbCurrentSoldier].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS))
//tais: handle selected kit {
WeaponKitSelectionUpdate(0); gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
//tais: handle selected kit
WeaponKitSelectionUpdate(0);
}
gfRedrawScreen = TRUE; gfRedrawScreen = TRUE;
} }
break; break;
@@ -5126,10 +5194,12 @@ void HandleAimMemberKeyBoardInput()
// kit 2 // kit 2
//gbCurrentSoldier = AimMercArray[gbCurrentIndex]; //gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId; gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE; if (!(gMercProfiles[gbCurrentSoldier].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS))
//tais: handle selected kit {
WeaponKitSelectionUpdate(1); gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
//tais: handle selected kit
WeaponKitSelectionUpdate(1);
}
gfRedrawScreen = TRUE; gfRedrawScreen = TRUE;
} }
break; break;
@@ -5139,10 +5209,12 @@ void HandleAimMemberKeyBoardInput()
// kit 3 // kit 3
//gbCurrentSoldier = AimMercArray[gbCurrentIndex]; //gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId; gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE; if (!(gMercProfiles[gbCurrentSoldier].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS))
//tais: handle selected kit {
WeaponKitSelectionUpdate(2); gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
//tais: handle selected kit
WeaponKitSelectionUpdate(2);
}
gfRedrawScreen = TRUE; gfRedrawScreen = TRUE;
} }
break; break;
@@ -5152,10 +5224,12 @@ void HandleAimMemberKeyBoardInput()
// kit 4 // kit 4
//gbCurrentSoldier = AimMercArray[gbCurrentIndex]; //gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId; gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE; if (!(gMercProfiles[gbCurrentSoldier].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS))
//tais: handle selected kit {
WeaponKitSelectionUpdate(3); gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
//tais: handle selected kit
WeaponKitSelectionUpdate(3);
}
gfRedrawScreen = TRUE; gfRedrawScreen = TRUE;
} }
break; break;
@@ -5165,10 +5239,12 @@ void HandleAimMemberKeyBoardInput()
// kit 5 // kit 5
//gbCurrentSoldier = AimMercArray[gbCurrentIndex]; //gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId; gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE; if (!(gMercProfiles[gbCurrentSoldier].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS))
//tais: handle selected kit {
WeaponKitSelectionUpdate(4); gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
//tais: handle selected kit
WeaponKitSelectionUpdate(4);
}
gfRedrawScreen = TRUE; gfRedrawScreen = TRUE;
} }
break; break;
@@ -5211,6 +5287,38 @@ void HandleAimMemberKeyBoardInput()
gbCurrentSoldierBio = gAimAvailability[AimMercArray[gbCurrentIndex]].AimBio; gbCurrentSoldierBio = gAimAvailability[AimMercArray[gbCurrentIndex]].AimBio;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE; gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
gfRedrawScreen = TRUE;
break;
case SHIFT_LEFTARROW:
// previous button
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex > 0)
gbCurrentIndex = __max(gbCurrentIndex - 10, 0);
else
gbCurrentIndex = MAX_NUMBER_MERCS - 1;
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gbCurrentSoldierBio = gAimAvailability[AimMercArray[gbCurrentIndex]].AimBio;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
gfRedrawScreen = TRUE;
break;
case SHIFT_RIGHTARROW:
// next button
InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
if( gbCurrentIndex < MAX_NUMBER_MERCS - 1 )
gbCurrentIndex = __min(MAX_NUMBER_MERCS - 1, gbCurrentIndex + 10);
else
gbCurrentIndex = 0;
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
gbCurrentSoldierBio = gAimAvailability[AimMercArray[gbCurrentIndex]].AimBio;
gubVideoConferencingMode = AIM_VIDEO_NOT_DISPLAYED_MODE;
gfRedrawScreen = TRUE; gfRedrawScreen = TRUE;
break; break;
} }
Laptop/AimSort.cpp
+1
View File
@@ -1103,6 +1103,7 @@ void HandleAimSortKeyBoardInput()
case 'f': case 'f':
guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS; guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS;
break; break;
case ENTER:
case 'm': case 'm':
guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX; guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX;
break; break;
Laptop/BobbyRGuns.cpp
+26 -22
View File
@@ -1349,14 +1349,12 @@ void BtnBobbyRNextPreviousPageCallback(GUI_BUTTON *btn,INT32 reason)
{ {
if( gubCurPage > 0 ) if( gubCurPage > 0 )
{ {
if (_KeyDown( 16 ) ) // SHIFT if (_KeyDown( 17 ) ) // CTRL
{ gubCurPage = 0;
gubCurPage = __max(gubCurPage - 5, 0); else if (_KeyDown( 16 ) ) // SHIFT
} gubCurPage = __max(gubCurPage - 10, 0);
else else
{
gubCurPage--; gubCurPage--;
}
} }
} }
//else next screen //else next screen
@@ -1364,14 +1362,12 @@ void BtnBobbyRNextPreviousPageCallback(GUI_BUTTON *btn,INT32 reason)
{ {
if( gubCurPage < gubNumPages - 1 ) if( gubCurPage < gubNumPages - 1 )
{ {
if (_KeyDown( 16 ) ) // SHIFT if (_KeyDown( 17 ) ) // CTRL
{ gubCurPage = gubNumPages - 1;
gubCurPage = __min(gubNumPages - 1, gubCurPage + 5); else if (_KeyDown( 16 ) ) // SHIFT
} gubCurPage = __min(gubNumPages - 1, gubCurPage + 10);
else else
{
gubCurPage++; gubCurPage++;
}
} }
} }
@@ -3911,18 +3907,26 @@ void HandleBobbyRGunsKeyBoardInput()
fPausedReDrawScreenFlag = TRUE; fPausedReDrawScreenFlag = TRUE;
break; break;
case SHIFT_LEFTARROW: case SHIFT_LEFTARROW:
// jump to 5 pages back // jump to 10 pages back
if( gubCurPage > 0 ) if( gubCurPage > 0 )
gubCurPage = __max(gubCurPage - 5, 0); {
if( fCtrl )
gubCurPage = 0;
else
gubCurPage = __max(gubCurPage - 10, 0);
}
fReDrawScreenFlag = TRUE; fReDrawScreenFlag = TRUE;
fPausedReDrawScreenFlag = TRUE; fPausedReDrawScreenFlag = TRUE;
break; break;
case SHIFT_RIGHTARROW: case SHIFT_RIGHTARROW:
// jump to 5 pages forward // jump to 10 pages forward
if( gubCurPage < gubNumPages - 1 ) if( gubCurPage < gubNumPages - 1 )
gubCurPage = __min(gubNumPages - 1, gubCurPage + 5); {
if( fCtrl )
gubCurPage = gubNumPages - 1;
else
gubCurPage = __min(gubNumPages - 1, gubCurPage + 10);
}
fReDrawScreenFlag = TRUE; fReDrawScreenFlag = TRUE;
fPausedReDrawScreenFlag = TRUE; fPausedReDrawScreenFlag = TRUE;
break; break;
@@ -4042,17 +4046,17 @@ void HandleBobbyRGunsKeyBoardInput()
fPausedReDrawScreenFlag = TRUE; fPausedReDrawScreenFlag = TRUE;
break; break;
case SHIFT_LEFTARROW: case SHIFT_LEFTARROW:
// jump to 5 pages back // jump to 10 pages back
if( gubCurPage > 0 ) if( gubCurPage > 0 )
gubCurPage = __max(gubCurPage - 5, 0); gubCurPage = __max(gubCurPage - 10, 0);
fReDrawScreenFlag = TRUE; fReDrawScreenFlag = TRUE;
fPausedReDrawScreenFlag = TRUE; fPausedReDrawScreenFlag = TRUE;
break; break;
case SHIFT_RIGHTARROW: case SHIFT_RIGHTARROW:
// jump to 5 pages forward // jump to 10 pages forward
if( gubCurPage < gubNumPages - 1 ) if( gubCurPage < gubNumPages - 1 )
gubCurPage = __min(gubNumPages - 1, gubCurPage + 5); gubCurPage = __min(gubNumPages - 1, gubCurPage + 10);
fReDrawScreenFlag = TRUE; fReDrawScreenFlag = TRUE;
fPausedReDrawScreenFlag = TRUE; fPausedReDrawScreenFlag = TRUE;
Laptop/aim.cpp
+1
View File
@@ -1327,6 +1327,7 @@ void HandleAimKeyBoardInput()
case 'l': case 'l':
guiCurrentLaptopMode = LAPTOP_MODE_AIM_LINKS; guiCurrentLaptopMode = LAPTOP_MODE_AIM_LINKS;
break; break;
case ENTER:
case 'm': case 'm':
if(!fFirstTimeIn) if(!fFirstTimeIn)
guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS_SORTED_FILES; guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS_SORTED_FILES;
Laptop/mercs Files.cpp
BIN
View File
Binary file not shown.