summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--main.lua10
2 files changed, 10 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 835bf27..bf5d509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,8 @@
assets/font.png
maps/emo.lua
.project
-*.sfs \ No newline at end of file
+*.sfs
+*.swp
+*.swo
+*~
+.backup/
diff --git a/main.lua b/main.lua
index 930a57b..e35f6ab 100644
--- a/main.lua
+++ b/main.lua
@@ -24,7 +24,7 @@ require "controller"
debug = false
-- Load
-function love.load ()
+function love.load()
-- Graphics
love.graphics.setBackgroundColor(189, 95, 93)
love.graphics.setDefaultFilter("nearest", "nearest")
@@ -71,12 +71,12 @@ function love.gamepadreleased(joystick, button)
end
-- Update
-function love.update (dt)
+function love.update(dt)
Scene:update(dt)
end
-- KeyPressed
-function love.keypressed (key)
+function love.keypressed(key)
-- Controllers
for _,controller in pairs(Controllers) do
controller:keypressed(key)
@@ -104,9 +104,9 @@ function love.keyreleased(key)
end
-- Draw
-function love.draw ()
+function love.draw()
Scene:draw()
if debug then
love.graphics.print("Current FPS: "..tostring(love.timer.getFPS()), 10, 10)
end
-end \ No newline at end of file
+end