* Renamed several methods in favor of a somewhat more uniform naming scheme: setupFOO for stuff that inits static data (i.e. will be called only once, or after loading savegames), vs. resetFOO / updateFOO methods which are called frequently and (re)set dynamic data.

* Doing this, split scummInit into setupScumm and resetScumm methods
* Moved some init code to new methods (huuuuge init methods are hard to read, and hard to customize using subclassing)
* Renmaed various setup???Palette methods to set???Palette
* Some minor cleanup / tweaks

svn-id: r22227

1 files changed, 10 insertions, 10 deletions

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 9cee5b48b8..a8cf836a21 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -543,7 +543,7 @@ void ScummEngine::restoreFlObjects() {
 	_numStoredFlObjects = 0;
 }
 
-void ScummEngine::loadRoomObjects() {
+void ScummEngine::resetRoomObjects() {
 	int i, j;
 	ObjectData *od;
 	const byte *ptr;
@@ -611,13 +611,13 @@ void ScummEngine::loadRoomObjects() {
 
 	for (i = 1; i < _numLocalObjects; i++) {
 		if (_objs[i].obj_nr && !_objs[i].fl_object_index)
-			setupRoomObject(&_objs[i], room);
+			resetRoomObject(&_objs[i], room);
 	}
 
 	CHECK_HEAP
 }
 
-void ScummEngine_v3old::loadRoomObjects() {
+void ScummEngine_v3old::resetRoomObjects() {
 	int i;
 	ObjectData *od;
 	const byte *room, *ptr;
@@ -648,7 +648,7 @@ void ScummEngine_v3old::loadRoomObjects() {
 			od->OBIMoffset = READ_LE_UINT16(ptr);
 
 		od->OBCDoffset = READ_LE_UINT16(ptr + 2 * _numObjectsInRoom);
-		setupRoomObject(od, room);
+		resetRoomObject(od, room);
 
 		ptr += 2;
 
@@ -662,7 +662,7 @@ void ScummEngine_v3old::loadRoomObjects() {
 	CHECK_HEAP
 }
 
-void ScummEngine_v4::loadRoomObjects() {
+void ScummEngine_v4::resetRoomObjects() {
 	int i, j;
 	ObjectData *od;
 	const byte *ptr;
@@ -711,14 +711,14 @@ void ScummEngine_v4::loadRoomObjects() {
 
 	for (i = 1; i < _numLocalObjects; i++) {
 		if (_objs[i].obj_nr && !_objs[i].fl_object_index) {
-			setupRoomObject(&_objs[i], room);
+			resetRoomObject(&_objs[i], room);
 		}
 	}
 
 	CHECK_HEAP
 }
 
-void ScummEngine_c64::setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
+void ScummEngine_c64::resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
 	assert(room);
 	const byte *ptr = room + od->OBCDoffset;
 	ptr -= 2;
@@ -742,7 +742,7 @@ void ScummEngine_c64::setupRoomObject(ObjectData *od, const byte *room, const by
 	od->height = *(ptr + 14) & 0xf8;
 }
 
-void ScummEngine_v4::setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
+void ScummEngine_v4::resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
 	assert(room);
 	const byte *ptr = room + od->OBCDoffset;
 
@@ -775,7 +775,7 @@ void ScummEngine_v4::setupRoomObject(ObjectData *od, const byte *room, const byt
 	}
 }
 
-void ScummEngine::setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
+void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr) {
 	const CodeHeader *cdhd = NULL;
 	const ImageHeader *imhd = NULL;
 
@@ -1784,7 +1784,7 @@ void ScummEngine::loadFlObject(uint object, uint room) {
 		res.unlock(rtRoomScripts, room);
 
 	// Setup local object flags
-	setupRoomObject(od, flob, flob);
+	resetRoomObject(od, flob, flob);
 
 	od->fl_object_index = slot;
 }