Fix stack underflow when Gorrister examines the mirror in IHNM. opReturnV

was popping *twice* the number of parameters that had originally been
pushed.

This appears to have been a bug in the ITE floppy version as well; one that
was fixed in the CD version.

At least that's how I understand it.

svn-id: r19017

1 files changed, 3 insertions, 2 deletions

diff --git a/saga/sthread.cpp b/saga/sthread.cpp
index 1c4e0badb9..58db4d24ed 100644
--- a/saga/sthread.cpp
+++ b/saga/sthread.cpp
@@ -308,7 +308,7 @@ bool Script::runThread(ScriptThread *thread, uint instructionLimit) {
 			addr = thread->baseAddress(scriptS.readByte());
 			iparam1 = scriptS.readSint16LE();
 			addr += iparam1;
-			*(uint16*)addr =  thread->pop();
+			*(uint16*)addr = thread->pop();
 			break;
 
 // FUNCTION CALL INSTRUCTIONS
@@ -380,8 +380,9 @@ bool Script::runThread(ScriptThread *thread, uint instructionLimit) {
 			} else {
 				thread->pop(); //cause it 0
 				thread->_instructionOffset = thread->pop();
+
+				// Pop all the call parameters off the stack
 				iparam1 = thread->pop();
-				iparam1 += iparam1;
 				while (iparam1--) {
 					thread->pop();
 				}