1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Due to erroneous code, the encyclopedia feature has been deactivated. for more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23090&goto=345928&#msg_345928

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-07-16 12:21:22 +00:00
parent 7a34e9a154
commit 57ec4e7fa1
15 changed files with 194 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/laptop.cpp
+32 -16
View File
@@ -788,11 +788,14 @@ UINT32 LaptopScreenInit()
GameInitFiles();
GameInitPersonnel();
#ifdef ENCYCLOPEDIA_WORKS
//legion
/* GameInitEncyclopedia();
GameInitEncyclopediaLocation();*/
GameInitEncyclopedia_NEW();
GameInitEncyclopediaData_NEW();
#endif
GameInitBriefingRoom();
GameInitBriefingRoomEnter();
@@ -1046,8 +1049,10 @@ INT32 EnterLaptop()
{
SetBookMark( AIM_BOOKMARK );
#ifdef ENCYCLOPEDIA_WORKS
if ( gGameExternalOptions.gEncyclopedia )
SetBookMark( ENCYCLOPEDIA_BOOKMARK );
#endif
if ( gGameExternalOptions.gBriefingRoom )
SetBookMark( BRIEFING_ROOM_BOOKMARK );
@@ -1258,9 +1263,10 @@ void RenderLaptop()
switch( guiCurrentLaptopMode )
{
case( LAPTOP_MODE_NONE ):
DrawDeskTopBackground( );
break;
DrawDeskTopBackground( );
break;
#ifdef ENCYCLOPEDIA_WORKS
case LAPTOP_MODE_ENCYCLOPEDIA: //LEGION
// RenderEncyclopedia();
RenderEncyclopedia_NEW();
@@ -1270,6 +1276,7 @@ void RenderLaptop()
// RenderEncyclopediaLocation(FALSE);
RenderEncyclopediaData_NEW();
break;
#endif
case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
RenderBriefingRoom();
@@ -1638,14 +1645,16 @@ void EnterNewLaptopMode()
if( gLaptopProgramStates[ LAPTOP_PROGRAM_WEB_BROWSER ] == LAPTOP_PROGRAM_MINIMIZED )
{
if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_DATA || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
{
guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
}
else if ( guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_PAGE || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_ENTER )
if ( guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_PAGE || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_ENTER )
{
guiCurrentLaptopMode = LAPTOP_MODE_BRIEFING_ROOM_ENTER;
}
#ifdef ENCYCLOPEDIA_WORKS
else if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_DATA || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
{
guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
}
#endif
// minized, maximized
if( fMaximizingProgram == FALSE )
@@ -1733,6 +1742,7 @@ void EnterNewLaptopMode()
//Initialize the new mode.
switch( guiCurrentLaptopMode )
{
#ifdef ENCYCLOPEDIA_WORKS
//legion
case LAPTOP_MODE_ENCYCLOPEDIA:
// EnterEncyclopedia();
@@ -1743,6 +1753,7 @@ void EnterNewLaptopMode()
// EnterEncyclopediaLocation();
EnterEncyclopediaData_NEW();
break;
#endif
case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
EnterBriefingRoom();
@@ -1999,6 +2010,7 @@ void HandleLapTopHandles()
switch( guiCurrentLaptopMode )
{
#ifdef ENCYCLOPEDIA_WORKS
//legion
case LAPTOP_MODE_ENCYCLOPEDIA:
// HandleEncyclopedia();
@@ -2009,6 +2021,7 @@ void HandleLapTopHandles()
// HandleEncyclopediaLocation();
HandleEncyclopediaData_NEW();
break;
#endif
case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
HandleBriefingRoom();
@@ -2587,7 +2600,7 @@ UINT32 ExitLaptopMode(UINT32 uiMode)
switch( uiMode )
{
#ifdef ENCYCLOPEDIA_WORKS
case LAPTOP_MODE_ENCYCLOPEDIA:
ExitEncyclopedia_NEW();
// ExitEncyclopedia();
@@ -2598,7 +2611,8 @@ UINT32 ExitLaptopMode(UINT32 uiMode)
// ExitEncyclopediaLocation();
ExitEncyclopediaData_NEW();
break;
#endif
case LAPTOP_MODE_BRIEFING_ROOM_PAGE:
ExitBriefingRoom();
break;
@@ -4195,6 +4209,7 @@ void GoToWebPage(INT32 iPageId )
//LEGION
case ENCYCLOPEDIA_BOOKMARK:
#ifdef ENCYCLOPEDIA_WORKS
guiCurrentWWWMode=LAPTOP_MODE_ENCYCLOPEDIA;
guiCurrentLaptopMode=LAPTOP_MODE_ENCYCLOPEDIA;
@@ -4211,6 +4226,7 @@ void GoToWebPage(INT32 iPageId )
fLoadPendingFlag = TRUE;
fFastLoadFlag = TRUE;
}
#endif
break;
case BRIEFING_ROOM_BOOKMARK:
@@ -5920,16 +5936,16 @@ void SetCurrentToLastProgramOpened( void )
break;
case( LAPTOP_PROGRAM_WEB_BROWSER ):
// last www mode
if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_DATA || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
{
guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
}
else if ( guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_PAGE || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_ENTER )
if ( guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_PAGE || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM || guiCurrentLaptopMode == LAPTOP_MODE_BRIEFING_ROOM_ENTER )
{
guiCurrentLaptopMode = LAPTOP_MODE_BRIEFING_ROOM_ENTER;
}
//else if( guiCurrentWWWMode != 0 && ( guiCurrentWWWMode == LAPTOP_MODE_ENCYCLOPEDIA_LOCATION || guiCurrentWWWMode == LAPTOP_MODE_ENCYCLOPEDIA || guiCurrentWWWMode == LAPTOP_MODE_BRIEFING_ROOM_PAGE || guiCurrentWWWMode == LAPTOP_MODE_BRIEFING_ROOM || guiCurrentWWWMode == LAPTOP_MODE_BRIEFING_ROOM_ENTER ) )
#ifdef ENCYCLOPEDIA_WORKS
else if ( guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA_DATA || guiCurrentLaptopMode == LAPTOP_MODE_ENCYCLOPEDIA )
{
guiCurrentLaptopMode = LAPTOP_MODE_ENCYCLOPEDIA;
}
#endif
else if( guiCurrentWWWMode >= LAPTOP_MODE_FINANCES && guiCurrentWWWMode <= LAPTOP_MODE_BOBBYR_SHIPMENTS )
{
guiCurrentLaptopMode = guiCurrentWWWMode;