Merge remote-tracking branch 'origin/lib-cleanup' into world

21 files changed, 391 insertions, 61 deletions

diff --git a/src/audio.cpp b/src/audio.cpp
new file mode 100644
index 0000000..7a5934f
--- /dev/null
+++ b/src/audio.cpp
@@ -0,0 +1,110 @@
+/**
+ * @file audio.cpp
+ * Handles audio loading and playback
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "audio.hpp"
+#include "components/Player.hpp"
+
+#include <AL/alut.h>
+#include <iostream>
+
+AudioSystem::AudioSystem(void) :
+    device(nullptr, [](ALCdevice *d) { alcCloseDevice(d); }),
+    context(nullptr, [](ALCcontext *c) { alcDestroyContext(c); }) {}
+
+AudioSystem::~AudioSystem(void)
+{
+    alutExit();
+
+    // Delete context before device
+    alcMakeContextCurrent(nullptr);
+    context.reset();
+    device.reset();
+}
+
+void AudioSystem::configure([[maybe_unused]] entityx::EntityManager& entities,
+                            entityx::EventManager& events)
+{
+    events.subscribe<entityx::ComponentAddedEvent<Audio>>(*this);
+    events.subscribe<entityx::ComponentRemovedEvent<Audio>>(*this);
+
+    // Access device
+    device.reset(alcOpenDevice(nullptr));
+    if (!device)
+        return; // TODO Uh oh
+
+    // Create context
+    context.reset(alcCreateContext(device.get(), nullptr));
+    if (!alcMakeContextCurrent(context.get()))
+        return; // TODO Another uh oh
+
+    if (alutInitWithoutContext(nullptr, nullptr) != AL_TRUE)
+        return; // TODO Third uh oh
+
+    // Set up listener
+    ALfloat listenerOri[] = { 0.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f };
+    alListener3f(AL_POSITION, 0, 0, 0.0f);
+    alListener3f(AL_VELOCITY, 0, 0, 0);
+    alListenerfv(AL_ORIENTATION, listenerOri);
+
+    alDistanceModel(AL_LINEAR_DISTANCE); 
+}
+
+void AudioSystem::update(entityx::EntityManager& entities,
+                         [[maybe_unused]] entityx::EventManager& events,
+                         [[maybe_unused]] entityx::TimeDelta dt)
+{
+    entities.each<Player, Position>(
+        []([[maybe_unused]] entityx::Entity e,
+                   [[maybe_unused]] Player& p,
+                   Position &pos)
+        {
+            alListener3f(AL_POSITION, pos.x, pos.y, 0.0f);
+        });
+}
+
+void AudioSystem::receive(const entityx::ComponentAddedEvent<Audio>& cae)
+{
+    alGenSources(1, const_cast<ALuint*>(&cae.component->source));
+    //alGenBuffers(1, const_cast<ALuint*>(&cae.component->buffer));
+    
+    if (auto buf = alutCreateBufferFromFile(cae.component->fileName.c_str());
+        buf != AL_NONE) {
+        const_cast<Audio*>(cae.component.get())->buffer = buf;
+        alSourcei(cae.component->source, AL_BUFFER, buf);
+        // TODO Do these values need to be scaled to the world or window?
+        alSourcef(cae.component->source, AL_MAX_DISTANCE, 25);
+        alSourcef(cae.component->source, AL_REFERENCE_DISTANCE, 2);
+
+        std::cout << "Loaded audio: " << cae.component->fileName << std::endl;
+    }
+}
+
+void AudioSystem::receive(const entityx::ComponentRemovedEvent<Audio>& cae)
+{
+    alDeleteBuffers(1, &cae.component->buffer);
+    alDeleteSources(1, &cae.component->source);
+}
+
+void AudioSystem::playSound(const Position& pos, const Audio& audio)
+{
+    alSource3f(audio.source, AL_POSITION, pos.x, pos.y, 0);
+    alSourcePlay(audio.source);
+}
+
diff --git a/src/audio.hpp b/src/audio.hpp
new file mode 100644
index 0000000..7a2076a
--- /dev/null
+++ b/src/audio.hpp
@@ -0,0 +1,60 @@
+/**
+ * @file audio.hpp
+ * Handles audio loading and playback
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef SYSTEM_AUDIO_HPP_
+#define SYSTEM_AUDIO_HPP_
+
+#include <AL/alut.h>
+#include <entityx/entityx.h>
+
+#include <components/Audio.hpp>
+#include <components/Position.hpp>
+
+class AudioSystem : public entityx::System<AudioSystem>,
+                    public entityx::Receiver<AudioSystem>
+{
+private:
+    std::unique_ptr<ALCdevice, void (*)(ALCdevice *)> device;
+    std::unique_ptr<ALCcontext, void (*)(ALCcontext *)> context;
+
+public:
+    AudioSystem(void);
+    ~AudioSystem(void);
+
+    /**
+     * Prepares the system for running.
+     */
+    void configure(entityx::EntityManager& entities,
+                   entityx::EventManager& events) final;
+    
+    /**
+     * Updates the render system.
+     */
+    void update(entityx::EntityManager& entities,
+                entityx::EventManager& events,
+                entityx::TimeDelta dt) final;
+
+    void receive(const entityx::ComponentAddedEvent<Audio>& cae);
+    void receive(const entityx::ComponentRemovedEvent<Audio>& cae);
+
+    void playSound(const Position& pos, const Audio& audio);
+};
+
+#endif // SYSTEM_AUDIO_HPP_
+
diff --git a/src/components/Audio.hpp b/src/components/Audio.hpp
new file mode 100644
index 0000000..2bb63eb
--- /dev/null
+++ b/src/components/Audio.hpp
@@ -0,0 +1,56 @@
+/**
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef COMPONENT_AUDIO_HPP_
+#define COMPONENT_AUDIO_HPP_
+
+#include <AL/al.h>
+
+#include "Component.hpp"
+
+struct Audio : Component<Audio>
+{
+public:
+    std::string fileName;
+    ALuint source;
+    ALuint buffer;
+
+    Audio(std::string _fileName = "") :
+        fileName(_fileName), source(0), buffer(0) {}
+
+    Audio FromLua(sol::object ref)
+    {
+        if (ref.get_type() == sol::type::table) {
+            sol::table tab = ref;
+            if (tab["file"] != nullptr)
+                this->fileName = tab["file"];
+        } else {
+            throw std::string("Audio table not formatted properly");
+        }
+
+        return *this;
+    }
+
+    void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
+    void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
+
+    virtual std::string serializeName(void) const final {
+        return "Audio";
+    }
+};
+
+#endif // COMPONENT_AUDIO_HPP_
+
diff --git a/src/components/Component.hpp b/src/components/Component.hpp
index 5b0e3af..3075cea 100644
--- a/src/components/Component.hpp
+++ b/src/components/Component.hpp
@@ -37,7 +37,7 @@ public:
     virtual void serialize(cereal::JSONOutputArchive& ar) = 0;
     virtual void serialize(cereal::JSONInputArchive& ar) = 0;
 
-    void internal_serialize(bool save, void *ar) final {
+    virtual void internal_serialize(bool save, void *ar) final {
         if (save)
             serialize(*reinterpret_cast<cereal::JSONOutputArchive*>(ar));
         else
diff --git a/src/components/EventListener.hpp b/src/components/EventListener.hpp
index 77a004e..fb55d95 100644
--- a/src/components/EventListener.hpp
+++ b/src/components/EventListener.hpp
@@ -42,16 +42,17 @@ public:
         return *this;
     }
 
-    void tryListener(const std::string& name, sol::table& self)
+    template<typename... Args>
+    void tryListener(const std::string& name, sol::table& self, Args... args)
     {
         if (listeners[name] == sol::type::function)
-            listeners[name](self);
+            listeners[name](self, args...);
     }
 
     void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
     void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "EventListener";
     }
 };
diff --git a/src/components/Light.hpp b/src/components/Light.hpp
index 6849d7c..c63b6cc 100644
--- a/src/components/Light.hpp
+++ b/src/components/Light.hpp
@@ -58,7 +58,7 @@ public:
         ar(CEREAL_NVP(r), CEREAL_NVP(g), CEREAL_NVP(b), CEREAL_NVP(strength));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Light";
     }
 };
diff --git a/src/components/Name.hpp b/src/components/Name.hpp
index a6a6d8a..6390d5e 100644
--- a/src/components/Name.hpp
+++ b/src/components/Name.hpp
@@ -47,7 +47,7 @@ public:
         ar(CEREAL_NVP(name));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Name";
     }
 };
diff --git a/src/components/Physics.hpp b/src/components/Physics.hpp
index cb4d08a..2d6b9b2 100644
--- a/src/components/Physics.hpp
+++ b/src/components/Physics.hpp
@@ -63,7 +63,7 @@ public:
     void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
     void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Physics";
     }
 };
diff --git a/src/components/Player.hpp b/src/components/Player.hpp
index a550c4f..43d083e 100644
--- a/src/components/Player.hpp
+++ b/src/components/Player.hpp
@@ -36,7 +36,7 @@ public:
     void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
     void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Player";
     }
 };
diff --git a/src/components/Position.hpp b/src/components/Position.hpp
index 1c649b4..a0adff5 100644
--- a/src/components/Position.hpp
+++ b/src/components/Position.hpp
@@ -52,7 +52,7 @@ public:
         ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Position";
     }
 };
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index a9af51a..10a04fc 100644
--- a/src/components/Render.hpp
+++ b/src/components/Render.hpp
@@ -81,7 +81,7 @@ public:
         ar(CEREAL_NVP(visible), CEREAL_NVP(flipX));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Render";
     }
 };
diff --git a/src/components/Script.hpp b/src/components/Script.hpp
index 3f96be5..93997a9 100644
--- a/src/components/Script.hpp
+++ b/src/components/Script.hpp
@@ -74,7 +74,7 @@ public:
             else if (value.get_type() == sol::type::number)
                 table_components.push_back(std::make_tuple(
                     key.as<std::string>(),
-                    std::string("return " + value.as<std::string>())
+                    std::string("return ") + std::to_string(value.as<double>())
                 ));
             else if (value.get_type() == sol::type::boolean) {
                 table_components.push_back(std::make_tuple(
@@ -119,7 +119,7 @@ public:
 
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Scripted";
     }
 };
diff --git a/src/components/Velocity.hpp b/src/components/Velocity.hpp
index 888cbb5..420dd3d 100644
--- a/src/components/Velocity.hpp
+++ b/src/components/Velocity.hpp
@@ -51,7 +51,7 @@ public:
         ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Velocity";
     }
 };
diff --git a/src/engine.cpp b/src/engine.cpp
index a3c4c6a..feb1b7f 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "audio.hpp"
 #include "config.hpp"
 #include "engine.hpp"
 #include "gamestate.hpp"
@@ -54,6 +55,7 @@ int Engine::init(void)
     systems.add<ScriptSystem>(entities, *(systems.system<WorldSystem>().get()));
     systems.add<PhysicsSystem>();
     systems.add<TextSystem>();
+    systems.add<AudioSystem>();
     systems.configure();
 
     // Load game script and entity data
@@ -64,6 +66,9 @@ int Engine::init(void)
     script->addToGameNamespace("puts",
         bindInstance(&TextSystem::put,
                      systems.system<TextSystem>().get()));
+    script->addToGameNamespace("play",
+        bindInstance(&AudioSystem::playSound,
+                     systems.system<AudioSystem>().get()));
     script->init();
     
 
@@ -115,6 +120,7 @@ void Engine::logicLoop(void)
             });
         }
 
+        systems.update<AudioSystem>(dt);
         std::this_thread::yield();
     }
 }
diff --git a/src/entityx/config.h b/src/entityx/config.h
new file mode 100644
index 0000000..630f8a8
--- /dev/null
+++ b/src/entityx/config.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <cstdint>
+#include <cstddef>
+
+namespace entityx {
+
+static const size_t MAX_COMPONENTS = 64;
+typedef double TimeDelta;
+
+}  // namespace entityx
diff --git a/src/gamestate.hpp b/src/gamestate.hpp
index 55f4e47..3ef641f 100644
--- a/src/gamestate.hpp
+++ b/src/gamestate.hpp
@@ -98,7 +98,13 @@ private:
         for (auto entity : entities.entities_for_debugging()) {
             archive.setNextName((name + std::to_string(i++)).c_str());
             archive.startNode();
-            entities.entity_serialize(entity, save, archive);
+            entities.serialize(entity,
+                [&archive, &save](auto c) {
+                    archive.setNextName(c->serializeName().c_str());
+                    archive.startNode();
+                    c->internal_serialize(save, static_cast<void*>(&archive));
+                    archive.finishNode();
+                });
             archive.finishNode();
         }
     }
diff --git a/src/input.cpp b/src/input.cpp
new file mode 100644
index 0000000..21959c1
--- /dev/null
+++ b/src/input.cpp
@@ -0,0 +1,83 @@
+/**
+ * @file input.cpp
+ * Handles user input received from SDL.
+ *
+ * Copyright (C) 2020 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "input.hpp"
+
+#include "components/EventListener.hpp"
+#include "components/Script.hpp"
+
+InputSystem::InputSystem() :
+    isMouseDown(false) {}
+
+/**
+ * Prepares the system for running.
+ */
+void InputSystem::configure([[maybe_unused]] entityx::EntityManager& entities,
+                            [[maybe_unused]] entityx::EventManager& events) {}
+
+/**
+ * Updates the system by checking for SDL events.
+ */
+void InputSystem::update(entityx::EntityManager& entities,
+            entityx::EventManager& events,
+            [[maybe_unused]] entityx::TimeDelta dt)
+{
+    for (SDL_Event event; SDL_PollEvent(&event);) {
+        switch (event.type) {
+        case SDL_KEYUP:
+            if (auto key = event.key; key.repeat == 0)
+                events.emit<KeyUpEvent>(key.keysym);
+            break;
+        case SDL_KEYDOWN:
+            if (auto key = event.key; key.repeat == 0)
+                events.emit<KeyDownEvent>(key.keysym);
+            break;
+        case SDL_MOUSEBUTTONDOWN:
+            if (!isMouseDown) {
+                isMouseDown = true;
+                entities.each<EventListener>(
+                    [&event](entityx::Entity e, EventListener& el) {
+                        el.tryListener("MousePressed",
+                            e.component<Scripted>()->caller,
+                            event.button.x,
+                            event.button.y,
+                            event.button.button);
+                    });
+            }
+            break;
+        case SDL_MOUSEBUTTONUP:
+            if (isMouseDown) {
+                isMouseDown = false;
+                entities.each<EventListener>(
+                    [&event](entityx::Entity e, EventListener& el) {
+                        el.tryListener("MouseReleased",
+                            e.component<Scripted>()->caller,
+                            event.button.x,
+                            event.button.y,
+                            event.button.button);
+                    });
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
diff --git a/src/input.hpp b/src/input.hpp
index fa92c39..6180388 100644
--- a/src/input.hpp
+++ b/src/input.hpp
@@ -1,5 +1,5 @@
 /**
- * @file window.hpp
+ * @file input.hpp
  * Handles user input received from SDL.
  *
  * Copyright (C) 2019 Clyne Sullivan
@@ -56,34 +56,23 @@ struct KeyDownEvent {
 class InputSystem : public entityx::System<InputSystem>
 {
 public:
+    InputSystem();
+
     /**
      * Prepares the system for running.
      */
-    void configure([[maybe_unused]] entityx::EntityManager& entities,
-                   [[maybe_unused]] entityx::EventManager& events) final {}
+    void configure(entityx::EntityManager& entities,
+                   entityx::EventManager& events) final;
 
     /**
      * Updates the system by checking for SDL events.
      */
-    void update([[maybe_unused]] entityx::EntityManager& entities,
-                [[maybe_unused]] entityx::EventManager& events,
-                [[maybe_unused]] entityx::TimeDelta dt) final
-    {
-        for (SDL_Event event; SDL_PollEvent(&event);) {
-            switch (event.type) {
-            case SDL_KEYUP:
-                if (auto key = event.key; key.repeat == 0)
-                    events.emit<KeyUpEvent>(key.keysym);
-                break;
-            case SDL_KEYDOWN:
-                if (auto key = event.key; key.repeat == 0)
-                    events.emit<KeyDownEvent>(key.keysym);
-                break;
-            default:
-                break;
-            }
-        }
-    }
+    void update(entityx::EntityManager& entities,
+                entityx::EventManager& events,
+                entityx::TimeDelta dt) final;
+
+private:
+    bool isMouseDown;
 };
 
 #endif // SYSTEM_INPUT_HPP_
diff --git a/src/player.cpp b/src/player.cpp
index b914672..f40a1d1 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -54,26 +54,23 @@ void PlayerSystem::receive(const KeyDownEvent& kue)
 {
     if (player.valid()) {
         if (kue.sym == SDLK_a) {
-            entities.each<EventListener>([&]([[maybe_unused]] entityx::Entity e,
-                                             EventListener& el)
-            {
+            entities.each<EventListener>(
+                [](entityx::Entity e, EventListener& el) {
                     el.tryListener("MoveLeftPressed",
                                    e.component<Scripted>()->caller);
-            });
+                });
         } else if (kue.sym == SDLK_d) {
-            entities.each<EventListener>([&]([[maybe_unused]] entityx::Entity e,
-                                             EventListener& el)
-            {
+            entities.each<EventListener>(
+                [](entityx::Entity e, EventListener& el) {
                     el.tryListener("MoveRightPressed",
                                    e.component<Scripted>()->caller);
-            });
+                });
         } else if (kue.sym == SDLK_SPACE) {
-            entities.each<EventListener>([&]([[maybe_unused]] entityx::Entity e,
-                                             EventListener& el)
-            {
+            entities.each<EventListener>(
+                [](entityx::Entity e, EventListener& el) {
                     el.tryListener("JumpKeyPressed",
                                    e.component<Scripted>()->caller);
-            });
+                });
         }
     }
 }
@@ -82,26 +79,23 @@ void PlayerSystem::receive(const KeyUpEvent& kue)
 {
     if (player.valid()) {
         if (kue.sym == SDLK_a) {
-            entities.each<EventListener>([&]([[maybe_unused]] entityx::Entity e,
-                                             EventListener& el)
-            {
+            entities.each<EventListener>(
+                [](entityx::Entity e, EventListener& el) {
                     el.tryListener("MoveLeftReleased",
                                    e.component<Scripted>()->caller);
-            });
+                });
         } else if (kue.sym == SDLK_d) {
-            entities.each<EventListener>([&]([[maybe_unused]] entityx::Entity e,
-                                             EventListener& el)
-            {
+            entities.each<EventListener>(
+                [](entityx::Entity e, EventListener& el) {
                     el.tryListener("MoveRightReleased",
                                    e.component<Scripted>()->caller);
-            });
+                });
         } else if (kue.sym == SDLK_SPACE) {
-            entities.each<EventListener>([&]([[maybe_unused]] entityx::Entity e,
-                                             EventListener& el)
-            {
+            entities.each<EventListener>(
+                [](entityx::Entity e, EventListener& el) {
                     el.tryListener("JumpKeyReleased",
                                    e.component<Scripted>()->caller);
-            });
+                });
         }
     }
 }
diff --git a/src/script.cpp b/src/script.cpp
index 4fda543..b1d82e9 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -75,6 +75,7 @@ void ScriptSystem::doFile(void)
 /********************
 *  SCRIPT PARSING  *
 ********************/
+#include <components/Audio.hpp>
 #include <components/EventListener.hpp>
 #include <components/Position.hpp>
 #include <components/Player.hpp>
@@ -123,6 +124,10 @@ void ScriptSystem::scriptExport(void)
             "standing", &Physics::standing,
             "gravity", &Physics::gravity);
 
+    lua.new_usertype<Audio>("Audio",
+            sol::constructors<Audio(std::string)>(),
+            "file", &Audio::fileName);
+
     lua.new_usertype<World>("World",
             sol::constructors<World(sol::object), World(void)>(),
             "Generate", &World::generate,
@@ -172,6 +177,11 @@ sol::table ScriptSystem::spawn(sol::object param)
                 e.assign<Name>(Name().FromLua(tab["Name"])).get();
         }
 
+        if (tab["Audio"] != nullptr) {
+            (*toRet)["Audio"] =
+                e.assign<Audio>(Audio().FromLua(tab["Audio"])).get();
+        }
+
         if (tab["Render"] != nullptr) {
             if (!e.has_component<Position>()) // Position must exist for render
                 (*toRet)["Position"] = e.assign<Position>().get();
diff --git a/src/world.cpp b/src/world.cpp
index 61a30de..48e54e3 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -189,8 +189,12 @@ glm::vec3 World::collide(glm::vec3 &start, glm::vec3 &end, Physics &phys)
                 // Get all colliding world spaces
                 std::vector<glm::vec3> inter = getIntersectingPlanes(pos, phys);
 
-                if (i == 0.0f)
+                if (i == 0.0f) {
                     std::cout << inter.size() << std::endl;
+                    if (inter.size()) {
+                        p.standing = true;
+                    }
+                }
 
                 // If there are no colliding world spaces, don't bother
                 if (inter.size()) {