[Scummvm-git-logs] scummvm master -> 99e759df64e6d8d65c87453e20a935ca3a636e42

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
99e759df64 ULTIMA8: Fix shape loading for U8 Spanish


Commit: 99e759df64e6d8d65c87453e20a935ca3a636e42
    https://github.com/scummvm/scummvm/commit/99e759df64e6d8d65c87453e20a935ca3a636e42
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-08-29T18:47:49+09:00

Commit Message:
ULTIMA8: Fix shape loading for U8 Spanish

Changed paths:
    engines/ultima/ultima8/graphics/shape.cpp


diff --git a/engines/ultima/ultima8/graphics/shape.cpp b/engines/ultima/ultima8/graphics/shape.cpp
index 0c0c212634..a322d7cb95 100644
--- a/engines/ultima/ultima8/graphics/shape.cpp
+++ b/engines/ultima/ultima8/graphics/shape.cpp
@@ -101,8 +101,7 @@ Common::Array<RawShapeFrame *> Shape::loadU8Format(const uint8 *data, uint32 siz
 	Common::Array<RawShapeFrame *> frames;
 
 	if (framecount == 0) {
-		loadGenericFormat(data, size, format);
-		return frames;
+		return loadGenericFormat(data, size, format);
 	}
 
 	frames.reserve(framecount);
@@ -125,8 +124,7 @@ Common::Array<RawShapeFrame *> Shape::loadPentagramFormat(const uint8 *data, uin
 	Common::Array<RawShapeFrame *> frames;
 
 	if (framecount == 0) {
-		loadGenericFormat(data, size, format);
-		return frames;
+		return loadGenericFormat(data, size, format);
 	}
 
 	frames.reserve(framecount);