From 4e592c724904bb0bc597e5bc7fe7707c1f858dab Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sun, 12 Jan 2014 02:59:21 +0000
Subject: CGE: Remove unecessary void pointer usage in resource file I/O.

---
 engines/cge/fileio.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/cge/fileio.h')

diff --git a/engines/cge/fileio.h b/engines/cge/fileio.h
index cee1fa79ef..653aabae8f 100644
--- a/engines/cge/fileio.h
+++ b/engines/cge/fileio.h
@@ -83,15 +83,15 @@ class ResourceManager {
 	} _buff[kBtLevel];
 
 	BtPage *getPage(int level, uint16 pageId);
-	uint16 catRead(void *buf, uint16 length);
+	uint16 catRead(byte *buf, uint16 length);
 	Common::File *_catFile;
 	Common::File *_datFile;
-	uint16  XCrypt(void *buf, uint16 length);
+	uint16  XCrypt(byte *buf, uint16 length);
 public:
 
 	ResourceManager();
 	~ResourceManager();
-	uint16 read(void *buf, uint16 length);
+	uint16 read(byte *buf, uint16 length);
 	bool seek(int32 offs, int whence = 0);
 
 	BtKeypack *find(const char *key);
@@ -111,7 +111,7 @@ public:
 	bool seek(int32 offset);
 	int32 pos();
 	int32 size();
-	uint32 read(void *dataPtr, uint32 dataSize);
+	uint32 read(byte *dataPtr, uint32 dataSize);
 	Common::String readLine();
 };
 
-- 
cgit v1.2.3


From ed4065310535e48900d7fd5238292b8b055ef115 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:18 +0100
Subject: CGE: Make GPL headers consistent in themselves.

---
 engines/cge/fileio.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/cge/fileio.h')

diff --git a/engines/cge/fileio.h b/engines/cge/fileio.h
index 653aabae8f..803d6b2d58 100644
--- a/engines/cge/fileio.h
+++ b/engines/cge/fileio.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3


From 2822df856d2ff4ca730a0a2a12fe9a120e495784 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 11 Mar 2014 07:31:12 +0100
Subject: CGE: Remove the useless return value of XCrypt()

---
 engines/cge/fileio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/cge/fileio.h')

diff --git a/engines/cge/fileio.h b/engines/cge/fileio.h
index 803d6b2d58..77404fb552 100644
--- a/engines/cge/fileio.h
+++ b/engines/cge/fileio.h
@@ -86,7 +86,7 @@ class ResourceManager {
 	uint16 catRead(byte *buf, uint16 length);
 	Common::File *_catFile;
 	Common::File *_datFile;
-	uint16  XCrypt(byte *buf, uint16 length);
+	void XCrypt(byte *buf, uint16 length);
 public:
 
 	ResourceManager();
-- 
cgit v1.2.3


From e9189b57b3133f603314799d663c0e96231477f8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 11 Mar 2014 07:52:46 +0100
Subject: CGE: Get rid of a magic value in file seek

---
 engines/cge/fileio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/cge/fileio.h')

diff --git a/engines/cge/fileio.h b/engines/cge/fileio.h
index 77404fb552..059d2c9a44 100644
--- a/engines/cge/fileio.h
+++ b/engines/cge/fileio.h
@@ -92,7 +92,7 @@ public:
 	ResourceManager();
 	~ResourceManager();
 	uint16 read(byte *buf, uint16 length);
-	bool seek(int32 offs, int whence = 0);
+	bool seek(int32 offs, int whence = SEEK_SET);
 
 	BtKeypack *find(const char *key);
 	bool exist(const char *name);
-- 
cgit v1.2.3