cpp/openttd-patchpack/source Changeset - r10048:dea3b80f3a79

Changeset - r10048:dea3b80f3a79

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 16 years ago 2008-08-31 20:08:24
peter1138@openttd.org

(svn r14208) -Fix (r14197): Crash if no .obg files are found.

1 file changed with 5 insertions and 4 deletions:

src/gfxinit.cpp

0 comments (0 inline, 0 general)

src/gfxinit.cpp

➞

Show inline comments

@@ @@ -169,9 +169,9 @@ static bool FileMD5(const MD5File file) @@
  * Determine the graphics pack that has to be used.
  * The one with the most correct files wins.
  */
-static void DetermineGraphicsPack()
+static bool DetermineGraphicsPack()
+{
 	if (_used_graphics_set != NULL) return;
+	if (_used_graphics_set != NULL) return true;
 	const GraphicsSet *best = _available_graphics_sets;
 	for (const GraphicsSet *c = _available_graphics_sets; c != NULL; c = c->next) {
@@ @@ -182,6 +182,7 @@ static void DetermineGraphicsPack() @@
+	}
 	_used_graphics_set = best;
 	return _used_graphics_set != NULL;
+}
 /**
@@ @@ -191,6 +192,7 @@ static void DetermineGraphicsPack() @@
  */
 static void DeterminePalette()
+{
 	assert(_used_graphics_set != NULL);
 	if (_use_palette < MAX_PAL) return;
 	_use_palette = _used_graphics_set->palette;
@@ @@ -203,7 +205,6 @@ static void DeterminePalette() @@
  */
 void CheckExternalFiles()
+{
 	DetermineGraphicsPack();
 	DeterminePalette();
 	static const size_t ERROR_MESSAGE_LENGTH = 128;
@@ @@ -468,7 +469,7 @@ void FindGraphicsSets() @@
 bool SetGraphicsSet(const char *name)
+{
 	if (StrEmpty(name)) {
 		DetermineGraphicsPack();
+		if (!DetermineGraphicsPack()) return false;
 		CheckExternalFiles();
 		return true;
+	}

0 comments (0 inline, 0 general)