Return built in default image

client/render/CDefFile.cpp

@@ -84,8 +84,8 @@ CDefFile::CDefFile(const AnimationPath & Name):
 
 void CDefFile::loadFrame(size_t frame, size_t group, IImageLoader &loader) const
 {
-	assert(hasFrame(frame, group));		// hasFrame() should be called before calling loadFrame()
-
+	assert(hasFrame(frame, group));		// hasFrame() should be called before calling loadFrame()
+
 	const ui8 * FDef = data.get() + offset.at(group)[frame];
 
 	const SSpriteDef sd = *reinterpret_cast<const SSpriteDef *>(FDef);
@@ -227,23 +227,23 @@ void CDefFile::loadFrame(size_t frame, size_t group, IImageLoader &loader) const
 	logGlobal->error("Error: unsupported format of def file: %d", sprite.format);
 		break;
 	}
-}
-
-bool CDefFile::hasFrame(size_t frame, size_t group) const
-{
-	std::map<size_t, std::vector <size_t> >::const_iterator it;
-	it = offset.find(group);
-	if(it == offset.end())
-	{
-		return false;
-	}
-
-	if(frame >= it->second.size())
-	{
-		return false;
-	}
-
-	return true;
+}
+
+bool CDefFile::hasFrame(size_t frame, size_t group) const
+{
+	std::map<size_t, std::vector <size_t> >::const_iterator it;
+	it = offset.find(group);
+	if(it == offset.end())
+	{
+		return false;
+	}
+
+	if(frame >= it->second.size())
+	{
+		return false;
+	}
+
+	return true;
 }
 
 CDefFile::~CDefFile() = default;

client/renderSDL/RenderHandler.cpp

@@ -264,7 +264,7 @@ std::shared_ptr<const ISharedImage> RenderHandler::loadImageFromFileUncached(con
 		{
 			logGlobal->error("Frame %d in group %d not found in file: %s", 
 				locator.defFrame, locator.defGroup, locator.defFile->getName().c_str());
-			return std::make_shared<SDLEmptyImageShared>();
+			return std::make_shared<SDLImageShared>(ImagePath::builtin("DEFAULT"), locator.preScaledFactor);
 		}
 	}