summaryrefslogtreecommitdiffhomepage
path: root/world.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-02-26 01:31:15 +0100
committerAki <nthirtyone@gmail.com>2017-02-26 01:31:15 +0100
commit55b0cf1a22e4a7e41fe00aa693445d6c4bd0652d (patch)
treee6b51ec7a27dba06c79ec7e7f500a100fd82594a /world.lua
parent0b287c4750553ab72c04680378487b9d11cd0b43 (diff)
parentf6931cb1bda8c7ec1301f359f28ecc3b1fdb1566 (diff)
downloadroflnauts-55b0cf1a22e4a7e41fe00aa693445d6c4bd0652d.zip
roflnauts-55b0cf1a22e4a7e41fe00aa693445d6c4bd0652d.tar.gz
roflnauts-55b0cf1a22e4a7e41fe00aa693445d6c4bd0652d.tar.bz2
Merge branch 'platforms'
Diffstat (limited to 'world.lua')
-rw-r--r--world.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/world.lua b/world.lua
index f2af28d..9c308b8 100644
--- a/world.lua
+++ b/world.lua
@@ -3,7 +3,7 @@
-- WHOLE CODE HAS FLAG OF "need a cleanup"
-require "ground"
+require "platform"
require "player"
require "cloud"
require "effect"
@@ -126,7 +126,7 @@ end
-- Add new platform to the world
function World:createPlatform(x, y, polygon, sprite, animations)
- table.insert(self.Platforms, Ground:new(self, self.world, x, y, polygon, sprite, animations))
+ table.insert(self.Platforms, Platform:new(self, self.world, x, y, polygon, sprite, animations))
end
-- Add new naut to the world