epicknex/ResearchDisorderGame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
Ryan Ward 2018-02-16 21:59:44 -05:00
parent 3b576bd118
commit bbb2953c21
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
game/main.lua
View File

@ -1,8 +1,6 @@
--package.path="/?/init.lua;"..package.path
require("Libs/Library") require("Libs/Library")
--~ require("Libs/Utils")
require("bin") require("bin")
require("multi.compat.love2d") -- for use with the love2d engine require("multi.compat.love2d")
require("parseManager") require("parseManager")
require("Libs/lovebind") require("Libs/lovebind")
require("GuiManager") require("GuiManager")
@ -31,9 +29,6 @@ parseManager:define{
loadAudio=function(self,path) loadAudio=function(self,path)
return love.audio.newSource(path) return love.audio.newSource(path)
end, end,
loadSong=function(self,path)
return love.audio.newSource(path)
end,
playSongLooped=function(self,item) playSongLooped=function(self,item)
item:setLooping(true) item:setLooping(true)
item:play() item:play()
@ -42,15 +37,7 @@ parseManager:define{
item:play() item:play()
if n then if n then
multi:newAlarm(n):OnRing(function() multi:newAlarm(n):OnRing(function()
item:stop() item:pause()
end)
end
end,
playSong=function(self,item,n)
item:play()
if n then
multi:newAlarm(n):OnRing(function()
item:stop()
end) end)
end end
end, end,
@ -72,13 +59,6 @@ parseManager:define{
stopAudio=function(self,item) stopAudio=function(self,item)
item:stop() item:stop()
end, end,
stopSong=function(self,item)
if self:varExists(item)==nil then
love.audio.stop()
return
end
item:stop()
end,
pauseAudio=function(self,item) pauseAudio=function(self,item)
item:pause() item:pause()
end, end,
@ -101,7 +81,6 @@ parseManager:define{
if obj.DPI>=2 then if obj.DPI>=2 then
obj.DPI=obj.DPI-1 obj.DPI=obj.DPI-1
end end
print("OBJECT: "..tostring(obj))
return obj return obj
end, end,
makeObject=function(self,link,x,y,w,h,sx,sy,sw,sh) makeObject=function(self,link,x,y,w,h,sx,sy,sw,sh)
@ -140,7 +119,7 @@ parseManager:define{
item:SetImage(path) item:SetImage(path)
end, end,
setText=function(self,item,text) setText=function(self,item,text)
if type(item)=="string" then if type(item)~="table" then
self:pushError("item must be a gui object!") self:pushError("item must be a gui object!")
end end
item.text=text item.text=text
@ -174,7 +153,7 @@ parseManager:define{
item:Destroy() item:Destroy()
end, end,
loadImage=function(self,path) loadImage=function(self,path)
-- return love.graphics.newImage(path)
end, end,
newThread=function(blocklink,block) newThread=function(blocklink,block)
multi:newThread(block.." [Thread]",function() multi:newThread(block.." [Thread]",function()
@ -194,7 +173,7 @@ parseManager:define{
end, end,
} }
gui.enableAutoWindowScaling(true) gui.enableAutoWindowScaling(true)
core=gui:newImageLabel(nil,0,0,0,0,0,0,1,1)--gui:newFullImageLabel("fire.jpg","BG") core=gui:newImageLabel(nil,0,0,0,0,0,0,1,1)
workspace=core:newFullFrame() workspace=core:newFullFrame()
top=gui:newFrame("",0,0,0,0,0,0,1,1) top=gui:newFrame("",0,0,0,0,0,0,1,1)
workspace.Visibility=0 workspace.Visibility=0
@ -207,7 +186,6 @@ core.chatFrame.textHolder.Visibility=0
core.chatFrame.textHolder.text="" core.chatFrame.textHolder.text=""
core.chatFrame.textHolder.TextFormat="left" core.chatFrame.textHolder.TextFormat="left"
test=parseManager:load("init.txt") test=parseManager:load("init.txt")
--~ print("DUMP:")
dump=test:dump() dump=test:dump()
print(dump) print(dump)
bin.new(dump):tofile("Dump.dat") bin.new(dump):tofile("Dump.dat")
@ -297,4 +275,3 @@ inputBox.input.ClipDescendants=true
inputBox:centerX() inputBox:centerX()
inputBox:centerY() inputBox:centerY()
inputBox.Visible=false inputBox.Visible=false
--~ t=test:next() -- lets start this!