[Scummvm-git-logs] scummvm master -> 7e592fd00bcc3d2dffab7a5346d9ca9253956e35

[sev-]

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

Summary:
d985b2ccfd GLK: ALAN2: Fix another instance of incorrect printf format
7e592fd00b GLK: ALAN3: Fix malloc/delete[] mismatch


Commit: d985b2ccfdbdacafaa8356bd7ce6acb875095c95
    https://github.com/scummvm/scummvm/commit/d985b2ccfdbdacafaa8356bd7ce6acb875095c95
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-28T09:45:29+02:00

Commit Message:
GLK: ALAN2: Fix another instance of incorrect printf format

Changed paths:
    engines/glk/alan2/inter.cpp


diff --git a/engines/glk/alan2/inter.cpp b/engines/glk/alan2/inter.cpp
index 967c8872c4..cdc150eaf9 100644
--- a/engines/glk/alan2/inter.cpp
+++ b/engines/glk/alan2/inter.cpp
@@ -181,7 +181,7 @@ void interpret(CONTEXT, Aaddr adr) {
 		case C_CURVAR:
 			switch (I_OP(i)) {
 			case V_PARAM:
-				if (stpflg) printf("PARAM \t%5u\t\t(%ld)", top(), params[top() - 1].code);
+				if (stpflg) printf("PARAM \t%5lu\t\t(%ld)", top(), params[top() - 1].code);
 				push(params[pop() - 1].code);
 				break;
 			case V_CURLOC:


Commit: 7e592fd00bcc3d2dffab7a5346d9ca9253956e35
    https://github.com/scummvm/scummvm/commit/7e592fd00bcc3d2dffab7a5346d9ca9253956e35
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-28T09:46:57+02:00

Commit Message:
GLK: ALAN3: Fix malloc/delete[] mismatch

Changed paths:
    engines/glk/alan3/output.cpp


diff --git a/engines/glk/alan3/output.cpp b/engines/glk/alan3/output.cpp
index 7ebf5a5873..816474f3b6 100644
--- a/engines/glk/alan3/output.cpp
+++ b/engines/glk/alan3/output.cpp
@@ -429,7 +429,7 @@ void output(const char *original) {
 		capitalize = strchr("!?.", str[strlen(str) - 1]) != 0;
 
 	anyOutput = TRUE;
-	delete[] copy;
+	free(copy);
 }