From a31c958004410b6dfb467ab01067e88a1c35874b Mon Sep 17 00:00:00 2001
From: ju-pinheiro <66486603+ju-pinheiro@users.noreply.github.com>
Date: Tue, 27 Oct 2020 18:52:56 -0300
Subject: [PATCH] Adding missing SpriteIdentifier enumerations to switch
 statements

---
 src/openrct2-ui/interface/ViewportInteraction.cpp | 7 +++++++
 src/openrct2/GameStateSnapshots.cpp               | 6 +++++-
 src/openrct2/scripting/ScEntity.hpp               | 4 ++++
 src/openrct2/world/Sprite.cpp                     | 4 ++++
 test/tests/S6ImportExportTests.cpp                | 2 ++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp
index d2b8049587..fa23f21bb8 100644
--- a/src/openrct2-ui/interface/ViewportInteraction.cpp
+++ b/src/openrct2-ui/interface/ViewportInteraction.cpp
@@ -109,6 +109,10 @@ InteractionInfo viewport_interaction_get_item_left(const ScreenCoordsXY& screenC
                     }
                 }
                 break;
+                case SpriteIdentifier::Misc:
+                case SpriteIdentifier::Litter:
+                case SpriteIdentifier::Null:
+                    break;
             }
             break;
         case VIEWPORT_INTERACTION_ITEM_RIDE:
@@ -210,6 +214,9 @@ bool viewport_interaction_left_click(const ScreenCoordsXY& screenCoords)
                         }
                     }
                     break;
+                case SpriteIdentifier::Litter:
+                case SpriteIdentifier::Null:
+                    break;
             }
             return true;
         }
diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp
index 3f48ff3b2a..b655e03d5c 100644
--- a/src/openrct2/GameStateSnapshots.cpp
+++ b/src/openrct2/GameStateSnapshots.cpp
@@ -110,8 +110,10 @@ struct GameStateSnapshot_t
                             ds << reinterpret_cast<uint8_t(&)[sizeof(SteamParticle)]>(sprite.steam_particle);
                             break;
                     }
+                    break;
                 }
-                break;
+                case SpriteIdentifier::Null:
+                    break;
             }
         }
     }
@@ -521,6 +523,8 @@ struct GameStateSnapshots final : public IGameStateSnapshots
                             break;
                     }
                     break;
+                case SpriteIdentifier::Null:
+                    break;
             }
         }
     }
diff --git a/src/openrct2/scripting/ScEntity.hpp b/src/openrct2/scripting/ScEntity.hpp
index df75647555..917aaa42ef 100644
--- a/src/openrct2/scripting/ScEntity.hpp
+++ b/src/openrct2/scripting/ScEntity.hpp
@@ -67,6 +67,8 @@ namespace OpenRCT2::Scripting
                         break;
                     case SpriteIdentifier::Litter:
                         return "litter";
+                    case SpriteIdentifier::Null:
+                        return "unknown";
                 }
             }
             return "unknown";
@@ -157,6 +159,8 @@ namespace OpenRCT2::Scripting
                     case SpriteIdentifier::Litter:
                         sprite_remove(entity);
                         break;
+                    case SpriteIdentifier::Null:
+                        break;
                 }
             }
         }
diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp
index 5db58b9343..135d492a84 100644
--- a/src/openrct2/world/Sprite.cpp
+++ b/src/openrct2/world/Sprite.cpp
@@ -913,6 +913,10 @@ static bool sprite_should_tween(SpriteBase* sprite)
         case SpriteIdentifier::Peep:
         case SpriteIdentifier::Vehicle:
             return true;
+        case SpriteIdentifier::Misc:
+        case SpriteIdentifier::Litter:
+        case SpriteIdentifier::Null:
+            return false;
     }
     return false;
 }
diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp
index 491d1bf0b5..39196d1103 100644
--- a/test/tests/S6ImportExportTests.cpp
+++ b/test/tests/S6ImportExportTests.cpp
@@ -443,6 +443,8 @@ static void CompareSpriteData(const rct_sprite& left, const rct_sprite& right)
                         break;
                 }
                 break;
+            case SpriteIdentifier::Null:
+                break;
         }
     }
 }