[Scummvm-git-logs] scummvm master -> 962d6763461150032b2f95536be5303052f9a22d

[aquadran]

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:
962d676346 GRIM: LUA: Replace numbers with macros


Commit: 962d6763461150032b2f95536be5303052f9a22d
    https://github.com/scummvm/scummvm/commit/962d6763461150032b2f95536be5303052f9a22d
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-01-16T08:30:23+01:00

Commit Message:
GRIM: LUA: Replace numbers with macros

Changed paths:
    engines/grim/lua/ldo.cpp
    engines/grim/lua/lvm.cpp


diff --git a/engines/grim/lua/ldo.cpp b/engines/grim/lua/ldo.cpp
index de5d8f9046d..e4fb4240528 100644
--- a/engines/grim/lua/ldo.cpp
+++ b/engines/grim/lua/ldo.cpp
@@ -253,7 +253,7 @@ int32 luaD_call(StkId base, int32 nResults) {
 		} else {
 			nResults = lua_state->task->initResults;
 			base = lua_state->task->initBase;
-			if (nResults != 255)
+			if (nResults != MULT_RET)
 				luaD_adjusttop(firstResult + nResults);
 			base--;
 			nResults = lua_state->stack.top - (lua_state->stack.stack + firstResult);
diff --git a/engines/grim/lua/lvm.cpp b/engines/grim/lua/lvm.cpp
index fafb9f243eb..c73a50c5c6d 100644
--- a/engines/grim/lua/lvm.cpp
+++ b/engines/grim/lua/lvm.cpp
@@ -661,7 +661,7 @@ callfunc:
 			// fall through
 		case RETCODE:
 			lua_state->callLevelCounter--;
-			return (task->base + ((task->aux == 123) ? *task->pc : 0));
+			return (task->base + ((task->aux == RETCODE) ? *task->pc : 0));
 		case SETLINEW:
 			task->aux = next_word(task->pc);
 			goto setline;