Brief: //dnl ch78

- Some mapeditor cosmetic and CTD fixes.
Details:
- Fix sticky tooltip if perform scroll or go to 'Sector Summary' window.
- Fix accidental mercid delete from textbox if press any key while in 'Profile ID mode'.
- Fix CTD from release if several time swap from RND to any other item button.
- Disable some enabled buttons and mouse area from taskbar when 'Sector Summary' windows is active.
- Checkbox toggles from Mercs bar now remember their state after switching to another taskbar option.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Kriplo
2013-11-27 21:05:12 +00:00
parent 8e2d59efca
commit f0c6b73e24
6 changed files with 37 additions and 12 deletions
+14 -6
View File
@@ -45,14 +45,12 @@
#include "Soldier Find.h"
#include "lighting.h"
#include "Keys.h"
#include "InterfaceItemImages.h"
#include "renderworld.h"//dnl ch78 271113
#endif
void RenderEditorInfo();
//extern ITEM_POOL *gpItemPool;//dnl ch26 210909
//editor icon storage vars
INT32 giEditMercDirectionIcons[2];
UINT32 guiMercInventoryPanel;
@@ -91,7 +89,7 @@ void DisableEditorRegion( INT8 bRegionID )
switch( bRegionID )
{
case BASE_TERRAIN_TILE_REGION_ID:
case 1: case 2: case 3: case 4: case 5: case 6: case 7:
case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8://dnl ch78 261113
MSYS_DisableRegion( &TerrainTileButtonRegion[ bRegionID ] );
break;
case ITEM_REGION_ID:
@@ -345,6 +343,17 @@ void DoTaskbar(void)
SetMercEditingMode( MERC_TEAMMODE );
fBuildingShowRoofs = FALSE;
UpdateRoofsView();
//dnl ch78 261113
if(gfShowPlayers)
ClickEditorButton(MERCS_PLAYERTOGGLE);
if(gfShowEnemies)
ClickEditorButton(MERCS_ENEMYTOGGLE);
if(gfShowCreatures)
ClickEditorButton(MERCS_CREATURETOGGLE);
if(gfShowRebels)
ClickEditorButton(MERCS_REBELTOGGLE);
if(gfShowCivilians)
ClickEditorButton(MERCS_CIVILIANTOGGLE);
break;
case TASK_TERRAIN:
ClickEditorButton( TAB_TERRAIN );
@@ -1052,9 +1061,8 @@ void ProcessEditorRendering()
//It is set to false when before we save the buffer, so the buttons don't get
//rendered with hilites, in case the mouse is over one.
gfRenderHilights = TRUE;
if(!gfSummaryWindowActive)//dnl ch77 131113
if(!gfSummaryWindowActive && !gfScrollInertia)//dnl ch77 131113 //dnl ch78 271113
RenderButtonsFastHelp();
}
#endif