From f64700b27fa8f083697a16459e8237bf6c48f1dc Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 11 Jun 2012 00:24:52 +1000 Subject: [PATCH] TONY: Fixed display of static animations, and some variable renaming --- engines/tony/custom.cpp | 14 +++++++------- engines/tony/tonychar.cpp | 9 ++++++--- engines/tony/tonychar.h | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index e00db701f3f4..185fc64e94c1 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -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) diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp index a63d2d69c3bd..f0357ad15dae 100644 --- a/engines/tony/tonychar.cpp +++ b/engines/tony/tonychar.cpp @@ -950,7 +950,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body case TALK_CONRICETTASTATIC: case TALK_CONCONIGLIOSTATIC: case TALK_CONCARTESTATIC: - case TALK_CONTACCUINOSTATIC: + case TALK_WITH_NOTEBOOK: case TALK_CONMEGAFONOSTATIC: switch (_TalkDirection) { case LEFT: @@ -1632,7 +1632,7 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat } break; - case TALK_CONTACCUINOSTATIC: + case TALK_WITH_NOTEBOOK: switch (_TalkDirection) { case UP: case LEFT: @@ -1736,6 +1736,9 @@ void RMTony::startStatic(CORO_PARAM, TALKTYPE nTalk) { _ctx->headPat = _ctx->headLoopPat = 0; _ctx->bodyStartPat = _ctx->bodyLoopPat = 0; + startStaticCalculate(nTalk, _ctx->headPat, _ctx->headLoopPat, + _ctx->bodyStartPat, _ctx->bodyLoopPat); + // e vai con i pattern _bIsStaticTalk = true; @@ -1827,7 +1830,7 @@ void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, } break; - case TALK_CONTACCUINOSTATIC: + case TALK_WITH_NOTEBOOK: switch (_TalkDirection) { case UP: case LEFT: diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h index 5179230b4c1b..4e0a0f0d9383 100644 --- a/engines/tony/tonychar.h +++ b/engines/tony/tonychar.h @@ -61,7 +61,7 @@ class RMTony : public RMCharacter { TALK_CONCONIGLIOSTATIC, TALK_CONRICETTASTATIC, TALK_CONCARTESTATIC, - TALK_CONTACCUINOSTATIC, + TALK_WITH_NOTEBOOK, TALK_CONMEGAFONOSTATIC, TALK_CONBARBASTATIC, TALK_RIDE2,