diff options
| author | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-09-11 00:24:40 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-09-11 00:24:40 -0400 |
| commit | 1d9c67f5719b3c55b1f2f2537e796e2ad95e1ac1 (patch) | |
| tree | 98e9656f5855a86ed8247ec3dc13e247d617141c /Scripts | |
| parent | b46aa08e48bdfa9008738ed5d599d6e7d11ede56 (diff) | |
| parent | 2b095e30f7786526da9339ccada3aae7f2ab5df4 (diff) | |
Merge branch 'master' of github.com:tcsullivan/gamedev2
Diffstat (limited to 'Scripts')
| -rw-r--r-- | Scripts/init.lua | 5 | ||||
| -rw-r--r-- | Scripts/world.lua | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Scripts/init.lua b/Scripts/init.lua index f177462..78b2a76 100644 --- a/Scripts/init.lua +++ b/Scripts/init.lua @@ -129,6 +129,9 @@ wall = { } } +-- Create the world +dofile("Scripts/world.lua") + birdSpawn = game.spawn(bird); dogSpawn = game.spawn(cat); @@ -156,8 +159,6 @@ game.spawn({ end }); -dofile("Scripts/world.lua") - ------------------- -- SERIALIZING -- ------------------- diff --git a/Scripts/world.lua b/Scripts/world.lua index 1157704..a6224ab 100644 --- a/Scripts/world.lua +++ b/Scripts/world.lua @@ -41,4 +41,5 @@ world = { end } -world:Generate() +--world:Generate() +game.worldRegister(world) |