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

New feature: Getting and using intel allows for more spy-related roleplay.

Browse Source 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23643&goto=352475&#msg_352475

Requires GameDir >= r2401.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-02-18 23:17:34 +00:00
parent ee73811cfe
commit e55b480996
83 changed files with 3784 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/laptop.cpp
+90 -12
View File
@@ -91,6 +91,7 @@
#include "WHO.h" // added by Flugente
#include "PMC.h" // added by Flugente
#include "MilitiaWebsite.h" // added by Flugente
#include "Intelmarket.h" // added by Flugente
#endif
#include "connect.h"
@@ -1071,6 +1072,9 @@ INT32 EnterLaptop()
SetBookMark( WHO_BOOKMARK );
else
RemoveBookmark( WHO_BOOKMARK );
if ( !gGameExternalOptions.fIntelResource )
RemoveBookmark( INTELMARKET_BOOKMARK );
}
LoadLoadPending( );
@@ -1505,6 +1509,18 @@ void RenderLaptop()
case LAPTOP_MODE_MILITIAROSTER_MAIN:
RenderMilitiaWebsiteMain( );
break;
case LAPTOP_MODE_INTELMARKET_BUYINFO:
RenderIntelmarket();
break;
case LAPTOP_MODE_INTELMARKET_SELLINFO:
RenderIntelmarket_Sell();
break;
case LAPTOP_MODE_INTELMARKET_ABOUT:
RenderIntelmarket_About();
break;
}
if( guiCurrentLaptopMode >= LAPTOP_MODE_WWW )
@@ -1969,6 +1985,18 @@ void EnterNewLaptopMode()
case LAPTOP_MODE_MILITIAROSTER_MAIN:
EnterMilitiaWebsiteMain( );
break;
case LAPTOP_MODE_INTELMARKET_BUYINFO:
EnterIntelmarket();
break;
case LAPTOP_MODE_INTELMARKET_SELLINFO:
EnterIntelmarket_Sell();
break;
case LAPTOP_MODE_INTELMARKET_ABOUT:
EnterIntelmarket_About();
break;
}
// first time using webbrowser in this laptop session
@@ -2248,8 +2276,19 @@ void HandleLapTopHandles()
case LAPTOP_MODE_MILITIAROSTER_MAIN:
HandleMilitiaWebsiteMain( );
break;
}
case LAPTOP_MODE_INTELMARKET_BUYINFO:
HandleIntelmarket();
break;
case LAPTOP_MODE_INTELMARKET_SELLINFO:
HandleIntelmarket_Sell();
break;
case LAPTOP_MODE_INTELMARKET_ABOUT:
HandleIntelmarket_About();
break;
}
}
extern BOOLEAN gfPrintFrameBuffer;
@@ -2835,6 +2874,18 @@ UINT32 ExitLaptopMode(UINT32 uiMode)
case LAPTOP_MODE_MILITIAROSTER_MAIN:
ExitMilitiaWebsiteMain();
break;
case LAPTOP_MODE_INTELMARKET_BUYINFO:
ExitIntelmarket();
break;
case LAPTOP_MODE_INTELMARKET_SELLINFO:
ExitIntelmarket_Sell();
break;
case LAPTOP_MODE_INTELMARKET_ABOUT:
ExitIntelmarket_About();
break;
}
if( ( uiMode != LAPTOP_MODE_NONE )&&( uiMode < LAPTOP_MODE_WWW ) )
@@ -4479,6 +4530,27 @@ void GoToWebPage(INT32 iPageId )
}
}
break;
case INTELMARKET_BOOKMARK:
{
guiCurrentWWWMode = LAPTOP_MODE_INTELMARKET_BUYINFO;
guiCurrentLaptopMode = LAPTOP_MODE_INTELMARKET_BUYINFO;
// do we have to have a World Wide Wait
if ( LaptopSaveInfo.fVisitedBookmarkAlready[INTELMARKET_BOOKMARK] == FALSE )
{
// reset flag and set load pending flag
LaptopSaveInfo.fVisitedBookmarkAlready[INTELMARKET_BOOKMARK] = TRUE;
fLoadPendingFlag = TRUE;
}
else
{
// fast reload
fLoadPendingFlag = TRUE;
fFastLoadFlag = TRUE;
}
}
break;
}
#ifdef JA2UB
@@ -6254,21 +6326,27 @@ void HandleKeyBoardShortCutsForLapTop( UINT16 usEvent, UINT32 usParam, UINT16 us
}
else if ((usEvent == KEY_DOWN )&& ( usParam == 's' ))
{
if( ( usKeyState & ALT_DOWN ) )
{
SetBookMark( AIM_BOOKMARK );
SetBookMark( BOBBYR_BOOKMARK );
SetBookMark( IMP_BOOKMARK );
SetBookMark( MERC_BOOKMARK );
SetBookMark( FUNERAL_BOOKMARK );
SetBookMark( FLORIST_BOOKMARK );
if( ( usKeyState & ALT_DOWN ) )
{
SetBookMark( AIM_BOOKMARK );
SetBookMark( BOBBYR_BOOKMARK );
SetBookMark( IMP_BOOKMARK );
SetBookMark( MERC_BOOKMARK );
SetBookMark( FUNERAL_BOOKMARK );
SetBookMark( FLORIST_BOOKMARK );
#ifdef JA2UB
if (gGameUBOptions.LaptopLinkInsurance == TRUE )
if (gGameUBOptions.LaptopLinkInsurance == TRUE )
SetBookMark( INSURANCE_BOOKMARK );
#else
SetBookMark( INSURANCE_BOOKMARK );
SetBookMark( INSURANCE_BOOKMARK );
#endif
}
SetBookMark( CAMPAIGNHISTORY_BOOKMARK );
SetBookMark( MERCCOMPARE_BOOKMARK );
SetBookMark( WHO_BOOKMARK );
SetBookMark( PMC_BOOKMARK );
SetBookMark( MILITIAROSTER_BOOKMARK );
SetBookMark( INTELMARKET_BOOKMARK );
}
}
//help screen stuff