1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE.

Browse Source 
Removed the "Major Version Update" system from the map editor.  Now, maps will be updated only when they are actually loaded.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2008-09-11 14:57:12 +00:00
parent eae98df88d
commit e6f9406ffe
6 changed files with 91 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/LoadScreen.cpp
+6 -1
View File
@@ -87,6 +87,8 @@ INT32 iLastFileClicked;
INT32 iLastClickTime;
CHAR16 gzFilename[31];
extern INT16 gsSelSectorX;
extern INT16 gsSelSectorY;
FDLG_LIST *FileList = NULL;
@@ -861,6 +863,8 @@ void InitErrorCatchDialog()
gfErrorCatch = FALSE;
}
extern BOOLEAN ReEvaluateWorld( const STR8 puiFilename );
//Because loading and saving the map takes a few seconds, we want to post a message
//on the screen and then update it which requires passing the screen back to the main loop.
//When we come back for the next frame, we then actually save or load the map. So this
@@ -937,7 +941,8 @@ UINT32 ProcessFileIO()
RemoveMercsInSector( );
if( !LoadWorld( ubNewFilename ) )
//CHRISL: What happens if we EvaluateWorld at this point?
if( !ReEvaluateWorld( ubNewFilename ) || !LoadWorld( ubNewFilename ) )
{ //Want to override crash, so user can do something else.
EnableUndo();
SetPendingNewScreen( LOADSAVE_SCREEN );