aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/entities/alexei.cpp
diff options
context:
space:
mode:
authorLittleboy2012-07-14 14:32:51 -0400
committerLittleboy2012-07-14 14:34:42 -0400
commit4cee0836c9d4dda646f1e76a3440ffb73499dbb5 (patch)
tree6f1853f3e1b554b8c6a9e85986c45483b3072361 /engines/lastexpress/entities/alexei.cpp
parent13c00d40486201989463d337d5c09720f10a0aeb (diff)
downloadscummvm-rg350-4cee0836c9d4dda646f1e76a3440ffb73499dbb5.tar.gz
scummvm-rg350-4cee0836c9d4dda646f1e76a3440ffb73499dbb5.tar.bz2
scummvm-rg350-4cee0836c9d4dda646f1e76a3440ffb73499dbb5.zip
LASTEXPRESS: Replace CALLBACK_ACTION macro by member function
Diffstat (limited to 'engines/lastexpress/entities/alexei.cpp')
-rw-r--r--engines/lastexpress/entities/alexei.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp
index b0f9dd6a42..437c31c476 100644
--- a/engines/lastexpress/entities/alexei.cpp
+++ b/engines/lastexpress/entities/alexei.cpp
@@ -204,7 +204,7 @@ IMPLEMENT_FUNCTION(13, Alexei, function13)
getData()->entityPosition = kPosition_7500;
getEntities()->clearSequences(kEntityAlexei);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -239,7 +239,7 @@ IMPLEMENT_FUNCTION(14, Alexei, function14)
getObjects()->update(kObjectCompartment2, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
getEntities()->exitCompartment(kEntityAlexei, kObjectCompartment2, true);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
IMPLEMENT_FUNCTION_END
@@ -289,7 +289,7 @@ IMPLEMENT_FUNCTION(15, Alexei, function15)
getData()->location = kLocationInsideCompartment;
getEntities()->drawSequenceLeft(kEntityAlexei, "103B");
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;
@@ -309,7 +309,7 @@ IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue)
getObjects()->update(kObjectCompartment2, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
getObjects()->update(kObjectHandleInsideBathroom, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
- CALLBACK_ACTION();
+ callbackAction();
break;
}
@@ -1375,7 +1375,7 @@ label_callback_3:
case 2:
case 5:
- CALLBACK_ACTION();
+ callbackAction();
break;
case 3:
@@ -1445,7 +1445,7 @@ IMPLEMENT_FUNCTION(36, Alexei, function36)
break;
case 4:
- CALLBACK_ACTION();
+ callbackAction();
break;
}
break;