Permalink
Browse files

Somewhat functional arena and stuff

  • Loading branch information...
1 parent 54c3e9a commit 54257cc2b24a243755b560ba3943e956a86f6450 @svenstaro committed Aug 4, 2012
Showing with 6 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +4 −1 BGJ02/src/game.lua
  3. +1 −1 BGJ02/src/main.lua
View
1 .gitignore
@@ -1,3 +1,4 @@
*.bin
*.pyc
*.exe
+screens/*
View
5 BGJ02/src/game.lua
@@ -1,5 +1,6 @@
--- intro
+-- game
+require("arena")
require("util/gamestate")
require("util/resources")
@@ -11,7 +12,9 @@ function Game:__init()
self.entities = {}
ship = Ship()
+ arena = Arena()
table.insert(self.entities, ship)
+ table.insert(self.entities, arena)
end
function Game:draw()
View
2 BGJ02/src/main.lua
@@ -10,7 +10,7 @@ function reset()
intro = Intro()
game = Game()
stack = GameStack()
- stack:push(intro)
+ stack:push(game)
end
function love.load()

0 comments on commit 54257cc

Please sign in to comment.