diff --git a/Zenitha b/Zenitha index 5a4b6a08..b2c77f2e 160000 --- a/Zenitha +++ b/Zenitha @@ -1 +1 @@ -Subproject commit 5a4b6a08a5271fc5b47b9648191048ff6cbb0c98 +Subproject commit b2c77f2e17a760dc4748b0896afda895ca73f693 diff --git a/assets/game/acryPlayer.lua b/assets/game/acryPlayer.lua index 3ea3ca91..72806dac 100644 --- a/assets/game/acryPlayer.lua +++ b/assets/game/acryPlayer.lua @@ -568,6 +568,7 @@ function AP:tickStep() local list=self.acryProcessQueue.explosion for i=1,#list do local acry=list[i] + -- TODO end TABLE.clear(list) end diff --git a/assets/game/basePlayer.lua b/assets/game/basePlayer.lua index e6a62d29..31d5ece5 100644 --- a/assets/game/basePlayer.lua +++ b/assets/game/basePlayer.lua @@ -782,14 +782,10 @@ function P:initialize() end end local dumpIgnore={ - 'P.soundTimeHistory', - 'P.particles', - 'P.texts', + ['P.soundTimeHistory']=true, + ['P.particles']=true, + ['P.texts']=true, } -for _,v in next,dumpIgnore do - dumpIgnore[v]=true -end -TABLE.clear(dumpIgnore) local function dump(self,L,t,path) local s='{' local count=1 diff --git a/assets/game/rectField.lua b/assets/game/rectField.lua index 68158958..19bf4afd 100644 --- a/assets/game/rectField.lua +++ b/assets/game/rectField.lua @@ -1,4 +1,5 @@ local gc=love.graphics +local buffer=require"string.buffer" ---@class Techmino.RectField ---@field _width number @@ -32,30 +33,28 @@ function F:export_table_simp() return t end function F:export_string_simp() - local str='' + local buf=buffer.new((self._width+1)*#self._matrix) for y=1,#self._matrix do - local buf='' for x=1,self._width do - buf=buf..(self._matrix[y][x] and 'x' or '_') + buf:put(self._matrix[y][x] and 'x' or '_') end - str=str..buf..'/' + buf:put('/') end - return str + return buf:get() end function F:export_string_color() - local str='' + local buf=buffer.new((self._width*2+1)*#self._matrix) for y=1,#self._matrix do - local buf='' for x=1,self._width do - buf=buf..STRING.base64[self._matrix[y][x].color] + buf:put(STRING.toHex(self._matrix[y][x].color,2)) end - str=str..buf..'/' + buf:put('/') end - return str + return buf:get() end function F:export_fumen() local str='' diff --git a/assets/scene_app/link.lua b/assets/scene_app/link.lua index 80c1966e..c20a326a 100644 --- a/assets/scene_app/link.lua +++ b/assets/scene_app/link.lua @@ -78,7 +78,7 @@ local function resetBoard() field.full=true total=total*2 - TABLE.clear(field) + TABLE.clearList(field) for y=1,field.r do field[y]={} for x=1,field.c do diff --git a/assets/scene_app/piano.lua b/assets/scene_app/piano.lua index d6b45050..a3a4df34 100644 --- a/assets/scene_app/piano.lua +++ b/assets/scene_app/piano.lua @@ -413,8 +413,8 @@ local scene={} local function stopAllSounds() for _,effect in next,activeEventMap do effect:stop(FMOD.FMOD_STUDIO_STOP_ALLOWFADEOUT) end - TABLE.clearAll(activeEventMap) - TABLE.clearAll(objPool) + TABLE.clear(activeEventMap) + TABLE.clear(objPool) end function scene.load() stopAllSounds() diff --git a/assets/vctrl.lua b/assets/vctrl.lua index 516173d2..40dc1214 100644 --- a/assets/vctrl.lua +++ b/assets/vctrl.lua @@ -433,7 +433,7 @@ end function VCTRL.importSettings(data) if not data then return end - TABLE.clear(VCTRL) + TABLE.clearList(VCTRL) for i=1,#data do local w=data[i] VCTRL[i]=(