From b51e9988e61733b5675623a598afc9ff436caf38 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 6 Sep 2009 12:58:43 +0000
Subject: SCI: cleanup

svn-id: r43982
---
 engines/sci/console.cpp            | 2 +-
 engines/sci/engine/seg_manager.cpp | 4 ++--
 engines/sci/engine/seg_manager.h   | 2 +-
 engines/sci/engine/vm.h            | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index c344b7ff62..04a3b2d037 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -1948,7 +1948,7 @@ bool Console::cmdViewReference(int argc, const char **argv) {
 			break;
 		case KSIG_REF: {
 			int size;
-			unsigned char *block = _vm->_gamestate->segMan->dereference(reg, &size);
+			byte *block = _vm->_gamestate->segMan->dereference(reg, &size);
 
 			DebugPrintf("raw data\n");
 
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index e3f746560b..5387c7abbd 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -920,7 +920,7 @@ byte *SegManager::dereference(reg_t pointer, int *size) {
 	return mobj->dereference(pointer, size);
 }
 
-unsigned char *SegManager::allocDynmem(int size, const char *descr, reg_t *addr) {
+byte *SegManager::allocDynmem(int size, const char *descr, reg_t *addr) {
 	SegmentId seg;
 	MemObject *mobj = allocNonscriptSegment(MEM_OBJ_DYNMEM, &seg);
 	*addr = make_reg(seg, 0);
@@ -936,7 +936,7 @@ unsigned char *SegManager::allocDynmem(int size, const char *descr, reg_t *addr)
 
 	d._description = strdup(descr);
 
-	return (unsigned char *)(d._buf);
+	return (byte *)(d._buf);
 }
 
 const char *SegManager::getDescription(reg_t addr) {
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index 933718624e..a412ec7333 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -310,7 +310,7 @@ public:
 	 * @return					Raw pointer into the allocated dynamic 
 	 * 							memory
 	 */
-	unsigned char *allocDynmem(int size, const char *description, reg_t *addr);
+	byte *allocDynmem(int size, const char *description, reg_t *addr);
 
 	/**
 	 * Deallocates a piece of dynamic memory
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index 54c268a502..50eb59571d 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -37,7 +37,6 @@ namespace Sci {
 
 class SegManager;
 struct EngineState;
-struct IntMapper;
 struct Object;
 class ResourceManager;
 
-- 
cgit v1.2.3