Zframework支持自定义onQuit触发的函数,destroyPlayers移出框架代码
This commit is contained in:
@@ -489,7 +489,6 @@ function love.errorhandler(msg)
|
|||||||
love.event.pump()
|
love.event.pump()
|
||||||
for E,a,b in love.event.poll()do
|
for E,a,b in love.event.poll()do
|
||||||
if E=='quit'or a=='escape'then
|
if E=='quit'or a=='escape'then
|
||||||
destroyPlayers()
|
|
||||||
return true
|
return true
|
||||||
elseif E=='resize'then
|
elseif E=='resize'then
|
||||||
SCR.resize(a,b)
|
SCR.resize(a,b)
|
||||||
@@ -559,6 +558,7 @@ local function drawCursor(_,x,y)
|
|||||||
gc_circle(ms.isDown(1)and'fill'or'line',x,y,6)
|
gc_circle(ms.isDown(1)and'fill'or'line',x,y,6)
|
||||||
end
|
end
|
||||||
local function showPowerInfo()return true end
|
local function showPowerInfo()return true end
|
||||||
|
local onQuit=NULL
|
||||||
|
|
||||||
function love.run()
|
function love.run()
|
||||||
local love=love
|
local love=love
|
||||||
@@ -602,7 +602,7 @@ function love.run()
|
|||||||
if love[N]then
|
if love[N]then
|
||||||
love[N](a,b,c,d,e)
|
love[N](a,b,c,d,e)
|
||||||
elseif N=='quit'then
|
elseif N=='quit'then
|
||||||
destroyPlayers()
|
onQuit()
|
||||||
return a or true
|
return a or true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -757,4 +757,5 @@ function Z.setIfPowerInfo(func)showPowerInfo=func end
|
|||||||
--Warning: color and line width is uncertain value, set it in the function.
|
--Warning: color and line width is uncertain value, set it in the function.
|
||||||
function Z.setCursor(func)drawCursor=func end
|
function Z.setCursor(func)drawCursor=func end
|
||||||
|
|
||||||
|
function Z.setOnQuit(func)onQuit=type(func)=='function'and func or NULL end
|
||||||
return Z
|
return Z
|
||||||
|
|||||||
61
main.lua
61
main.lua
@@ -44,35 +44,6 @@ end
|
|||||||
|
|
||||||
--Load modules
|
--Load modules
|
||||||
Z=require'Zframework'
|
Z=require'Zframework'
|
||||||
do
|
|
||||||
local normImg=GC.DO{16,16,
|
|
||||||
{'fCirc',8,8,4},
|
|
||||||
{'setCL',1,1,1,.7},
|
|
||||||
{'fCirc',8,8,6},
|
|
||||||
}
|
|
||||||
local holdImg=GC.DO{16,16,
|
|
||||||
{'setLW',2},
|
|
||||||
{'dCirc',8,8,7},
|
|
||||||
{'fCirc',8,8,3},
|
|
||||||
}
|
|
||||||
local min,int,abs=math.min,math.floor,math.abs
|
|
||||||
local gc_setColor,gc_draw=love.graphics.setColor,love.graphics.draw
|
|
||||||
local ms=love.mouse
|
|
||||||
Z.setCursor(function(time,x,y)
|
|
||||||
if not SETTING.sysCursor then
|
|
||||||
local R=int((time+1)/2)%7+1
|
|
||||||
_=minoColor[SETTING.skin[R]]
|
|
||||||
gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3))
|
|
||||||
_=DSCP[R][0]
|
|
||||||
gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5)
|
|
||||||
gc_setColor(1,1,1)
|
|
||||||
gc_draw(ms.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8)
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
Z.setIfPowerInfo(function()
|
|
||||||
return SETTING.powerInfo and LOADED
|
|
||||||
end)
|
|
||||||
|
|
||||||
FONT.init('parts/fonts/puhui.ttf')
|
FONT.init('parts/fonts/puhui.ttf')
|
||||||
setFont=FONT.set
|
setFont=FONT.set
|
||||||
@@ -120,6 +91,38 @@ PLY= require'parts.player'
|
|||||||
netPLY= require'parts.netPlayer'
|
netPLY= require'parts.netPlayer'
|
||||||
MODES= require'parts.modes'
|
MODES= require'parts.modes'
|
||||||
|
|
||||||
|
--Init Zframework
|
||||||
|
do
|
||||||
|
local normImg=GC.DO{16,16,
|
||||||
|
{'fCirc',8,8,4},
|
||||||
|
{'setCL',1,1,1,.7},
|
||||||
|
{'fCirc',8,8,6},
|
||||||
|
}
|
||||||
|
local holdImg=GC.DO{16,16,
|
||||||
|
{'setLW',2},
|
||||||
|
{'dCirc',8,8,7},
|
||||||
|
{'fCirc',8,8,3},
|
||||||
|
}
|
||||||
|
local min,int,abs=math.min,math.floor,math.abs
|
||||||
|
local gc_setColor,gc_draw=love.graphics.setColor,love.graphics.draw
|
||||||
|
local ms=love.mouse
|
||||||
|
Z.setCursor(function(time,x,y)
|
||||||
|
if not SETTING.sysCursor then
|
||||||
|
local R=int((time+1)/2)%7+1
|
||||||
|
_=minoColor[SETTING.skin[R]]
|
||||||
|
gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3))
|
||||||
|
_=DSCP[R][0]
|
||||||
|
gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5)
|
||||||
|
gc_setColor(1,1,1)
|
||||||
|
gc_draw(ms.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
Z.setIfPowerInfo(function()
|
||||||
|
return SETTING.powerInfo and LOADED
|
||||||
|
end)
|
||||||
|
Z.setOnQuit(destroyPlayers)
|
||||||
|
|
||||||
--Load settings and statistics
|
--Load settings and statistics
|
||||||
TABLE.cover (FILE.load('conf/user')or{},USER)
|
TABLE.cover (FILE.load('conf/user')or{},USER)
|
||||||
TABLE.cover (FILE.load('conf/unlock')or{},RANKS)
|
TABLE.cover (FILE.load('conf/unlock')or{},RANKS)
|
||||||
|
|||||||
Reference in New Issue
Block a user