Merge pull request #927 from lairworks/moveEmptyFrameListCheck

Move empty frameList check to caller
lairworks · Jul 15, 2021 · 3e8fcdd · 3e8fcdd
2 parents 1b481c2 + 0b78386
commit 3e8fcdd
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/NAS2D/Resource/AnimationSet.cpp b/NAS2D/Resource/AnimationSet.cpp
@@ -41,7 +41,7 @@ namespace
 	AnimationSet processXml(std::string filePath, ImageCache& imageCache);
 	std::map<std::string, std::string> processImageSheets(const std::string& basePath, const Xml::XmlElement* element, ImageCache& imageCache);
 	std::map<std::string, std::vector<AnimationSet::Frame>> processActions(const std::map<std::string, std::string>& imageSheetMap, const Xml::XmlElement* element, ImageCache& imageCache);
-	std::vector<AnimationSet::Frame> processFrames(const std::map<std::string, std::string>& imageSheetMap, const std::string& action, const Xml::XmlElement* element, ImageCache& imageCache);
+	std::vector<AnimationSet::Frame> processFrames(const std::map<std::string, std::string>& imageSheetMap, const Xml::XmlElement* element, ImageCache& imageCache);
 }
 
 
@@ -195,7 +195,12 @@ namespace
 				throw std::runtime_error("Sprite Action redefinition: '" + actionName + "' " + endTag(action->row()));
 			}
 
-			actions[actionName] = processFrames(imageSheetMap, actionName, action, imageCache);
+			actions[actionName] = processFrames(imageSheetMap, action, imageCache);
+
+			if (actions[actionName].empty())
+			{
+				throw std::runtime_error("Sprite Action contains no valid frames: " + actionName);
+			}
 		}
 
 		return actions;
@@ -205,7 +210,7 @@ namespace
 	/**
 	 * Parses through all <frame> tags within an <action> tag in a Sprite Definition.
 	 */
-	std::vector<AnimationSet::Frame> processFrames(const std::map<std::string, std::string>& imageSheetMap, const std::string& action, const Xml::XmlElement* element, ImageCache& imageCache)
+	std::vector<AnimationSet::Frame> processFrames(const std::map<std::string, std::string>& imageSheetMap, const Xml::XmlElement* element, ImageCache& imageCache)
 	{
 		std::vector<AnimationSet::Frame> frameList;
 
@@ -262,11 +267,6 @@ namespace
 			frameList.push_back(AnimationSet::Frame{image, bounds, anchorOffset, delay});
 		}
 
-		if (frameList.empty())
-		{
-			throw std::runtime_error("Sprite Action contains no valid frames: " + action);
-		}
-
 		return frameList;
 	}