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
+8
View File
@@ -138,8 +138,16 @@ extern UINT8 gubCurrentTalkingID;
void InitializeMines( void )
{
INT32 i;
// Don't execute hardcoded logic. Leave initialization to the Lua script.
g_luaMines.InitializeMines();
// Buggler: set mining site flag for AI Viewer.cpp
for (i=0; i < MAX_NUMBER_OF_MINES; i++)
{
SectorInfo[ SECTOR( gMineStatus[i].sSectorX, gMineStatus[i].sSectorY ) ].uiFlags |= SF_MINING_SITE;
}
#if 0
UINT8 ubMineIndex;
MINE_STATUS_TYPE *pMineStatus;