misc fixes

- fix paste crashing program if copied before opening/merging a map - fix merge failing if AllocBlock was at 63/64 usage
wootguy · Apr 30, 2024 · 159bd58 · 159bd58
1 parent 1514b27
commit 159bd58
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/bsp/Bsp.cpp b/src/bsp/Bsp.cpp
@@ -3468,8 +3468,7 @@ bool Bsp::isValid() {
 		&& textureCount < g_limits.max_textures
 		&& lightDataLength < g_limits.max_lightdata
 		&& visDataLength < g_limits.max_visdata
-		&& ents.size() < g_limits.max_entities
-		&& ceilf(calc_allocblock_usage()) < g_limits.max_allocblocks;
+		&& ceilf(calc_allocblock_usage()) <= g_limits.max_allocblocks;
 }
 
 bool Bsp::validate_vis_data() {

diff --git a/src/editor/Renderer.cpp b/src/editor/Renderer.cpp
@@ -558,6 +558,11 @@ void Renderer::reloadMaps() {
 
 	clearUndoCommands();
 	clearRedoCommands();
+
+	if (copiedEnt != NULL) {
+		delete copiedEnt;
+		copiedEnt = NULL;
+	}
 
 	logf("Reloaded maps\n");
 }
@@ -575,6 +580,11 @@ void Renderer::openMap(const char* fpath) {
 	pickInfo.valid = false;
 	addMap(new Bsp(fpath));
 
+	if (copiedEnt != NULL) {
+		delete copiedEnt;
+		copiedEnt = NULL;
+	}
+
 	clearUndoCommands();
 	clearRedoCommands();
 	gui->refresh();
@@ -3105,6 +3115,11 @@ void Renderer::merge(string fpath) {
 	pickInfo.valid = false;
 	addMap(mergeResult.map);
 
+	if (copiedEnt != NULL) {
+		delete copiedEnt;
+		copiedEnt = NULL;
+	}
+
 	clearUndoCommands();
 	clearRedoCommands();
 	gui->refresh();