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:
+29
-29
@@ -18,10 +18,10 @@
|
||||
#define FLORIST_CARDS_SENTENCE_FONT FONT12ARIAL
|
||||
#define FLORIST_CARDS_SENTENCE_COLOR FONT_MCOLOR_WHITE
|
||||
|
||||
#define FLORIST_CARD_FIRST_POS_X LAPTOP_SCREEN_UL_X + 7
|
||||
#define FLORIST_CARD_FIRST_POS_Y LAPTOP_SCREEN_WEB_UL_Y + 72
|
||||
#define FLORIST_CARD_FIRST_OFFSET_X 174
|
||||
#define FLORIST_CARD_FIRST_OFFSET_Y 109
|
||||
#define FLORIST_CARD_FIRST_POS_X LAPTOP_SCREEN_UL_X + 7
|
||||
#define FLORIST_CARD_FIRST_POS_Y LAPTOP_SCREEN_WEB_UL_Y + 72
|
||||
#define FLORIST_CARD_FIRST_OFFSET_X 174
|
||||
#define FLORIST_CARD_FIRST_OFFSET_Y 109
|
||||
|
||||
#define FLORIST_CARD_CARD_WIDTH 135
|
||||
#define FLORIST_CARD_CARD_HEIGHT 100
|
||||
@@ -45,7 +45,7 @@ UINT32 guiCardBackground;
|
||||
INT8 gbCurrentlySelectedCard;
|
||||
|
||||
//link to the card gallery
|
||||
MOUSE_REGION gSelectedFloristCardsRegion[9];
|
||||
MOUSE_REGION gSelectedFloristCardsRegion[9];
|
||||
void SelectFloristCardsRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ void GameInitFloristCards()
|
||||
BOOLEAN EnterFloristCards()
|
||||
{
|
||||
UINT16 i, j, usPosX, usPosY;
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
UINT8 ubCount;
|
||||
|
||||
InitFloristDefaults();
|
||||
@@ -81,9 +81,9 @@ BOOLEAN EnterFloristCards()
|
||||
for(i=0; i<3; i++)
|
||||
{
|
||||
MSYS_DefineRegion( &gSelectedFloristCardsRegion[ubCount], usPosX, usPosY, (UINT16)(usPosX + FLORIST_CARD_CARD_WIDTH), (UINT16)(usPosY + FLORIST_CARD_CARD_HEIGHT), MSYS_PRIORITY_HIGH,
|
||||
CURSOR_WWW, MSYS_NO_CALLBACK, SelectFloristCardsRegionCallBack );
|
||||
MSYS_AddRegion(&gSelectedFloristCardsRegion[ubCount]);
|
||||
MSYS_SetRegionUserData( &gSelectedFloristCardsRegion[ubCount], 0, ubCount );
|
||||
CURSOR_WWW, MSYS_NO_CALLBACK, SelectFloristCardsRegionCallBack );
|
||||
MSYS_AddRegion(&gSelectedFloristCardsRegion[ubCount]);
|
||||
MSYS_SetRegionUserData( &gSelectedFloristCardsRegion[ubCount], 0, ubCount );
|
||||
ubCount++;
|
||||
usPosX += FLORIST_CARD_FIRST_OFFSET_X;
|
||||
}
|
||||
@@ -93,12 +93,12 @@ BOOLEAN EnterFloristCards()
|
||||
|
||||
guiFlowerCardsButtonImage = LoadButtonImage("LAPTOP\\FloristButtons.sti", -1,0,-1,1,-1 );
|
||||
|
||||
guiFlowerCardsBackButton = CreateIconAndTextButton( guiFlowerCardsButtonImage, sFloristCards[FLORIST_CARDS_BACK], FLORIST_BUTTON_TEXT_FONT,
|
||||
FLORIST_BUTTON_TEXT_UP_COLOR, FLORIST_BUTTON_TEXT_SHADOW_COLOR,
|
||||
FLORIST_BUTTON_TEXT_DOWN_COLOR, FLORIST_BUTTON_TEXT_SHADOW_COLOR,
|
||||
TEXT_CJUSTIFIED,
|
||||
FLORIST_CARD_BACK_BUTTON_X, FLORIST_CARD_BACK_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnFlowerCardsBackButtonCallback);
|
||||
guiFlowerCardsBackButton = CreateIconAndTextButton( guiFlowerCardsButtonImage, sFloristCards[FLORIST_CARDS_BACK], FLORIST_BUTTON_TEXT_FONT,
|
||||
FLORIST_BUTTON_TEXT_UP_COLOR, FLORIST_BUTTON_TEXT_SHADOW_COLOR,
|
||||
FLORIST_BUTTON_TEXT_DOWN_COLOR, FLORIST_BUTTON_TEXT_SHADOW_COLOR,
|
||||
TEXT_CJUSTIFIED,
|
||||
FLORIST_CARD_BACK_BUTTON_X, FLORIST_CARD_BACK_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnFlowerCardsBackButtonCallback);
|
||||
SetButtonCursor(guiFlowerCardsBackButton, CURSOR_WWW );
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@ void ExitFloristCards()
|
||||
RemoveFloristDefaults();
|
||||
DeleteVideoObjectFromIndex( guiCardBackground );
|
||||
|
||||
//card gallery
|
||||
//card gallery
|
||||
for(i=0; i<9; i++)
|
||||
MSYS_RemoveRegion( &gSelectedFloristCardsRegion[i]);
|
||||
|
||||
@@ -135,7 +135,7 @@ void RenderFloristCards()
|
||||
UINT16 usPosX, usPosY;
|
||||
CHAR16 sTemp[ 640 ];
|
||||
UINT32 uiStartLoc=0;
|
||||
HVOBJECT hPixHandle;
|
||||
HVOBJECT hPixHandle;
|
||||
UINT16 usHeightOffset;
|
||||
|
||||
DisplayFloristDefaults();
|
||||
@@ -157,17 +157,17 @@ void RenderFloristCards()
|
||||
uiStartLoc = FLOR_CARD_TEXT_TITLE_SIZE * ubCount;
|
||||
LoadEncryptedDataFromFile(FLOR_CARD_TEXT_FILE, sTemp, uiStartLoc, FLOR_CARD_TEXT_TITLE_SIZE);
|
||||
|
||||
// DisplayWrappedString((UINT16)(usPosX+7), (UINT16)(usPosY+15), FLORIST_CARD_TEXT_WIDTH, 2, FLORIST_CARDS_SENTENCE_FONT, FLORIST_CARDS_SENTENCE_COLOR, sTemp, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
|
||||
usHeightOffset = IanWrappedStringHeight( (UINT16)(usPosX+7), (UINT16)(usPosY), FLORIST_CARD_TEXT_WIDTH, 2,
|
||||
FLORIST_CARDS_SENTENCE_FONT, FLORIST_CARDS_SENTENCE_COLOR, sTemp,
|
||||
0, FALSE, 0);
|
||||
// DisplayWrappedString((UINT16)(usPosX+7), (UINT16)(usPosY+15), FLORIST_CARD_TEXT_WIDTH, 2, FLORIST_CARDS_SENTENCE_FONT, FLORIST_CARDS_SENTENCE_COLOR, sTemp, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
|
||||
usHeightOffset = IanWrappedStringHeight( (UINT16)(usPosX+7), (UINT16)(usPosY), FLORIST_CARD_TEXT_WIDTH, 2,
|
||||
FLORIST_CARDS_SENTENCE_FONT, FLORIST_CARDS_SENTENCE_COLOR, sTemp,
|
||||
0, FALSE, 0);
|
||||
|
||||
usHeightOffset = ( FLORIST_CARD_TEXT_HEIGHT - usHeightOffset ) / 2;
|
||||
|
||||
|
||||
IanDisplayWrappedString( (UINT16)(usPosX+7), (UINT16)(usPosY+10+usHeightOffset), FLORIST_CARD_TEXT_WIDTH, 2,
|
||||
FLORIST_CARDS_SENTENCE_FONT, FLORIST_CARDS_SENTENCE_COLOR, sTemp,
|
||||
0, FALSE, 0);
|
||||
IanDisplayWrappedString( (UINT16)(usPosX+7), (UINT16)(usPosY+10+usHeightOffset), FLORIST_CARD_TEXT_WIDTH, 2,
|
||||
FLORIST_CARDS_SENTENCE_FONT, FLORIST_CARDS_SENTENCE_COLOR, sTemp,
|
||||
0, FALSE, 0);
|
||||
|
||||
ubCount++;
|
||||
usPosX += FLORIST_CARD_FIRST_OFFSET_X;
|
||||
@@ -175,15 +175,15 @@ void RenderFloristCards()
|
||||
usPosY += FLORIST_CARD_FIRST_OFFSET_Y;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void SelectFloristCardsRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
|
||||
{
|
||||
{
|
||||
if (iReason & MSYS_CALLBACK_REASON_INIT)
|
||||
{
|
||||
}
|
||||
@@ -195,7 +195,7 @@ void SelectFloristCardsRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
|
||||
}
|
||||
else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -223,4 +223,4 @@ void BtnFlowerCardsBackButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
btn->uiFlags &= (~BUTTON_CLICKED_ON );
|
||||
InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user