[Scummvm-git-logs] scummvm master -> 710f395ca71180ae98b5e7c9f52c5a3fac1d44d5

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
710f395ca7 WINTERMUTE: restored commented out stack->pop()


Commit: 710f395ca71180ae98b5e7c9f52c5a3fac1d44d5
    https://github.com/scummvm/scummvm/commit/710f395ca71180ae98b5e7c9f52c5a3fac1d44d5
Author: lolbot-iichan (lolbot_iichan at mail.ru)
Date: 2019-12-02T11:06:01+02:00

Commit Message:
WINTERMUTE: restored commented out stack->pop()

Unused variables were cleaned up at
47811167d5ddd9cbf64099ad36f2da5ae413fc86, commenting out a bit too much
code, since stack->pop() has a side effect (popping a value from data
stack).

Changed paths:
    engines/wintermute/base/scriptables/script_ext_directory.cpp


diff --git a/engines/wintermute/base/scriptables/script_ext_directory.cpp b/engines/wintermute/base/scriptables/script_ext_directory.cpp
index 0b5c7a7..6ea067a 100644
--- a/engines/wintermute/base/scriptables/script_ext_directory.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_directory.cpp
@@ -64,7 +64,7 @@ bool SXDirectory::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
 	//////////////////////////////////////////////////////////////////////////
 	if (strcmp(name, "Create") == 0) {
 		stack->correctParams(1);
-		//const char *path = stack->pop()->getString();
+		stack->pop()->getString();
 
 		if (BaseEngine::instance().getGameId() == "hamlet") {
 			// No need to actually create anything since "gamelet.save" is stored at SavefileManager
@@ -82,7 +82,7 @@ bool SXDirectory::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "Delete") == 0) {
 		stack->correctParams(1);
-		//const char *path = stack->pop()->getString();
+		stack->pop()->getString();
 
 		warning("Directory.Delete is not implemented! Returning false...");
 
@@ -95,8 +95,8 @@ bool SXDirectory::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "GetFiles") == 0 || strcmp(name, "GetDirectories") == 0) {
 		stack->correctParams(2);
-		//const char *path = stack->pop()->getString();
-		//const char *mask = stack->pop()->getString();
+		stack->pop()->getString();
+		stack->pop()->getString();
 
 		stack->pushInt(0);
 		BaseScriptable *array = makeSXArray(_gameRef, stack);