old slabset error

rainlizard · Nov 30, 2023 · 03b80a4 · 03b80a4
1 parent d33dcc6
commit 03b80a4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Autoload/Slabset.gd b/Autoload/Slabset.gd
@@ -109,6 +109,11 @@ func import_cfg_slabset(filePath, fullImport, showMessages):
 
 	resize_dat_and_tng_based_on_cfg(cfg)
 
+	if cfg.has_section("slab0.S"):
+		if cfg.get_value("slab0.S", "columns"): # Lowercase "Columns" means it's an out of date slabset.cfg file
+			oMessage.big("Failed loading Slabset", "Old /fxdata/slabset.cfg file, please install the latest KeeperFX alpha patch")
+
+
 	for section in cfg.get_sections():
 		var parts = section.split(".")
 		if parts.size() <= 1:

diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn
@@ -2413,13 +2413,13 @@ script = ExtResource( 103 )
 
 [node name="MarginContainer" type="MarginContainer" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabPlacements"]
 margin_right = 544.0
-margin_bottom = 626.0
+margin_bottom = 661.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabPlacements/MarginContainer"]
 margin_right = 544.0
-margin_bottom = 626.0
+margin_bottom = 661.0
 mouse_filter = 2
 __meta__ = {
 "_edit_use_anchors_": false

diff --git a/Scenes/SlabPlacement.gd b/Scenes/SlabPlacement.gd
@@ -575,8 +575,6 @@ func place_general(xSlab, ySlab, slabID, ownership, surrID, surrOwner, bitmaskTy
 	elif slabID == Slabs.PATH:
 		randomize_path_cubes(constructedColumns)
 
-
-
 	set_columns(xSlab, ySlab, constructedColumns, constructedFloor)
 	oPlaceThingWithSlab.place_slab_objects(xSlab, ySlab, slabID, ownership, slabsetIndexGroup, bitmask, surrID, bitmaskType)