pressing undo marks map as edited after saving

Author: rainlizard

Scenes/Editor.gd

@@ -14,20 +14,26 @@ onready var oMenu = Nodelist.list["oMenu"]
 onready var oConfirmSaveBeforeQuit = Nodelist.list["oConfirmSaveBeforeQuit"]
 onready var oExportPreview = Nodelist.list["oExportPreview"]
 onready var oUndoStates = Nodelist.list["oUndoStates"]
+onready var oEditor = Nodelist.list["oEditor"]
 
 enum {
 	VIEW_2D = 0
 	VIEW_3D = 1
+	SET_EDITED_WITHOUT_SAVING_STATE = 777
 }
 
 var currentView = VIEW_2D
 var fieldBoundary = Rect2()
 var mapHasBeenEdited = false setget set_map_has_been_edited
 
 func set_map_has_been_edited(setVal):
-	mapHasBeenEdited = setVal
-	if setVal == true:
+	if int(setVal) == oEditor.SET_EDITED_WITHOUT_SAVING_STATE: #If you save, then click Undo, it should mark as not saved but not create a new undo state when marking as edited.
+		mapHasBeenEdited = true
+		return
+	elif setVal == true:
 		oUndoStates.call_deferred("attempt_to_save_new_undo_state")
+	mapHasBeenEdited = setVal
+
 
 func _ready():
 	get_tree().set_auto_accept_quit(false)

Scenes/OpenMap.gd

@@ -45,6 +45,7 @@ onready var oDisplaySlxNumbers = Nodelist.list["oDisplaySlxNumbers"]
 onready var oThingDetails = Nodelist.list["oThingDetails"]
 onready var oInspector = Nodelist.list["oInspector"]
 onready var oGuidelines = Nodelist.list["oGuidelines"]
+onready var oResizeCurrentMapSize = Nodelist.list["oResizeCurrentMapSize"]
 
 var TOTAL_TIME_TO_OPEN_MAP
 
@@ -66,7 +67,7 @@ func start():
 			#for i in 200:
 			#	yield(get_tree(), "idle_frame")
 			#oCurrentMap.clear_map()
-			open_map("D:/Dungeon Keeper/levels/personal/map00056.slb")
+			open_map("D:/Dungeon Keeper/levels/personal/map00002.slb")
 			pass
 		else:
 			# initialize a cleared map
@@ -236,6 +237,8 @@ func continue_load(map):
 	if oColumnEditor.visible == true:
 		oColumnEditor.visible = false
 		Utils.popup_centered(oColumnEditor)
+	if oResizeCurrentMapSize.visible == true:
+		oResizeCurrentMapSize._on_ResizeCurrentMapSize_about_to_show()
 
 	if is_instance_valid(oInspector.inspectingInstance):
 		oInspector.deselect()

Scenes/ResizeCurrentMapSize.gd

@@ -19,7 +19,6 @@ onready var oInstances = Nodelist.list["oInstances"]
 onready var oGuidelines = Nodelist.list["oGuidelines"]
 onready var oBuffers = Nodelist.list["oBuffers"]
 
-
 func _on_ResizeCurrentMapSizeButton_pressed():
 	Utils.popup_centered(self)
 
@@ -33,8 +32,8 @@ func set_new_map_size(newWidth, newHeight):
 	M.xSize = newWidth
 	M.ySize = newHeight
 	oMapSizeTextLabel.text = str(M.xSize) + " x " + str(M.ySize)
-	
-	
+
+
 # Function to get positions that need to be updated
 func get_positions_to_update(newWidth, newHeight, previousWidth, previousHeight):
 	var positionsToUpdate = {}

Scenes/UndoStates.gd

@@ -12,6 +12,7 @@ onready var oEditor = Nodelist.list["oEditor"]
 onready var oMenu = Nodelist.list["oMenu"]
 
 
+
 var is_saving_state = false
 var undo_history = []
 var max_undo_states = 256
@@ -65,6 +66,8 @@ func perform_undo():
 		oMessage.big("Undo state error", "previous_state is not a dictionary")
 		return
 
+
+	
 	var CODETIME_START = OS.get_ticks_msec()
 	performing_undo = true
 
@@ -85,7 +88,9 @@ func perform_undo():
 	oMenu.update_undo_availability()
 	oMessage.quick("Undo performed")
 
-	if undo_history.size() <= 1:
+	if oEditor.mapHasBeenEdited == false:
+		oEditor.mapHasBeenEdited = oEditor.SET_EDITED_WITHOUT_SAVING_STATE
+	elif undo_history.size() <= 1:
 		oEditor.mapHasBeenEdited = false
 
 	print('perform_undo: ' + str(OS.get_ticks_msec() - CODETIME_START) + 'ms')
@@ -95,7 +100,7 @@ func perform_undo():
 	print('Idle frame (after undo): ' + str(OS.get_ticks_msec() - IDLE_FRAME_CODETIME_START) + 'ms')
 
 	performing_undo = false
-	
+
 
 
 func are_states_equal(state1, state2): # (0ms or 1ms)