Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
rainlizard committed Jul 26, 2023
1 parent 1f52583 commit 5989a19
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Scenes/GenerateBorderWindow.gd
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ func _on_ButtonNewMapOK_pressed():
oMessage.quick("Error: Game executable is not set. Set in File -> Preferences")
return

oCurrentMap._on_ButtonNewMap_pressed()

if oDkDat.dat.empty() == true:
oMessage.quick("Error: Game executable might not be correct. Set in File -> Preferences")
oMessage.quick("Failed loading slabset, game executable might not be correct. Set in File -> Preferences")
return

oCurrentMap._on_ButtonNewMap_pressed()

var rectStart = Vector2(0, 0)
var rectEnd = Vector2(M.xSize-1, M.ySize-1)
var shapePositionArray = []
Expand Down
28 changes: 20 additions & 8 deletions Scenes/Main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2278,10 +2278,16 @@ text = "Path"
valign = 1
autowrap = true

[node name="HBoxContainer" type="HBoxContainer" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer"]
[node name="HSeparator" type="HSeparator" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer"]
margin_top = 56.0
margin_right = 544.0
margin_bottom = 96.0
margin_bottom = 76.0
rect_min_size = Vector2( 0, 20 )

[node name="HBoxContainer" type="HBoxContainer" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer"]
margin_top = 80.0
margin_right = 544.0
margin_bottom = 120.0
size_flags_horizontal = 3

[node name="Label" type="Label" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer/HBoxContainer"]
Expand All @@ -2301,9 +2307,9 @@ rect_min_size = Vector2( 0, 40 )
size_flags_horizontal = 3

[node name="ScrollContainer" type="ScrollContainer" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer"]
margin_top = 100.0
margin_top = 124.0
margin_right = 544.0
margin_bottom = 140.0
margin_bottom = 164.0
size_flags_horizontal = 3
size_flags_vertical = 0
scroll_vertical_enabled = false
Expand Down Expand Up @@ -2342,10 +2348,16 @@ size_flags_horizontal = 3
editable = false
expand_to_text_length = true

[node name="HSeparator4" type="HSeparator" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer"]
margin_top = 168.0
margin_right = 544.0
margin_bottom = 188.0
rect_min_size = Vector2( 0, 20 )

[node name="ReloadTextureMapsButton" type="Button" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer"]
margin_top = 144.0
margin_top = 192.0
margin_right = 188.0
margin_bottom = 171.0
margin_bottom = 219.0
hint_tooltip = "Reads tmapa00x.dat files from Dungeon Keeper's /data/ directory and then recreates cache files in Unearth's /unearthdata/ directory."
size_flags_horizontal = 2
text = "Reload tileset cache"
Expand All @@ -2354,9 +2366,9 @@ __meta__ = {
}

[node name="CheckBoxAlwaysDecompress" type="CheckBox" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings/TabFiles/VBoxContainer"]
margin_top = 175.0
margin_top = 223.0
margin_right = 544.0
margin_bottom = 204.0
margin_bottom = 252.0
text = "Always decompress maps"

[node name="TabPlacements" type="ScrollContainer" parent="Ui/UiSystem/PreferencesWindow/VBoxContainer/TabSettings"]
Expand Down
4 changes: 0 additions & 4 deletions Scenes/OpenMap.gd
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ func open_map(filePath):
oMessage.quick("Error: Cannot open map because game executable is not set. Set in File -> Preferences")
return

if oDkDat.dat.empty() == true:
oMessage.quick("Error: Game executable might not be correct. Set in File -> Preferences")
return

# Prevent opening any maps under any circumstance if textures haven't been loaded. (Fix to launching via file association)
if oTextureCache.texturesLoadedState != oTextureCache.LOADING_SUCCESS:
oMessage.quick("Error: Cannot open map because textures haven't been loaded")
Expand Down

0 comments on commit 5989a19

Please sign in to comment.