[Scummvm-cvs-logs] SF.net SVN: scummvm:[43982] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 43982
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43982&view=rev
Author:   fingolfin
Date:     2009-09-06 12:58:43 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
SCI: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/engine/seg_manager.cpp
    scummvm/trunk/engines/sci/engine/seg_manager.h
    scummvm/trunk/engines/sci/engine/vm.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2009-09-06 12:58:16 UTC (rev 43981)
+++ scummvm/trunk/engines/sci/console.cpp	2009-09-06 12:58:43 UTC (rev 43982)
@@ -1948,7 +1948,7 @@
 			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");
 

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-09-06 12:58:16 UTC (rev 43981)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-09-06 12:58:43 UTC (rev 43982)
@@ -920,7 +920,7 @@
 	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 @@
 
 	d._description = strdup(descr);
 
-	return (unsigned char *)(d._buf);
+	return (byte *)(d._buf);
 }
 
 const char *SegManager::getDescription(reg_t addr) {

Modified: scummvm/trunk/engines/sci/engine/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.h	2009-09-06 12:58:16 UTC (rev 43981)
+++ scummvm/trunk/engines/sci/engine/seg_manager.h	2009-09-06 12:58:43 UTC (rev 43982)
@@ -310,7 +310,7 @@
 	 * @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

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2009-09-06 12:58:16 UTC (rev 43981)
+++ scummvm/trunk/engines/sci/engine/vm.h	2009-09-06 12:58:43 UTC (rev 43982)
@@ -37,7 +37,6 @@
 
 class SegManager;
 struct EngineState;
-struct IntMapper;
 struct Object;
 class ResourceManager;
 


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