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; 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_BEGIN_CONTEXT;
CORO_END_CONTEXT(_ctx); CORO_END_CONTEXT(_ctx);
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONTACCUINOSTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_WITH_NOTEBOOK;
GLOBALS.bStaticTalk = true; 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; 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_BEGIN_CONTEXT;
CORO_END_CONTEXT(_ctx); CORO_END_CONTEXT(_ctx);
CORO_BEGIN_CODE(_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.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -2459,8 +2459,8 @@ ASSIGN(98, TonyConRicettaStart)
ASSIGN(99, TonyConRicettaEnd) ASSIGN(99, TonyConRicettaEnd)
ASSIGN(100, TonyConCarteStart) ASSIGN(100, TonyConCarteStart)
ASSIGN(101, TonyConCarteEnd) ASSIGN(101, TonyConCarteEnd)
ASSIGN(102, TonyConTaccuinoStart) ASSIGN(102, TonyWithNotebookStart)
ASSIGN(103, TonyConTaccuinoEnd) ASSIGN(103, TonyWithNotebookEnd)
ASSIGN(104, TonyConMegafonoStart) ASSIGN(104, TonyConMegafonoStart)
ASSIGN(105, TonyConMegafonoEnd) ASSIGN(105, TonyConMegafonoEnd)
ASSIGN(106, TonyConBarbaStart) ASSIGN(106, TonyConBarbaStart)

9
engines/tony/tonychar.cpp
View file

@ -950,7 +950,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
case TALK_CONRICETTASTATIC: case TALK_CONRICETTASTATIC:
case TALK_CONCONIGLIOSTATIC: case TALK_CONCONIGLIOSTATIC:
case TALK_CONCARTESTATIC: case TALK_CONCARTESTATIC:
case TALK_CONTACCUINOSTATIC: case TALK_WITH_NOTEBOOK:
case TALK_CONMEGAFONOSTATIC: case TALK_CONMEGAFONOSTATIC:
switch (_TalkDirection) { switch (_TalkDirection) {
case LEFT: case LEFT:
@ -1632,7 +1632,7 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat
} }
break; break;
case TALK_CONTACCUINOSTATIC: case TALK_WITH_NOTEBOOK:
switch (_TalkDirection) { switch (_TalkDirection) {
case UP: case UP:
case LEFT: case LEFT:
@ -1736,6 +1736,9 @@ void RMTony::startStatic(CORO_PARAM, TALKTYPE nTalk) {
_ctx->headPat = _ctx->headLoopPat = 0; _ctx->headPat = _ctx->headLoopPat = 0;
_ctx->bodyStartPat = _ctx->bodyLoopPat = 0; _ctx->bodyStartPat = _ctx->bodyLoopPat = 0;
startStaticCalculate(nTalk, _ctx->headPat, _ctx->headLoopPat,
_ctx->bodyStartPat, _ctx->bodyLoopPat);
// e vai con i pattern // e vai con i pattern
_bIsStaticTalk = true; _bIsStaticTalk = true;
@ -1827,7 +1830,7 @@ void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat,
} }
break; break;
case TALK_CONTACCUINOSTATIC: case TALK_WITH_NOTEBOOK:
switch (_TalkDirection) { switch (_TalkDirection) {
case UP: case UP:
case LEFT: case LEFT:

2
engines/tony/tonychar.h
View file

@ -61,7 +61,7 @@ public:
TALK_CONCONIGLIOSTATIC, TALK_CONCONIGLIOSTATIC,
TALK_CONRICETTASTATIC, TALK_CONRICETTASTATIC,
TALK_CONCARTESTATIC, TALK_CONCARTESTATIC,
TALK_CONTACCUINOSTATIC, TALK_WITH_NOTEBOOK,
TALK_CONMEGAFONOSTATIC, TALK_CONMEGAFONOSTATIC,
TALK_CONBARBASTATIC, TALK_CONBARBASTATIC,
TALK_RIDE2, TALK_RIDE2,