reimplemented opcode 0xEC a better way

svn-id: r3801

2 files changed, 8 insertions, 7 deletions

diff --git a/script_v2.cpp b/script_v2.cpp
index 855cc02154..acdd81466c 100644
--- a/script_v2.cpp
+++ b/script_v2.cpp
@@ -322,7 +322,7 @@ void Scumm::setupOpcodes2() {
 	&Scumm::o6_invalid,
 	&Scumm::o6_invalid,
 	/* EC */	
-	&Scumm::o6_setBlastWindow,
+	&Scumm::o6_getActorPriority,
 	&Scumm::o6_getObjectNewDir,
 	&Scumm::o6_invalid,
 	&Scumm::o6_invalid,
@@ -2833,10 +2833,11 @@ void Scumm::decodeParseString2(int m, int n) {
 	}
 }
 
-void Scumm::o6_setBlastWindow()
+void Scumm::o6_getActorPriority()
 {
-	pop();
-	pop();
-	pop();
-	pop();
+	Actor *a;
+
+	a=derefActorSafe(pop(),"getActorPriority");
+
+	push(a->layer);
 }
diff --git a/scumm.h b/scumm.h
index 370616698c..3b4485ffe6 100644
--- a/scumm.h
+++ b/scumm.h
@@ -1558,7 +1558,7 @@ public:
 	void o6_kernelFunction();
 	void o6_getAnimateVariable();
 	void o6_drawBlastObject();
-	void o6_setBlastWindow();
+	void o6_getActorPriority();
 
 	/* Scumm Vars */
 	byte VAR_EGO;