Merge branch 'dev' of https://github.com/ucsd-cse125-sp24/group3 into…

… dev
ucsd-cse125-sp24 · Jun 7, 2024 · 71cd0aa · 71cd0aa
2 parents ce94150 + 82f5204
commit 71cd0aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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;
         }
     }