aboutsummaryrefslogtreecommitdiff
path: root/engines/sludge/builtin.cpp
diff options
context:
space:
mode:
authorSimei Yin2018-05-31 20:14:33 +0200
committerSimei Yin2018-05-31 23:15:09 +0200
commit04ef7becf37fbc5ed0ac9183aa8355ffa838df4b (patch)
tree7f475fe6980671b48c8d124df22789d454f4b6e1 /engines/sludge/builtin.cpp
parent805a47b74ab9b2ffa299d5c8401f178db022d4d8 (diff)
downloadscummvm-rg350-04ef7becf37fbc5ed0ac9183aa8355ffa838df4b.tar.gz
scummvm-rg350-04ef7becf37fbc5ed0ac9183aa8355ffa838df4b.tar.bz2
scummvm-rg350-04ef7becf37fbc5ed0ac9183aa8355ffa838df4b.zip
SLUDGE: Move PersonAnimation functions into struct Variable
Diffstat (limited to 'engines/sludge/builtin.cpp')
-rw-r--r--engines/sludge/builtin.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 20b4ba8328..f282d681cd 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -165,7 +165,7 @@ builtIn(howFrozen) {
builtIn(setCursor) {
UNUSEDALL
- PersonaAnimation *aa = getAnimationFromVar(fun->stack->thisVar);
+ PersonaAnimation *aa = fun->stack->thisVar.getAnimationFromVar();
g_sludge->_cursorMan->pickAnimCursor(aa);
trimStack(fun->stack);
return BR_CONTINUE;
@@ -370,7 +370,7 @@ builtIn(pasteImage) {
if (!getValueType(x, SVT_INT, fun->stack->thisVar))
return BR_ERROR;
trimStack(fun->stack);
- PersonaAnimation *pp = getAnimationFromVar(fun->stack->thisVar);
+ PersonaAnimation *pp = fun->stack->thisVar.getAnimationFromVar();
trimStack(fun->stack);
if (pp == NULL)
return BR_CONTINUE;
@@ -840,7 +840,7 @@ builtIn(anim) {
ba->theSprites = sprBanky;
// Return value
- newAnimationVariable(fun->reg, ba);
+ fun->reg.makeAnimationVariable(ba);
return BR_CONTINUE;
}
@@ -860,7 +860,7 @@ builtIn(costume) {
if (!checkNew(newPersona->animation))
return BR_ERROR;
for (iii = numParams - 1; iii >= 0; iii--) {
- newPersona->animation[iii] = getAnimationFromVar(fun->stack->thisVar);
+ newPersona->animation[iii] = fun->stack->thisVar.getAnimationFromVar();
trimStack(fun->stack);
}
@@ -1553,7 +1553,7 @@ builtIn(pasteCharacter) {
builtIn(animate) {
UNUSEDALL
int obj;
- PersonaAnimation *pp = getAnimationFromVar(fun->stack->thisVar);
+ PersonaAnimation *pp = fun->stack->thisVar.getAnimationFromVar();
if (pp == NULL)
return BR_ERROR;
trimStack(fun->stack);