mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
Merged from revision: 7267
Fixes (by Buggler) - Allows sector inventory item deletion feature to delete inaccessible and not-in-sector items. Hold 'Delete' hotkey and click the item - Hot key Ctrl+Tab can now switch to the second page of General tab in EDB for weapons - Fixed hardcoded mine icons and spawning pool sector in AI Viewer Editor - Hotkey for finding previous merc changed to 'Ctrl+Space' to avoid out-of-map boundary display - Added editor command line options in popup help text git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7268 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -204,6 +204,7 @@ extern INT16 ITEMDESC_START_Y;
|
||||
BOOLEAN gfMouseLockedOnBorder = FALSE;
|
||||
extern int iWindowedMode;
|
||||
|
||||
extern OBJECTTYPE *gpItemDescObject;
|
||||
extern BOOLEAN gfInItemStackPopup;
|
||||
extern BOOLEAN gfInKeyRingPopup;
|
||||
|
||||
@@ -2243,8 +2244,14 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
|
||||
// go to next tab in enhanced description box
|
||||
if( ( fCtrl ) && InItemDescriptionBox( ) && gGameSettings.fOptions[ TOPTION_ENHANCED_DESC_BOX ] == TRUE )
|
||||
{
|
||||
if ( gubDescBoxPage < 2 )
|
||||
if ( (Item[ gpItemDescObject->usItem ].usItemClass & IC_WEAPON || Item[ gpItemDescObject->usItem ].usItemClass & IC_PUNCH)
|
||||
&& gubDescGenPage == 0 && gubDescBoxPage == 1 )
|
||||
{
|
||||
gubDescGenPage = 1;
|
||||
}
|
||||
else if ( gubDescBoxPage < 2 )
|
||||
{
|
||||
gubDescGenPage = 0;
|
||||
gubDescBoxPage++;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user