From 82f52044acef7895dfdd1ba48e04692575f878b8 Mon Sep 17 00:00:00 2001 From: Tyler Lentz Date: Thu, 6 Jun 2024 23:53:27 -0700 Subject: [PATCH] green checkmark :) --- src/client/animation.cpp | 8 +++++++- src/server/game/teleportertrap.cpp | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/client/animation.cpp b/src/client/animation.cpp index 0f2cbbf6..bc5d5d21 100644 --- a/src/client/animation.cpp +++ b/src/client/animation.cpp @@ -14,7 +14,13 @@ Animation::Animation(const std::string& animationPath, Model* model) { readMissingBones(animation, *model); } -Animation::Animation(const std::string& animationDirPath, const std::string& animName, int frames) { +Animation::Animation(const std::string& animationDirPath, const std::string& animName, int frames): + m_rootNode({}) +{ + // not used by this constructor + m_duration = 0; + m_ticksPerSecond = 0; + for (int i = 1; i <= frames; i++) { auto frame_model_path = animationDirPath + "/" + animName + std::to_string(i) + ".obj"; auto frame_model = new Model(frame_model_path, true); diff --git a/src/server/game/teleportertrap.cpp b/src/server/game/teleportertrap.cpp index 4e1d5733..bcb13ff0 100644 --- a/src/server/game/teleportertrap.cpp +++ b/src/server/game/teleportertrap.cpp @@ -50,7 +50,6 @@ void TeleporterTrap::doCollision(Object* other, ServerGameState& state) { } int attempts = 0; - bool good = false; while (true) { attempts++; @@ -62,7 +61,6 @@ void TeleporterTrap::doCollision(Object* other, ServerGameState& state) { } if (grid.getCell(r_col, r_row)->type == CellType::Empty) { - good = true; break; } }