[Scummvm-cvs-logs] SF.net SVN: scummvm: [21408] scummvm/trunk/engines/simon/simon.cpp

wonst719 at users.sourceforge.net wonst719 at users.sourceforge.net
Wed Mar 22 18:50:03 CET 2006


Revision: 21408
Author:   wonst719
Date:     2006-03-22 18:48:53 -0800 (Wed, 22 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21408&view=rev

Log Message:
-----------
Fix compile without ZLIB support (GP32).

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-03-22 23:38:16 UTC (rev 21407)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-03-23 02:48:53 UTC (rev 21408)
@@ -3734,10 +3734,11 @@
 				error("read_vga_from_datfile_2: read failed");
 		}
 		in.close();
+		return dst;
 #else
 		error("Zlib support is required for Amiga and Macintosh versions");
+		return NULL;
 #endif
-		return dst;
 	} else if (getFeatures() & GF_OLD_BUNDLE) {
 		File in;
 		char buf[15];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list