[Scummvm-cvs-logs] SF.net SVN: scummvm:[52398] scummvm/trunk/engines/sci/engine/kfile.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 52398
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52398&view=rev
Author:   m_kiewitz
Date:     2010-08-26 07:31:54 +0000 (Thu, 26 Aug 2010)

Log Message:
-----------
SCI: adjust r52397

actually they return 0:0, when no bytes were read, otherwise they return the destination pointer

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kfile.cpp

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2010-08-26 07:26:30 UTC (rev 52397)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2010-08-26 07:31:54 UTC (rev 52398)
@@ -256,7 +256,7 @@
 	debugC(2, kDebugLevelFile, "kFGets(%d, %d)", handle, maxsize);
 	int readBytes = fgets_wrapper(s, buf, maxsize, handle);
 	s->_segMan->memcpy(argv[0], (const byte*)buf, maxsize);
-	return make_reg(0, readBytes);
+	return readBytes ? argv[0] : NULL_REG;
 }
 
 /**
@@ -907,7 +907,7 @@
 	int readBytes = fgets_wrapper(s, buf, size, handle);
 	s->_segMan->memcpy(argv[0], (const byte*)buf, size);
 	delete[] buf;
-	return make_reg(0, readBytes);
+	return readBytes ? argv[0] : NULL_REG;
 }
 
 reg_t kFileIOWriteString(EngineState *s, int argc, reg_t *argv) {


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