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

New feature: individual militia creates small militia profiles that track a militia's history and allow it to be recreated, thereby maintaining the illusion of persistent militia.

Browse Source 
Requires GameDir >= r2316.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23044&goto=345324&#msg_345324

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-05-06 14:51:24 +00:00
parent 67927ed723
commit 9f52c940a8
75 changed files with 6740 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/laptop.cpp
+42
View File
@@ -90,6 +90,7 @@
#include "MercCompare.h" // added by Flugente
#include "WHO.h" // added by Flugente
#include "PMC.h" // added by Flugente
#include "MilitiaWebsite.h" // added by Flugente
#endif
#include "connect.h"
@@ -1498,6 +1499,11 @@ void RenderLaptop()
case LAPTOP_MODE_PMC_CONTRACT_INDIVIDUAL:
RenderPMCContract( );
break;
case LAPTOP_MODE_MILITIAROSTER_MAIN:
case LAPTOP_MODE_MILITIAROSTER_ABOUT:
RenderMilitiaWebsiteMain( );
break;
}
if( guiCurrentLaptopMode >= LAPTOP_MODE_WWW )
@@ -1954,6 +1960,11 @@ void EnterNewLaptopMode()
case LAPTOP_MODE_PMC_CONTRACT_INDIVIDUAL:
EnterPMCContract( );
break;
case LAPTOP_MODE_MILITIAROSTER_MAIN:
case LAPTOP_MODE_MILITIAROSTER_ABOUT:
EnterMilitiaWebsiteMain( );
break;
}
// first time using webbrowser in this laptop session
@@ -2227,6 +2238,11 @@ void HandleLapTopHandles()
case LAPTOP_MODE_PMC_CONTRACT_INDIVIDUAL:
HandlePMCContract( );
break;
case LAPTOP_MODE_MILITIAROSTER_MAIN:
case LAPTOP_MODE_MILITIAROSTER_ABOUT:
HandleMilitiaWebsiteMain( );
break;
}
}
@@ -2809,6 +2825,11 @@ UINT32 ExitLaptopMode(UINT32 uiMode)
case LAPTOP_MODE_PMC_CONTRACT_INDIVIDUAL:
ExitPMCContract( );
break;
case LAPTOP_MODE_MILITIAROSTER_MAIN:
case LAPTOP_MODE_MILITIAROSTER_ABOUT:
ExitMilitiaWebsiteMain();
break;
}
if( ( uiMode != LAPTOP_MODE_NONE )&&( uiMode < LAPTOP_MODE_WWW ) )
@@ -4444,6 +4465,27 @@ if( (gubQuest[ QUEST_FIX_LAPTOP ] != QUESTINPROGRESS) || (gGameUBOptions.LaptopQ
}
}
break;
case MILITIAROSTER_BOOKMARK:
{
guiCurrentWWWMode = LAPTOP_MODE_MILITIAROSTER_MAIN;
guiCurrentLaptopMode = LAPTOP_MODE_MILITIAROSTER_MAIN;
// do we have to have a World Wide Wait
if ( LaptopSaveInfo.fVisitedBookmarkAlready[MILITIAROSTER_BOOKMARK] == FALSE )
{
// reset flag and set load pending flag
LaptopSaveInfo.fVisitedBookmarkAlready[MILITIAROSTER_BOOKMARK] = TRUE;
fLoadPendingFlag = TRUE;
}
else
{
// fast reload
fLoadPendingFlag = TRUE;
fFastLoadFlag = TRUE;
}
}
break;
}
#ifdef JA2UB