Brief: //dnl ch86

- Fixing mapeditor move building and improving some related mapeditor stuff.
Details:
- Change the way exit grids are add, remove, save and load through editor, also add undo option for exit grids and you can place unlimited number of them.
- Fix incorrect gridno save in temporary map file for bigmap exit grids.
- Increase maximum number of light sprite from 256 to 4096 per map.
- Using DEL key for QuickEraseMapTile will now erase ItemPool too, and with improved function DeleteStuffFromMapTile will erase light sprites, exit grids and door locks.
- Cliff hang tiles used for middle cliffs are now possible to erase with when erase button is on.
- Add support for undo door locks, also you can now erase them if erase button is on.
- Move building function is completely rewrite and will properly move exit grids, door locks, lights and items too.
- Removing unnecessary tiles during copy building is improved too.
- Fix undo function for light sprites which now will also store all three types and undo them properly.
- Fix CTD situation if tile elements are deleted and after that items too, then undo will crash mapeditor.
- Fix spawning of item pool cursors during when adding items.
- Fix text glitches over door locks form.
- Fix sticky tooltip when loadsave screen or door locks form is active.
- High ground marking cursors will not be drawn in invisible map tiles anymore to increase speed and maybe fix some render problems but I doubt it.
- Move GLOCK_17_ForUseWithLOS item generation from init.cpp to los.cpp to avoid potential problems if global world items array not set.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Kriplo
2014-03-02 11:25:11 +00:00
parent db9ecb102d
commit a665154a62
22 changed files with 633 additions and 126 deletions
+13 -1
View File
@@ -44,6 +44,7 @@
#include "Scheduling.h"
#include "MessageBoxScreen.h"
#include <vfs/Core/vfs.h>//dnl ch37 110909
#include "Exit Grids.h"//dnl ch86 190214
#endif
//===========================================================================
@@ -155,6 +156,7 @@ void LoadSaveScreenEntry()
gfDeleteFile = FALSE;
gfNoFiles = FALSE;
gfSaveError = FALSE;//dnl ch37 200909
RestoreBackgroundRects();//dnl ch86 210214
// setup filename dialog box
// (*.dat and *.map) as file filter
@@ -666,7 +668,7 @@ void DrawFileDialog(void)
MarkButtonsDirty();
RenderButtons();
RenderButtonsFastHelp();
//RenderButtonsFastHelp();//dnl ch86 210214 disable this because of sticky tooltip from taskbar
SetFont( FONT10ARIAL );
SetFontForeground( FONT_LTKHAKI );
@@ -1056,6 +1058,11 @@ UINT32 ProcessFileIO()
CreateMessageBox((STR16)(_BS(L" Error saving ") << (const char*)ubNewFilename << L" file. Try another filename? " << _BS::wget).c_str() );
return(guiCurrentScreen);
}
if(gfShowExitGrids)//dnl ch86 190214
{
gfShowExitGrids = FALSE;
ShowExitGrids();
}
if( gfShowPits )
AddAllPits();
GetSectorFromFileName(gzFilename, gWorldSectorX, gWorldSectorY, gbWorldSectorZ, fAltMap);//dnl ch31 140909
@@ -1156,6 +1163,11 @@ UINT32 ProcessFileIO()
ShowHighGround(4);//dnl ch41 210909
SetRenderCenter(WORLD_COLS/2, WORLD_ROWS/2);//dnl ch43 280909
gsSelectedMercGridNo = 0;//dnl ch74 241013 to prevent CTD in IndicateSelectedMerc after loading
if(gfShowExitGrids)//dnl ch86 190214
{
gfShowExitGrids = FALSE;
ShowExitGrids();
}
if( gfShowPits )
AddAllPits();