diff options
| author | 1029chris <1029chris@gmail.com> | 2016-06-17 14:42:25 -0700 |
|---|---|---|
| committer | 1029chris <1029chris@gmail.com> | 2016-06-17 14:42:25 -0700 |
| commit | ac55f9bb143bba3112e671622fbcce8a5fc28ff8 (patch) | |
| tree | 15d3596c120084713e7b33767c97499debc42f36 /var.lua | |
| parent | 9811a04aa5f439714d71604b5b0709362f328a83 (diff) | |
| parent | 97924650a46ef7960c5fdde56a8f6641a0fa40e5 (diff) | |
Merge branch 'master' of https://github.com/1029chris/dont-get-a-virus
Diffstat (limited to 'var.lua')
| -rw-r--r-- | var.lua | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -91,6 +91,9 @@ function loadVar() av.fireb = false av.fire = false av.bullets = {} + av.shake = 0 + av.shakex = 0 + av.shakey = 0 chat.status = 0 chat.profilename = "Best Friend" colors = {} @@ -211,7 +214,7 @@ function loadVar() stre[1].hl = true modes = love.window.getFullscreenModes() for i=1,#modes do - if modes[i].width >= 1000 and modes[i].height >= 720 and i <= 10 then + if modes[i].width >= 1000 and modes[i].height >= 720 and i <= 9 then table.insert(stre, { title = modes[i].width .. "x" .. modes[i].height, hl = false, @@ -239,7 +242,6 @@ function loadVar() f.music[5] = {name="finale.mp3",x=0,y=0,hl=false} f.videos = {} f.videos[1] = {name="wtf.avi",x=0,y=0,hl=false} - f.videos[2] = {name="lol.avi",x=0,y=0,hl=false} f.downloads = {} files = f.home file = {} |
