ScummEngine_v4 used to be a subclass of ScummEngine_v3, now it is the other way around; added a new class ScummEngine_v3old, for GF_OLD_BUNDLE games; took advantage of the new inheritance structure and turned various methods into virtual methods which then are overriden in subclasses

svn-id: r17346

1 files changed, 3 insertions, 3 deletions

diff --git a/scumm/object.cpp b/scumm/object.cpp
index 3535b38fc2..262a5c5793 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -625,7 +625,7 @@ void ScummEngine::loadRoomObjects() {
 	CHECK_HEAP
 }
 
-void ScummEngine::loadRoomObjectsOldBundle() {
+void ScummEngine_v3old::loadRoomObjects() {
 	int i;
 	ObjectData *od;
 	const byte *room, *ptr;
@@ -665,7 +665,7 @@ void ScummEngine::loadRoomObjectsOldBundle() {
 	CHECK_HEAP
 }
 
-void ScummEngine::loadRoomObjectsSmall() {
+void ScummEngine_v4::loadRoomObjects() {
 	int i, j;
 	ObjectData *od;
 	const byte *ptr;
@@ -725,7 +725,7 @@ void ScummEngine::loadRoomObjectsSmall() {
 	CHECK_HEAP
 }
 
-void ScummEngine_v3::setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
+void ScummEngine_v4::setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
 	assert(room);
 	const byte *ptr = room + od->OBCDoffset;