Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into soltys_wip2

3 files changed, 28 insertions, 25 deletions

diff --git a/engines/cge/btfile.cpp b/engines/cge/btfile.cpp
index 3cdb3c7199..0552e78c1c 100644
--- a/engines/cge/btfile.cpp
+++ b/engines/cge/btfile.cpp
@@ -92,7 +92,7 @@ BT_PAGE *BTFILE::GetPage(int lev, uint16 pgn) {
 
 // Does this work, or does it have to compare the entire buffer?
 #define memicmp(s1, s2, n) scumm_strnicmp((const char *)s1, (const char *)s2, n)
-
+ 
 BT_KEYPACK *BTFILE::Find(const char *key) {
 	int lev = 0;
 	uint16 nxt = BT_ROOT;
diff --git a/engines/cge/game.cpp b/engines/cge/game.cpp
index 655cfbe4ec..58334f2e53 100644
--- a/engines/cge/game.cpp
+++ b/engines/cge/game.cpp
@@ -29,7 +29,6 @@
 #include "cge/mouse.h"
 #include <stdlib.h>
 
-
 namespace CGE {
 
 uint8 *Glass(DAC *pal, uint8 r, uint8 g, uint8 b) {
diff --git a/engines/cge/general.cpp b/engines/cge/general.cpp
index e547921bb5..7e1653f61a 100644
--- a/engines/cge/general.cpp
+++ b/engines/cge/general.cpp
@@ -237,51 +237,55 @@ uint16 IOHAND::Read(void *buf, uint16 len) {
 }
 
 uint16 IOHAND::Write(void *buf, uint16 len) {
-	/*
-	  if (len) {
-	      if (Mode == REA || Handle < 0) return 0;
-	      if (Crypt) Seed = Crypt(buf, len, Seed);
-	      Error = _dos_write(Handle, buf, len, &len);
-	      if (Crypt) Seed = Crypt(buf, len, Seed); //------$$$$$$$
-	    }
-	  return len;
-	*/
+/*
+	if (len) {
+		if (Mode == REA || Handle < 0)
+			return 0;
+		if (Crypt)
+			Seed = Crypt(buf, len, Seed);
+		Error = _dos_write(Handle, buf, len, &len);
+		if (Crypt)
+			Seed = Crypt(buf, len, Seed); //------$$$$$$$
+	}
+	return len;
+*/
 	warning("STUB: IOHAND::Write");
 	return 0;
 }
 
 long IOHAND::Mark(void) {
-	/*
-	return (Handle < 0) ? 0 : tell(Handle);
-	*/
+/*
+ 	return (Handle < 0) ? 0 : tell(Handle);
+*/
 	warning("STUB: IOHAND::Mark");
 	return 0;
 }
 
 long IOHAND::Seek(long pos) {
-	/*
-	if (Handle < 0) return 0;
-	lseek(Handle, pos, SEEK_SET);
-	return tell(Handle);
-	*/
+/*
+ 	if (Handle < 0)
+		return 0;
+ 	lseek(Handle, pos, SEEK_SET);
+ 	return tell(Handle);
+*/
 	warning("STUB: IOHAND::Seek");
 	return 0;
 }
 
 long IOHAND::Size(void) {
-	/*
-	if (Handle < 0) return 0;
-	
+/*
+	if (Handle < 0)
+		return 0;
 	return filelength(Handle);
-	*/
+*/
 	warning("STUB: IOHAND::Size");
 	return 0;
 }
 
 bool IOHAND::Exist(const char *name) {
-	/*
+/*
 	return access(name, 0) == 0;
-	*/
+*/
 	warning("STUB: IOHAND::Exist");
 	return 0;
 }