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

New feature: quest & intel map overlay

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

Requires GameDir >= r2424

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-05-14 21:26:37 +00:00
parent 70ad3387a8
commit 100eea196b
28 changed files with 946 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+31 -4
View File
@@ -4916,6 +4916,10 @@ UINT32 MapScreenHandle(void)
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\incross.sti", VObjectDesc.ImageFile);
CHECKF(AddVideoObject(&VObjectDesc, &guiCROSS));
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP( "INTERFACE\\IntelMapSymbols.sti", VObjectDesc.ImageFile );
CHECKF( AddVideoObject( &VObjectDesc, &guiINTEL ) );
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
if (iResolution >= _640x480 && iResolution < _800x600)
@@ -5659,6 +5663,13 @@ UINT32 MapScreenHandle(void)
{
DisplayPositionOfEnemyHelicopter();
}
// Flugente: intel
else if ( gusMapDisplayColourMode == MAP_DISPLAY_INTEL && !fShowMapInventoryPool )
{
extern void ShowIntelOnMap();
ShowIntelOnMap();
}
// display town info
DisplayTownInfo( sSelMapX, sSelMapY, ( INT8 ) iCurrentMapSectorZ );
@@ -7564,13 +7575,18 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
break;
case 'd':
#ifdef JA2TESTVERSION
#ifdef JA2TESTVERSION
if( fAlt )
{
// prints out a text file in C:\TEMP telling you how many stat change chances/successes each profile merc got
TestDumpStatChanges();
}
#endif
else
#endif
if ( !fShowMapInventoryPool )
{
ToggleDiseaseFilter();
}
break;
case 'D':
@@ -7985,7 +8001,7 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
break;
case 'q':
#ifdef JA2TESTVERSION
#ifdef JA2TESTVERSION
if( fAlt )
{
// initialize miners if not already done so (fakes entering Drassen mine first)
@@ -7993,7 +8009,12 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
// test miner quote system
IssueHeadMinerQuote( (INT8) (1 + Random(MAX_NUMBER_OF_MINES - 1)), (UINT8) (1 + Random(2)));
}
#endif
else
#endif
if ( !fShowMapInventoryPool )
{
ToggleIntelFilter();
}
break;
case 'Q'://dnl ch75 021113
#ifdef _DEBUG
@@ -8018,6 +8039,10 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
{ //activate autoresolve in prebattle interface.
ActivatePreBattleRetreatAction();
}
else if ( !fShowMapInventoryPool )
{
ToggleWeatherFilter();
}
break;
case 's':
if( fAlt )
@@ -8615,6 +8640,7 @@ INT32 iCounter2 = 0;
//DeleteVideoObjectFromIndex(guiPOPUPBORDERS);
DeleteVideoObjectFromIndex(guiCHARINFO);
DeleteVideoObjectFromIndex(guiCHARICONS);
DeleteVideoObjectFromIndex( guiINTEL );
DeleteVideoObjectFromIndex(guiCROSS);
DeleteVideoSurfaceFromIndex(guiBIGMAP);
// DeleteVideoSurfaceFromIndex(guiPOPUPTEX);
@@ -13448,6 +13474,7 @@ void HandleRemovalOfPreLoadedMapGraphics( void )
// DeleteVideoObjectFromIndex(guiPOPUPBORDERS);
DeleteVideoObjectFromIndex(guiCHARINFO);
DeleteVideoObjectFromIndex(guiCHARICONS);
DeleteVideoObjectFromIndex( guiINTEL );
DeleteVideoObjectFromIndex(guiCROSS);
DeleteVideoSurfaceFromIndex(guiBIGMAP);
DeleteVideoObjectFromIndex(guiSubLevel1);