[Scummvm-cvs-logs] SF.net SVN: scummvm:[40265] scummvm/trunk/engines/sci/engine
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun May 3 11:18:56 CEST 2009
Revision: 40265
http://scummvm.svn.sourceforge.net/scummvm/?rev=40265&view=rev
Author: fingolfin
Date: 2009-05-03 09:18:56 +0000 (Sun, 03 May 2009)
Log Message:
-----------
SCI: Removed MEM_OBJ_RESERVED and related code
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/seg_manager.cpp
scummvm/trunk/engines/sci/engine/vm.h
Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-05-03 09:18:25 UTC (rev 40264)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-05-03 09:18:56 UTC (rev 40265)
@@ -286,9 +286,6 @@
mobj->data.hunks.table = NULL;
mobj->data.hunks.entries_nr = mobj->data.hunks.max_entry = 0;
break;
- case MEM_OBJ_RESERVED:
- free(mobj->data.reserved);
- break;
case MEM_OBJ_STRING_FRAG:
break;
default:
@@ -1284,16 +1281,8 @@
return NULL;
}
- case MEM_OBJ_RESERVED:
- sciprintf("Error: Trying to dereference pointer "PREG" to reserved segment `%s'!\n",
- PRINT_REG(pointer),
- mobj->data.reserved);
- return NULL;
- break;
-
default:
- sciprintf("Error: Trying to dereference pointer "PREG" to inappropriate"
- " segment!\n",
+ error("Error: Trying to dereference pointer "PREG" to inappropriate segment",
PRINT_REG(pointer));
return NULL;
}
@@ -1689,14 +1678,6 @@
}
-//-------------------- reserved --------------------
-class SegInterfaceReserved : public SegInterface {
-public:
- SegInterfaceReserved(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
- SegInterface(segmgr, mobj, segId, MEM_OBJ_RESERVED) {}
-};
-
-
SegInterface *SegManager::getSegInterface(SegmentId segid) {
if (!check(segid))
return NULL; // Invalid segment
@@ -1734,9 +1715,6 @@
case MEM_OBJ_STRING_FRAG:
retval = new SegInterfaceStringFrag(this, mobj, segid);
break;
- case MEM_OBJ_RESERVED:
- retval = new SegInterfaceReserved(this, mobj, segid);
- break;
default:
error("Improper segment interface for %d", mobj->type);
}
Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h 2009-05-03 09:18:25 UTC (rev 40264)
+++ scummvm/trunk/engines/sci/engine/vm.h 2009-05-03 09:18:56 UTC (rev 40265)
@@ -338,8 +338,7 @@
MEM_OBJ_HUNK = 8,
MEM_OBJ_DYNMEM = 9,
MEM_OBJ_STRING_FRAG = 10,
- MEM_OBJ_RESERVED = 11,
- MEM_OBJ_MAX = MEM_OBJ_RESERVED // For sanity checking
+ MEM_OBJ_MAX = 11 // For sanity checking
};
struct MemObject {
@@ -355,7 +354,6 @@
NodeTable nodes;
HunkTable hunks;
DynMem dynmem;
- char *reserved;
} data;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list