[Scummvm-cvs-logs] SF.net SVN: scummvm:[52798] scummvm/trunk/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 52798
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52798&view=rev
Author:   Kirben
Date:     2010-09-18 14:31:21 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
SCUMM: Remove unused code, which was replaced by ScummEngine_v0::runObject in revision 42737.

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=42737&view=rev

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm_v2.h
    scummvm/trunk/engines/scumm/verbs.cpp

Modified: scummvm/trunk/engines/scumm/scumm_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm_v2.h	2010-09-18 14:22:22 UTC (rev 52797)
+++ scummvm/trunk/engines/scumm/scumm_v2.h	2010-09-18 14:31:21 UTC (rev 52798)
@@ -103,8 +103,6 @@
 
 	virtual void setBuiltinCursor(int index);
 
-	virtual void runObject(int obj, int entry);
-
 	/* Version 2 script opcodes */
 	void o2_actorFromPos();
 	void o2_actorOps();

Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp	2010-09-18 14:22:22 UTC (rev 52797)
+++ scummvm/trunk/engines/scumm/verbs.cpp	2010-09-18 14:31:21 UTC (rev 52798)
@@ -756,19 +756,6 @@
 	}
 }
 
-void ScummEngine_v2::runObject(int obj, int entry) {
-	if (getVerbEntrypoint(obj, entry) != 0) {
-		runObjectScript(obj, entry, false, false, NULL);
-	} else if (entry != 13 && entry != 15) {
-		VAR(9) = entry;
-		runScript(3, 0, 0, 0);
-	}
-
-	_activeInventory = 0;
-	_activeObject = 0;
-	_activeVerb = 13;
-}
-
 bool ScummEngine_v0::verbMoveToActor(int actor) {
 	Actor *a = derefActor(VAR(VAR_EGO), "verbMoveToActor");
 	Actor *a2 = derefActor(actor, "verbMoveToActor");


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