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:
Wanne
2014-06-05 14:37:32 +00:00
parent ca03cb86c0
commit f5e94e869a
15 changed files with 75 additions and 75 deletions
+1 -1
View File
@@ -1560,7 +1560,7 @@ void IndicateSelectedMerc( INT16 sID )
bTeam = -1;
// hotkey to select previous instead of next merc
fSelectPrevious = gfKeyState[ SHIFT ];
fSelectPrevious = gfKeyState[ CTRL ];
//determine selection method
switch( sID )