mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
************************************************************
* Merged Source Code from Development Trunk: Revision 4063 * ************************************************************ - Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP - This will be the Source for the Beta 2011 Test git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -214,6 +214,7 @@ BOOLEAN gfRealGunNut = TRUE;
|
||||
INT16 sGridX, sGridY;
|
||||
INT32 iMapIndex;
|
||||
BOOLEAN fNewMap = FALSE;
|
||||
BOOLEAN fNewMapSaved = TRUE;
|
||||
|
||||
INT32 iPrevDrawMode = DRAW_MODE_NOTHING;
|
||||
UINT16 PrevCurrentPaste = FIRSTTEXTURE;
|
||||
@@ -297,7 +298,8 @@ BOOLEAN EditModeInit( void )
|
||||
|
||||
//dnl after multiplayer stuff was implemeted, editor goes to assertion when you leave editor mode, because InitGameOption() is not called anymore from InitializeGame()
|
||||
is_networked = FALSE;
|
||||
InitGameOptions();
|
||||
//InitGameOptions();
|
||||
GameInitOptionsScreenInit();
|
||||
|
||||
ResetCustomFileSectorSummary();//dnl ch30 150909
|
||||
|
||||
@@ -375,6 +377,7 @@ BOOLEAN EditModeInit( void )
|
||||
|
||||
gfEditMode = TRUE;
|
||||
fNewMap = FALSE;
|
||||
fNewMapSaved = TRUE;
|
||||
|
||||
gfEditingDoor = FALSE;
|
||||
|
||||
@@ -2483,6 +2486,8 @@ void CreateNewMap()
|
||||
ResetCustomFileSectorSummary();//dnl ch30 150909
|
||||
SetRenderCenter(WORLD_COLS/2, WORLD_ROWS/2);//dnl ch43 280909
|
||||
InitRenderParams(gMapInformation.ubRestrictedScrollID);//dnl ch54 101009
|
||||
|
||||
fNewMapSaved = FALSE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user