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:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+109 -110
View File
@@ -20,7 +20,7 @@
UINT8 AimMercArray[ MAX_NUMBER_MERCS ];
UINT8 gCurrentAimPage[ NUM_AIM_SCREENS ] =
UINT8 gCurrentAimPage[ NUM_AIM_SCREENS ] =
{
LAPTOP_MODE_AIM,
LAPTOP_MODE_AIM_MEMBERS_SORTED_FILES,
@@ -31,8 +31,8 @@ UINT8 gCurrentAimPage[ NUM_AIM_SCREENS ] =
};
//
//*** Defines **
//
//*** Defines **
//
@@ -48,7 +48,7 @@ UINT8 gCurrentAimPage[ NUM_AIM_SCREENS ] =
#define MEMBERCARD_Y IMAGE_OFFSET_Y + 190
#define POLICIES_X IMAGE_OFFSET_X + 284
#define POLICIES_Y MEMBERCARD_Y
#define POLICIES_Y MEMBERCARD_Y
#define HISTORY_X MEMBERCARD_X
#define HISTORY_Y IMAGE_OFFSET_Y + 279
@@ -114,7 +114,7 @@ UINT8 gCurrentAimPage[ NUM_AIM_SCREENS ] =
#define AIM_AD_BOBBYR_AD_NUM_DUCK_SUBIMAGES 6
//#define
//#define
enum
{
@@ -131,7 +131,7 @@ enum
// Aim Screen Handle
UINT32 guiAimSymbol;
UINT32 guiAimSymbol;
UINT32 guiRustBackGround;
UINT32 guiMemberCard;
UINT32 guiPolicies;
@@ -154,20 +154,20 @@ UINT8 gubCurrentAdvertisment;
BOOLEAN gfInitAdArea;
// MemberCard
MOUSE_REGION gSelectedMemberCardRegion;
MOUSE_REGION gSelectedMemberCardRegion;
void SelectMemberCardRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
// Policies
MOUSE_REGION gSelectedPoliciesRegion;
MOUSE_REGION gSelectedPoliciesRegion;
void SelectPoliciesRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
//History
MOUSE_REGION gSelectedHistoryRegion;
MOUSE_REGION gSelectedHistoryRegion;
void SelectHistoryRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
//Links
MOUSE_REGION gSelectedLinksRegion;
MOUSE_REGION gSelectedLinksRegion;
void SelectLinksRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
//Bottom Buttons
@@ -176,11 +176,11 @@ UINT32 guiBottomButtons[ NUM_AIM_SCREENS ];
INT32 guiBottomButtonImage;
//Banner Area
MOUSE_REGION gSelectedBannerRegion;
MOUSE_REGION gSelectedBannerRegion;
void SelectBannerRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
//Aim logo click
MOUSE_REGION gSelectedAimLogo;
MOUSE_REGION gSelectedAimLogo;
void SelectAimLogoRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
@@ -199,7 +199,7 @@ UINT8 GetNextAimAd( UINT8 ubCurrentAd );
BOOLEAN fFirstTimeIn=TRUE;
//
// *********************** Functions *************************
// *********************** Functions *************************
//
void GameInitAIM()
@@ -211,7 +211,7 @@ void GameInitAIM()
BOOLEAN EnterAIM()
{
VOBJECT_DESC VObjectDesc;
VOBJECT_DESC VObjectDesc;
gubWarningTimer = 0;
gubCurrentAdvertisment = AIM_AD_WARNING_BOX;
@@ -269,37 +269,37 @@ BOOLEAN EnterAIM()
GetMLGFilename( VObjectDesc.ImageFile, MLG_BOBBYRAYAD21 );
CHECKF(AddVideoObject(&VObjectDesc, &guiBobbyRAdImages ));
//** Mouse Regions **
//Mouse region for the MebershipCard
MSYS_DefineRegion( &gSelectedMemberCardRegion, MEMBERCARD_X, MEMBERCARD_Y , (MEMBERCARD_X + LINK_SIZE_X), (MEMBERCARD_Y + LINK_SIZE_Y), MSYS_PRIORITY_HIGH,
CURSOR_WWW, MSYS_NO_CALLBACK, SelectMemberCardRegionCallBack );
MSYS_AddRegion(&gSelectedMemberCardRegion);
CURSOR_WWW, MSYS_NO_CALLBACK, SelectMemberCardRegionCallBack );
MSYS_AddRegion(&gSelectedMemberCardRegion);
//Mouse region for the Policies
MSYS_DefineRegion( &gSelectedPoliciesRegion, POLICIES_X, POLICIES_Y , (POLICIES_X + LINK_SIZE_X), (POLICIES_Y + LINK_SIZE_Y), MSYS_PRIORITY_HIGH,
CURSOR_WWW, MSYS_NO_CALLBACK, SelectPoliciesRegionCallBack );
MSYS_AddRegion(&gSelectedPoliciesRegion);
CURSOR_WWW, MSYS_NO_CALLBACK, SelectPoliciesRegionCallBack );
MSYS_AddRegion(&gSelectedPoliciesRegion);
//Mouse region for the History
MSYS_DefineRegion( &gSelectedHistoryRegion, HISTORY_X, HISTORY_Y , (HISTORY_X + LINK_SIZE_X), (HISTORY_Y + LINK_SIZE_Y), MSYS_PRIORITY_HIGH,
CURSOR_WWW, MSYS_NO_CALLBACK, SelectHistoryRegionCallBack );
MSYS_AddRegion(&gSelectedHistoryRegion);
CURSOR_WWW, MSYS_NO_CALLBACK, SelectHistoryRegionCallBack );
MSYS_AddRegion(&gSelectedHistoryRegion);
//Mouse region for the Links
MSYS_DefineRegion( &gSelectedLinksRegion, LINKS_X, LINKS_Y , (LINKS_X + LINK_SIZE_X), (LINKS_Y + LINK_SIZE_Y), MSYS_PRIORITY_HIGH,
CURSOR_WWW, MSYS_NO_CALLBACK, SelectLinksRegionCallBack );
MSYS_AddRegion(&gSelectedLinksRegion);
CURSOR_WWW, MSYS_NO_CALLBACK, SelectLinksRegionCallBack );
MSYS_AddRegion(&gSelectedLinksRegion);
//Mouse region for the Links
MSYS_DefineRegion( &gSelectedBannerRegion, AIM_AD_TOP_LEFT_X, AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X, AIM_AD_BOTTOM_RIGHT_Y, MSYS_PRIORITY_HIGH,
CURSOR_WWW, MSYS_NO_CALLBACK, SelectBannerRegionCallBack);
MSYS_AddRegion(&gSelectedBannerRegion);
CURSOR_WWW, MSYS_NO_CALLBACK, SelectBannerRegionCallBack);
MSYS_AddRegion(&gSelectedBannerRegion);
// disable the region because only certain banners will be 'clickable'
MSYS_DisableRegion(&gSelectedBannerRegion);
MSYS_DisableRegion(&gSelectedBannerRegion);
gubAimMenuButtonDown=255;
@@ -331,11 +331,11 @@ void ExitAIM()
// Remove Mouse Regions
MSYS_RemoveRegion( &gSelectedMemberCardRegion);
MSYS_RemoveRegion( &gSelectedPoliciesRegion);
MSYS_RemoveRegion( &gSelectedLinksRegion);
MSYS_RemoveRegion( &gSelectedHistoryRegion);
MSYS_RemoveRegion( &gSelectedBannerRegion);
MSYS_RemoveRegion( &gSelectedMemberCardRegion);
MSYS_RemoveRegion( &gSelectedPoliciesRegion);
MSYS_RemoveRegion( &gSelectedLinksRegion);
MSYS_RemoveRegion( &gSelectedHistoryRegion);
MSYS_RemoveRegion( &gSelectedBannerRegion);
}
void HandleAIM()
@@ -346,29 +346,29 @@ void HandleAIM()
void RenderAIM()
{
HVOBJECT hMemberCardHandle;
HVOBJECT hPoliciesHandle;
HVOBJECT hLinksHandle;
HVOBJECT hHistoryHandle;
HVOBJECT hMemberCardHandle;
HVOBJECT hPoliciesHandle;
HVOBJECT hLinksHandle;
HVOBJECT hHistoryHandle;
// UINT16 x,y, uiPosX, uiPosY;
DrawAimDefaults();
//MemberCard
GetVideoObject(&hMemberCardHandle, guiMemberCard);
BltVideoObject(FRAME_BUFFER, hMemberCardHandle, 0,MEMBERCARD_X, MEMBERCARD_Y, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hMemberCardHandle, 0,MEMBERCARD_X, MEMBERCARD_Y, VO_BLT_SRCTRANSPARENCY,NULL);
//Policies
GetVideoObject(&hPoliciesHandle, guiPolicies);
BltVideoObject(FRAME_BUFFER, hPoliciesHandle, 0,POLICIES_X, POLICIES_Y, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hPoliciesHandle, 0,POLICIES_X, POLICIES_Y, VO_BLT_SRCTRANSPARENCY,NULL);
//Links
GetVideoObject(&hLinksHandle, guiLinks);
BltVideoObject(FRAME_BUFFER, hLinksHandle, 0,LINKS_X, LINKS_Y, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hLinksHandle, 0,LINKS_X, LINKS_Y, VO_BLT_SRCTRANSPARENCY,NULL);
//History
GetVideoObject(&hHistoryHandle, guiHistory);
BltVideoObject(FRAME_BUFFER, hHistoryHandle, 0,HISTORY_X, HISTORY_Y, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hHistoryHandle, 0,HISTORY_X, HISTORY_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// Draw the aim slogan under the symbol
DisplayAimSlogan();
@@ -389,13 +389,13 @@ void RenderAIM()
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 SelectMemberCardRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
{
{
if (iReason & MSYS_CALLBACK_REASON_INIT)
{
@@ -407,12 +407,12 @@ void SelectMemberCardRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
{
}
}
}
void SelectPoliciesRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
{
{
if (iReason & MSYS_CALLBACK_REASON_INIT)
{
@@ -423,12 +423,12 @@ void SelectPoliciesRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
{
}
}
}
void SelectHistoryRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
{
{
if (iReason & MSYS_CALLBACK_REASON_INIT)
{
@@ -439,13 +439,13 @@ void SelectHistoryRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
{
}
}
}
void SelectLinksRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
{
{
if (iReason & MSYS_CALLBACK_REASON_INIT)
{
}
@@ -455,14 +455,14 @@ void SelectLinksRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
{
}
}
}
BOOLEAN InitAimDefaults()
{
VOBJECT_DESC VObjectDesc;
VOBJECT_DESC VObjectDesc;
// load the Rust bacground graphic and add it
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
@@ -476,8 +476,8 @@ BOOLEAN InitAimDefaults()
//Mouse region for the Links
MSYS_DefineRegion( &gSelectedAimLogo, AIM_SYMBOL_X, AIM_SYMBOL_Y, AIM_SYMBOL_X+AIM_SYMBOL_WIDTH, AIM_SYMBOL_Y+AIM_SYMBOL_HEIGHT, MSYS_PRIORITY_HIGH,
CURSOR_WWW, MSYS_NO_CALLBACK, SelectAimLogoRegionCallBack);
MSYS_AddRegion(&gSelectedAimLogo);
CURSOR_WWW, MSYS_NO_CALLBACK, SelectAimLogoRegionCallBack);
MSYS_AddRegion(&gSelectedAimLogo);
return(TRUE);
@@ -487,15 +487,15 @@ BOOLEAN RemoveAimDefaults()
{
DeleteVideoObjectFromIndex(guiRustBackGround);
DeleteVideoObjectFromIndex(guiAimSymbol);
MSYS_RemoveRegion( &gSelectedAimLogo);
MSYS_RemoveRegion( &gSelectedAimLogo);
return(TRUE);
}
BOOLEAN DrawAimDefaults()
{
HVOBJECT hRustBackGroundHandle;
HVOBJECT hAimSymbolHandle;
HVOBJECT hRustBackGroundHandle;
HVOBJECT hAimSymbolHandle;
UINT16 x,y, uiPosX, uiPosY;
// Blt the rust background
@@ -507,7 +507,7 @@ BOOLEAN DrawAimDefaults()
uiPosX = RUSTBACKGROUND_1_X;
for(x=0; x<4; x++)
{
BltVideoObject(FRAME_BUFFER, hRustBackGroundHandle, 0,uiPosX, uiPosY, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hRustBackGroundHandle, 0,uiPosX, uiPosY, VO_BLT_SRCTRANSPARENCY,NULL);
uiPosX += RUSTBACKGROUND_SIZE_X;
}
uiPosY += RUSTBACKGROUND_SIZE_Y;
@@ -515,14 +515,14 @@ BOOLEAN DrawAimDefaults()
// Aim Symbol
GetVideoObject(&hAimSymbolHandle, guiAimSymbol);
BltVideoObject(FRAME_BUFFER, hAimSymbolHandle, 0,AIM_SYMBOL_X, AIM_SYMBOL_Y, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hAimSymbolHandle, 0,AIM_SYMBOL_X, AIM_SYMBOL_Y, VO_BLT_SRCTRANSPARENCY,NULL);
return(TRUE);
}
void SelectAimLogoRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
{
{
if (iReason & MSYS_CALLBACK_REASON_INIT)
{
}
@@ -532,7 +532,7 @@ void SelectAimLogoRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
{
}
}
}
@@ -556,12 +556,12 @@ BOOLEAN DisplayAimCopyright()
CHAR16 sSlogan[400];
UINT32 uiStartLoc=0;
//Load and Display the copyright notice
//Load and Display the copyright notice
uiStartLoc = AIM_HISTORY_LINE_SIZE * AIM_COPYRIGHT_1;
LoadEncryptedDataFromFile(AIMHISTORYFILE, sSlogan, uiStartLoc, AIM_HISTORY_LINE_SIZE);
DrawTextToScreen(sSlogan, AIM_COPYRIGHT_X, AIM_COPYRIGHT_Y, AIM_COPYRIGHT_WIDTH, AIM_COPYRIGHT_FONT, FONT_MCOLOR_DKWHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
uiStartLoc = AIM_HISTORY_LINE_SIZE * AIM_COPYRIGHT_2;
LoadEncryptedDataFromFile(AIMHISTORYFILE, sSlogan, uiStartLoc, AIM_HISTORY_LINE_SIZE);
DrawTextToScreen(sSlogan, AIM_COPYRIGHT_X, AIM_COPYRIGHT_Y + AIM_COPYRIGHT_GAP, AIM_COPYRIGHT_WIDTH, AIM_COPYRIGHT_FONT, FONT_MCOLOR_DKWHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
@@ -580,17 +580,17 @@ BOOLEAN InitAimMenuBar(void)
UINT8 i;
UINT16 usPosX;
guiBottomButtonImage = LoadButtonImage("LAPTOP\\BottomButtons2.sti", -1,0,-1,1,-1 );
guiBottomButtonImage = LoadButtonImage("LAPTOP\\BottomButtons2.sti", -1,0,-1,1,-1 );
usPosX = BOTTOM_BUTTON_START_X;
for(i=0; i<BOTTOM_BUTTON_AMOUNT; i++)
{
guiBottomButtons[i] = CreateIconAndTextButton( guiBottomButtonImage, AimBottomMenuText[i], FONT10ARIAL,
AIM_BUTTON_ON_COLOR, DEFAULT_SHADOW,
AIM_BUTTON_OFF_COLOR, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
usPosX, BOTTOM_BUTTON_START_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
DEFAULT_MOVE_CALLBACK, BtnAimBottomButtonsCallback);
guiBottomButtons[i] = CreateIconAndTextButton( guiBottomButtonImage, AimBottomMenuText[i], FONT10ARIAL,
AIM_BUTTON_ON_COLOR, DEFAULT_SHADOW,
AIM_BUTTON_OFF_COLOR, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
usPosX, BOTTOM_BUTTON_START_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
DEFAULT_MOVE_CALLBACK, BtnAimBottomButtonsCallback);
SetButtonCursor(guiBottomButtons[i], CURSOR_LAPTOP_SCREEN);
@@ -645,16 +645,16 @@ void BtnAimBottomButtonsCallback(GUI_BUTTON *btn,INT32 reason)
InvalidateRegion(BOTTOM_BUTTON_START_X,BOTTOM_BUTTON_START_Y,BOTTOM_BUTTON_END_X,BOTTOM_BUTTON_END_Y);
}
DisableAimButton();
}
}
void ResetAimButtons(UINT32 *Buttons, UINT16 uNumberOfButtons)
{
UINT32 cnt;
UINT32 cnt;
for ( cnt = 0; cnt < uNumberOfButtons; cnt++ )
{
ButtonList[ Buttons[ cnt ] ]->uiFlags &= ~(BUTTON_CLICKED_ON);
ButtonList[ Buttons[ cnt ] ]->uiFlags &= ~(BUTTON_CLICKED_ON);
}
}
@@ -665,7 +665,7 @@ void DisableAimButton()
for(i=0; i<NUM_AIM_BOTTOMBUTTONS; i++)
{
if( gCurrentAimPage[i] == guiCurrentLaptopMode)
ButtonList[ guiBottomButtons[i] ]->uiFlags |= BUTTON_CLICKED_ON;
ButtonList[ guiBottomButtons[i] ]->uiFlags |= BUTTON_CLICKED_ON;
}
}
@@ -741,7 +741,7 @@ void HandleAdAndWarningArea( BOOLEAN fInit, BOOLEAN fRedraw )
switch( gubCurrentAdvertisment )
{
case AIM_AD_WARNING_BOX:
MSYS_DisableRegion(&gSelectedBannerRegion);
MSYS_DisableRegion(&gSelectedBannerRegion);
ubPreviousAdvertisment = DrawWarningBox( fInit, fRedraw );
break;
@@ -751,22 +751,22 @@ void HandleAdAndWarningArea( BOOLEAN fInit, BOOLEAN fRedraw )
case AIM_AD_FOR_ADS:
// disable the region because only certain banners will be 'clickable'
MSYS_DisableRegion(&gSelectedBannerRegion);
MSYS_DisableRegion(&gSelectedBannerRegion);
ubPreviousAdvertisment = DisplayAd( fInit, fRedraw, AIM_AD_FOR_ADS_DELAY, AIM_AD_FOR_ADS__NUM_SUBIMAGES, guiAdForAdsImages );
break;
case AIM_AD_INSURANCE_AD:
MSYS_EnableRegion(&gSelectedBannerRegion);
MSYS_EnableRegion(&gSelectedBannerRegion);
ubPreviousAdvertisment = DisplayAd( fInit, fRedraw, AIM_AD_INSURANCE_AD_DELAY, AIM_AD_INSURANCE_AD__NUM_SUBIMAGES, guiInsuranceAdImages );
break;
case AIM_AD_FUNERAL_ADS:
MSYS_EnableRegion(&gSelectedBannerRegion);
MSYS_EnableRegion(&gSelectedBannerRegion);
ubPreviousAdvertisment = DisplayAd( fInit, fRedraw, AIM_AD_FUNERAL_AD_DELAY, AIM_AD_FUNERAL_AD__NUM_SUBIMAGES, guiFuneralAdImages );
break;
case AIM_AD_BOBBY_RAY_AD:
MSYS_EnableRegion(&gSelectedBannerRegion);
MSYS_EnableRegion(&gSelectedBannerRegion);
// ubPreviousAdvertisment = DisplayAd( fInit, fRedraw, AIM_AD_BOBBYR_AD_DELAY, AIM_AD_BOBBYR_AD__NUM_SUBIMAGES, guiBobbyRAdImages );
ubPreviousAdvertisment = DisplayBobbyRAd( fInit, fRedraw );
break;
@@ -787,7 +787,7 @@ BOOLEAN DisplayFlowerAd( BOOLEAN fInit, BOOLEAN fRedraw )
uiLastTime = 0;
ubSubImage = 0;
ubCount = 0;
MSYS_EnableRegion(&gSelectedBannerRegion);
MSYS_EnableRegion(&gSelectedBannerRegion);
}
if( ((uiCurTime - uiLastTime) > AIM_FLOWER_AD_DELAY) || fRedraw)
@@ -801,14 +801,14 @@ BOOLEAN DisplayFlowerAd( BOOLEAN fInit, BOOLEAN fRedraw )
//Blit the blue sky frame with text on top
GetVideoObject(&hAdHandle, guiFlowerAdvertisement);
BltVideoObject(FRAME_BUFFER, hAdHandle, 0,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
//Display Aim Warning Text
//Display Aim Warning Text
DisplayWrappedString(AIM_WARNING_TEXT_X, AIM_WARNING_TEXT_Y, AIM_WARNING_TEXT_WIDTH, 2, FONT14ARIAL, FONT_GREEN, AimScreenText[AIM_INFO_6], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
//Display Aim Warning Text
//Display Aim Warning Text
SetFontShadow( FONT_MCOLOR_WHITE );
DisplayWrappedString(AIM_WARNING_TEXT_X, AIM_FLOWER_LINK_TEXT_Y, AIM_WARNING_TEXT_WIDTH, 2, FONT12ARIAL, 2, AimScreenText[AIM_INFO_7], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
SetFontShadow( DEFAULT_SHADOW );
@@ -831,15 +831,15 @@ BOOLEAN DisplayFlowerAd( BOOLEAN fInit, BOOLEAN fRedraw )
{
GetVideoObject(&hAdHandle, guiFlowerAdvertisement);
BltVideoObject(FRAME_BUFFER, hAdHandle, ubSubImage,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
ubSubImage++;
}
uiLastTime = GetJA2Clock();
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
return( AIM_AD_NOT_DONE );
}
@@ -856,7 +856,7 @@ BOOLEAN DrawWarningBox( BOOLEAN fInit, BOOLEAN fRedraw )
{
CHAR16 sText[400];
UINT32 uiStartLoc=0;
UINT16 usLocY = AIM_WARNING_TEXT_Y + (GetFontHeight(AIM_WARNING_FONT) + 2) * 2;
//UINT16 usLocY = AIM_WARNING_TEXT_Y + (GetFontHeight(AIM_WARNING_FONT) + 2) * 2;
HVOBJECT hWarningHandle;
//Warning
@@ -867,7 +867,7 @@ BOOLEAN DrawWarningBox( BOOLEAN fInit, BOOLEAN fRedraw )
uiStartLoc = AIM_HISTORY_LINE_SIZE * AIM_WARNING_1;
LoadEncryptedDataFromFile(AIMHISTORYFILE, sText, uiStartLoc, AIM_HISTORY_LINE_SIZE);
//Display Aim Warning Text
//Display Aim Warning Text
DisplayWrappedString(AIM_WARNING_TEXT_X, AIM_WARNING_TEXT_Y, AIM_WARNING_TEXT_WIDTH, 2, AIM_WARNING_FONT, FONT_RED, sText, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
@@ -888,7 +888,7 @@ BOOLEAN DrawWarningBox( BOOLEAN fInit, BOOLEAN fRedraw )
}
void SelectBannerRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
{
{
if (iReason & MSYS_CALLBACK_REASON_INIT)
{
}
@@ -907,7 +907,7 @@ void SelectBannerRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
else if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
{
}
}
}
@@ -939,10 +939,10 @@ BOOLEAN DisplayAd( BOOLEAN fInit, BOOLEAN fRedraw, UINT16 usDelay, UINT16 usNumb
//Blit the ad
GetVideoObject(&hAdHandle, uiAdImageIdentifier);
BltVideoObject(FRAME_BUFFER, hAdHandle, 0,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
@@ -966,10 +966,10 @@ BOOLEAN DisplayAd( BOOLEAN fInit, BOOLEAN fRedraw, UINT16 usDelay, UINT16 usNumb
//Blit the ad
GetVideoObject(&hAdHandle, uiAdImageIdentifier);
BltVideoObject(FRAME_BUFFER, hAdHandle, ubSubImage,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
@@ -986,10 +986,10 @@ BOOLEAN DisplayAd( BOOLEAN fInit, BOOLEAN fRedraw, UINT16 usDelay, UINT16 usNumb
{
GetVideoObject(&hAdHandle, uiAdImageIdentifier);
BltVideoObject(FRAME_BUFFER, hAdHandle, ubSubImage,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
ubSubImage++;
}
@@ -997,7 +997,7 @@ BOOLEAN DisplayAd( BOOLEAN fInit, BOOLEAN fRedraw, UINT16 usDelay, UINT16 usNumb
HandleTextOnAimAdd( ubSubImage );
uiLastTime = GetJA2Clock();
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
return( ubRetVal );
}
@@ -1026,7 +1026,7 @@ void HandleTextOnAimAdd( UINT8 ubCurSubImage )
//if the subimage is the first couple
if( ubCurSubImage <= AIM_AD_BOBBYR_AD_NUM_DUCK_SUBIMAGES )
{
//Display Aim Warning Text
//Display Aim Warning Text
SetFontShadow( 2 );
DisplayWrappedString(AIM_BOBBYR1_LINK_TEXT_X, AIM_BOBBYR1_LINK_TEXT_Y, AIM_WARNING_TEXT_WIDTH, 2, BOBBYR_UNDER_CONSTRUCTION_AD_FONT, BOBBYR_UNDER_CONSTRUCTION_AD_COLOR, AimScreenText[AIM_BOBBYR_ADD1], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | INVALIDATE_TEXT );
SetFontShadow( DEFAULT_SHADOW );
@@ -1035,7 +1035,7 @@ void HandleTextOnAimAdd( UINT8 ubCurSubImage )
else if( ubCurSubImage >= AIM_AD_BOBBYR_AD__NUM_SUBIMAGES-5 )
{
//Display Aim Warning Text
//Display Aim Warning Text
SetFontShadow( 2 );
DisplayWrappedString(AIM_BOBBYR2_LINK_TEXT_X, AIM_BOBBYR2_LINK_TEXT_Y, AIM_WARNING_TEXT_WIDTH, 2, BOBBYR_UNDER_CONSTRUCTION_AD_FONT, BOBBYR_UNDER_CONSTRUCTION_AD_COLOR, AimScreenText[AIM_BOBBYR_ADD2], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | INVALIDATE_TEXT ) ;
SetFontShadow( DEFAULT_SHADOW );
@@ -1043,7 +1043,7 @@ void HandleTextOnAimAdd( UINT8 ubCurSubImage )
/*
else
{
//Display Aim Warning Text
//Display Aim Warning Text
SetFontShadow( 2 );
// DisplayWrappedString( AIM_BOBBYR3_LINK_TEXT_X, AIM_BOBBYR3_LINK_TEXT_Y, AIM_WARNING_TEXT_WIDTH, 2, BOBBYR_UNDER_CONSTRUCTION_AD_FONT, FONT_MCOLOR_WHITE, AimScreenText[AIM_BOBBYR_ADD3], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | INVALIDATE_TEXT );
SetFontShadow( DEFAULT_SHADOW );
@@ -1121,10 +1121,10 @@ BOOLEAN DisplayBobbyRAd( BOOLEAN fInit, BOOLEAN fRedraw )
ubSubImage = AIM_AD_BOBBYR_AD__NUM_SUBIMAGES - 1;
}
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
@@ -1133,7 +1133,7 @@ BOOLEAN DisplayBobbyRAd( BOOLEAN fInit, BOOLEAN fRedraw )
uiLastTime = GetJA2Clock();
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
/*
@@ -1164,10 +1164,10 @@ BOOLEAN DisplayBobbyRAd( BOOLEAN fInit, BOOLEAN fRedraw )
{
//Blit the ad
BltVideoObject(FRAME_BUFFER, hAdHandle, ubSubImage,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
@@ -1184,10 +1184,10 @@ BOOLEAN DisplayBobbyRAd( BOOLEAN fInit, BOOLEAN fRedraw )
//Blit the ad
GetVideoObject(&hAdHandle, guiBobbyRAdImages);
BltVideoObject(FRAME_BUFFER, hAdHandle, ubSubImage,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
InvalidateRegion(AIM_AD_TOP_LEFT_X,AIM_AD_TOP_LEFT_Y, AIM_AD_BOTTOM_RIGHT_X ,AIM_AD_BOTTOM_RIGHT_Y);
}
@@ -1204,10 +1204,10 @@ BOOLEAN DisplayBobbyRAd( BOOLEAN fInit, BOOLEAN fRedraw )
{
GetVideoObject(&hAdHandle, guiBobbyRAdImages);
BltVideoObject(FRAME_BUFFER, hAdHandle, ubSubImage,WARNING_X, WARNING_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// redraw new mail warning, and create new mail button, if nessacary
fReDrawNewMailFlag = TRUE;
ubSubImage++;
}
*/
@@ -1220,8 +1220,6 @@ UINT8 GetNextAimAd( UINT8 ubCurrentAd )
{
UINT8 ubNextAd;
UINT32 uiDay = GetWorldDay();
BOOLEAN fSkip=FALSE;
if( ubCurrentAd == AIM_AD_WARNING_BOX )
{
if( uiDay < AIM_AD_BOBBYR_AD_STARTS )
@@ -1257,6 +1255,7 @@ UINT8 GetNextAimAd( UINT8 ubCurrentAd )