diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attack.cpp | 5 | ||||
| -rw-r--r-- | src/world.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/attack.cpp b/src/attack.cpp index cf2f627..41fb77c 100644 --- a/src/attack.cpp +++ b/src/attack.cpp @@ -51,7 +51,10 @@ namespace lua { int damage(lua_State* state) { float d = lua_tonumber(state, 1); - entity->component<Health>()->health -= d; + auto h = entity->component<Health>(); + h->health -= d; + if (h->ouch != nullptr) + Mix_PlayChannel(0, h->ouch, 0); return 0; } } diff --git a/src/world.cpp b/src/world.cpp index e54a7ec..0cfa725 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -69,6 +69,8 @@ void WorldSystem::generate(LuaScript& script) script("ground", {LuaVariable("height", h)}); if (h == -1.0f) break; + if (h > 5000) + h = 5000; script("grass", {LuaVariable("height", g[0])}); script("grass", {LuaVariable("height", g[1])}); world.data.push_back(WorldData {true, {g[0], g[1]}, h, |