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

Merged New Inventory Project into main branch

Browse Source 
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:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP Skill Trait.cpp
+31 -32
View File
@@ -80,7 +80,7 @@ BOOLEAN gfSkillTraitQuestions[ IMP_SKILL_TRAITS__NUMBER_SKILLS ];
INT32 giIMPSkillTraitAnswerButton[ IMP_SKILL_TRAITS__NUMBER_SKILLS ];
INT32 giIMPSkillTraitAnswerButtonImage[ IMP_SKILL_TRAITS__NUMBER_SKILLS ];
// this is the Done buttons
// this is the Done buttons
INT32 giIMPSkillTraitFinsihButton;
INT32 giIMPSkillTraitFinsihButtonImage;
@@ -124,7 +124,7 @@ BOOLEAN CameBackToSpecialtiesPageButNotFinished();
void EnterIMPSkillTrait( void )
{
// UINT32 uiCnt;
VOBJECT_DESC VObjectDesc;
VOBJECT_DESC VObjectDesc;
//add the skill trait buttons
AddImpSkillTraitButtons();
@@ -141,13 +141,13 @@ void EnterIMPSkillTrait( void )
giIMPSkillTraitFinsihButtonImage = LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
giIMPSkillTraitFinsihButton = CreateIconAndTextButton( giIMPSkillTraitFinsihButtonImage, pImpButtonText[ 24 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 350 ), LAPTOP_SCREEN_WEB_UL_Y + ( 340 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPSkillTraitFinishCallback );
giIMPSkillTraitFinsihButtonImage = LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
giIMPSkillTraitFinsihButton = CreateIconAndTextButton( giIMPSkillTraitFinsihButtonImage, pImpButtonText[ 24 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 350 ), LAPTOP_SCREEN_WEB_UL_Y + ( 340 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPSkillTraitFinishCallback );
@@ -206,7 +206,7 @@ void HandleIMPSkillTrait( void )
gfIST_Redraw = FALSE;
}
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);
}
void AddImpSkillTraitButtons()
@@ -243,9 +243,9 @@ void AddImpSkillTraitButtons()
}
if( iCnt == 0 )
giIMPSkillTraitAnswerButtonImage[ iCnt ] = LoadButtonImage( "LAPTOP\\button_6.sti", -1,0,-1,1,-1 );
giIMPSkillTraitAnswerButtonImage[ iCnt ] = LoadButtonImage( "LAPTOP\\button_6.sti", -1,0,-1,1,-1 );
else
giIMPSkillTraitAnswerButtonImage[ iCnt ] = UseLoadedButtonImage( giIMPSkillTraitAnswerButtonImage[ 0 ], -1,0,-1,1,-1 );
giIMPSkillTraitAnswerButtonImage[ iCnt ] = UseLoadedButtonImage( giIMPSkillTraitAnswerButtonImage[ 0 ], -1,0,-1,1,-1 );
giIMPSkillTraitAnswerButton[iCnt] = QuickCreateButton( giIMPSkillTraitAnswerButtonImage[ iCnt ], usPosX, usPosY,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 3,
@@ -289,7 +289,7 @@ void BtnIMPSkillTraitAnswerCallback(GUI_BUTTON *btn,INT32 reason)
{
// btn->uiFlags|=(BUTTON_CLICKED_ON);
INT32 iSkillTrait = MSYS_GetBtnUserData( btn, 0 );
INT32 iSkillTrait = MSYS_GetBtnUserData( btn, 0 );
HandleIMPSkillTraitAnswers( iSkillTrait, FALSE );
}
@@ -333,9 +333,9 @@ void HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fResetAllButtons
HandleLastSelectedTraits( (INT8)uiSkillPressed );
/*
/*
//if there are already 2 skills selected, and we are trying to PRESS a new button ( skill isnt currently set )
if( CountNumSkillStraitsSelected() == 2 &&
if( CountNumSkillStraitsSelected() == 2 &&
!gfSkillTraitQuestions[ uiSkillPressed ] &&
uiSkillPressed != IMP_SKILL_TRAITS__NONE )
{
@@ -443,7 +443,7 @@ void IMPSkillTraitDisplaySkills()
UINT32 uiCnt;
UINT16 usPosX, usPosY;
UINT16 usBoxPosX, usBoxPosY;
HVOBJECT hImageHandle;
HVOBJECT hImageHandle;
//Display the title
@@ -577,7 +577,7 @@ INT8 DoesPlayerHaveExtraAttibutePointsToDistributeBasedOnSkillSelection()
{
//if the trait is not the ones you cant be expert in )
if( gfSkillTraitQuestions[ IMP_SKILL_TRAITS__ELECTRONICS ] ||
gfSkillTraitQuestions[ IMP_SKILL_TRAITS__AMBIDEXTROUS ] ||
gfSkillTraitQuestions[ IMP_SKILL_TRAITS__AMBIDEXTROUS ] ||
gfSkillTraitQuestions[ IMP_SKILL_TRAITS__CAMO ] )
{
bExtraPoints = 5;
@@ -632,47 +632,47 @@ void AddSelectedSkillsToSkillsList()
case IMP_SKILL_TRAITS__ELECTRONICS:
AddSkillToSkillList( ELECTRONICS );
break;
case IMP_SKILL_TRAITS__NIGHT_OPS:
AddSkillToSkillList( NIGHTOPS );
break;
case IMP_SKILL_TRAITS__THROWING:
AddSkillToSkillList( THROWING );
break;
case IMP_SKILL_TRAITS__TEACHING:
AddSkillToSkillList( TEACHING );
break;
case IMP_SKILL_TRAITS__HEAVY_WEAPONS:
AddSkillToSkillList( HEAVY_WEAPS );
break;
case IMP_SKILL_TRAITS__AUTO_WEAPONS:
AddSkillToSkillList( AUTO_WEAPS );
break;
case IMP_SKILL_TRAITS__STEALTHY:
AddSkillToSkillList( STEALTHY );
break;
case IMP_SKILL_TRAITS__AMBIDEXTROUS:
AddSkillToSkillList( AMBIDEXT );
break;
case IMP_SKILL_TRAITS__KNIFING:
AddSkillToSkillList( KNIFING );
break;
case IMP_SKILL_TRAITS__ROOFTOP_SNIPING:
AddSkillToSkillList( ONROOF );
case IMP_SKILL_TRAITS__PROF_SNIPER:
AddSkillToSkillList( PROF_SNIPER );
break;
case IMP_SKILL_TRAITS__CAMO:
AddSkillToSkillList( CAMOUFLAGED );
break;
case IMP_SKILL_TRAITS__MARTIAL_ARTS:
AddSkillToSkillList( MARTIALARTS );
break;
@@ -684,7 +684,6 @@ void AddSelectedSkillsToSkillsList()
void HandleLastSelectedTraits( INT8 bNewTrait )
{
INT8 bTemp=-1;
//if there are none selected
if( gbLastSelectedTraits[ 0 ] == -1 )
{
@@ -706,4 +705,4 @@ void HandleLastSelectedTraits( INT8 bNewTrait )
gbLastSelectedTraits[ 1 ] = gbLastSelectedTraits[ 0 ];
gbLastSelectedTraits[ 0 ] = bNewTrait;
}
}
}