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

Bugfix: Briefing Room: Deleted unused/wrong text box from briefing room (by Jazz)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2016-03-10 21:01:35 +00:00
parent e206c21daa
commit 80bfe613e8
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/BriefingRoomM.cpp
+23 -13
View File
@@ -172,9 +172,10 @@ BOOLEAN EnterBriefingRoomEnter()
CHECKF(AddVideoObject(&VObjectDesc, &guiContentButtonBriefingRoomEnter)); CHECKF(AddVideoObject(&VObjectDesc, &guiContentButtonBriefingRoomEnter));
// this procedure will load the activation indent into memory // this procedure will load the activation indent into memory
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE; //off
FilenameForBPP("LAPTOP\\ActivationIndent.sti", VObjectDesc.ImageFile); //VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
CHECKF(AddVideoObject(&VObjectDesc, &guiBRIEFINGROOM_MISSIONACTIVATIONINDENT)); //FilenameForBPP("LAPTOP\\ActivationIndent.sti", VObjectDesc.ImageFile);
//CHECKF(AddVideoObject(&VObjectDesc, &guiBRIEFINGROOM_MISSIONACTIVATIONINDENT));
//** Mouse Regions ** //** Mouse Regions **
@@ -217,7 +218,8 @@ void ExitBriefingRoomEnter()
MSYS_RemoveRegion( &gSelectedBriefingRoomEnterTocMenuRegion[i]); MSYS_RemoveRegion( &gSelectedBriefingRoomEnterTocMenuRegion[i]);
// remove activation indent symbol // remove activation indent symbol
DeleteVideoObjectFromIndex( guiBRIEFINGROOM_MISSIONACTIVATIONINDENT ); //off
//DeleteVideoObjectFromIndex( guiBRIEFINGROOM_MISSIONACTIVATIONINDENT );
} }
@@ -226,6 +228,7 @@ void HandleBriefingRoomEnter()
// handle keyboard input for this screen // handle keyboard input for this screen
GetPlayerKeyBoardInputForBriefingRoomEnterHomePage( ); GetPlayerKeyBoardInputForBriefingRoomEnterHomePage( );
/* off
// has a new char been added to activation string // has a new char been added to activation string
if( fNewCharInActivationBriefingRoomEnterString ) if( fNewCharInActivationBriefingRoomEnterString )
{ {
@@ -234,7 +237,8 @@ void HandleBriefingRoomEnter()
} }
// render the cursor // render the cursor
DisplayActivationBriefingRoomEnterStringCursor( ); DisplayActivationBriefingRoomEnterStringCursor( );
*/
} }
void RenderBriefingRoomEnter() void RenderBriefingRoomEnter()
@@ -273,9 +277,11 @@ void RenderBriefingRoomEnter()
} }
// get the video object // get the video object
GetVideoObject(&hHandle, guiBRIEFINGROOM_MISSIONACTIVATIONINDENT); //off
//GetVideoObject(&hHandle, guiBRIEFINGROOM_MISSIONACTIVATIONINDENT);
// blt to sX, sY relative to upper left corner // blt to sX, sY relative to upper left corner
BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + 100, LAPTOP_SCREEN_WEB_UL_Y + 240 , VO_BLT_SRCTRANSPARENCY,NULL); //off
//BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + 100, LAPTOP_SCREEN_WEB_UL_Y + 240 , VO_BLT_SRCTRANSPARENCY,NULL);
DisplayBriefingRoomEnterSlogan(); DisplayBriefingRoomEnterSlogan();
@@ -286,7 +292,7 @@ void RenderBriefingRoomEnter()
// render the activation string // render the activation string
//------------- //-------------
DisplayPlayerActivationBriefingRoomEnterString( ); //DisplayPlayerActivationBriefingRoomEnterString( ); //off
//------------- //-------------
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);
@@ -393,10 +399,11 @@ HVOBJECT hHandle;
// restore background // restore background
//RenderActivationIndent( 257, 328 ); //RenderActivationIndent( 257, 328 );
// get the video object // get the video object
GetVideoObject(&hHandle, guiBRIEFINGROOM_MISSIONACTIVATIONINDENT); //off
//GetVideoObject(&hHandle, guiBRIEFINGROOM_MISSIONACTIVATIONINDENT);
//off
// blt to sX, sY relative to upper left corner // blt to sX, sY relative to upper left corner
BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + 100, LAPTOP_SCREEN_WEB_UL_Y + 240 , VO_BLT_SRCTRANSPARENCY,NULL); //BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + 100, LAPTOP_SCREEN_WEB_UL_Y + 240 , VO_BLT_SRCTRANSPARENCY,NULL);
// setup the font stuff // setup the font stuff
SetFont( FONT14ARIAL ); SetFont( FONT14ARIAL );
@@ -405,8 +412,9 @@ HVOBJECT hHandle;
// reset shadow // reset shadow
SetFontShadow(DEFAULT_SHADOW); //off
mprintf(IMP_PLAYER_ACTIVATION_STRING_X, IMP_PLAYER_ACTIVATION_STRING_Y, pPlayerBriefingRoomEnterActivationString); //SetFontShadow(DEFAULT_SHADOW);
//mprintf(IMP_PLAYER_ACTIVATION_STRING_X, IMP_PLAYER_ACTIVATION_STRING_Y, pPlayerBriefingRoomEnterActivationString);
fNewCharInActivationBriefingRoomEnterString = FALSE; fNewCharInActivationBriefingRoomEnterString = FALSE;
@@ -511,6 +519,7 @@ void GetPlayerKeyBoardInputForBriefingRoomEnterHomePage( void )
switch( InputEvent.usParam ) switch( InputEvent.usParam )
{ {
case (( ENTER ) ): case (( ENTER ) ):
/* off
if(( InputEvent.usEvent == KEY_UP ) ) if(( InputEvent.usEvent == KEY_UP ) )
{ {
// return hit, check to see if current player activation string is a valid one // return hit, check to see if current player activation string is a valid one
@@ -518,6 +527,7 @@ void GetPlayerKeyBoardInputForBriefingRoomEnterHomePage( void )
fNewCharInActivationBriefingRoomEnterString = TRUE; fNewCharInActivationBriefingRoomEnterString = TRUE;
} }
*/
break; break;
case (( ESC )): case (( ESC )):
HandleLapTopESCKey(); // WANNE: Fix for proper closing of the IMP laptop page HandleLapTopESCKey(); // WANNE: Fix for proper closing of the IMP laptop page