1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +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/DropDown.h
+2
View File
@@ -138,6 +138,8 @@ enum definedDropDowns
DROPDOWNNR_MSGBOX_1,
DROPDOWNNR_MSGBOX_2,
DROPDOWN_INTEL_BUY,
DROPDOWN_MILTIAWEBSITE_FILTER_DEAD,
DROPDOWN_MILTIAWEBSITE_FILTER_RANK,
DROPDOWN_MILTIAWEBSITE_FILTER_ORIGIN,
Laptop/LaptopSave.h
+8 -1
View File
@@ -67,6 +67,8 @@ enum
BOBBYR_ALREADY_SENT_EMAIL,
};
// Flugente: intel
#define INTELINFO_MAXNUMBER 2
typedef struct
{
@@ -174,7 +176,12 @@ typedef struct
FLOAT dMilitiaArmourPool;
FLOAT dMilitiaMiscPool;
UINT8 bPadding[ 60 ];
// Flugente: intel
FLOAT dIntelPool;
UINT32 usMapIntelFlags;
INT16 sIntelInfoForThisHour[INTELINFO_MAXNUMBER];
UINT8 bPadding[ 48 ];
} LaptopSaveInfoStruct;
Laptop/Laptop_VS2005.vcproj
+8
View File
@@ -626,6 +626,10 @@
RelativePath=".\insurance.h"
>
</File>
<File
RelativePath=".\Intelmarket.h"
>
</File>
<File
RelativePath=".\Laptop All.h"
>
@@ -976,6 +980,10 @@
RelativePath=".\insurance.cpp"
>
</File>
<File
RelativePath=".\Intelmarket.cpp"
>
</File>
<File
RelativePath=".\laptop.cpp"
>
Laptop/Laptop_VS2008.vcproj
+8
View File
@@ -626,6 +626,10 @@
RelativePath="insurance.h"
>
</File>
<File
RelativePath="Intelmarket.h"
>
</File>
<File
RelativePath="Laptop All.h"
>
@@ -978,6 +982,10 @@
RelativePath="insurance.cpp"
>
</File>
<File
RelativePath="Intelmarket.cpp"
>
</File>
<File
RelativePath="laptop.cpp"
>
Laptop/Laptop_VS2010.vcxproj
+4 -2
View File
@@ -95,7 +95,8 @@
<ClInclude Include="insurance Info.h" />
<ClInclude Include="Insurance Text.h" />
<ClInclude Include="insurance.h" />
<ClInclude Include="Laptop All.h" />
<ClInclude Include="Intelmarket.h" />
<ClInclude Include="Laptop All.h" />
<ClInclude Include="laptop.h" />
<ClInclude Include="LaptopSave.h" />
<ClInclude Include="merccompare.h" />
@@ -184,7 +185,8 @@
<ClCompile Include="insurance Contract.cpp" />
<ClCompile Include="insurance Info.cpp" />
<ClCompile Include="insurance.cpp" />
<ClCompile Include="laptop.cpp" />
<ClCompile Include="Intelmarket.cpp" />
<ClCompile Include="laptop.cpp" />
<ClCompile Include="merccompare.cpp" />
<ClCompile Include="mercs Account.cpp" />
<ClCompile Include="mercs Files.cpp" />
Laptop/Laptop_VS2010.vcxproj.filters
+7 -1
View File
@@ -185,6 +185,9 @@
</ClInclude>
<ClInclude Include="insurance.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Intelmarket.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Laptop All.h">
<Filter>Header Files</Filter>
@@ -452,7 +455,10 @@
<ClCompile Include="insurance.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="laptop.cpp">
<ClCompile Include="Intelmarket.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="laptop.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mercs Account.cpp">
Laptop/Laptop_VS2013.vcxproj
+2
View File
@@ -95,6 +95,7 @@
<ClInclude Include="insurance Info.h" />
<ClInclude Include="Insurance Text.h" />
<ClInclude Include="insurance.h" />
<ClInclude Include="Intelmarket.h" />
<ClInclude Include="Laptop All.h" />
<ClInclude Include="laptop.h" />
<ClInclude Include="LaptopSave.h" />
@@ -184,6 +185,7 @@
<ClCompile Include="insurance Contract.cpp" />
<ClCompile Include="insurance Info.cpp" />
<ClCompile Include="insurance.cpp" />
<ClCompile Include="Intelmarket.cpp" />
<ClCompile Include="laptop.cpp" />
<ClCompile Include="merccompare.cpp" />
<ClCompile Include="mercs Account.cpp" />
Laptop/Laptop_VS2013.vcxproj.filters
+7 -1
View File
@@ -176,6 +176,9 @@
</ClInclude>
<ClInclude Include="insurance.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Intelmarket.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Laptop All.h">
<Filter>Header Files</Filter>
@@ -443,7 +446,10 @@
<ClCompile Include="insurance.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="laptop.cpp">
<ClCompile Include="Intelmarket.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="laptop.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mercs Account.cpp">
Laptop/Laptop_VS2017.vcxproj
+2
View File
@@ -95,6 +95,7 @@
<ClInclude Include="insurance Info.h" />
<ClInclude Include="Insurance Text.h" />
<ClInclude Include="insurance.h" />
<ClInclude Include="Intelmarket.h" />
<ClInclude Include="Laptop All.h" />
<ClInclude Include="laptop.h" />
<ClInclude Include="LaptopSave.h" />
@@ -184,6 +185,7 @@
<ClCompile Include="insurance Contract.cpp" />
<ClCompile Include="insurance Info.cpp" />
<ClCompile Include="insurance.cpp" />
<ClCompile Include="Intelmarket.cpp" />
<ClCompile Include="laptop.cpp" />
<ClCompile Include="merccompare.cpp" />
<ClCompile Include="mercs Account.cpp" />
Laptop/email.cpp
+4
View File
@@ -3740,6 +3740,10 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr
fReDrawScreenFlag = TRUE;
break;
case INTEL_ENRICO_INTRO:
SetBookMark( INTELMARKET_BOOKMARK );
fReDrawScreenFlag = TRUE;
break;
#endif
}
Laptop/email.h
+3
View File
@@ -384,6 +384,9 @@
#define MILITIAROSTER_INTRO (KINGPIN_BOUNTY_TARGET_GOTAWAY + KINGPIN_BOUNTY_TARGET_GOTAWAY_LENGTH)
#define MILITIAROSTER_INTRO_LENGTH 4
#define INTEL_ENRICO_INTRO (MILITIAROSTER_INTRO + MILITIAROSTER_INTRO_LENGTH)
#define INTEL_ENRICO_INTRO_LENGTH 5
#endif
// WANNE: New 1.13 MERC merc mail text for level up that Speck sends
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
Laptop/laptop.h
+7 -1
View File
@@ -95,7 +95,7 @@ extern BOOLEAN fReDrawBookMarkInfo;
enum
{
LAPTOP_MODE_NONE=0,
LAPTOP_MODE_NONE = 0,
LAPTOP_MODE_FINANCES,
LAPTOP_MODE_PERSONNEL,
LAPTOP_MODE_HISTORY,
@@ -164,6 +164,11 @@ enum
// Flugente: militia roster
LAPTOP_MODE_MILITIAROSTER_MAIN,
// Flugente: intel websites
LAPTOP_MODE_INTELMARKET_BUYINFO,
LAPTOP_MODE_INTELMARKET_SELLINFO,
LAPTOP_MODE_INTELMARKET_ABOUT,
LAPTOP_MODE_BOBBYR_SHIPMENTS,
@@ -245,6 +250,7 @@ enum{
WHO_BOOKMARK, // added by Flugente
PMC_BOOKMARK, // added by Flugente
MILITIAROSTER_BOOKMARK, // added by Flugente
INTELMARKET_BOOKMARK, // added by Flugente
TEXT_NUM_LAPTOP_BOOKMARKS
};