mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Brief: //dnl ch75
- More map editor fixes and map inventory pool performance improvement for big maps. Details: - Fix not showing expected messagebox on exit (ALT+x) which also throw exception and goes to improper mapeditor exit. - Fix second annoying sticky message which shouldn't popup during map loading and performing RemoveProhibitedAttachments. - Fix CTD when delete all enemies or civilians or all of them in map. - Fix some std exception when reporting for missing optional xml file. - Fix memory and map corruption in old mapeditors if loaded old map has item with invalid attachment and we try to attach something else. - As years ago pInventoryPoolList had migrated from WORLDITEM* array to std::vector<WORLDITEM> it was time to do that with gWorldItems too, all necessary functions which need to be adopted to gWorldItems std::vector type are also changed. - Resize code for gWorldItems is changed hoping will lead into less corruption problems as now could occur in mapeditor and game when code automatically doing attachment changes. - Change code for handling map inventory which now should be fast enough to support AIMNAS project which will probably deal with thousands of items per map. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6554 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2051,7 +2051,6 @@ void HandleKeyboardShortcuts( )
|
||||
if( gfEditingDoor )
|
||||
KillDoorEditing();
|
||||
iCurrentAction = ACTION_QUIT_GAME;
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 'z':
|
||||
@@ -2313,7 +2312,7 @@ UINT32 PerformSelectedAction( void )
|
||||
break;
|
||||
|
||||
case ACTION_QUIT_GAME:
|
||||
gfProgramIsRunning = FALSE;
|
||||
//gfProgramIsRunning = FALSE;//dnl ch75 251013 throw exception on exit without showing message box
|
||||
case ACTION_EXIT_EDITOR:
|
||||
if( EditModeShutdown( ) )
|
||||
{
|
||||
@@ -2741,6 +2740,11 @@ UINT32 ProcessEditscreenMessageBoxResponse()
|
||||
{
|
||||
gfConfirmExitFirst = FALSE;
|
||||
iEditorToolbarState = TBAR_MODE_EXIT_EDIT;
|
||||
if(iCurrentAction == ACTION_QUIT_GAME)//dnl ch75 251013
|
||||
{
|
||||
iEditorToolbarState = TBAR_MODE_QUIT_GAME;
|
||||
gfProgramIsRunning = FALSE;
|
||||
}
|
||||
}
|
||||
return EDIT_SCREEN;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user