Force current costume to be in range

Author: adazem009

src/scratch/target.cpp

@@ -203,7 +203,8 @@ int Target::currentCostume() const
 /*! Sets the ID of the current costume. */
 void Target::setCurrentCostume(int newCostume)
 {
-    impl->currentCostume = newCostume;
+    if (newCostume > 0 && newCostume <= costumes().size())
+        impl->currentCostume = newCostume;
 }
 
 /*! Returns the list of costumes. */

src/scratch/target_p.h

@@ -26,7 +26,7 @@ struct TargetPrivate
         std::vector<std::shared_ptr<Variable>> variables;
         std::vector<std::shared_ptr<List>> lists;
         std::vector<std::shared_ptr<Block>> blocks;
-        int currentCostume = 1;
+        int currentCostume = 0;
         std::vector<std::shared_ptr<Costume>> costumes;
         std::vector<std::shared_ptr<Sound>> sounds;
         int layerOrder = 0;

test/scratch_classes/sprite_test.cpp

@@ -44,6 +44,8 @@ TEST(SpriteTest, Clone)
     sprite.addList(list1);
     sprite.addList(list2);
 
+    sprite.addCostume(std::make_shared<Costume>("", "", ""));
+    sprite.addCostume(std::make_shared<Costume>("", "", ""));
     sprite.setCurrentCostume(2);
     sprite.setLayerOrder(5);
     sprite.setVolume(50);

test/scratch_classes/target_test.cpp

@@ -178,9 +178,31 @@ TEST(TargetTest, Blocks)
 TEST(TargetTest, CurrentCostume)
 {
     Target target;
+    ASSERT_EQ(target.currentCostume(), 0);
+
+    target.setCurrentCostume(1);
+    ASSERT_EQ(target.currentCostume(), 0);
+
+    target.setCurrentCostume(2);
+    ASSERT_EQ(target.currentCostume(), 0);
+
+    target.addCostume(std::make_shared<Costume>("", "", ""));
+    ASSERT_EQ(target.currentCostume(), 0);
+
+    target.setCurrentCostume(1);
+    ASSERT_EQ(target.currentCostume(), 1);
+
+    target.setCurrentCostume(2);
+    ASSERT_EQ(target.currentCostume(), 1);
+
+    target.addCostume(std::make_shared<Costume>("", "", ""));
     ASSERT_EQ(target.currentCostume(), 1);
-    target.setCurrentCostume(5);
-    ASSERT_EQ(target.currentCostume(), 5);
+
+    target.setCurrentCostume(2);
+    ASSERT_EQ(target.currentCostume(), 2);
+
+    target.setCurrentCostume(3);
+    ASSERT_EQ(target.currentCostume(), 2);
 }
 
 TEST(TargetTest, Costumes)