Skip to content

Commit ac40a01

Browse files
committed
fix: slim directory filter
1 parent 80e62cc commit ac40a01

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

animationsystem.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ function animationsystem_load()
1111
if not dcplaying then
1212
local fl = love.filesystem.getDirectoryItems(mappackfolder .. "/" .. mappack .. "/animations")
1313
for i = 1, #fl do
14-
local fsinfo = love.filesystem.getInfo(mappackfolder .. "/" .. mappack .. "/animations/" .. fl[i])
15-
if fsinfo and fsinfo.type == "directory" then
14+
if love.filesystem.getInfo(mappackfolder .. "/" .. mappack .. "/animations/" .. fl[i], "directory") then
1615
--load animations from folder
1716
local fl2 = love.filesystem.getDirectoryItems(mappackfolder .. "/" .. mappack .. "/animations/" .. fl[i])
1817
for i2 = 1, #fl2 do

editor.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -7432,15 +7432,15 @@ function opencustomimagefolder(f)
74327432
return false
74337433
end
74347434
if customtabstate == "graphics" then
7435-
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/custom") then
7435+
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/custom", "directory") then
74367436
love.filesystem.createDirectory( mappackfolder .. "/" .. mappack .. "/custom")
74377437
end
74387438
love.system.openURL("file://" .. love.filesystem.getSaveDirectory() .. "/" .. mappackfolder .. "/" .. mappack .. "/custom")
74397439
elseif customtabstate == "tiles" then
74407440
if f == "tiles" then
74417441
love.system.openURL("file://" .. love.filesystem.getSaveDirectory() .. "/" .. mappackfolder .. "/" .. mappack)
74427442
elseif f == "animated" then
7443-
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/animated") then
7443+
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/animated", "directory") then
74447444
love.filesystem.createDirectory( mappackfolder .. "/" .. mappack .. "/animated")
74457445
end
74467446
love.system.openURL("file://" .. love.filesystem.getSaveDirectory() .. "/" .. mappackfolder .. "/" .. mappack .. "/animated")
@@ -7452,18 +7452,18 @@ function opencustomimagefolder(f)
74527452
love.system.openURL("file://" .. love.filesystem.getSaveDirectory() .. "/" .. mappackfolder .. "/" .. mappack .. "/backgrounds")
74537453
elseif customtabstate == "sounds" then
74547454
if f == "sounds" then
7455-
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/sounds") then
7455+
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/sounds", "directory") then
74567456
love.filesystem.createDirectory( mappackfolder .. "/" .. mappack .. "/sounds")
74577457
end
74587458
love.system.openURL("file://" .. love.filesystem.getSaveDirectory() .. "/" .. mappackfolder .. "/" .. mappack .. "/sounds")
74597459
else
7460-
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/music") then
7460+
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/music", "directory") then
74617461
love.filesystem.createDirectory( mappackfolder .. "/" .. mappack .. "/music")
74627462
end
74637463
love.system.openURL("file://" .. love.filesystem.getSaveDirectory() .. "/" .. mappackfolder .. "/" .. mappack .. "/music")
74647464
end
74657465
elseif customtabstate == "enemies" then
7466-
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/enemies") then
7466+
if not love.filesystem.getInfo( mappackfolder .. "/" .. mappack .. "/enemies", "directory") then
74677467
love.filesystem.createDirectory( mappackfolder .. "/" .. mappack .. "/enemies")
74687468
end
74697469
love.system.openURL("file://" .. love.filesystem.getSaveDirectory() .. "/" .. mappackfolder .. "/" .. mappack .. "/enemies")

enemies.lua

+2-4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ function enemies_load()
4040

4141
for i = 1, #fl2 do
4242
local mpepath = mappackfolder .. "/" .. mappack .. "/enemies/" .. fl2[i]
43-
local mpepathinfo = love.filesystem.getInfo(mpepath)
44-
if mpepathinfo ~= nil and mpepathinfo.type == "directory" then
43+
if love.filesystem.getInfo(mpepath, "directory") then
4544
--load enemies from folder
4645
local fl3 = love.filesystem.getDirectoryItems(mpepath)
4746
for i2 = 1, #fl3 do
@@ -59,8 +58,7 @@ function enemies_load()
5958
local fl3 = love.filesystem.getDirectoryItems("alesans_entities/characters/" .. mariocharacter[i] .. "/enemies/")
6059
for i2 = 1, #fl3 do
6160
local cepath = "alesans_entities/characters/" .. mariocharacter[i] .. "/enemies/" .. fl3[i2]
62-
local cepathinfo = love.filesystem.getInfo(mpepath)
63-
if cepathinfo ~= nil and cepathinfo.type == "directory" then
61+
if love.filesystem.getInfo(cepath, "directory") then
6462
--load enemies from folder
6563
local fl4 = love.filesystem.getDirectoryItems(cepath)
6664
for i3 = 1, #fl4 do

0 commit comments

Comments
 (0)