1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement page scrolling in Laptop Personnel page

Browse Source 
Pressing Shift and right or left arrow buttons, 'a' or 'd' buttons, or previous or next ingame buttons now advance one whole page. Without shift pressed down, all three function as original and move one merc at a time.
This commit is contained in:
Asdow
2024-11-09 15:29:07 +02:00
parent 17875978e0
commit bc870123bf
1 changed files with 141 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/personnel.cpp
+141 -12
View File
@@ -921,7 +921,7 @@ void RenderPersonnelFace(INT32 iId, INT32 iSlot, BOOLEAN fDead, BOOLEAN fFired,
// WDS - make number of mercenaries, etc. be configurable
BOOLEAN NextPersonnelFace( void )
static BOOLEAN NextPersonnelFace( void )
{
if (fCurrentTeamMode)
{
@@ -965,7 +965,7 @@ BOOLEAN NextPersonnelFace( void )
return TRUE;
}
BOOLEAN PrevPersonnelFace( void )
static BOOLEAN PrevPersonnelFace( void )
{
if (fCurrentTeamMode) {
// Anyone to display?
@@ -1021,6 +1021,107 @@ BOOLEAN PrevPersonnelFace( void )
return TRUE;
}
static BOOLEAN NextPersonnelFacePage(void)
{
if (fCurrentTeamMode)
{
// Anyone to display?
if (currentTeamIndex == -1) {
return TRUE;
}
fReDrawScreenFlag = TRUE;
// wrap around?
currentTeamIndex += MAX_MERCS_ON_SCREEN;
if (currentTeamIndex >= maxCurrentTeamIndex)
{
currentTeamIndex = 0;
currentTeamFirstIndex = 0;
return FALSE;
}
else
{
currentTeamFirstIndex += MAX_MERCS_ON_SCREEN;
}
}
else {
// Anyone to display?
if (iCurPortraitId == -1) {
return TRUE;
}
iCurPortraitId += MAX_MERCS_ON_SCREEN;
if (iCurPortraitId >= (GetNumberOfDeadOnPastTeam() + GetNumberOfLeftOnPastTeam() + GetNumberOfOtherOnPastTeam()) - giCurrentUpperLeftPortraitNumber)
{
// about to go off the end
giCurrentUpperLeftPortraitNumber = 0;
iCurPortraitId = 0;
}
else
{
giCurrentUpperLeftPortraitNumber += MAX_MERCS_ON_SCREEN;
iCurPortraitId = 0;
}
// get of this merc in this slot
iCurrentPersonSelectedId = iCurPortraitId;
fReDrawScreenFlag = TRUE;
}
return TRUE;
}
static BOOLEAN PrevPersonnelFacePage(void)
{
if (fCurrentTeamMode) {
// Anyone to display?
if (currentTeamIndex == -1) {
return TRUE;
}
fReDrawScreenFlag = TRUE;
currentTeamIndex -= MAX_MERCS_ON_SCREEN;
// wrap around?
if (currentTeamIndex <= 0) {
currentTeamIndex = maxCurrentTeamIndex;
currentTeamFirstIndex = (currentTeamIndex / MAX_MERCS_ON_SCREEN) * MAX_MERCS_ON_SCREEN;
if (currentTeamIndex == 0) {
return FALSE;
}
}
else {
currentTeamFirstIndex -= MAX_MERCS_ON_SCREEN;
}
}
else
{
// Anyone to display?
if (iCurPortraitId == -1) {
return TRUE;
}
iCurPortraitId -= MAX_MERCS_ON_SCREEN;
if ((iCurPortraitId <= 0) && (giCurrentUpperLeftPortraitNumber == 0))
{
// about to go off the end
giCurrentUpperLeftPortraitNumber = (GetNumberOfDeadOnPastTeam() + GetNumberOfLeftOnPastTeam() + GetNumberOfOtherOnPastTeam()) - (GetNumberOfDeadOnPastTeam() + GetNumberOfLeftOnPastTeam() + GetNumberOfOtherOnPastTeam()) % MAX_MERCS_ON_SCREEN;
iCurPortraitId = (GetNumberOfDeadOnPastTeam() + GetNumberOfLeftOnPastTeam() + GetNumberOfOtherOnPastTeam()) % MAX_MERCS_ON_SCREEN;
}
else
{
giCurrentUpperLeftPortraitNumber -= MAX_MERCS_ON_SCREEN;
iCurPortraitId = MAX_MERCS_ON_SCREEN - 1;
}
// get of this merc in this slot
iCurrentPersonSelectedId = iCurPortraitId;
fReDrawScreenFlag = TRUE;
}
return TRUE;
}
void CreatePersonnelButtons( void )
{
@@ -1109,7 +1210,14 @@ void LeftButtonCallBack(GUI_BUTTON *btn,INT32 reason)
{
btn->uiFlags&=~(BUTTON_CLICKED_ON);
fReDrawScreenFlag=TRUE;
PrevPersonnelFace( );
if (_KeyDown(SHIFT))
{
PrevPersonnelFacePage();
}
else
{
PrevPersonnelFace( );
}
uiCurrentInventoryIndex = 0;
guiSliderPosition = 0;
@@ -1156,21 +1264,26 @@ void RightButtonCallBack(GUI_BUTTON *btn,INT32 reason)
{
if(!(btn->uiFlags & BUTTON_CLICKED_ON))
{
fReDrawScreenFlag=TRUE;
fReDrawScreenFlag=TRUE;
}
btn->uiFlags|=(BUTTON_CLICKED_ON);
btn->uiFlags|=(BUTTON_CLICKED_ON);
}
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{
if(btn->uiFlags & BUTTON_CLICKED_ON)
{
btn->uiFlags&=~(BUTTON_CLICKED_ON);
fReDrawScreenFlag=TRUE;
NextPersonnelFace( );
uiCurrentInventoryIndex = 0;
guiSliderPosition = 0;
btn->uiFlags&=~(BUTTON_CLICKED_ON);
fReDrawScreenFlag=TRUE;
if (_KeyDown(SHIFT))
{
NextPersonnelFacePage();
}
else
{
NextPersonnelFace( );
}
uiCurrentInventoryIndex = 0;
guiSliderPosition = 0;
}
}
}
@@ -6759,6 +6872,22 @@ void HandlePersonnelKeyboard( void )
guiSliderPosition = 0;
fPausedReDrawScreenFlag = TRUE;
break;
case SHIFT_LEFTARROW:
case 'A':
fReDrawScreenFlag = TRUE;
PrevPersonnelFacePage();
uiCurrentInventoryIndex = 0;
guiSliderPosition = 0;
fPausedReDrawScreenFlag = TRUE;
break;
case SHIFT_RIGHTARROW:
case 'D':
fReDrawScreenFlag = TRUE;
NextPersonnelFacePage();
uiCurrentInventoryIndex = 0;
guiSliderPosition = 0;
fPausedReDrawScreenFlag = TRUE;
break;
case SHIFT_TAB:
if ( !fCurrentTeamMode )
{