- update code to fix crashes on missing game data

- add missing game data warning to gamefiles

gamefiles/main.json

@@ -12,19 +12,10 @@
   "mountFile": [
     { "file": "DIABDAT.zip", "append": true }
   ],
-  "saveDir": ".diablo",
-  "icon": {
-    "file":"res/icon.png"
-  },
-  "cursor": {
-    "show": false
-  },
-  "load": "settings.json",
-  "load": "res/actions.json",
-  "load": "res/fonts.json",
-  "load": "res/music.json",
-  "load": "res/palettes.json",
-  "load": "res/sounds.json",
-  "load": "res/textures.json",
-  "load": "ui/splashScreen.json"
+  "action": {
+    "name": "if.fileExists",
+    "param1": "ui_art/title.pcx",
+    "then": { "name": "load", "file": "ui/loadMain.json" },
+    "else": { "name": "load", "file": "ui/dataMissing.json" }
+  }
 }

gamefiles/ui/dataMissing.json

@@ -0,0 +1,22 @@
+{
+  "keyboard": {
+    "key": ["enter", " ", "esc"],
+    "action": { "name": "game.close" }
+  },
+  "font": {
+    "id": "liberationSerif",
+    "file": "res/LiberationSerif-Regular.ttf"
+  },
+  "button": {
+    "id": "quit",
+    "font": "liberationSerif",
+    "fontSize": 28,
+    "color": "0xFFFFFF",
+    "position": [320, 240],
+    "anchor": "none",
+    "horizontalAlign": "center",
+    "verticalAlign": "center",
+    "text": "Error loading DIABDAT.zip\nMake sure the game data is present.",
+    "onClick": "game.close"
+  }
+}

gamefiles/ui/loadMain.json

@@ -0,0 +1,17 @@
+{
+  "saveDir": ".diablo",
+  "icon": {
+    "file":"res/icon.png"
+  },
+  "cursor": {
+    "show": false
+  },
+  "load": "settings.json",
+  "load": "res/actions.json",
+  "load": "res/fonts.json",
+  "load": "res/music.json",
+  "load": "res/palettes.json",
+  "load": "res/sounds.json",
+  "load": "res/textures.json",
+  "load": "ui/splashScreen.json"
+}

src/Dun.cpp

@@ -7,6 +7,11 @@ Dun::Dun(const std::string& filename)
 {
 	sf::PhysFSStream file(filename);
 
+	if (file.hasError() == true)
+	{
+		return;
+	}
+
 	int16_t temp;
 	file.read(&temp, 2);
 	width = temp;

src/Font2.h

@@ -12,5 +12,12 @@ class Font2 : public sf::Font
 public:
 	Font2(const std::shared_ptr<sf::PhysFSStream>& file_) : file(file_) {}
 
-	bool load() { return loadFromStream(*file); }
+	bool load()
+	{
+		if (file == nullptr || file->hasError() == true)
+		{
+			return false;
+		}
+		return loadFromStream(*file);
+	}
 };

src/LoadingScreen.cpp

@@ -16,7 +16,7 @@ void LoadingScreen::setProgress(int percent_)
 	else
 	{
 		sf::Vector2f newSize(barSize);
-		newSize.x *= (percent_ / 100.0f);
+		newSize.x = std::round(newSize.x * (percent_ / 100.0f));
 		progressBar.setSize(newSize);
 	}
 }

src/Min.cpp

@@ -5,6 +5,11 @@ Min::Min(const std::string& filename, size_t minSize)
 {
 	sf::PhysFSStream file(filename);
 
+	if (file.hasError() == true)
+	{
+		return;
+	}
+
 	auto numPillars = file.getSize() / (minSize * 2);
 
 	file.seek(0);

src/Movie2.h

@@ -24,6 +24,10 @@ class Movie2 : public UIObject
 
 	bool load()
 	{
+		if (file == nullptr || file->hasError() == true)
+		{
+			return false;
+		}
 		bool ret = movie.openFromStream(*file);
 		if (ret == true)
 		{

src/Music2.h

@@ -16,7 +16,14 @@ class Music2 : public sf::NonCopyable
 	Music2(const char* file_) : file(std::make_unique<sf::PhysFSStream>(file_)),
 		music(std::make_unique<sf::Music>()) {}
 
-	bool load() { return music->openFromStream(*file); }
+	bool load()
+	{
+		if (file == nullptr || file->hasError() == true)
+		{
+			return false;
+		}
+		return music->openFromStream(*file);
+	}
 
 	void play() { music->play(); }
 	void pause() { music->pause(); }

src/Palette.cpp

@@ -5,7 +5,7 @@ Palette::Palette(const char* file)
 {
 	sf::PhysFSStream stream(file);
 
-	if (stream.getSize() < 768)
+	if (stream.hasError() == true || stream.getSize() < 768)
 	{
 		return;
 	}

src/Parser/ParseBitmapFont.cpp

@@ -29,6 +29,11 @@ namespace Parser
 		else if (isValidString(elem, "textureId"))
 		{
 			img = parseTextureImg(game, elem);
+			auto imgSize = img.getSize();
+			if (imgSize.x == 0 || imgSize.y == 0)
+			{
+				return;
+			}
 			texture = std::make_shared<sf::Texture>();
 			texture->loadFromImage(img);
 			texture->setSmooth(getBool(elem, "smooth"));

src/Parser/ParseText.cpp

@@ -34,7 +34,7 @@ namespace Parser
 				return nullptr;
 			}
 
-			auto size = getUInt(elem, "fontSize");
+			auto size = getUInt(elem, "fontSize", 12);
 			auto text = std::make_unique<StringText>(displayText, *font, size);
 			text->setColor(getColor(elem, "color", sf::Color::White));
 			text->setHorizontalAlign(GameUtils::getHorizontalAlignment(getString(elem, "horizontalAlign")));

src/Sol.cpp

@@ -5,6 +5,11 @@ Sol::Sol(const std::string& path)
 {
 	sf::PhysFSStream file(path);
 
+	if (file.hasError() == true)
+	{
+		return;
+	}
+
 	auto size = (unsigned)file.getSize();
 	data.resize(size);