thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TONY: Fixed display of static animations, and some variable renaming

Browse source
This commit is contained in:
Paul Gilbert 2012-06-11 00:24:52 +10:00
parent e37319a287
commit f64700b27f
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/tony/custom.cpp
View file

@ -985,26 +985,26 @@ DECLARE_CUSTOM_FUNCTION(TonyConCarteEnd)(CORO_PARAM, uint32, uint32, uint32, uin
CORO_END_CODE;
}
DECLARE_CUSTOM_FUNCTION(TonyConTaccuinoStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
DECLARE_CUSTOM_FUNCTION(TonyWithNotebookStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
CORO_BEGIN_CONTEXT;
CORO_END_CONTEXT(_ctx);
CORO_BEGIN_CODE(_ctx);
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONTACCUINOSTATIC;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_WITH_NOTEBOOK;
GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_CONTACCUINOSTATIC);
CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_WITH_NOTEBOOK);
CORO_END_CODE;
}
DECLARE_CUSTOM_FUNCTION(TonyConTaccuinoEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
DECLARE_CUSTOM_FUNCTION(TonyWithNotebookEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
CORO_BEGIN_CONTEXT;
CORO_END_CONTEXT(_ctx);
CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_CONTACCUINOSTATIC);
CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_WITH_NOTEBOOK);
GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -2459,8 +2459,8 @@ ASSIGN(98, TonyConRicettaStart)
ASSIGN(99, TonyConRicettaEnd)
ASSIGN(100, TonyConCarteStart)
ASSIGN(101, TonyConCarteEnd)
ASSIGN(102, TonyConTaccuinoStart)
ASSIGN(103, TonyConTaccuinoEnd)
ASSIGN(102, TonyWithNotebookStart)
ASSIGN(103, TonyWithNotebookEnd)
ASSIGN(104, TonyConMegafonoStart)
ASSIGN(105, TonyConMegafonoEnd)
ASSIGN(106, TonyConBarbaStart)