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

- Updated Merc Inventory Popup-Code (by The_Bob)

Browse Source 
o externalized the hardcoded popup text code
o enable/disable the popup in the ingame option screen
-> To open the popup, left click on empty merc inventory slot while viewing sector inventory in mapscreen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-07-23 14:01:08 +00:00
parent 609047e333
commit c265a63b28
14 changed files with 248 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+10 -4
View File
@@ -9459,10 +9459,16 @@ void MAPInvClickCallback( MOUSE_REGION *pRegion, INT32 iReason )
if ( pSoldier->inv[ uiHandPos ].exists() == false )
{
if ( _KeyDown(CTRL) ){
PocketPopupFull( pSoldier, uiHandPos ); // if ctrl is pressed, display all options
} else {
PocketPopupDefault( pSoldier, uiHandPos ); // display pocket-specific options
if (gGameSettings.fOptions[ TOPTION_ENABLE_INVENTORY_POPUPS ] == TRUE) // the_bob : enable popups for picking items from sector inv
{
if ( _KeyDown(CTRL) )
{
PocketPopupFull( pSoldier, uiHandPos ); // if ctrl is pressed, display all options
}
else
{
PocketPopupDefault( pSoldier, uiHandPos ); // display pocket-specific options
}
}
return;