mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+44
-45
@@ -137,7 +137,7 @@ enum
|
||||
|
||||
|
||||
//Toc menu mouse regions
|
||||
MOUSE_REGION gSelectedPolicyTocMenuRegion[ NUM_AIM_POLICY_TOC_BUTTONS ];
|
||||
MOUSE_REGION gSelectedPolicyTocMenuRegion[ NUM_AIM_POLICY_TOC_BUTTONS ];
|
||||
void SelectPolicyTocMenuRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
|
||||
|
||||
//Agree/Disagree menu Buttons regions
|
||||
@@ -156,7 +156,7 @@ INT32 guiPoliciesMenuButtonImage;
|
||||
UINT32 guiBottomButton;
|
||||
UINT32 guiBottomButton2;
|
||||
UINT8 gubCurPageNum;
|
||||
BOOLEAN gfInPolicyToc = FALSE;
|
||||
BOOLEAN gfInPolicyToc = FALSE;
|
||||
BOOLEAN gfInAgreementPage = FALSE;
|
||||
BOOLEAN gfAimPolicyMenuBarLoaded = FALSE;
|
||||
UINT32 guiContentButton;
|
||||
@@ -174,8 +174,8 @@ BOOLEAN ExitAimPolicyMenuBar(void);
|
||||
BOOLEAN InitAimPolicyTocMenu(void);
|
||||
BOOLEAN ExitAimPolicyTocMenu(void);
|
||||
BOOLEAN DrawAimPolicyMenu();
|
||||
BOOLEAN DisplayAimPolicyStatement(void);
|
||||
BOOLEAN DisplayAimPolicyTitleText(void);
|
||||
BOOLEAN DisplayAimPolicyStatement(void);
|
||||
BOOLEAN DisplayAimPolicyTitleText(void);
|
||||
BOOLEAN InitAgreementRegion(void);
|
||||
BOOLEAN ExitAgreementButton(void);
|
||||
void DisableAimPolicyButton();
|
||||
@@ -184,7 +184,7 @@ void ChangingAimPoliciesSubPage( UINT8 ubSubPageNumber );
|
||||
|
||||
|
||||
|
||||
BOOLEAN DisplayAimPolicyTitle(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber);
|
||||
BOOLEAN DisplayAimPolicyTitle(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber);
|
||||
UINT16 DisplayAimPolicyParagraph(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber);
|
||||
UINT16 DisplayAimPolicySubParagraph(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber);
|
||||
|
||||
@@ -203,7 +203,7 @@ void EnterInitAimPolicies()
|
||||
|
||||
BOOLEAN EnterAimPolicies()
|
||||
{
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
|
||||
InitAimDefaults();
|
||||
|
||||
@@ -251,9 +251,9 @@ void ExitAimPolicies()
|
||||
|
||||
if(gfInPolicyToc)
|
||||
ExitAimPolicyTocMenu();
|
||||
|
||||
|
||||
if( gfInAgreementPage )
|
||||
ExitAgreementButton();
|
||||
ExitAgreementButton();
|
||||
RemoveAimDefaults();
|
||||
|
||||
giCurrentSubPage = gubCurPageNum;
|
||||
@@ -280,7 +280,7 @@ void RenderAimPolicies()
|
||||
DisplayAimPolicyTitleText();
|
||||
|
||||
if( gfInAgreementPage )
|
||||
ExitAgreementButton();
|
||||
ExitAgreementButton();
|
||||
|
||||
switch( gubCurPageNum )
|
||||
{
|
||||
@@ -384,11 +384,11 @@ void RenderAimPolicies()
|
||||
break;
|
||||
}
|
||||
|
||||
MarkButtonsDirty( );
|
||||
MarkButtonsDirty( );
|
||||
|
||||
RenderWWWProgramTitleBar( );
|
||||
|
||||
InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
|
||||
InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
|
||||
}
|
||||
|
||||
|
||||
@@ -401,7 +401,7 @@ BOOLEAN InitAimPolicyMenuBar(void)
|
||||
return(TRUE);
|
||||
|
||||
//Load graphic for buttons
|
||||
guiPoliciesMenuButtonImage = LoadButtonImage("LAPTOP\\BottomButtons2.sti", -1,0,-1,1,-1 );
|
||||
guiPoliciesMenuButtonImage = LoadButtonImage("LAPTOP\\BottomButtons2.sti", -1,0,-1,1,-1 );
|
||||
|
||||
usPosX = AIM_POLICY_MENU_X;
|
||||
for(i=0; i<AIM_POLICY_MENU_BUTTON_AMOUNT; i++)
|
||||
@@ -413,15 +413,15 @@ BOOLEAN InitAimPolicyMenuBar(void)
|
||||
// SetButtonCursor(guiPoliciesMenuButton[i], CURSOR_WWW);
|
||||
// MSYS_SetBtnUserData( guiPoliciesMenuButton[i], 0, i);
|
||||
|
||||
guiPoliciesMenuButton[i] = CreateIconAndTextButton( guiPoliciesMenuButtonImage, AimPolicyText[i], FONT10ARIAL,
|
||||
AIM_BUTTON_ON_COLOR, DEFAULT_SHADOW,
|
||||
AIM_BUTTON_OFF_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
usPosX, AIM_POLICY_MENU_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnPoliciesMenuButtonCallback);
|
||||
guiPoliciesMenuButton[i] = CreateIconAndTextButton( guiPoliciesMenuButtonImage, AimPolicyText[i], FONT10ARIAL,
|
||||
AIM_BUTTON_ON_COLOR, DEFAULT_SHADOW,
|
||||
AIM_BUTTON_OFF_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
usPosX, AIM_POLICY_MENU_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnPoliciesMenuButtonCallback);
|
||||
SetButtonCursor(guiPoliciesMenuButton[i], CURSOR_WWW);
|
||||
MSYS_SetBtnUserData( guiPoliciesMenuButton[i], 0, i);
|
||||
|
||||
|
||||
|
||||
|
||||
usPosX += AIM_POLICY_GAP_X;
|
||||
@@ -439,7 +439,7 @@ BOOLEAN ExitAimPolicyMenuBar(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
if( !gfAimPolicyMenuBarLoaded )
|
||||
if( !gfAimPolicyMenuBarLoaded )
|
||||
return( FALSE );
|
||||
|
||||
for(i=0; i<AIM_POLICY_MENU_BUTTON_AMOUNT; i++)
|
||||
@@ -460,8 +460,8 @@ BOOLEAN DrawAimPolicyMenu()
|
||||
UINT16 usHeight;
|
||||
UINT32 uiStartLoc=0;
|
||||
CHAR16 sText[400];
|
||||
HVOBJECT hContentButtonHandle;
|
||||
UINT8 ubLocInFile[]=
|
||||
HVOBJECT hContentButtonHandle;
|
||||
UINT8 ubLocInFile[]=
|
||||
{ DEFINITIONS,
|
||||
LENGTH_OF_ENGAGEMENT,
|
||||
LOCATION_0F_ENGAGEMENT,
|
||||
@@ -478,7 +478,7 @@ BOOLEAN DrawAimPolicyMenu()
|
||||
usPosY = AIM_POLICY_TOC_Y;
|
||||
for(i=0; i<NUM_AIM_POLICY_TOC_BUTTONS; i++)
|
||||
{
|
||||
BltVideoObject(FRAME_BUFFER, hContentButtonHandle, 0,AIM_POLICY_TOC_X, usPosY, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
BltVideoObject(FRAME_BUFFER, hContentButtonHandle, 0,AIM_POLICY_TOC_X, usPosY, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
|
||||
uiStartLoc = AIM_POLICY_LINE_SIZE * ubLocInFile[i];
|
||||
LoadEncryptedDataFromFile(AIMPOLICYFILE, sText, uiStartLoc, AIM_HISTORY_LINE_SIZE);
|
||||
@@ -495,8 +495,6 @@ BOOLEAN InitAimPolicyTocMenu(void)
|
||||
{
|
||||
UINT16 i, usPosY;
|
||||
UINT16 usHeight;
|
||||
UINT32 uiStartLoc=0;
|
||||
|
||||
if(gfInPolicyToc)
|
||||
return(TRUE);
|
||||
|
||||
@@ -506,8 +504,8 @@ BOOLEAN InitAimPolicyTocMenu(void)
|
||||
{
|
||||
//Mouse region for the toc buttons
|
||||
MSYS_DefineRegion( &gSelectedPolicyTocMenuRegion[i], AIM_POLICY_TOC_X, usPosY, (UINT16)(AIM_POLICY_TOC_X + AIM_CONTENTBUTTON_WIDTH), (UINT16)(usPosY + AIM_CONTENTBUTTON_HEIGHT), MSYS_PRIORITY_HIGH,
|
||||
CURSOR_WWW, MSYS_NO_CALLBACK, SelectPolicyTocMenuRegionCallBack);
|
||||
MSYS_AddRegion(&gSelectedPolicyTocMenuRegion[i]);
|
||||
CURSOR_WWW, MSYS_NO_CALLBACK, SelectPolicyTocMenuRegionCallBack);
|
||||
MSYS_AddRegion(&gSelectedPolicyTocMenuRegion[i]);
|
||||
MSYS_SetRegionUserData( &gSelectedPolicyTocMenuRegion[i], 0, i+2);
|
||||
|
||||
usPosY += AIM_POLICY_TOC_GAP_Y;
|
||||
@@ -533,7 +531,7 @@ BOOLEAN ExitAimPolicyTocMenu()
|
||||
|
||||
|
||||
void SelectPolicyTocMenuRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
|
||||
{
|
||||
{
|
||||
if(gfInPolicyToc)
|
||||
{
|
||||
if (iReason & MSYS_CALLBACK_REASON_INIT)
|
||||
@@ -556,7 +554,7 @@ void SelectPolicyTocMenuRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
|
||||
}
|
||||
|
||||
|
||||
BOOLEAN DisplayAimPolicyTitleText(void)
|
||||
BOOLEAN DisplayAimPolicyTitleText(void)
|
||||
{
|
||||
CHAR16 sText[400];
|
||||
UINT32 uiStartLoc = 0;
|
||||
@@ -574,7 +572,7 @@ BOOLEAN DisplayAimPolicyTitleText(void)
|
||||
}
|
||||
|
||||
|
||||
BOOLEAN DisplayAimPolicyStatement(void)
|
||||
BOOLEAN DisplayAimPolicyStatement(void)
|
||||
{
|
||||
CHAR16 sText[400];
|
||||
UINT32 uiStartLoc = 0;
|
||||
@@ -603,7 +601,7 @@ BOOLEAN InitAgreementRegion(void)
|
||||
gfExitingPolicesAgreeButton = FALSE;
|
||||
|
||||
//Load graphic for buttons
|
||||
guiPoliciesButtonImage = LoadButtonImage("LAPTOP\\BottomButtons2.sti", -1,0,-1,1,-1 );
|
||||
guiPoliciesButtonImage = LoadButtonImage("LAPTOP\\BottomButtons2.sti", -1,0,-1,1,-1 );
|
||||
|
||||
usPosX = AIM_POLICY_AGREEMENT_X;
|
||||
for(i=0; i < 2; i++)
|
||||
@@ -614,15 +612,15 @@ BOOLEAN InitAgreementRegion(void)
|
||||
// SetButtonCursor(guiPoliciesAgreeButton[i], CURSOR_WWW);
|
||||
// MSYS_SetBtnUserData( guiPoliciesAgreeButton[i], 0, i);
|
||||
|
||||
guiPoliciesAgreeButton[i] = CreateIconAndTextButton( guiPoliciesButtonImage, AimPolicyText[i+AIM_POLICIES_DISAGREE], AIM_POLICY_TOC_FONT,
|
||||
AIM_POLICY_AGREE_TOC_COLOR_ON, DEFAULT_SHADOW,
|
||||
AIM_POLICY_AGREE_TOC_COLOR_OFF, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
usPosX, AIM_POLICY_AGREEMENT_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnPoliciesAgreeButtonCallback);
|
||||
guiPoliciesAgreeButton[i] = CreateIconAndTextButton( guiPoliciesButtonImage, AimPolicyText[i+AIM_POLICIES_DISAGREE], AIM_POLICY_TOC_FONT,
|
||||
AIM_POLICY_AGREE_TOC_COLOR_ON, DEFAULT_SHADOW,
|
||||
AIM_POLICY_AGREE_TOC_COLOR_OFF, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
usPosX, AIM_POLICY_AGREEMENT_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnPoliciesAgreeButtonCallback);
|
||||
SetButtonCursor(guiPoliciesAgreeButton[i], CURSOR_WWW);
|
||||
MSYS_SetBtnUserData( guiPoliciesAgreeButton[i], 0, i);
|
||||
|
||||
|
||||
|
||||
|
||||
usPosX += 125;
|
||||
@@ -640,7 +638,7 @@ BOOLEAN ExitAgreementButton(void)
|
||||
UnloadButtonImage( guiPoliciesButtonImage);
|
||||
|
||||
for(i=0; i<2; i++)
|
||||
RemoveButton( guiPoliciesAgreeButton[ i ]);
|
||||
RemoveButton( guiPoliciesAgreeButton[ i ]);
|
||||
|
||||
gfInAgreementPage = FALSE;
|
||||
|
||||
@@ -649,7 +647,7 @@ BOOLEAN ExitAgreementButton(void)
|
||||
|
||||
|
||||
|
||||
BOOLEAN DisplayAimPolicyTitle(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber)
|
||||
BOOLEAN DisplayAimPolicyTitle(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber)
|
||||
{
|
||||
CHAR16 sText[400];
|
||||
UINT32 uiStartLoc = 0;
|
||||
@@ -753,7 +751,7 @@ void BtnPoliciesAgreeButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
gubPoliciesAgreeButtonDown = 255;
|
||||
InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void BtnPoliciesMenuButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
@@ -832,7 +830,7 @@ void BtnPoliciesMenuButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
DisableAimPolicyButton();
|
||||
InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -842,7 +840,7 @@ void ResetAimPolicyButtons()
|
||||
|
||||
for(i=0; i<AIM_POLICY_MENU_BUTTON_AMOUNT; i++)
|
||||
{
|
||||
ButtonList[ guiPoliciesMenuButton[i] ]->uiFlags &= ~BUTTON_CLICKED_ON;
|
||||
ButtonList[ guiPoliciesMenuButton[i] ]->uiFlags &= ~BUTTON_CLICKED_ON;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -857,7 +855,7 @@ void DisableAimPolicyButton()
|
||||
ButtonList[ guiPoliciesMenuButton[ 0 ] ]->uiFlags |= (BUTTON_CLICKED_ON );
|
||||
ButtonList[ guiPoliciesMenuButton[ 2 ] ]->uiFlags |= (BUTTON_CLICKED_ON );
|
||||
}
|
||||
else if( ( gubCurPageNum == AIM_POLICY_LAST_PAGE ) )
|
||||
else if( ( gubCurPageNum == AIM_POLICY_LAST_PAGE ) )
|
||||
{
|
||||
ButtonList[ guiPoliciesMenuButton[ 3 ] ]->uiFlags |= (BUTTON_CLICKED_ON );
|
||||
}
|
||||
@@ -886,6 +884,7 @@ void ChangingAimPoliciesSubPage( UINT8 ubSubPageNumber )
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user