changed file io in sounds to class File

svn-id: r4896

2 files changed, 11 insertions, 6 deletions

diff --git a/common/file.cpp b/common/file.cpp
index faa09dde1e..809c843ecf 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -114,7 +114,7 @@ void File::seek(uint32 offs, int whence) {
 		clearerr(_handle);
 }
 
-void File::read(void *ptr, uint32 size) {
+uint32 File::read(void *ptr, uint32 size) {
 	byte *ptr2 = (byte *)ptr;
 
 	if (_handle == NULL) {
@@ -125,14 +125,19 @@ void File::read(void *ptr, uint32 size) {
 	if (size == 0)
 		return;
 
-	if ((uint32)fread(ptr2, size, 1, _handle) != 1) {
+	if ((uint32)fread(ptr2, 1, size, _handle) != size) {
 		clearerr(_handle);
 		_readFailed = true;
 	}
 
-	do {
-		*ptr2++ ^= _encbyte;
-	} while (--size);
+	if (_encbyte != 0) {
+		uint32 t_size = size;
+		do {
+			*ptr2++ ^= _encbyte;
+		} while (--t_size);
+	}
+
+	return size;
 }
 
 byte File::readByte() {
diff --git a/common/file.h b/common/file.h
index a3cb1988cc..6820e77255 100644
--- a/common/file.h
+++ b/common/file.h
@@ -46,7 +46,7 @@ public:
 	bool eof();
 	uint32 pos();
 	void seek(uint32 offs, int whence);
-	void read(void *ptr, uint32 size);
+	uint32 read(void *ptr, uint32 size);
 	byte readByte();
 	uint16 readWordLE();
 	uint32 readDwordLE();