maybe fix crash when lights cut with fireball

ucsd-cse125-sp24 · Jun 7, 2024 · aea58f5 · aea58f5
1 parent 6a0f4a0
commit aea58f5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -1478,7 +1478,10 @@ void Client::lightingPass() {
                     glm::vec3 flame_color = properties.diffuse_color;
 
                     animManager->setFrameAnimation(sharedObject->globalID, sharedObject->modelType, sharedObject->animState);
-                    Model* fireball_frame_model = animManager->updateFrameAnimation(timeElapsed);       
+                    Model* fireball_frame_model = animManager->updateFrameAnimation(timeElapsed);
+                    if (fireball_frame_model == nullptr) {
+                        continue; // THIS IS BREAKING WHEN SUN GODS FIREBALLS ARE DESTROYED WHWEN LIGHTS ARE CUT
+                    }
 
                     this->deferred_light_box_shader->setVec3("lightColor", flame_color);
 
@@ -1491,7 +1494,10 @@ void Client::lightingPass() {
                     glm::vec3 flame_color = properties.diffuse_color;
 
                     animManager->setFrameAnimation(sharedObject->globalID, sharedObject->modelType, sharedObject->animState);
-                    Model* fireball_frame_model = animManager->updateFrameAnimation(timeElapsed);       
+                    Model* fireball_frame_model = animManager->updateFrameAnimation(timeElapsed);
+                    if (fireball_frame_model == nullptr) {
+                        continue; // THIS IS BREAKING WHEN SUN GODS FIREBALLS ARE DESTROYED WHWEN LIGHTS ARE CUT
+                    }
 
                     this->deferred_light_box_shader->setVec3("lightColor", flame_color);