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

[thebluegr at users.sourceforge.net]

Revision: 52258
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52258&view=rev
Author:   thebluegr
Date:     2010-08-21 13:24:09 +0000 (Sat, 21 Aug 2010)

Log Message:
-----------
Reverted part of r52256, it's not really undefined behavior (the two parts of the bitwise OR aren't reading from the same source)

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-21 13:21:09 UTC (rev 52257)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2010-08-21 13:24:09 UTC (rev 52258)
@@ -954,8 +954,7 @@
 	FileHandle *f = getFileFromHandle(s, argv[0].toUint16());
 	if (!f)
 		return NULL_REG;
-	byte b = f->_in->readByte();
-	return make_reg(0, (s->r_acc.toUint16() & 0xff00) | b);
+	return make_reg(0, (s->r_acc.toUint16() & 0xff00) | f->_in->readByte());
 }
 
 reg_t kFileIOWriteByte(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.