Editor refresh lights when a light is deleted

Interrupt · Jan 4, 2019 · 6078ae0 · 6078ae0
1 parent 7b38b76
commit 6078ae0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 29 deletions.
diff --git a/DelvEdit/src/com/interrupt/dungeoneer/editor/EditorFrame.java b/DelvEdit/src/com/interrupt/dungeoneer/editor/EditorFrame.java
@@ -2775,25 +2775,9 @@ public boolean selectionHasEntityMarker() {
    }
 
    public void addEntity(Entity e) {
-	   if(selected) {
-		   int x = selectionX;
-		   int y = selectionY;
-
-		   String objCopy = Game.toJson(e);
-
-		   Entity copy = Game.fromJson(e.getClass(), objCopy);
-		   copy.x = x + 0.5f;
-		   copy.y = y + 0.5f;
-
-		   Tile at = level.getTileOrNull(x, y);
-		   if(at != null) copy.z = at.floorHeight + 0.5f;
-
-		   level.entities.add(copy);
-
-		   markWorldAsDirty(x, y, 4);
-	   }
-
-       history.saveState(level);
+	   level.entities.add(e);
+	   e.init(level, Source.EDITOR);
+	   markWorldAsDirty((int)e.x, (int)e.y, 4);
    }
 
    public void clearSelectedMarkers() {
@@ -3314,10 +3298,7 @@ public void paste() {
                 	copy.z += copyAt.getFloorHeight(0.5f, 0.5f);
 				}
 
-                level.entities.add(copy);
-                copy.init(level, Source.EDITOR);
-
-				markWorldAsDirty((int)copy.x, (int)copy.y, 4);
+				addEntity(copy);
             }
 
             // save undo history
@@ -3872,6 +3853,8 @@ public void doDelete() {
             clearTiles();
         }
 
+		refreshLights();
+
         // save undo history
         history.saveState(level);
 	}

diff --git a/DelvEdit/src/com/interrupt/dungeoneer/editor/EditorRightClickEntitiesMenu.java b/DelvEdit/src/com/interrupt/dungeoneer/editor/EditorRightClickEntitiesMenu.java
@@ -219,9 +219,7 @@ else if(surface.edge == TileEdges.South) {
 			}
 		}
 
-		editor.level.entities.add(entity);
-		entity.init(editor.level, Level.Source.EDITOR);
-		editor.markWorldAsDirty((int)entity.x, (int)entity.y, 4);
+		editor.addEntity(entity);
 
 		editor.refreshLights();
 		editor.history.saveState(editor.level);

diff --git a/DelvEdit/src/com/interrupt/dungeoneer/editor/EditorRightClickMenu.java b/DelvEdit/src/com/interrupt/dungeoneer/editor/EditorRightClickMenu.java
@@ -110,8 +110,6 @@ public void actionPerformed (ActionEvent event) {
 				newGroup.x = main.x;
 				newGroup.y = main.y;
 				newGroup.z = main.z;
-
-				editor.markWorldAsDirty((int)main.x, (int)main.y, 4);
 
 				for(Entity selected : additionalSelected) {
 					selected.x = selected.x - main.x;
@@ -130,7 +128,7 @@ public void actionPerformed (ActionEvent event) {
 				newGroup.entities.add(main);
 
 				level.entities.removeValue(main, true);
-				level.entities.add(newGroup);
+				editor.addEntity(newGroup);
 			}
     	});