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

[lordhoto at users.sourceforge.net]

Revision: 46542
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46542&view=rev
Author:   lordhoto
Date:     2009-12-25 03:29:17 +0000 (Fri, 25 Dec 2009)

Log Message:
-----------
Fix gcc warning (and along with it make the code a little bit easier to read).

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

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2009-12-25 01:00:57 UTC (rev 46541)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2009-12-25 03:29:17 UTC (rev 46542)
@@ -863,7 +863,7 @@
 #ifdef ENABLE_SCI32
 	case K_FILEIO_READ_BYTE:
 		// Read the byte into the low byte of the accumulator
-		return make_reg(0, s->r_acc.toUint16() & 0xff00 | getFileFromHandle(s, argv[1].toUint16())->_in->readByte());
+		return make_reg(0, (s->r_acc.toUint16() & 0xff00) | getFileFromHandle(s, argv[1].toUint16())->_in->readByte());
 	case K_FILEIO_WRITE_BYTE:
 		getFileFromHandle(s, argv[1].toUint16())->_out->writeByte(argv[2].toUint16() & 0xff);
 		break;
@@ -873,7 +873,7 @@
 		getFileFromHandle(s, argv[1].toUint16())->_out->writeUint16LE(argv[2].toUint16());
 		break;
 #endif
-	default :
+	default:
 		error("Unknown FileIO() sub-command: %d", func_nr);
 	}
 


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