[Scummvm-cvs-logs] CVS: scummvm/scumm camera.cpp,2.5,2.6 debugger.cpp,1.60,1.61 object.cpp,1.120,1.121 script.cpp,1.113,1.114 script_v2.cpp,2.137,2.138 script_v5.cpp,1.117,1.118 script_v6.cpp,1.161,1.162 scumm.h,1.253,1.254 scummvm.cpp,2.234,2.235 vars.cpp,1.57,1.58

Max Horn fingolfin at users.sourceforge.net
Sat Jun 14 05:24:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv25024

Modified Files:
	camera.cpp debugger.cpp object.cpp script.cpp script_v2.cpp 
	script_v5.cpp script_v6.cpp scumm.h scummvm.cpp vars.cpp 
Log Message:
runHook -> runInventoryScript, VAR_HOOK_SCRIPT -> VAR_INVENTORY_SCRIPT

Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- camera.cpp	7 Jun 2003 00:13:24 -0000	2.5
+++ camera.cpp	14 Jun 2003 12:23:30 -0000	2.6
@@ -106,7 +106,7 @@
 		if (_actors[i].isInCurrentRoom())
 			_actors[i].needRedraw = true;
 	}
-	runHook(0);
+	runInventoryScript(0);
 }
 
 void Scumm_v7::setCameraFollows(Actor *a) {
@@ -129,7 +129,7 @@
 	}
 
 	if (a->number != oldfollow)
-		runHook(0);
+		runInventoryScript(0);
 }
 
 
@@ -365,7 +365,7 @@
 		old = camera._follows;
 		setCameraFollows(derefActor(act, "actorFollowCamera"));
 		if (camera._follows != old)
-			runHook(0);
+			runInventoryScript(0);
 
 		camera._movingToActor = false;
 	}

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- debugger.cpp	7 Jun 2003 00:49:35 -0000	1.60
+++ debugger.cpp	14 Jun 2003 12:23:30 -0000	1.61
@@ -620,7 +620,7 @@
 		for (i = 1; i < _s->_maxInventoryItems; i++) {
 			if (_s->_inventory[i] == (uint16)obj) {
 				_s->putOwner(obj, _s->VAR(_s->VAR_EGO));
-				_s->runHook(obj);
+				_s->runInventoryScript(obj);
 				return true;
 			}
 		}
@@ -635,7 +635,7 @@
 		_s->putState(obj, 1);
 		_s->removeObjectFromRoom(obj);
 		_s->clearDrawObjectQueue();
-		_s->runHook(obj);
+		_s->runInventoryScript(obj);
 	} else {
 		Debug_Printf("Unknown object command '%s'\nRight now the only command is pickup", argv[2]); //change when adding commands
 	}

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- object.cpp	14 Jun 2003 08:56:09 -0000	1.120
+++ object.cpp	14 Jun 2003 12:23:30 -0000	1.121
@@ -1171,7 +1171,7 @@
 		ss = &vm.slot[_currentScript];
 		if (ss->where == WIO_INVENTORY && _inventory[ss->number] == obj) {
 			putOwner(obj, 0);
-			runHook(0);
+			runInventoryScript(0);
 			stopObjectCode();
 			return;
 		}
@@ -1180,7 +1180,7 @@
 		SamInventoryHack(obj);
 
 	putOwner(obj, owner);
-	runHook(0);
+	runInventoryScript(0);
 }
 
 int Scumm::getObjX(int obj) {

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- script.cpp	12 Jun 2003 17:33:45 -0000	1.113
+++ script.cpp	14 Jun 2003 12:23:30 -0000	1.114
@@ -647,14 +647,14 @@
 	_currentScript = 0xFF;
 }
 
-void Scumm::runHook(int i) {
+void Scumm::runInventoryScript(int i) {
 	if (_version <= 2) {
-		// FIXME - TODO
+		redrawV2Inventory();
 	} else {
 		int tmp[16];
 		tmp[0] = i;
-		if (VAR(VAR_HOOK_SCRIPT)) {
-			runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp);
+		if (VAR(VAR_INVENTORY_SCRIPT)) {
+			runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, tmp);
 		}
 	}
 }

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.137
retrieving revision 2.138
diff -u -d -r2.137 -r2.138
--- script_v2.cpp	7 Jun 2003 04:24:57 -0000	2.137
+++ script_v2.cpp	14 Jun 2003 12:23:30 -0000	2.138
@@ -1153,7 +1153,6 @@
 	owner = getVarOrDirectByte(0x40);
 
 	setOwnerOf(obj, owner);
-	redrawV2Inventory();
 }
 
 void Scumm_v2::o2_delay() {
@@ -1296,7 +1295,7 @@
 	putState(obj, getState(obj) | 0xA);
 	clearDrawObjectQueue();
 
-	redrawV2Inventory();
+	runInventoryScript(1);
 }
 
 void Scumm_v2::o2_setObjectName() {
@@ -1344,7 +1343,7 @@
 	work[i-1] = 0;
 	
 	memcpy(name, work, i);
-	redrawV2Inventory();
+	runInventoryScript(0);
 }
 
 void Scumm_v2::o2_cursorCommand() {	// TODO: Define the magic numbers
@@ -1357,7 +1356,7 @@
 
 	if (a2 & 4) {						// Userface
 		_userState = a2 & (32 | 64 | 128);
-		redrawV2Inventory();
+		runInventoryScript(0);
 	}
 
 	if (a2 & 1) {						// Freeze

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- script_v5.cpp	13 Jun 2003 17:35:44 -0000	1.117
+++ script_v5.cpp	14 Jun 2003 12:23:30 -0000	1.118
@@ -1415,7 +1415,7 @@
 	putState(obj, 1);
 	removeObjectFromRoom(obj);
 	clearDrawObjectQueue();
-	runHook(1);
+	runInventoryScript(1);
 }
 
 void Scumm_v5::o5_print() {
@@ -1984,7 +1984,7 @@
 	}
 
 	memcpy(name, work, i+1);
-	runHook(0);
+	runInventoryScript(0);
 }
 
 void Scumm_v5::o5_setOwnerOf() {
@@ -2681,5 +2681,5 @@
 	putClass(obj, kObjectClassUntouchable, 1);
 	putState(obj, 1);
 	clearDrawObjectQueue();
-	runHook(1);
+	runInventoryScript(1);
 }

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- script_v6.cpp	13 Jun 2003 06:45:05 -0000	1.161
+++ script_v6.cpp	14 Jun 2003 12:23:30 -0000	1.162
@@ -1121,7 +1121,7 @@
 	for (i = 1; i < _maxInventoryItems; i++) {
 		if (_inventory[i] == (uint16)obj) {
 			putOwner(obj, VAR(VAR_EGO));
-			runHook(obj);
+			runInventoryScript(obj);
 			return;
 		}
 	}
@@ -1132,7 +1132,7 @@
 	putState(obj, 1);
 	removeObjectFromRoom(obj);
 	clearDrawObjectQueue();
-	runHook(obj);									/* Difference */
+	runInventoryScript(obj);									/* Difference */
 }
 
 void Scumm_v6::o6_loadRoomWithEgo() {
@@ -1336,7 +1336,7 @@
 		if (_newNames[i] == 0) {
 			loadPtrToResource(rtObjectName, i, NULL);
 			_newNames[i] = obj;
-			runHook(0);
+			runInventoryScript(0);
 			return;
 		}
 	}

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- scumm.h	14 Jun 2003 11:52:34 -0000	1.253
+++ scumm.h	14 Jun 2003 12:23:30 -0000	1.254
@@ -524,7 +524,7 @@
 	void runScriptNested(int script);
 	void executeScript();
 	void updateScriptPtr();
-	void runHook(int i);
+	void runInventoryScript(int i);
 	void checkAndRunSentenceScript();
 	void runExitScript();
 	void runEntryScript();
@@ -1123,7 +1123,7 @@
 	byte VAR_EXIT_SCRIPT2;
 	byte VAR_VERB_SCRIPT;
 	byte VAR_SENTENCE_SCRIPT;
-	byte VAR_HOOK_SCRIPT;
+	byte VAR_INVENTORY_SCRIPT;
 	byte VAR_CUTSCENE_START_SCRIPT;
 	byte VAR_CUTSCENE_END_SCRIPT;
 	byte VAR_CHARINC;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.234
retrieving revision 2.235
diff -u -d -r2.234 -r2.235
--- scummvm.cpp	14 Jun 2003 11:52:34 -0000	2.234
+++ scummvm.cpp	14 Jun 2003 12:23:30 -0000	2.235
@@ -452,7 +452,7 @@
 	VAR_EXIT_SCRIPT2 = 0xFF;
 	VAR_VERB_SCRIPT = 0xFF;
 	VAR_SENTENCE_SCRIPT = 0xFF;
-	VAR_HOOK_SCRIPT = 0xFF;
+	VAR_INVENTORY_SCRIPT = 0xFF;
 	VAR_CUTSCENE_START_SCRIPT = 0xFF;
 	VAR_CUTSCENE_END_SCRIPT = 0xFF;
 	VAR_CHARINC = 0xFF;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- vars.cpp	12 Jun 2003 16:38:43 -0000	1.57
+++ vars.cpp	14 Jun 2003 12:23:30 -0000	1.58
@@ -60,7 +60,7 @@
 	VAR_EXIT_SCRIPT2 = 31;
 	VAR_VERB_SCRIPT = 32;
 	VAR_SENTENCE_SCRIPT = 33;
-	VAR_HOOK_SCRIPT = 34;
+	VAR_INVENTORY_SCRIPT = 34;
 	VAR_CUTSCENE_START_SCRIPT = 35;
 	VAR_CUTSCENE_END_SCRIPT = 36;
 	VAR_CHARINC = 37;
@@ -194,7 +194,7 @@
 	VAR_EXIT_SCRIPT2 = 54;
 	VAR_VERB_SCRIPT = 55;
 	VAR_SENTENCE_SCRIPT = 56;
-	VAR_HOOK_SCRIPT = 57;
+	VAR_INVENTORY_SCRIPT = 57;
 	VAR_CUTSCENE_START_SCRIPT = 58;
 	VAR_CUTSCENE_END_SCRIPT = 59;
 	VAR_SAVELOAD_SCRIPT = 60;
@@ -285,7 +285,7 @@
 	VAR_EXIT_SCRIPT2 = 54;
 	VAR_VERB_SCRIPT = 55;
 	VAR_SENTENCE_SCRIPT = 56;
-	VAR_HOOK_SCRIPT = 57;
+	VAR_INVENTORY_SCRIPT = 57;
 	VAR_CUTSCENE_START_SCRIPT = 58;
 	VAR_CUTSCENE_END_SCRIPT = 59;
 





More information about the Scummvm-git-logs mailing list