[Scummvm-cvs-logs] SF.net SVN: scummvm: [21988] scummvm/trunk/engines/kyra/sequences_v1.cpp

[lordhoto at users.sourceforge.net]

Revision: 21988
Author:   lordhoto
Date:     2006-04-17 12:39:31 -0700 (Mon, 17 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21988&view=rev

Log Message:
-----------
Simplifies credits.txt loading.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_v1.cpp
Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-04-17 19:33:08 UTC (rev 21987)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-04-17 19:39:31 UTC (rev 21988)
@@ -1033,18 +1033,7 @@
 	uint8 *buffer = 0;
 	uint32 size;
 	
-	if (_features & GF_FLOPPY) {
-		Common::File file;
-		if (file.open("CREDITS.TXT")) {
-			size = file.size();
-			buffer = new uint8[size];
-			file.read(buffer, size);
-			file.close();
-		}
-	} else {
-		buffer = _res->fileData("CREDITS.TXT", &size);	
-	}
-
+	buffer = _res->fileData("CREDITS.TXT", &size);
 	assert(buffer);
 
 	uint8 *nextString = buffer;


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