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

TONY: Rename variables and functions in loc.h and tonychar.h

Browse source
This commit is contained in:
Strangerke 2012-06-07 07:58:01 +02:00
parent 53e38106b7
commit 53bd99ce87
12 changed files with 1292 additions and 1303 deletions
Download patch file Download diff file Expand all files Collapse all files

253
engines/tony/custom.cpp
View file

@ -109,7 +109,7 @@ const char *staccFileNames[] = {
void ReapplyChangedHotspot(void) { void ReapplyChangedHotspot(void) {
int i; int i;
for (i = 0; i < GLOBALS.curChangedHotspot; i++) for (i = 0; i < GLOBALS.curChangedHotspot; i++)
GLOBALS.Loc->GetItemFromCode(GLOBALS.ChangedHotspot[i].dwCode)->ChangeHotspot(RMPoint(GLOBALS.ChangedHotspot[i].nX, GLOBALS.ChangedHotspot[i].nY)); GLOBALS.Loc->getItemFromCode(GLOBALS.ChangedHotspot[i].dwCode)->changeHotspot(RMPoint(GLOBALS.ChangedHotspot[i].nX, GLOBALS.ChangedHotspot[i].nY));
} }
void SaveChangedHotspot(Common::OutSaveFile *f) { void SaveChangedHotspot(Common::OutSaveFile *f) {
@ -141,9 +141,9 @@ void LoadChangedHotspot(Common::InSaveFile *f) {
*/ */
void MCharResetCodes(void) { void MCharResetCodes(void) {
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
GLOBALS.MCharacter[i].item = GLOBALS.Loc->GetItemFromCode(GLOBALS.MCharacter[i].code); GLOBALS.MCharacter[i].item = GLOBALS.Loc->getItemFromCode(GLOBALS.MCharacter[i].code);
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
GLOBALS.Character[i].item = GLOBALS.Loc->GetItemFromCode(GLOBALS.Character[i].code); GLOBALS.Character[i].item = GLOBALS.Loc->getItemFromCode(GLOBALS.Character[i].code);
} }
void CharsSaveAll(Common::OutSaveFile *f) { void CharsSaveAll(Common::OutSaveFile *f) {
@ -168,19 +168,19 @@ void CharsLoadAll(Common::InSaveFile *f) {
} }
DECLARE_CUSTOM_FUNCTION(FaceToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(FaceToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_STANDDOWN); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_STANDDOWN);
} }
DECLARE_CUSTOM_FUNCTION(BackToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(BackToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_STANDUP); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_STANDUP);
} }
DECLARE_CUSTOM_FUNCTION(LeftToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(LeftToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_STANDLEFT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_STANDLEFT);
} }
DECLARE_CUSTOM_FUNCTION(RightToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(RightToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_STANDRIGHT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_STANDRIGHT);
} }
@ -263,8 +263,8 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
if (GLOBALS.bSkipIdle) return; if (GLOBALS.bSkipIdle) return;
_ctx->msg.Load(dwMessage); _ctx->msg.load(dwMessage);
if (!_ctx->msg.IsValid()) { if (!_ctx->msg.isValid()) {
return; return;
} }
@ -285,15 +285,15 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
} }
if (GLOBALS.nTonyNextTalkType != GLOBALS.Tony->TALK_NORMAL) { if (GLOBALS.nTonyNextTalkType != GLOBALS.Tony->TALK_NORMAL) {
CORO_INVOKE_1(GLOBALS.Tony->StartTalk, GLOBALS.nTonyNextTalkType); CORO_INVOKE_1(GLOBALS.Tony->startTalk, GLOBALS.nTonyNextTalkType);
if (!GLOBALS.bStaticTalk) if (!GLOBALS.bStaticTalk)
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
} else { } else {
if (_ctx->msg.NumPeriods() > 1) if (_ctx->msg.numPeriods() > 1)
CORO_INVOKE_1(GLOBALS.Tony->StartTalk, GLOBALS.Tony->TALK_FIANCHI); CORO_INVOKE_1(GLOBALS.Tony->startTalk, GLOBALS.Tony->TALK_FIANCHI);
else else
CORO_INVOKE_1(GLOBALS.Tony->StartTalk, GLOBALS.Tony->TALK_NORMAL); CORO_INVOKE_1(GLOBALS.Tony->startTalk, GLOBALS.Tony->TALK_NORMAL);
} }
if (GLOBALS.curBackText) if (GLOBALS.curBackText)
@ -301,7 +301,7 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
GLOBALS.bTonyIsSpeaking = true; GLOBALS.bTonyIsSpeaking = true;
for (_ctx->i = 0; _ctx->i < _ctx->msg.NumPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) { for (_ctx->i = 0; _ctx->i < _ctx->msg.numPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) {
_ctx->text.setInput(GLOBALS.Input); _ctx->text.setInput(GLOBALS.Input);
// Alignment // Alignment
@ -315,9 +315,9 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
// Set the position // Set the position
if (nX == 0 && nY == 0) if (nX == 0 && nY == 0)
_ctx->text.setPosition(GLOBALS.Tony->Position() - RMPoint(0, 130) - GLOBALS.Loc->ScrollPosition()); _ctx->text.setPosition(GLOBALS.Tony->position() - RMPoint(0, 130) - GLOBALS.Loc->scrollPosition());
else else
_ctx->text.setPosition(RMPoint(nX, nY) - GLOBALS.Loc->ScrollPosition()); _ctx->text.setPosition(RMPoint(nX, nY) - GLOBALS.Loc->scrollPosition());
// Handling for always display // Handling for always display
if (GLOBALS.bAlwaysDisplay) { if (GLOBALS.bAlwaysDisplay) {
@ -359,13 +359,13 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
if (GLOBALS.curBackText) if (GLOBALS.curBackText)
GLOBALS.curBackText->show(); GLOBALS.curBackText->show();
CORO_INVOKE_0(GLOBALS.Tony->EndTalk); CORO_INVOKE_0(GLOBALS.Tony->endTalk);
CORO_END_CODE; CORO_END_CODE;
} }
DECLARE_CUSTOM_FUNCTION(ChangeBoxStatus)(CORO_PARAM, uint32 nLoc, uint32 nBox, uint32 nStatus, uint32) { DECLARE_CUSTOM_FUNCTION(ChangeBoxStatus)(CORO_PARAM, uint32 nLoc, uint32 nBox, uint32 nStatus, uint32) {
GLOBALS.Boxes->ChangeBoxStatus(nLoc, nBox, nStatus); GLOBALS.Boxes->changeBoxStatus(nLoc, nBox, nStatus);
} }
@ -408,16 +408,16 @@ DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgStart)(CORO_PARAM, uint32 nMsg, uint32
_ctx->msg = new RMMessage(nMsg); _ctx->msg = new RMMessage(nMsg);
GLOBALS.SFM_nLoc = GLOBALS.Loc->TEMPGetNumLoc(); GLOBALS.SFM_nLoc = GLOBALS.Loc->TEMPGetNumLoc();
GLOBALS.SFM_pt = GLOBALS.Tony->Position(); GLOBALS.SFM_pt = GLOBALS.Tony->position();
if (GLOBALS.bSkipIdle) if (GLOBALS.bSkipIdle)
return; return;
CORO_INVOKE_2(GLOBALS.UnloadLocation, false, NULL); CORO_INVOKE_2(GLOBALS.UnloadLocation, false, NULL);
GLOBALS.Tony->Hide(); GLOBALS.Tony->hide();
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
for (_ctx->i = 0; _ctx->i < _ctx->msg->NumPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) { for (_ctx->i = 0; _ctx->i < _ctx->msg->numPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) {
_ctx->text.setInput(GLOBALS.Input); _ctx->text.setInput(GLOBALS.Input);
// Alignment // Alignment
@ -474,7 +474,7 @@ DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgEnd)(CORO_PARAM, uint32 bNotEnableTony,
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.LoadLocation(GLOBALS.SFM_nLoc, RMPoint(GLOBALS.SFM_pt.x, GLOBALS.SFM_pt.y), RMPoint(-1, -1)); GLOBALS.LoadLocation(GLOBALS.SFM_nLoc, RMPoint(GLOBALS.SFM_pt.x, GLOBALS.SFM_pt.y), RMPoint(-1, -1));
if (!bNotEnableTony) if (!bNotEnableTony)
GLOBALS.Tony->Show(); GLOBALS.Tony->show();
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
MCharResetCodes(); MCharResetCodes();
@ -578,7 +578,7 @@ DECLARE_CUSTOM_FUNCTION(SetLocStartPosition)(CORO_PARAM, uint32 nLoc, uint32 lX,
} }
DECLARE_CUSTOM_FUNCTION(SaveTonyPosition)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(SaveTonyPosition)(CORO_PARAM, uint32, uint32, uint32, uint32) {
GLOBALS.saveTonyPos = GLOBALS.Tony->Position(); GLOBALS.saveTonyPos = GLOBALS.Tony->position();
GLOBALS.saveTonyLoc = GLOBALS.Loc->TEMPGetNumLoc(); GLOBALS.saveTonyLoc = GLOBALS.Loc->TEMPGetNumLoc();
} }
@ -604,7 +604,7 @@ DECLARE_CUSTOM_FUNCTION(EnableInput)(CORO_PARAM, uint32, uint32, uint32, uint32)
} }
DECLARE_CUSTOM_FUNCTION(StopTony)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(StopTony)(CORO_PARAM, uint32, uint32, uint32, uint32) {
GLOBALS.Tony->StopNoAction(coroParam); GLOBALS.Tony->stopNoAction(coroParam);
} }
DECLARE_CUSTOM_FUNCTION(CustEnableGUI)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(CustEnableGUI)(CORO_PARAM, uint32, uint32, uint32, uint32) {
@ -624,11 +624,11 @@ void TonyGenericTake1(CORO_PARAM, uint32 nDirection) {
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Tony->Take(nDirection, 0); GLOBALS.Tony->take(nDirection, 0);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
if (!GLOBALS.bSkipIdle) if (!GLOBALS.bSkipIdle)
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
CORO_END_CODE; CORO_END_CODE;
} }
@ -640,14 +640,14 @@ void TonyGenericTake2(CORO_PARAM, uint32 nDirection) {
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Tony->Take(nDirection, 1); GLOBALS.Tony->take(nDirection, 1);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
if (!GLOBALS.bSkipIdle) if (!GLOBALS.bSkipIdle)
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Tony->Take(nDirection, 2); GLOBALS.Tony->take(nDirection, 2);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_END_CODE; CORO_END_CODE;
@ -660,11 +660,11 @@ void TonyGenericPut1(CORO_PARAM, uint32 nDirection) {
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Tony->Put(nDirection, 0); GLOBALS.Tony->put(nDirection, 0);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
if (!GLOBALS.bSkipIdle) if (!GLOBALS.bSkipIdle)
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
CORO_END_CODE; CORO_END_CODE;
} }
@ -676,14 +676,14 @@ void TonyGenericPut2(CORO_PARAM, uint32 nDirection) {
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Tony->Put(nDirection, 1); GLOBALS.Tony->put(nDirection, 1);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
if (!GLOBALS.bSkipIdle) if (!GLOBALS.bSkipIdle)
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Tony->Put(nDirection, 2); GLOBALS.Tony->put(nDirection, 2);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_END_CODE; CORO_END_CODE;
@ -749,9 +749,9 @@ DECLARE_CUSTOM_FUNCTION(TonyPutDown2)(CORO_PARAM, uint32, uint32, uint32, uint32
DECLARE_CUSTOM_FUNCTION(TonyPerTerra)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyPerTerra)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
if (dwParte == 0) if (dwParte == 0)
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_PERTERRALEFT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_PERTERRALEFT);
else else
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_PERTERRARIGHT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_PERTERRARIGHT);
} }
DECLARE_CUSTOM_FUNCTION(TonySiRialza)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonySiRialza)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
@ -761,18 +761,18 @@ DECLARE_CUSTOM_FUNCTION(TonySiRialza)(CORO_PARAM, uint32 dwParte, uint32, uint32
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
if (dwParte == 0) if (dwParte == 0)
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_SIRIALZALEFT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_SIRIALZALEFT);
else else
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_SIRIALZARIGHT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_SIRIALZARIGHT);
if (!GLOBALS.bSkipIdle) if (!GLOBALS.bSkipIdle)
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
CORO_END_CODE; CORO_END_CODE;
} }
DECLARE_CUSTOM_FUNCTION(TonyPastorella)(CORO_PARAM, uint32 bIsPast, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyPastorella)(CORO_PARAM, uint32 bIsPast, uint32, uint32, uint32) {
GLOBALS.Tony->SetPastorella(bIsPast); GLOBALS.Tony->setPastorella(bIsPast);
} }
DECLARE_CUSTOM_FUNCTION(TonyFischietto)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyFischietto)(CORO_PARAM, uint32, uint32, uint32, uint32) {
@ -781,11 +781,11 @@ DECLARE_CUSTOM_FUNCTION(TonyFischietto)(CORO_PARAM, uint32, uint32, uint32, uint
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_FISCHIETTORIGHT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_FISCHIETTORIGHT);
if (!GLOBALS.bSkipIdle) if (!GLOBALS.bSkipIdle)
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_STANDRIGHT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_STANDRIGHT);
CORO_END_CODE; CORO_END_CODE;
} }
@ -834,31 +834,31 @@ DECLARE_CUSTOM_FUNCTION(TonySpaventatoSenzaMani)(CORO_PARAM, uint32 dwText, uint
DECLARE_CUSTOM_FUNCTION(TonyConMartello)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyConMartello)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
TonySetNumTexts(dwText); TonySetNumTexts(dwText);
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONMARTELLO; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONMARTELLO;
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_CONMARTELLO); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_CONMARTELLO);
} }
DECLARE_CUSTOM_FUNCTION(TonyConBicchiere)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyConBicchiere)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
TonySetNumTexts(dwText); TonySetNumTexts(dwText);
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONBICCHIERE; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONBICCHIERE;
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_CONBICCHIERE); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_CONBICCHIERE);
} }
DECLARE_CUSTOM_FUNCTION(TonyConVerme)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyConVerme)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
TonySetNumTexts(dwText); TonySetNumTexts(dwText);
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONVERME; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONVERME;
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_CONVERME); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_CONVERME);
} }
DECLARE_CUSTOM_FUNCTION(TonyConCorda)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyConCorda)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
TonySetNumTexts(dwText); TonySetNumTexts(dwText);
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONCORDA; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONCORDA;
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_CONCORDA); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_CONCORDA);
} }
DECLARE_CUSTOM_FUNCTION(TonyConSegretaria)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyConSegretaria)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
TonySetNumTexts(dwText); TonySetNumTexts(dwText);
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONSEGRETARIA; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONSEGRETARIA;
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_CONSEGRETARIA); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_CONSEGRETARIA);
} }
DECLARE_CUSTOM_FUNCTION(TonyConConiglioANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(TonyConConiglioANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
@ -889,7 +889,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConPupazzoStart)(CORO_PARAM, uint32, uint32, uint32,
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONPUPAZZOSTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONPUPAZZOSTATIC;
GLOBALS.bStaticTalk = true; GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->StartStatic, GLOBALS.Tony->TALK_CONPUPAZZOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_CONPUPAZZOSTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -900,7 +900,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConPupazzoEnd)(CORO_PARAM, uint32, uint32, uint32, u
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->EndStatic, GLOBALS.Tony->TALK_CONPUPAZZOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_CONPUPAZZOSTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -915,7 +915,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConConiglioStart)(CORO_PARAM, uint32, uint32, uint32
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONCONIGLIOSTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONCONIGLIOSTATIC;
GLOBALS.bStaticTalk = true; GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->StartStatic, GLOBALS.Tony->TALK_CONCONIGLIOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_CONCONIGLIOSTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -926,7 +926,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConConiglioEnd)(CORO_PARAM, uint32, uint32, uint32,
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->EndStatic, GLOBALS.Tony->TALK_CONCONIGLIOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_CONCONIGLIOSTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -941,7 +941,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConRicettaStart)(CORO_PARAM, uint32, uint32, uint32,
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONRICETTASTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONRICETTASTATIC;
GLOBALS.bStaticTalk = true; GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->StartStatic, GLOBALS.Tony->TALK_CONRICETTASTATIC); CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_CONRICETTASTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -952,7 +952,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConRicettaEnd)(CORO_PARAM, uint32, uint32, uint32, u
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->EndStatic, GLOBALS.Tony->TALK_CONRICETTASTATIC); CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_CONRICETTASTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -967,7 +967,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConCarteStart)(CORO_PARAM, uint32, uint32, uint32, u
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONCARTESTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONCARTESTATIC;
GLOBALS.bStaticTalk = true; GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->StartStatic, GLOBALS.Tony->TALK_CONCARTESTATIC); CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_CONCARTESTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -978,7 +978,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConCarteEnd)(CORO_PARAM, uint32, uint32, uint32, uin
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->EndStatic, GLOBALS.Tony->TALK_CONCARTESTATIC); CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_CONCARTESTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -993,7 +993,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConTaccuinoStart)(CORO_PARAM, uint32, uint32, uint32
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONTACCUINOSTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONTACCUINOSTATIC;
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_CONTACCUINOSTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -1004,7 +1004,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConTaccuinoEnd)(CORO_PARAM, uint32, uint32, uint32,
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_CONTACCUINOSTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -1019,7 +1019,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConMegafonoStart)(CORO_PARAM, uint32, uint32, uint32
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONMEGAFONOSTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONMEGAFONOSTATIC;
GLOBALS.bStaticTalk = true; GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->StartStatic, GLOBALS.Tony->TALK_CONMEGAFONOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_CONMEGAFONOSTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -1030,7 +1030,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConMegafonoEnd)(CORO_PARAM, uint32, uint32, uint32,
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->EndStatic, GLOBALS.Tony->TALK_CONMEGAFONOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_CONMEGAFONOSTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -1045,7 +1045,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConBarbaStart)(CORO_PARAM, uint32, uint32, uint32, u
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONBARBASTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_CONBARBASTATIC;
GLOBALS.bStaticTalk = true; GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->StartStatic, GLOBALS.Tony->TALK_CONBARBASTATIC); CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_CONBARBASTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -1056,7 +1056,7 @@ DECLARE_CUSTOM_FUNCTION(TonyConBarbaEnd)(CORO_PARAM, uint32, uint32, uint32, uin
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->EndStatic, GLOBALS.Tony->TALK_CONBARBASTATIC); CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_CONBARBASTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -1071,7 +1071,7 @@ DECLARE_CUSTOM_FUNCTION(TonySpaventatoStart)(CORO_PARAM, uint32, uint32, uint32,
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_SPAVENTATOSTATIC; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_SPAVENTATOSTATIC;
GLOBALS.bStaticTalk = true; GLOBALS.bStaticTalk = true;
CORO_INVOKE_1(GLOBALS.Tony->StartStatic, GLOBALS.Tony->TALK_SPAVENTATOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->startStatic, GLOBALS.Tony->TALK_SPAVENTATOSTATIC);
CORO_END_CODE; CORO_END_CODE;
} }
@ -1082,7 +1082,7 @@ DECLARE_CUSTOM_FUNCTION(TonySpaventatoEnd)(CORO_PARAM, uint32, uint32, uint32, u
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->EndStatic, GLOBALS.Tony->TALK_SPAVENTATOSTATIC); CORO_INVOKE_1(GLOBALS.Tony->endStatic, GLOBALS.Tony->TALK_SPAVENTATOSTATIC);
GLOBALS.bStaticTalk = false; GLOBALS.bStaticTalk = false;
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
@ -1101,8 +1101,8 @@ DECLARE_CUSTOM_FUNCTION(TonySniffaLeft)(CORO_PARAM, uint32, uint32, uint32, uint
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_SNIFFA_LEFT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_SNIFFA_LEFT);
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
CORO_INVOKE_4(LeftToMe, 0, 0, 0, 0); CORO_INVOKE_4(LeftToMe, 0, 0, 0, 0);
CORO_END_CODE; CORO_END_CODE;
@ -1114,8 +1114,8 @@ DECLARE_CUSTOM_FUNCTION(TonySniffaRight)(CORO_PARAM, uint32, uint32, uint32, uin
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
GLOBALS.Tony->SetPattern(GLOBALS.Tony->PAT_SNIFFA_RIGHT); GLOBALS.Tony->setPattern(GLOBALS.Tony->PAT_SNIFFA_RIGHT);
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Tony->waitForEndPattern);
CORO_INVOKE_4(RightToMe, 0, 0, 0, 0); CORO_INVOKE_4(RightToMe, 0, 0, 0, 0);
CORO_END_CODE; CORO_END_CODE;
@ -1160,11 +1160,11 @@ DECLARE_CUSTOM_FUNCTION(TonyMacbeth)(CORO_PARAM, uint32 nPos, uint32, uint32, ui
DECLARE_CUSTOM_FUNCTION(EnableTony)(CORO_PARAM, uint32, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(EnableTony)(CORO_PARAM, uint32, uint32, uint32, uint32) {
GLOBALS.Tony->Show(); GLOBALS.Tony->show();
} }
DECLARE_CUSTOM_FUNCTION(DisableTony)(CORO_PARAM, uint32 bShowOmbra, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(DisableTony)(CORO_PARAM, uint32 bShowOmbra, uint32, uint32, uint32) {
GLOBALS.Tony->Hide(bShowOmbra); GLOBALS.Tony->hide(bShowOmbra);
} }
DECLARE_CUSTOM_FUNCTION(WaitForPatternEnd)(CORO_PARAM, uint32 nItem, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(WaitForPatternEnd)(CORO_PARAM, uint32 nItem, uint32, uint32, uint32) {
@ -1174,17 +1174,17 @@ DECLARE_CUSTOM_FUNCTION(WaitForPatternEnd)(CORO_PARAM, uint32 nItem, uint32, uin
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
_ctx->item = GLOBALS.Loc->GetItemFromCode(nItem); _ctx->item = GLOBALS.Loc->getItemFromCode(nItem);
if (!GLOBALS.bSkipIdle && _ctx->item != NULL) if (!GLOBALS.bSkipIdle && _ctx->item != NULL)
CORO_INVOKE_1(_ctx->item->WaitForEndPattern, GLOBALS.hSkipIdle); CORO_INVOKE_1(_ctx->item->waitForEndPattern, GLOBALS.hSkipIdle);
CORO_END_CODE; CORO_END_CODE;
} }
DECLARE_CUSTOM_FUNCTION(SetTonyPosition)(CORO_PARAM, uint32 nX, uint32 nY, uint32 nLoc, uint32) { DECLARE_CUSTOM_FUNCTION(SetTonyPosition)(CORO_PARAM, uint32 nX, uint32 nY, uint32 nLoc, uint32) {
GLOBALS.Tony->SetPosition(RMPoint(nX, nY), nLoc); GLOBALS.Tony->setPosition(RMPoint(nX, nY), nLoc);
} }
DECLARE_CUSTOM_FUNCTION(MoveTonyAndWait)(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(MoveTonyAndWait)(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) {
@ -1193,16 +1193,16 @@ DECLARE_CUSTOM_FUNCTION(MoveTonyAndWait)(CORO_PARAM, uint32 nX, uint32 nY, uint3
CORO_BEGIN_CODE(_ctx); CORO_BEGIN_CODE(_ctx);
CORO_INVOKE_1(GLOBALS.Tony->Move, RMPoint(nX, nY)); CORO_INVOKE_1(GLOBALS.Tony->move, RMPoint(nX, nY));
if (!GLOBALS.bSkipIdle) if (!GLOBALS.bSkipIdle)
CORO_INVOKE_0(GLOBALS.Tony->WaitForEndMovement); CORO_INVOKE_0(GLOBALS.Tony->waitForEndMovement);
CORO_END_CODE; CORO_END_CODE;
} }
DECLARE_CUSTOM_FUNCTION(MoveTony)(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(MoveTony)(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) {
GLOBALS.Tony->Move(coroParam, RMPoint(nX, nY)); GLOBALS.Tony->move(coroParam, RMPoint(nX, nY));
} }
DECLARE_CUSTOM_FUNCTION(ScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, uint32 sX, uint32 sY) { DECLARE_CUSTOM_FUNCTION(ScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, uint32 sX, uint32 sY) {
@ -1217,7 +1217,7 @@ DECLARE_CUSTOM_FUNCTION(ScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, uint32
_ctx->lx = (int32)nX; _ctx->lx = (int32)nX;
_ctx->ly = (int32)nY; _ctx->ly = (int32)nY;
_ctx->pt = GLOBALS.Loc->ScrollPosition(); _ctx->pt = GLOBALS.Loc->scrollPosition();
while ((_ctx->lx != 0 || _ctx->ly != 0) && !GLOBALS.bSkipIdle) { while ((_ctx->lx != 0 || _ctx->ly != 0) && !GLOBALS.bSkipIdle) {
if (_ctx->lx > 0) { if (_ctx->lx > 0) {
@ -1243,8 +1243,8 @@ DECLARE_CUSTOM_FUNCTION(ScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, uint32
CORO_INVOKE_0(GLOBALS.WaitFrame); CORO_INVOKE_0(GLOBALS.WaitFrame);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Loc->SetScrollPosition(_ctx->pt); GLOBALS.Loc->setScrollPosition(_ctx->pt);
GLOBALS.Tony->SetScrollPosition(_ctx->pt); GLOBALS.Tony->setScrollPosition(_ctx->pt);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
} }
@ -1276,7 +1276,7 @@ DECLARE_CUSTOM_FUNCTION(SyncScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, ui
_ctx->stepX = sX; _ctx->stepX = sX;
_ctx->stepY = sY; _ctx->stepY = sY;
_ctx->startpt = GLOBALS.Loc->ScrollPosition(); _ctx->startpt = GLOBALS.Loc->scrollPosition();
_ctx->dwStartTime = _vm->getTime(); _ctx->dwStartTime = _vm->getTime();
@ -1308,8 +1308,8 @@ DECLARE_CUSTOM_FUNCTION(SyncScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, ui
CORO_INVOKE_0(GLOBALS.WaitFrame); CORO_INVOKE_0(GLOBALS.WaitFrame);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Loc->SetScrollPosition(_ctx->pt); GLOBALS.Loc->setScrollPosition(_ctx->pt);
GLOBALS.Tony->SetScrollPosition(_ctx->pt); GLOBALS.Tony->setScrollPosition(_ctx->pt);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
} }
@ -1329,8 +1329,8 @@ DECLARE_CUSTOM_FUNCTION(SyncScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, ui
} }
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Loc->SetScrollPosition(_ctx->pt); GLOBALS.Loc->setScrollPosition(_ctx->pt);
GLOBALS.Tony->SetScrollPosition(_ctx->pt); GLOBALS.Tony->setScrollPosition(_ctx->pt);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_END_CODE; CORO_END_CODE;
@ -1354,7 +1354,7 @@ DECLARE_CUSTOM_FUNCTION(ChangeHotspot)(CORO_PARAM, uint32 dwCode, uint32 nX, uin
GLOBALS.curChangedHotspot++; GLOBALS.curChangedHotspot++;
} }
GLOBALS.Loc->GetItemFromCode(dwCode)->ChangeHotspot(RMPoint(nX, nY)); GLOBALS.Loc->getItemFromCode(dwCode)->changeHotspot(RMPoint(nX, nY));
} }
@ -1384,8 +1384,8 @@ DECLARE_CUSTOM_FUNCTION(TremaSchermo)(CORO_PARAM, uint32 nScosse, uint32, uint32
CORO_INVOKE_0(GLOBALS.WaitFrame); CORO_INVOKE_0(GLOBALS.WaitFrame);
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Loc->SetFixedScroll(RMPoint(1 * _ctx->dirx, 1 * _ctx->diry)); GLOBALS.Loc->setFixedScroll(RMPoint(1 * _ctx->dirx, 1 * _ctx->diry));
GLOBALS.Tony->SetFixedScroll(RMPoint(1 * _ctx->dirx, 1 * _ctx->diry)); GLOBALS.Tony->setFixedScroll(RMPoint(1 * _ctx->dirx, 1 * _ctx->diry));
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
_ctx->i = _vm->_randomSource.getRandomNumber(2); _ctx->i = _vm->_randomSource.getRandomNumber(2);
@ -1397,8 +1397,8 @@ DECLARE_CUSTOM_FUNCTION(TremaSchermo)(CORO_PARAM, uint32 nScosse, uint32, uint32
} }
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Loc->SetFixedScroll(RMPoint(0, 0)); GLOBALS.Loc->setFixedScroll(RMPoint(0, 0));
GLOBALS.Tony->SetFixedScroll(RMPoint(0, 0)); GLOBALS.Tony->setFixedScroll(RMPoint(0, 0));
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_END_CODE; CORO_END_CODE;
@ -1413,7 +1413,7 @@ DECLARE_CUSTOM_FUNCTION(TremaSchermo)(CORO_PARAM, uint32 nScosse, uint32, uint32
DECLARE_CUSTOM_FUNCTION(CharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(CharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, uint32, uint32) {
assert(nChar < 16); assert(nChar < 16);
GLOBALS.Character[nChar].code = nCode; GLOBALS.Character[nChar].code = nCode;
GLOBALS.Character[nChar].item = GLOBALS.Loc->GetItemFromCode(nCode); GLOBALS.Character[nChar].item = GLOBALS.Loc->getItemFromCode(nCode);
GLOBALS.Character[nChar].r = 255; GLOBALS.Character[nChar].r = 255;
GLOBALS.Character[nChar].g = 255; GLOBALS.Character[nChar].g = 255;
GLOBALS.Character[nChar].b = 255; GLOBALS.Character[nChar].b = 255;
@ -1461,18 +1461,18 @@ DECLARE_CUSTOM_FUNCTION(CharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMess
_ctx->curOffset = 0; _ctx->curOffset = 0;
assert(nChar < 16); assert(nChar < 16);
_ctx->pt = GLOBALS.Character[nChar].item->CalculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->ScrollPosition(); _ctx->pt = GLOBALS.Character[nChar].item->calculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->scrollPosition();
if (GLOBALS.Character[nChar].starttalkpattern != 0) { if (GLOBALS.Character[nChar].starttalkpattern != 0) {
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Character[nChar].item->SetPattern(GLOBALS.Character[nChar].starttalkpattern); GLOBALS.Character[nChar].item->setPattern(GLOBALS.Character[nChar].starttalkpattern);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_INVOKE_0(GLOBALS.Character[nChar].item->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Character[nChar].item->waitForEndPattern);
} }
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Character[nChar].item->SetPattern(GLOBALS.Character[nChar].talkpattern); GLOBALS.Character[nChar].item->setPattern(GLOBALS.Character[nChar].talkpattern);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
_ctx->curVoc = SearchVoiceHeader(0, dwMessage); _ctx->curVoc = SearchVoiceHeader(0, dwMessage);
@ -1483,7 +1483,7 @@ DECLARE_CUSTOM_FUNCTION(CharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMess
_ctx->curOffset = _ctx->curVoc->_offset; _ctx->curOffset = _ctx->curVoc->_offset;
} }
for (_ctx->i = 0; _ctx->i < _ctx->msg->NumPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) { for (_ctx->i = 0; _ctx->i < _ctx->msg->numPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) {
if (bIsBack) { if (bIsBack) {
GLOBALS.curBackText = _ctx->text = new RMTextDialogScrolling(GLOBALS.Loc); GLOBALS.curBackText = _ctx->text = new RMTextDialogScrolling(GLOBALS.Loc);
if (GLOBALS.bTonyIsSpeaking) if (GLOBALS.bTonyIsSpeaking)
@ -1545,13 +1545,13 @@ DECLARE_CUSTOM_FUNCTION(CharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMess
if (GLOBALS.Character[nChar].endtalkpattern != 0) { if (GLOBALS.Character[nChar].endtalkpattern != 0) {
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Character[nChar].item->SetPattern(GLOBALS.Character[nChar].endtalkpattern); GLOBALS.Character[nChar].item->setPattern(GLOBALS.Character[nChar].endtalkpattern);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_INVOKE_0(GLOBALS.Character[nChar].item->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Character[nChar].item->waitForEndPattern);
} }
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Character[nChar].item->SetPattern(GLOBALS.Character[nChar].standpattern); GLOBALS.Character[nChar].item->setPattern(GLOBALS.Character[nChar].standpattern);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
delete _ctx->msg; delete _ctx->msg;
@ -1581,7 +1581,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, ui
if (nCode == 0) if (nCode == 0)
GLOBALS.MCharacter[nChar].item = NULL; GLOBALS.MCharacter[nChar].item = NULL;
else else
GLOBALS.MCharacter[nChar].item = GLOBALS.Loc->GetItemFromCode(nCode); GLOBALS.MCharacter[nChar].item = GLOBALS.Loc->getItemFromCode(nCode);
GLOBALS.MCharacter[nChar].r = 255; GLOBALS.MCharacter[nChar].r = 255;
GLOBALS.MCharacter[nChar].g = 255; GLOBALS.MCharacter[nChar].g = 255;
GLOBALS.MCharacter[nChar].b = 255; GLOBALS.MCharacter[nChar].b = 255;
@ -1598,7 +1598,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, ui
} }
DECLARE_CUSTOM_FUNCTION(MCharResetCode)(CORO_PARAM, uint32 nChar, uint32, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(MCharResetCode)(CORO_PARAM, uint32 nChar, uint32, uint32, uint32) {
GLOBALS.MCharacter[nChar].item = GLOBALS.Loc->GetItemFromCode(GLOBALS.MCharacter[nChar].code); GLOBALS.MCharacter[nChar].item = GLOBALS.Loc->getItemFromCode(GLOBALS.MCharacter[nChar].code);
} }
@ -1670,7 +1670,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes
// Calculates the position of the text according to the current frame // Calculates the position of the text according to the current frame
if (GLOBALS.MCharacter[nChar].x == -1) if (GLOBALS.MCharacter[nChar].x == -1)
_ctx->pt = GLOBALS.MCharacter[nChar].item->CalculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->ScrollPosition(); _ctx->pt = GLOBALS.MCharacter[nChar].item->calculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->scrollPosition();
else else
_ctx->pt = RMPoint(GLOBALS.MCharacter[nChar].x, GLOBALS.MCharacter[nChar].y); _ctx->pt = RMPoint(GLOBALS.MCharacter[nChar].x, GLOBALS.MCharacter[nChar].y);
@ -1680,7 +1680,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes
// Try to run the custom function to initialise the speech // Try to run the custom function to initialise the speech
if (GLOBALS.MCharacter[nChar].item) { if (GLOBALS.MCharacter[nChar].item) {
_ctx->h = mpalQueryDoAction(30, GLOBALS.MCharacter[nChar].item->MpalCode(), _ctx->parm); _ctx->h = mpalQueryDoAction(30, GLOBALS.MCharacter[nChar].item->mpalCode(), _ctx->parm);
if (_ctx->h != CORO_INVALID_PID_VALUE) { if (_ctx->h != CORO_INVALID_PID_VALUE) {
CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE); CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE);
} }
@ -1695,7 +1695,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes
_ctx->curOffset = _ctx->curVoc->_offset; _ctx->curOffset = _ctx->curVoc->_offset;
} }
for (_ctx->i = 0; _ctx->i < _ctx->msg->NumPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) { for (_ctx->i = 0; _ctx->i < _ctx->msg->numPeriods() && !GLOBALS.bSkipIdle; _ctx->i++) {
// Create a different object depending on whether it's background or not // Create a different object depending on whether it's background or not
if (bIsBack) { if (bIsBack) {
GLOBALS.curBackText = _ctx->text = new RMTextDialogScrolling(GLOBALS.Loc); GLOBALS.curBackText = _ctx->text = new RMTextDialogScrolling(GLOBALS.Loc);
@ -1759,7 +1759,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes
// Try to run the custom function to close the speech // Try to run the custom function to close the speech
if (GLOBALS.MCharacter[nChar].item) { if (GLOBALS.MCharacter[nChar].item) {
_ctx->h = mpalQueryDoAction(31, GLOBALS.MCharacter[nChar].item->MpalCode(), _ctx->parm); _ctx->h = mpalQueryDoAction(31, GLOBALS.MCharacter[nChar].item->mpalCode(), _ctx->parm);
if (_ctx->h != CORO_INVALID_PID_VALUE) if (_ctx->h != CORO_INVALID_PID_VALUE)
CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE); CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE);
} }
@ -1767,11 +1767,6 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes
CORO_END_CODE; CORO_END_CODE;
} }
/* /*
* Dialoghi * Dialoghi
*/ */
@ -1815,46 +1810,46 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg
if (nPers == 0) { if (nPers == 0) {
_ctx->text = new RMTextDialog; _ctx->text = new RMTextDialog;
_ctx->text->setColor(0, 255, 0); _ctx->text->setColor(0, 255, 0);
_ctx->text->setPosition(GLOBALS.Tony->Position() - RMPoint(0, 130) - GLOBALS.Loc->ScrollPosition()); _ctx->text->setPosition(GLOBALS.Tony->position() - RMPoint(0, 130) - GLOBALS.Loc->scrollPosition());
_ctx->text->writeText(_ctx->string, 0); _ctx->text->writeText(_ctx->string, 0);
if (GLOBALS.dwTonyNumTexts > 0) { if (GLOBALS.dwTonyNumTexts > 0) {
if (!GLOBALS.bTonyInTexts) { if (!GLOBALS.bTonyInTexts) {
if (GLOBALS.nTonyNextTalkType != GLOBALS.Tony->TALK_NORMAL) { if (GLOBALS.nTonyNextTalkType != GLOBALS.Tony->TALK_NORMAL) {
CORO_INVOKE_1(GLOBALS.Tony->StartTalk, GLOBALS.nTonyNextTalkType); CORO_INVOKE_1(GLOBALS.Tony->startTalk, GLOBALS.nTonyNextTalkType);
if (!GLOBALS.bStaticTalk) if (!GLOBALS.bStaticTalk)
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
} else } else
CORO_INVOKE_1(GLOBALS.Tony->StartTalk, GLOBALS.Tony->TALK_NORMAL); CORO_INVOKE_1(GLOBALS.Tony->startTalk, GLOBALS.Tony->TALK_NORMAL);
GLOBALS.bTonyInTexts = true; GLOBALS.bTonyInTexts = true;
} }
GLOBALS.dwTonyNumTexts--; GLOBALS.dwTonyNumTexts--;
} else { } else {
CORO_INVOKE_1(GLOBALS.Tony->StartTalk, GLOBALS.nTonyNextTalkType); CORO_INVOKE_1(GLOBALS.Tony->startTalk, GLOBALS.nTonyNextTalkType);
if (!GLOBALS.bStaticTalk) if (!GLOBALS.bStaticTalk)
GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL; GLOBALS.nTonyNextTalkType = GLOBALS.Tony->TALK_NORMAL;
} }
} else if (!GLOBALS.IsMChar[nPers]) { } else if (!GLOBALS.IsMChar[nPers]) {
_ctx->text = new RMTextDialog; _ctx->text = new RMTextDialog;
_ctx->pt = GLOBALS.Character[nPers].item->CalculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->ScrollPosition(); _ctx->pt = GLOBALS.Character[nPers].item->calculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->scrollPosition();
if (GLOBALS.Character[nPers].starttalkpattern != 0) { if (GLOBALS.Character[nPers].starttalkpattern != 0) {
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Character[nPers].item->SetPattern(GLOBALS.Character[nPers].starttalkpattern); GLOBALS.Character[nPers].item->setPattern(GLOBALS.Character[nPers].starttalkpattern);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_INVOKE_0(GLOBALS.Character[nPers].item->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Character[nPers].item->waitForEndPattern);
} }
GLOBALS.Character[nPers].item->SetPattern(GLOBALS.Character[nPers].talkpattern); GLOBALS.Character[nPers].item->setPattern(GLOBALS.Character[nPers].talkpattern);
_ctx->text->setColor(GLOBALS.Character[nPers].r, GLOBALS.Character[nPers].g, GLOBALS.Character[nPers].b); _ctx->text->setColor(GLOBALS.Character[nPers].r, GLOBALS.Character[nPers].g, GLOBALS.Character[nPers].b);
_ctx->text->writeText(_ctx->string, 0); _ctx->text->writeText(_ctx->string, 0);
_ctx->text->setPosition(_ctx->pt); _ctx->text->setPosition(_ctx->pt);
} else { } else {
if (GLOBALS.MCharacter[nPers].x == -1) if (GLOBALS.MCharacter[nPers].x == -1)
_ctx->pt = GLOBALS.MCharacter[nPers].item->CalculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->ScrollPosition(); _ctx->pt = GLOBALS.MCharacter[nPers].item->calculatePos() - RMPoint(-60, 20) - GLOBALS.Loc->scrollPosition();
else else
_ctx->pt = RMPoint(GLOBALS.MCharacter[nPers].x, GLOBALS.MCharacter[nPers].y); _ctx->pt = RMPoint(GLOBALS.MCharacter[nPers].x, GLOBALS.MCharacter[nPers].y);
@ -1866,7 +1861,7 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg
GLOBALS.MCharacter[nPers].numtexts--; GLOBALS.MCharacter[nPers].numtexts--;
} else { } else {
// Try to run the custom function to initialise the speech // Try to run the custom function to initialise the speech
_ctx->h = mpalQueryDoAction(30, GLOBALS.MCharacter[nPers].item->MpalCode(), _ctx->parm); _ctx->h = mpalQueryDoAction(30, GLOBALS.MCharacter[nPers].item->mpalCode(), _ctx->parm);
if (_ctx->h != CORO_INVALID_PID_VALUE) if (_ctx->h != CORO_INVALID_PID_VALUE)
CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE); CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE);
@ -1922,18 +1917,18 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg
if (!GLOBALS.IsMChar[nPers]) { if (!GLOBALS.IsMChar[nPers]) {
if (GLOBALS.Character[nPers].endtalkpattern != 0) { if (GLOBALS.Character[nPers].endtalkpattern != 0) {
GLOBALS.Freeze(); GLOBALS.Freeze();
GLOBALS.Character[nPers].item->SetPattern(GLOBALS.Character[nPers].endtalkpattern); GLOBALS.Character[nPers].item->setPattern(GLOBALS.Character[nPers].endtalkpattern);
GLOBALS.Unfreeze(); GLOBALS.Unfreeze();
CORO_INVOKE_0(GLOBALS.Character[nPers].item->WaitForEndPattern); CORO_INVOKE_0(GLOBALS.Character[nPers].item->waitForEndPattern);
} }
GLOBALS.Character[nPers].item->SetPattern(GLOBALS.Character[nPers].standpattern); GLOBALS.Character[nPers].item->setPattern(GLOBALS.Character[nPers].standpattern);
delete _ctx->text; delete _ctx->text;
} else { } else {
if ((GLOBALS.MCharacter[nPers].bInTexts && GLOBALS.MCharacter[nPers].numtexts == 0) || !GLOBALS.MCharacter[nPers].bInTexts) { if ((GLOBALS.MCharacter[nPers].bInTexts && GLOBALS.MCharacter[nPers].numtexts == 0) || !GLOBALS.MCharacter[nPers].bInTexts) {
// Try to run the custom function to close the speech // Try to run the custom function to close the speech
GLOBALS.MCharacter[nPers].curTalk = (GLOBALS.MCharacter[nPers].curTalk % 10) + GLOBALS.MCharacter[nPers].curgroup * 10; GLOBALS.MCharacter[nPers].curTalk = (GLOBALS.MCharacter[nPers].curTalk % 10) + GLOBALS.MCharacter[nPers].curgroup * 10;
_ctx->h = mpalQueryDoAction(31, GLOBALS.MCharacter[nPers].item->MpalCode(), GLOBALS.MCharacter[nPers].curTalk); _ctx->h = mpalQueryDoAction(31, GLOBALS.MCharacter[nPers].item->mpalCode(), GLOBALS.MCharacter[nPers].curTalk);
if (_ctx->h != CORO_INVALID_PID_VALUE) if (_ctx->h != CORO_INVALID_PID_VALUE)
CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE); CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE);
@ -1946,7 +1941,7 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg
} }
} else { } else {
if ((GLOBALS.dwTonyNumTexts == 0 && GLOBALS.bTonyInTexts) || !GLOBALS.bTonyInTexts) { if ((GLOBALS.dwTonyNumTexts == 0 && GLOBALS.bTonyInTexts) || !GLOBALS.bTonyInTexts) {
CORO_INVOKE_0(GLOBALS.Tony->EndTalk); CORO_INVOKE_0(GLOBALS.Tony->endTalk);
GLOBALS.dwTonyNumTexts = 0; GLOBALS.dwTonyNumTexts = 0;
GLOBALS.bTonyInTexts = false; GLOBALS.bTonyInTexts = false;
} }
@ -2201,11 +2196,11 @@ DECLARE_CUSTOM_FUNCTION(PlayStacchetto)(CORO_PARAM, uint32 nMusic, uint32 nFX, u
DECLARE_CUSTOM_FUNCTION(PlayItemSfx)(CORO_PARAM, uint32 nItem, uint32 nSFX, uint32, uint32) { DECLARE_CUSTOM_FUNCTION(PlayItemSfx)(CORO_PARAM, uint32 nItem, uint32 nSFX, uint32, uint32) {
if (nItem == 0) { if (nItem == 0) {
GLOBALS.Tony->PlaySfx(nSFX); GLOBALS.Tony->playSfx(nSFX);
} else { } else {
RMItem *item = GLOBALS.Loc->GetItemFromCode(nItem); RMItem *item = GLOBALS.Loc->getItemFromCode(nItem);
if (item) if (item)
item->PlaySfx(nSFX); item->playSfx(nSFX);
} }
} }
@ -2325,9 +2320,9 @@ DECLARE_CUSTOM_FUNCTION(DoCredits)(CORO_PARAM, uint32 nMsg, uint32 dwTime, uint3
_ctx->msg = new RMMessage(nMsg); _ctx->msg = new RMMessage(nMsg);
_ctx->hDisable = CoroScheduler.createEvent(true, false); _ctx->hDisable = CoroScheduler.createEvent(true, false);
_ctx->text = new RMTextDialog[_ctx->msg->NumPeriods()]; _ctx->text = new RMTextDialog[_ctx->msg->numPeriods()];
for (_ctx->i = 0; _ctx->i < _ctx->msg->NumPeriods(); _ctx->i++) { for (_ctx->i = 0; _ctx->i < _ctx->msg->numPeriods(); _ctx->i++) {
_ctx->text[_ctx->i].setInput(GLOBALS.Input); _ctx->text[_ctx->i].setInput(GLOBALS.Input);
// Alignment // Alignment

4
engines/tony/debugger.cpp
View file

@ -87,7 +87,7 @@ bool Debugger::Cmd_Scene(int argc, const char **argv) {
} }
int sceneNumber = strToInt(argv[1]); int sceneNumber = strToInt(argv[1]);
if (sceneNumber >= _vm->_theBoxes.GetLocBoxesCount()) { if (sceneNumber >= _vm->_theBoxes.getLocBoxesCount()) {
DebugPrintf("Invalid scene\n"); DebugPrintf("Invalid scene\n");
return true; return true;
} }
@ -99,7 +99,7 @@ bool Debugger::Cmd_Scene(int argc, const char **argv) {
} else { } else {
// Get the box areas for the scene, and choose one so as to have a default // Get the box areas for the scene, and choose one so as to have a default
// position for Tony that will be in the walkable areas // position for Tony that will be in the walkable areas
RMBoxLoc *box = _vm->_theBoxes.GetBoxes(sceneNumber); RMBoxLoc *box = _vm->_theBoxes.getBoxes(sceneNumber);
scenePos.Set(box->boxes[0].hotspot[0].hotx, box->boxes[0].hotspot[0].hoty); scenePos.Set(box->boxes[0].hotspot[0].hotx, box->boxes[0].hotspot[0].hoty);
} }

14
engines/tony/font.cpp
View file

@ -2180,7 +2180,7 @@ RMTextDialogScrolling::RMTextDialogScrolling() {
RMTextDialogScrolling::RMTextDialogScrolling(RMLocation *loc) { RMTextDialogScrolling::RMTextDialogScrolling(RMLocation *loc) {
curLoc = loc; curLoc = loc;
startScroll = loc->ScrollPosition(); startScroll = loc->scrollPosition();
} }
RMTextDialogScrolling::~RMTextDialogScrolling() { RMTextDialogScrolling::~RMTextDialogScrolling() {
@ -2196,7 +2196,7 @@ void RMTextDialogScrolling::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPri
_ctx->curDst = dst; _ctx->curDst = dst;
if (curLoc != NULL) if (curLoc != NULL)
dst -= curLoc->ScrollPosition() - startScroll; dst -= curLoc->scrollPosition() - startScroll;
CORO_INVOKE_2(RMTextDialog::draw, bigBuf, prim); CORO_INVOKE_2(RMTextDialog::draw, bigBuf, prim);
@ -2240,19 +2240,19 @@ void RMTextItemName::doFrame(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMLocation &
bigBuf.addPrim(new RMGfxPrimitive(this)); bigBuf.addPrim(new RMGfxPrimitive(this));
// Update the scrolling co-ordinates // Update the scrolling co-ordinates
_curscroll = loc.ScrollPosition(); _curscroll = loc.scrollPosition();
// Check if we are on the inventory // Check if we are on the inventory
if (inv.itemInFocus(_mpos)) if (inv.itemInFocus(_mpos))
_item = inv.whichItemIsIn(_mpos); _item = inv.whichItemIsIn(_mpos);
else else
_item = loc.WhichItemIsIn(_mpos); _item = loc.whichItemIsIn(_mpos);
itemName = ""; itemName = "";
// If there an item, get its name // If there an item, get its name
if (_item != NULL) if (_item != NULL)
_item->GetName(itemName); _item->getName(itemName);
// Write it // Write it
writeText(itemName, 1); writeText(itemName, 1);
@ -2262,7 +2262,7 @@ void RMTextItemName::doFrame(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMLocation &
if (_item == NULL) if (_item == NULL)
ptr.setSpecialPointer(RMPointer::PTR_NONE); ptr.setSpecialPointer(RMPointer::PTR_NONE);
else { else {
_ctx->hThread = mpalQueryDoAction(20, _item->MpalCode(), 0); _ctx->hThread = mpalQueryDoAction(20, _item->mpalCode(), 0);
if (_ctx->hThread == CORO_INVALID_PID_VALUE) if (_ctx->hThread == CORO_INVALID_PID_VALUE)
ptr.setSpecialPointer(RMPointer::PTR_NONE); ptr.setSpecialPointer(RMPointer::PTR_NONE);
else else
@ -2296,7 +2296,7 @@ RMPoint RMTextItemName::getHotspot() {
if (_item == NULL) if (_item == NULL)
return _mpos + _curscroll; return _mpos + _curscroll;
else else
return _item->Hotspot(); return _item->hotspot();
} }
RMItem *RMTextItemName::getSelectedItem() { RMItem *RMTextItemName::getSelectedItem() {

2
engines/tony/game.h
View file

@ -115,7 +115,7 @@ public:
void setSpecialPointer(POINTER ptr) { void setSpecialPointer(POINTER ptr) {
_nCurSpecialPointer = ptr; _nCurSpecialPointer = ptr;
if (_nCurSpecialPointer && _nCurSpecialPointer != PTR_CUSTOM) if (_nCurSpecialPointer && _nCurSpecialPointer != PTR_CUSTOM)
_specialPointer[ptr - 1]->SetPattern(1); _specialPointer[ptr - 1]->setPattern(1);
} }
POINTER getSpecialPointer(void) { POINTER getSpecialPointer(void) {
return (POINTER)_nCurSpecialPointer; return (POINTER)_nCurSpecialPointer;

68
engines/tony/gfxengine.cpp
View file

@ -126,7 +126,7 @@ void RMGfxEngine::openOptionScreen(CORO_PARAM, int type) {
if (type == 1 || type == 2) { if (type == 1 || type == 2) {
GLOBALS.bIdleExited = true; GLOBALS.bIdleExited = true;
} else { } else {
CORO_INVOKE_0(_tony.StopNoAction); CORO_INVOKE_0(_tony.stopNoAction);
GLOBALS.bIdleExited = false; GLOBALS.bIdleExited = false;
@ -170,7 +170,7 @@ void RMGfxEngine::doFrame(CORO_PARAM, bool bDrawLocation) {
_loc.doFrame(&_bigBuf); _loc.doFrame(&_bigBuf);
// Check the mouse input // Check the mouse input
if (_bInput && !_tony.InAction()) { if (_bInput && !_tony.inAction()) {
// If we are on the inventory, it is it who controls all input // If we are on the inventory, it is it who controls all input
if (_inv.haveFocus(_input.mousePos()) && !_inter.active()) { if (_inv.haveFocus(_input.mousePos()) && !_inter.active()) {
// Left Click // Left Click
@ -197,7 +197,7 @@ void RMGfxEngine::doFrame(CORO_PARAM, bool bDrawLocation) {
// ************* // *************
if (_input.mouseRightReleased()) { if (_input.mouseRightReleased()) {
if (_inv.rightRelease(_input.mousePos(), _curAction)) { if (_inv.rightRelease(_input.mousePos(), _curAction)) {
CORO_INVOKE_3(_tony.MoveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), _curAction); CORO_INVOKE_3(_tony.moveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), _curAction);
_curAction = TA_GOTO; _curAction = TA_GOTO;
_point.setAction(_curAction); _point.setAction(_curAction);
@ -207,7 +207,7 @@ void RMGfxEngine::doFrame(CORO_PARAM, bool bDrawLocation) {
// Options Menu // Options Menu
// ************ // ************
if (_bGUIOption) { if (_bGUIOption) {
if (!_tony.InAction() && _bInput) { if (!_tony.inAction() && _bInput) {
if ((_input.mouseLeftClicked() && _input.mousePos().x < 3 && _input.mousePos().y < 3)) { if ((_input.mouseLeftClicked() && _input.mousePos().x < 3 && _input.mousePos().y < 3)) {
CORO_INVOKE_1(openOptionScreen, 0); CORO_INVOKE_1(openOptionScreen, 0);
goto SKIPCLICKSINISTRO; goto SKIPCLICKSINISTRO;
@ -229,9 +229,9 @@ void RMGfxEngine::doFrame(CORO_PARAM, bool bDrawLocation) {
if (_input.mouseLeftClicked() && !_inter.active()) { if (_input.mouseLeftClicked() && !_inter.active()) {
if (_curAction != TA_COMBINE) if (_curAction != TA_COMBINE)
CORO_INVOKE_3(_tony.MoveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), _point.curAction()); CORO_INVOKE_3(_tony.moveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), _point.curAction());
else if (_itemName.getSelectedItem() != NULL) else if (_itemName.getSelectedItem() != NULL)
CORO_INVOKE_4(_tony.MoveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), TA_COMBINE, _curActionObj); CORO_INVOKE_4(_tony.moveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), TA_COMBINE, _curActionObj);
if (_curAction == TA_COMBINE) { if (_curAction == TA_COMBINE) {
_inv.endCombine(); _inv.endCombine();
@ -271,7 +271,7 @@ SKIPCLICKSINISTRO:
if (_bGUIInterface) { if (_bGUIInterface) {
if (_inter.released(_input.mousePos(), _curAction)) { if (_inter.released(_input.mousePos(), _curAction)) {
_point.setAction(_curAction); _point.setAction(_curAction);
CORO_INVOKE_3(_tony.MoveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), _curAction); CORO_INVOKE_3(_tony.moveAndDoAction, _itemName.getHotspot(), _itemName.getSelectedItem(), _curAction);
_curAction = TA_GOTO; _curAction = TA_GOTO;
_point.setAction(_curAction); _point.setAction(_curAction);
@ -288,23 +288,23 @@ SKIPCLICKSINISTRO:
// Interface & Inventory // Interface & Inventory
_inter.doFrame(_bigBuf, _input.mousePos()); _inter.doFrame(_bigBuf, _input.mousePos());
_inv.doFrame(_bigBuf, _point, _input.mousePos(), (!_tony.InAction() && !_inter.active() && _bGUIInventory)); _inv.doFrame(_bigBuf, _point, _input.mousePos(), (!_tony.inAction() && !_inter.active() && _bGUIInventory));
} }
// Animate Tony // Animate Tony
CORO_INVOKE_2(_tony.DoFrame, &_bigBuf, _nCurLoc); CORO_INVOKE_2(_tony.doFrame, &_bigBuf, _nCurLoc);
// Update screen scrolling to keep Tony in focus // Update screen scrolling to keep Tony in focus
if (_tony.MustUpdateScrolling() && _bLocationLoaded) { if (_tony.mustUpdateScrolling() && _bLocationLoaded) {
RMPoint showThis = _tony.Position(); RMPoint showThis = _tony.position();
showThis.y -= 60; showThis.y -= 60;
_loc.UpdateScrolling(showThis); _loc.updateScrolling(showThis);
} }
if (_bLocationLoaded) if (_bLocationLoaded)
_tony.SetScrollPosition(_loc.ScrollPosition()); _tony.setScrollPosition(_loc.scrollPosition());
if ((!_tony.InAction() && _bInput) || _bAlwaysDrawMouse) { if ((!_tony.inAction() && _bInput) || _bAlwaysDrawMouse) {
_point.setCoord(_input.mousePos()); _point.setCoord(_input.mousePos());
_point.doFrame(&_bigBuf); _point.doFrame(&_bigBuf);
} }
@ -362,17 +362,17 @@ void RMGfxEngine::itemIrq(uint32 dwItem, int nPattern, int nStatus) {
assert(GLOBALS.GfxEngine); assert(GLOBALS.GfxEngine);
if (GLOBALS.GfxEngine->_bLocationLoaded) { if (GLOBALS.GfxEngine->_bLocationLoaded) {
item = GLOBALS.GfxEngine->_loc.GetItemFromCode(dwItem); item = GLOBALS.GfxEngine->_loc.getItemFromCode(dwItem);
if (item != NULL) { if (item != NULL) {
if (nPattern != -1) { if (nPattern != -1) {
if (GLOBALS.bPatIrqFreeze) if (GLOBALS.bPatIrqFreeze)
mainFreeze(); mainFreeze();
item->SetPattern(nPattern, true); item->setPattern(nPattern, true);
if (GLOBALS.bPatIrqFreeze) if (GLOBALS.bPatIrqFreeze)
mainUnfreeze(); mainUnfreeze();
} }
if (nStatus != -1) if (nStatus != -1)
item->SetStatus(nStatus); item->setStatus(nStatus);
} }
} }
} }
@ -384,12 +384,12 @@ void RMGfxEngine::initForNewLocation(int nLoc, RMPoint ptTonyStart, RMPoint star
start.y = ptTonyStart.y - RM_SY / 2; start.y = ptTonyStart.y - RM_SY / 2;
} }
_loc.SetScrollPosition(start); _loc.setScrollPosition(start);
if (ptTonyStart.x == 0 && ptTonyStart.y == 0) { if (ptTonyStart.x == 0 && ptTonyStart.y == 0) {
} else { } else {
_tony.SetPosition(ptTonyStart, nLoc); _tony.setPosition(ptTonyStart, nLoc);
_tony.SetScrollPosition(start); _tony.setScrollPosition(start);
} }
_curAction = TA_GOTO; _curAction = TA_GOTO;
@ -415,7 +415,7 @@ uint32 RMGfxEngine::loadLocation(int nLoc, RMPoint ptTonyStart, RMPoint start) {
if (!res.IsValid()) if (!res.IsValid())
continue; continue;
_loc.Load(res); _loc.load(res);
initForNewLocation(nLoc, ptTonyStart, start); initForNewLocation(nLoc, ptTonyStart, start);
bLoaded = true; bLoaded = true;
break; break;
@ -455,7 +455,7 @@ void RMGfxEngine::unloadLocation(CORO_PARAM, bool bDoOnExit, uint32 *result) {
_bLocationLoaded = false; _bLocationLoaded = false;
_bigBuf.clearOT(); _bigBuf.clearOT();
_loc.Unload(); _loc.unload();
if (result != NULL) if (result != NULL)
*result = CORO_INVALID_PID_VALUE; *result = CORO_INVALID_PID_VALUE;
@ -503,7 +503,7 @@ void RMGfxEngine::init() {
// Initialise Tony // Initialise Tony
_tony.init(); _tony.init();
_tony.LinkToBoxes(&_vm->_theBoxes); _tony.linkToBoxes(&_vm->_theBoxes);
// Initialise the inventory and the interface // Initialise the inventory and the interface
_inv.init(); _inv.init();
@ -515,7 +515,7 @@ void RMGfxEngine::init() {
enableInput(); enableInput();
// Starting the game // Starting the game
_tony.ExecuteAction(20, 1, 0); _tony.executeAction(20, 1, 0);
} }
void RMGfxEngine::close(void) { void RMGfxEngine::close(void) {
@ -523,7 +523,7 @@ void RMGfxEngine::close(void) {
_inter.close(); _inter.close();
_inv.close(); _inv.close();
_tony.Close(); _tony.close();
_point.close(); _point.close();
_input.close(); _input.close();
} }
@ -579,7 +579,7 @@ void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Comm
uint size; uint size;
int i; int i;
char buf[4]; char buf[4];
RMPoint tp = _tony.Position(); RMPoint tp = _tony.position();
// Saving: MPAL variables, current location, and Tony inventory position // Saving: MPAL variables, current location, and Tony inventory position
@ -627,9 +627,9 @@ void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Comm
delete[] state; delete[] state;
// boxes // boxes
size = _vm->_theBoxes.GetSaveStateSize(); size = _vm->_theBoxes.getSaveStateSize();
state = new byte[size]; state = new byte[size];
_vm->_theBoxes.SaveState(state); _vm->_theBoxes.saveState(state);
f->writeUint32LE(size); f->writeUint32LE(size);
f->write(state, size); f->write(state, size);
delete[] state; delete[] state;
@ -638,7 +638,7 @@ void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Comm
bool bStat; bool bStat;
// Saves the state of the shepherdess and show yourself // Saves the state of the shepherdess and show yourself
bStat = _tony.GetPastorella(); bStat = _tony.getPastorella();
f->writeByte(bStat); f->writeByte(bStat);
bStat = _inter.getPalesati(); bStat = _inter.getPalesati();
f->writeByte(bStat); f->writeByte(bStat);
@ -765,7 +765,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
_ctx->size = _ctx->f->readUint32LE(); _ctx->size = _ctx->f->readUint32LE();
_ctx->state = new byte[_ctx->size]; _ctx->state = new byte[_ctx->size];
_ctx->f->read(_ctx->state, _ctx->size); _ctx->f->read(_ctx->state, _ctx->size);
_vm->_theBoxes.LoadState(_ctx->state); _vm->_theBoxes.loadState(_ctx->state);
delete[] _ctx->state; delete[] _ctx->state;
} }
@ -774,7 +774,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
bool bStat = false; bool bStat = false;
bStat = _ctx->f->readByte(); bStat = _ctx->f->readByte();
_tony.SetPastorella(bStat); _tony.setPastorella(bStat);
bStat = _ctx->f->readByte(); bStat = _ctx->f->readByte();
_inter.setPalesati(bStat); _inter.setPalesati(bStat);
@ -813,7 +813,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
CORO_INVOKE_2(unloadLocation, false, NULL); CORO_INVOKE_2(unloadLocation, false, NULL);
loadLocation(_ctx->loc, _ctx->tp, RMPoint(-1, -1)); loadLocation(_ctx->loc, _ctx->tp, RMPoint(-1, -1));
_tony.SetPattern(RMTony::PAT_STANDRIGHT); _tony.setPattern(RMTony::PAT_STANDRIGHT);
mainUnfreeze(); mainUnfreeze();
// On older versions, need to an enter action // On older versions, need to an enter action
@ -838,7 +838,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
void RMGfxEngine::pauseSound(bool bPause) { void RMGfxEngine::pauseSound(bool bPause) {
if (_bLocationLoaded) if (_bLocationLoaded)
_loc.PauseSound(bPause); _loc.pauseSound(bPause);
} }
void RMGfxEngine::initWipe(int type) { void RMGfxEngine::initWipe(int type) {
@ -861,7 +861,7 @@ void RMGfxEngine::waitWipeEnd(CORO_PARAM) {
} }
bool RMGfxEngine::canLoadSave() { bool RMGfxEngine::canLoadSave() {
return _bInput && !_tony.InAction() && !_vm->getIsDemo(); return _bInput && !_tony.inAction() && !_vm->getIsDemo();
} }
} // End of namespace Tony } // End of namespace Tony

60
engines/tony/inventory.cpp
View file

@ -100,7 +100,7 @@ void RMInventory::init(void) {
assert(res.IsValid()); assert(res.IsValid());
// Initialise the MPAL inventory item by reading it in. // Initialise the MPAL inventory item by reading it in.
_items[i].icon.SetInitCurPattern(false); _items[i].icon.setInitCurPattern(false);
ds.OpenBuffer(res); ds.OpenBuffer(res);
ds >> _items[i].icon; ds >> _items[i].icon;
ds.Close(); ds.Close();
@ -108,16 +108,16 @@ void RMInventory::init(void) {
// Puts in the default pattern 1 // Puts in the default pattern 1
_items[i].pointer = NULL; _items[i].pointer = NULL;
_items[i].status = 1; _items[i].status = 1;
_items[i].icon.SetPattern(1); _items[i].icon.setPattern(1);
_items[i].icon.doFrame(this, false); _items[i].icon.doFrame(this, false);
curres++; curres++;
if (i == 0 || i == 28 || i == 29) if (i == 0 || i == 28 || i == 29)
continue; continue;
_items[i].pointer = new RMGfxSourceBuffer8RLEByteAA[_items[i].icon.NumPattern()]; _items[i].pointer = new RMGfxSourceBuffer8RLEByteAA[_items[i].icon.numPattern()];
for (j = 0; j < _items[i].icon.NumPattern(); j++) { for (j = 0; j < _items[i].icon.numPattern(); j++) {
RMResRaw raw(curres); RMResRaw raw(curres);
assert(raw.IsValid()); assert(raw.IsValid());
@ -127,8 +127,8 @@ void RMInventory::init(void) {
} }
} }
_items[28].icon.SetPattern(1); _items[28].icon.setPattern(1);
_items[29].icon.SetPattern(1); _items[29].icon.setPattern(1);
// Download interface // Download interface
RMDataStream ds; RMDataStream ds;
@ -136,7 +136,7 @@ void RMInventory::init(void) {
assert(res.IsValid()); assert(res.IsValid());
ds.OpenBuffer(res); ds.OpenBuffer(res);
ds >> miniInterface; ds >> miniInterface;
miniInterface.SetPattern(1); miniInterface.setPattern(1);
ds.Close(); ds.Close();
// Create the text for hints on the mini interface // Create the text for hints on the mini interface
@ -264,7 +264,7 @@ void RMInventory::addItem(int code) {
g_system->lockMutex(_csModifyInterface); g_system->lockMutex(_csModifyInterface);
if (_curPos + 8 == _nInv) { if (_curPos + 8 == _nInv) {
// Break through the inventory! On the flashing pattern // Break through the inventory! On the flashing pattern
_items[28].icon.SetPattern(2); _items[28].icon.setPattern(2);
} }
_inv[_nInv++] = code - 10000; _inv[_nInv++] = code - 10000;
@ -281,7 +281,7 @@ void RMInventory::changeItemStatus(uint32 code, uint32 dwStatus) {
error("Specified object code is not valid"); error("Specified object code is not valid");
} else { } else {
g_system->lockMutex(_csModifyInterface); g_system->lockMutex(_csModifyInterface);
_items[code - 10000].icon.SetPattern(dwStatus); _items[code - 10000].icon.setPattern(dwStatus);
_items[code - 10000].status = dwStatus; _items[code - 10000].status = dwStatus;
prepare(); prepare();
@ -355,12 +355,12 @@ bool RMInventory::leftClick(const RMPoint &mpos, int &nCombineObj) {
if (_curPos + 8 >= _nInv) { if (_curPos + 8 >= _nInv) {
_bBlinkingRight = false; _bBlinkingRight = false;
_items[28].icon.SetPattern(1); _items[28].icon.setPattern(1);
} }
if (_curPos > 0) { if (_curPos > 0) {
_bBlinkingLeft = true; _bBlinkingLeft = true;
_items[29].icon.SetPattern(2); _items[29].icon.setPattern(2);
} }
prepare(); prepare();
@ -376,12 +376,12 @@ bool RMInventory::leftClick(const RMPoint &mpos, int &nCombineObj) {
if (_curPos == 0) { if (_curPos == 0) {
_bBlinkingLeft = false; _bBlinkingLeft = false;
_items[29].icon.SetPattern(1); _items[29].icon.setPattern(1);
} }
if (_curPos + 8 < _nInv) { if (_curPos + 8 < _nInv) {
_bBlinkingRight = true; _bBlinkingRight = true;
_items[28].icon.SetPattern(2); _items[28].icon.setPattern(2);
} }
prepare(); prepare();
@ -420,12 +420,12 @@ void RMInventory::rightClick(const RMPoint &mpos) {
if (_curPos + 8 <= _nInv) { if (_curPos + 8 <= _nInv) {
_bBlinkingRight = false; _bBlinkingRight = false;
_items[28].icon.SetPattern(1); _items[28].icon.setPattern(1);
} }
if (_curPos > 0) { if (_curPos > 0) {
_bBlinkingLeft = true; _bBlinkingLeft = true;
_items[29].icon.SetPattern(2); _items[29].icon.setPattern(2);
} }
prepare(); prepare();
@ -441,12 +441,12 @@ void RMInventory::rightClick(const RMPoint &mpos) {
if (_curPos == 0) { if (_curPos == 0) {
_bBlinkingLeft = false; _bBlinkingLeft = false;
_items[29].icon.SetPattern(1); _items[29].icon.setPattern(1);
} }
if (_curPos + 8 < _nInv) { if (_curPos + 8 < _nInv) {
_bBlinkingRight = true; _bBlinkingRight = true;
_items[28].icon.SetPattern(2); _items[28].icon.setPattern(2);
} }
prepare(); prepare();
@ -495,24 +495,24 @@ void RMInventory::doFrame(RMGfxTargetBuffer &bigBuf, RMPointer &ptr, RMPoint mpo
if ((_state == CLOSING || _state == OPENING || _state == OPENED) && checkPointInside(mpos)) { if ((_state == CLOSING || _state == OPENING || _state == OPENED) && checkPointInside(mpos)) {
if (mpos.x > RM_SX - 64) { if (mpos.x > RM_SX - 64) {
if (_curPos + 8 < _nInv && !_bBlinkingRight) { if (_curPos + 8 < _nInv && !_bBlinkingRight) {
_items[28].icon.SetPattern(3); _items[28].icon.setPattern(3);
_bBlinkingRight = true; _bBlinkingRight = true;
bNeedRedraw = true; bNeedRedraw = true;
} }
} else if (_bBlinkingRight) { } else if (_bBlinkingRight) {
_items[28].icon.SetPattern(2); _items[28].icon.setPattern(2);
_bBlinkingRight = false; _bBlinkingRight = false;
bNeedRedraw = true; bNeedRedraw = true;
} }
if (mpos.x < 64) { if (mpos.x < 64) {
if (_curPos > 0 && !_bBlinkingLeft) { if (_curPos > 0 && !_bBlinkingLeft) {
_items[29].icon.SetPattern(3); _items[29].icon.setPattern(3);
_bBlinkingLeft = true; _bBlinkingLeft = true;
bNeedRedraw = true; bNeedRedraw = true;
} }
} else if (_bBlinkingLeft) { } else if (_bBlinkingLeft) {
_items[29].icon.SetPattern(2); _items[29].icon.setPattern(2);
_bBlinkingLeft = false; _bBlinkingLeft = false;
bNeedRedraw = true; bNeedRedraw = true;
} }
@ -633,28 +633,28 @@ void RMInventory::doFrame(RMGfxTargetBuffer &bigBuf, RMPointer &ptr, RMPoint mpo
if (mpos.y > starty && mpos.y < starty + 45) { if (mpos.y > starty && mpos.y < starty + 45) {
if (mpos.x > startx && mpos.x < startx + 40) { if (mpos.x > startx && mpos.x < startx + 40) {
if (miniAction != 1) { if (miniAction != 1) {
miniInterface.SetPattern(2); miniInterface.setPattern(2);
miniAction = 1; miniAction = 1;
_vm->playUtilSFX(1); _vm->playUtilSFX(1);
} }
} else if (mpos.x >= startx + 40 && mpos.x < startx + 80) { } else if (mpos.x >= startx + 40 && mpos.x < startx + 80) {
if (miniAction != 2) { if (miniAction != 2) {
miniInterface.SetPattern(3); miniInterface.setPattern(3);
miniAction = 2; miniAction = 2;
_vm->playUtilSFX(1); _vm->playUtilSFX(1);
} }
} else if (mpos.x >= startx + 80 && mpos.x < startx + 108) { } else if (mpos.x >= startx + 80 && mpos.x < startx + 108) {
if (miniAction != 3) { if (miniAction != 3) {
miniInterface.SetPattern(4); miniInterface.setPattern(4);
miniAction = 3; miniAction = 3;
_vm->playUtilSFX(1); _vm->playUtilSFX(1);
} }
} else { } else {
miniInterface.SetPattern(1); miniInterface.setPattern(1);
miniAction = 0; miniAction = 0;
} }
} else { } else {
miniInterface.SetPattern(1); miniInterface.setPattern(1);
miniAction = 0; miniAction = 0;
} }
@ -729,19 +729,19 @@ int RMInventory::loadState(byte *state) {
if (i < _nItems) { if (i < _nItems) {
_items[i].status = x; _items[i].status = x;
_items[i].icon.SetPattern(x); _items[i].icon.setPattern(x);
} }
} }
_curPos = 0; _curPos = 0;
_bCombining = false; _bCombining = false;
_items[29].icon.SetPattern(1); _items[29].icon.setPattern(1);
if (_nInv > 8) if (_nInv > 8)
_items[28].icon.SetPattern(2); _items[28].icon.setPattern(2);
else else
_items[28].icon.SetPattern(1); _items[28].icon.setPattern(1);
prepare(); prepare();
drawOT(Common::nullContext); drawOT(Common::nullContext);

4
engines/tony/inventory.h
View file

@ -123,11 +123,11 @@ public:
// Add an item to the inventory // Add an item to the inventory
void addItem(int code); void addItem(int code);
RMInventory &operator+=(RMItem *item) { RMInventory &operator+=(RMItem *item) {
addItem(item->MpalCode()); addItem(item->mpalCode());
return *this; return *this;
} }
RMInventory &operator+=(RMItem &item) { RMInventory &operator+=(RMItem &item) {
addItem(item.MpalCode()); addItem(item.mpalCode());
return *this; return *this;
} }
RMInventory &operator+=(int code) { RMInventory &operator+=(int code) {

1075
engines/tony/loc.cpp
View file

File diff suppressed because it is too large Load diff

322
engines/tony/loc.h
View file

@ -59,7 +59,7 @@ typedef enum {
*/ */
class RMPalette { class RMPalette {
public: public:
byte m_data[1024]; byte _data[1024];
public: public:
friend RMDataStream &operator>>(RMDataStream &ds, RMPalette &pal); friend RMDataStream &operator>>(RMDataStream &ds, RMPalette &pal);
@ -71,9 +71,9 @@ public:
*/ */
class RMSfx { class RMSfx {
public: public:
RMString m_name; RMString _name;
FPSFX *m_fx; FPSFX *_fx;
bool m_bPlayingLoop; bool _bPlayingLoop;
public: public:
RMSfx(); RMSfx();
@ -81,12 +81,12 @@ public:
friend RMDataStream &operator>>(RMDataStream &ds, RMSfx &sfx); friend RMDataStream &operator>>(RMDataStream &ds, RMSfx &sfx);
void Play(bool bLoop = false); void play(bool bLoop = false);
void SetVolume(int vol); void setVolume(int vol);
void Pause(bool bPause); void pause(bool bPause);
void Stop(void); void stop(void);
void ReadFromStream(RMDataStream &ds, bool bLOX = false); void readFromStream(RMDataStream &ds, bool bLOX = false);
}; };
@ -108,38 +108,38 @@ public:
// Class slot // Class slot
class RMSlot { class RMSlot {
private: private:
RMPoint m_pos; // Child co-ordinates RMPoint _pos; // Child co-ordinates
public: public:
RMSlotType m_type; RMSlotType _type;
int m_data; int _data;
byte m_flag; byte _flag;
public: public:
friend RMDataStream &operator>>(RMDataStream &ds, RMSlot &slot); friend RMDataStream &operator>>(RMDataStream &ds, RMSlot &slot);
RMPoint Pos() { RMPoint pos() {
return m_pos; return _pos;
} }
void ReadFromStream(RMDataStream &ds, bool bLOX = false); void readFromStream(RMDataStream &ds, bool bLOX = false);
}; };
public: public:
RMString m_name; RMString _name;
private: private:
int m_speed; int _speed;
RMPoint m_pos; // Parent coordinates RMPoint _pos; // Parent coordinates
RMPoint m_curPos; // Parent + child coordinates RMPoint _curPos; // Parent + child coordinates
int m_bLoop; int _bLoop;
int m_nSlots; int _nSlots;
int m_nCurSlot; int _nCurSlot;
int m_nCurSprite; int _nCurSprite;
RMSlot *m_slots; RMSlot *_slots;
uint32 m_nStartTime; uint32 _nStartTime;
public: public:
RMPattern(); RMPattern();
@ -148,24 +148,24 @@ public:
friend RMDataStream &operator>>(RMDataStream &ds, RMPattern &pat); friend RMDataStream &operator>>(RMDataStream &ds, RMPattern &pat);
// A warning that the pattern now and the current // A warning that the pattern now and the current
int Init(RMSfx *sfx, bool bPlayP0 = false, byte *bFlag = NULL); int init(RMSfx *sfx, bool bPlayP0 = false, byte *bFlag = NULL);
// Update the pattern, checking to see if it's time to change slot and executing // Update the pattern, checking to see if it's time to change slot and executing
// any associated commands // any associated commands
int Update(uint32 hEndPattern, byte &bFlag, RMSfx *sfx); int update(uint32 hEndPattern, byte &bFlag, RMSfx *sfx);
// Stop a sound effect // Stop a sound effect
void StopSfx(RMSfx *sfx); void stopSfx(RMSfx *sfx);
// Reads the position of the pattern // Reads the position of the pattern
RMPoint Pos() { RMPoint pos() {
return m_curPos; return _curPos;
} }
void ReadFromStream(RMDataStream &ds, bool bLOX = false); void readFromStream(RMDataStream &ds, bool bLOX = false);
private: private:
void UpdateCoord(void); void updateCoord(void);
}; };
@ -174,24 +174,24 @@ private:
*/ */
class RMSprite : public RMGfxTask { class RMSprite : public RMGfxTask {
public: public:
RMString m_name; RMString _name;
RMRect m_rcBox; RMRect _rcBox;
protected: protected:
RMGfxSourceBuffer *m_buf; RMGfxSourceBuffer *_buf;
public: public:
RMSprite(); RMSprite();
virtual ~RMSprite(); virtual ~RMSprite();
void Init(RMGfxSourceBuffer *buf); void init(RMGfxSourceBuffer *buf);
friend RMDataStream &operator>>(RMDataStream &ds, RMSprite &sprite); friend RMDataStream &operator>>(RMDataStream &ds, RMSprite &sprite);
virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
void SetPalette(byte *lpBuf); void setPalette(byte *lpBuf);
void GetSizeFromStream(RMDataStream &ds, int *dimx, int *dimy); void getSizeFromStream(RMDataStream &ds, int *dimx, int *dimy);
void LOXGetSizeFromStream(RMDataStream &ds, int *dimx, int *dimy); void LOXGetSizeFromStream(RMDataStream &ds, int *dimx, int *dimy);
void ReadFromStream(RMDataStream &ds, bool bLOX = false); void readFromStream(RMDataStream &ds, bool bLOX = false);
}; };
@ -200,42 +200,42 @@ public:
*/ */
class RMItem : public RMGfxTask { class RMItem : public RMGfxTask {
public: public:
RMString m_name; RMString _name;
protected: protected:
int m_z; int _z;
RMPoint m_pos; // Coordinate nonno RMPoint _pos; // Coordinate nonno
RMColorMode m_cm; RMColorMode _cm;
RMPoint m_curScroll; RMPoint _curScroll;
byte m_FX; byte _FX;
byte m_FXparm; byte _FXparm;
virtual int GetCurPattern() { virtual int getCurPattern() {
return m_nCurPattern; return _nCurPattern;
} }
private: private:
int m_nCurPattern; int _nCurPattern;
int m_mpalCode; int _mpalCode;
RMPoint m_hot; RMPoint _hot;
RMRect m_rcBox; RMRect _rcBox;
int m_nSprites, m_nSfx, m_nPatterns; int _nSprites, _nSfx, _nPatterns;
byte m_bPal; byte _bPal;
RMPalette m_pal; RMPalette _pal;
RMSprite *m_sprites; RMSprite *_sprites;
RMSfx *m_sfx; RMSfx *_sfx;
RMPattern *m_patterns; RMPattern *_patterns;
byte m_bCurFlag; byte _bCurFlag;
int m_nCurSprite; int _nCurSprite;
bool m_bIsActive; bool _bIsActive;
uint32 m_hEndPattern; uint32 _hEndPattern;
bool m_bInitCurPattern; bool _bInitCurPattern;
public: public:
RMPoint CalculatePos(void); RMPoint calculatePos(void);
public: public:
RMItem(); RMItem();
@ -248,7 +248,7 @@ public:
bool doFrame(RMGfxTargetBuffer *bigBuf, bool bAddToList = true); bool doFrame(RMGfxTargetBuffer *bigBuf, bool bAddToList = true);
// Sets the current scrolling position // Sets the current scrolling position
void SetScrollPosition(const RMPoint &scroll); void setScrollPosition(const RMPoint &scroll);
// Overloading of check whether to remove from active list // Overloading of check whether to remove from active list
virtual void removeThis(CORO_PARAM, bool &result); virtual void removeThis(CORO_PARAM, bool &result);
@ -258,54 +258,54 @@ public:
// Overloaded priority: it's based on Z ordering // Overloaded priority: it's based on Z ordering
virtual int priority() { virtual int priority() {
return m_z; return _z;
} }
// Pattern number // Pattern number
int NumPattern() { int numPattern() {
return m_nPatterns; return _nPatterns;
} }
// Set anew animation pattern, changing abruptly from the current // Set anew animation pattern, changing abruptly from the current
virtual void SetPattern(int nPattern, bool bPlayP0 = false); virtual void setPattern(int nPattern, bool bPlayP0 = false);
// Set a new status // Set a new status
void SetStatus(int nStatus); void setStatus(int nStatus);
bool IsIn(const RMPoint &pt, int *size = NULL); bool isIn(const RMPoint &pt, int *size = NULL);
RMPoint Hotspot() { RMPoint hotspot() {
return m_hot; return _hot;
} }
bool GetName(RMString &name); bool getName(RMString &name);
int MpalCode() { int mpalCode() {
return m_mpalCode; return _mpalCode;
} }
// Unload // Unload
void Unload(void); void unload(void);
// Wait for the end of the current pattern // Wait for the end of the current pattern
void WaitForEndPattern(CORO_PARAM, uint32 hCustomSkip = CORO_INVALID_PID_VALUE); void waitForEndPattern(CORO_PARAM, uint32 hCustomSkip = CORO_INVALID_PID_VALUE);
// Sets a new hotspot fro the object // Sets a new hotspot fro the object
void ChangeHotspot(const RMPoint &pt); void changeHotspot(const RMPoint &pt);
void SetInitCurPattern(bool status) { void setInitCurPattern(bool status) {
m_bInitCurPattern = status; _bInitCurPattern = status;
} }
void PlaySfx(int nSfx); void playSfx(int nSfx);
void ReadFromStream(RMDataStream &ds, bool bLOX = false); void readFromStream(RMDataStream &ds, bool bLOX = false);
void PauseSound(bool bPause); void pauseSound(bool bPause);
protected: protected:
// Create a primitive that has as it's task this item // Create a primitive that has as it's task this item
virtual RMGfxPrimitive *NewItemPrimitive(); virtual RMGfxPrimitive *newItemPrimitive();
// Allocate memory for the sprites // Allocate memory for the sprites
virtual RMGfxSourceBuffer *NewItemSpriteBuffer(int dimx, int dimy, bool bPreRLE); virtual RMGfxSourceBuffer *newItemSpriteBuffer(int dimx, int dimy, bool bPreRLE);
}; };
@ -330,7 +330,7 @@ public:
bool bReversed; bool bReversed;
private: private:
void ReadFromStream(RMDataStream &ds); void readFromStream(RMDataStream &ds);
public: public:
friend RMDataStream &operator>>(RMDataStream &ds, RMBox &box); friend RMDataStream &operator>>(RMDataStream &ds, RMBox &box);
@ -343,47 +343,47 @@ public:
RMBox *boxes; RMBox *boxes;
private: private:
void ReadFromStream(RMDataStream &ds); void readFromStream(RMDataStream &ds);
public: public:
RMBoxLoc(); RMBoxLoc();
virtual ~RMBoxLoc(); virtual ~RMBoxLoc();
friend RMDataStream &operator >>(RMDataStream &ds, RMBoxLoc &bl); friend RMDataStream &operator >>(RMDataStream &ds, RMBoxLoc &bl);
void RecalcAllAdj(void); void recalcAllAdj(void);
}; };
#define GAME_BOXES_SIZE 200 #define GAME_BOXES_SIZE 200
class RMGameBoxes { class RMGameBoxes {
protected: protected:
RMBoxLoc *m_allBoxes[GAME_BOXES_SIZE]; RMBoxLoc *_allBoxes[GAME_BOXES_SIZE];
int m_nLocBoxes; int _nLocBoxes;
public: public:
RMGameBoxes(); RMGameBoxes();
~RMGameBoxes(); ~RMGameBoxes();
void Init(void); void init(void);
void Close(void); void close(void);
// Get binding boxes for a given location // Get binding boxes for a given location
RMBoxLoc *GetBoxes(int nLoc); RMBoxLoc *getBoxes(int nLoc);
int GetLocBoxesCount() const { return m_nLocBoxes; } int getLocBoxesCount() const { return _nLocBoxes; }
// Return the box which contains a given point // Return the box which contains a given point
int WhichBox(int nLoc, const RMPoint &pt); int whichBox(int nLoc, const RMPoint &pt);
// Check whether a point is inside a given box // Check whether a point is inside a given box
bool IsInBox(int nLoc, int nBox, const RMPoint &pt); bool isInBox(int nLoc, int nBox, const RMPoint &pt);
// Change the status of a box // Change the status of a box
void ChangeBoxStatus(int nLoc, int nBox, int status); void changeBoxStatus(int nLoc, int nBox, int status);
// Save state handling // Save state handling
int GetSaveStateSize(void); int getSaveStateSize(void);
void SaveState(byte *buf); void saveState(byte *buf);
void LoadState(byte *buf); void loadState(byte *buf);
}; };
class RMCharacter : protected RMItem { class RMCharacter : protected RMItem {
@ -426,21 +426,21 @@ private:
bool bMovingWithoutMinpath; bool bMovingWithoutMinpath;
RMGameBoxes *theBoxes; RMGameBoxes *theBoxes;
RMPoint m_fixedScroll; RMPoint _fixedScroll;
private: private:
int InWhichBox(const RMPoint &pt); int inWhichBox(const RMPoint &pt);
short FindPath(short source, short destination); short findPath(short source, short destination);
RMPoint Searching(char UP, char DOWN, char RIGHT, char LEFT, RMPoint punto); RMPoint searching(char UP, char DOWN, char RIGHT, char LEFT, RMPoint punto);
RMPoint NearestPoint(const RMPoint &punto); RMPoint nearestPoint(const RMPoint &punto);
void GoTo(CORO_PARAM, RMPoint destcoord, bool bReversed = false); void goTo(CORO_PARAM, RMPoint destcoord, bool bReversed = false);
short ScanLine(const RMPoint &punto); short scanLine(const RMPoint &punto);
RMPoint InvScanLine(const RMPoint &punto); RMPoint invScanLine(const RMPoint &punto);
RMPoint NearestHotSpot(int sourcebox, int destbox); RMPoint nearestHotSpot(int sourcebox, int destbox);
void NewBoxEntered(int nBox); void newBoxEntered(int nBox);
protected: protected:
bool bMoving; bool bMoving;
@ -452,42 +452,42 @@ public:
RMCharacter(); RMCharacter();
virtual ~RMCharacter(); virtual ~RMCharacter();
void LinkToBoxes(RMGameBoxes *theBoxes); void linkToBoxes(RMGameBoxes *theBoxes);
virtual void removeThis(CORO_PARAM, bool &result); virtual void removeThis(CORO_PARAM, bool &result);
// Update the position of a character // Update the position of a character
void DoFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int loc); void doFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int loc);
// Overloaded draw // Overloaded draw
virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
// TRUE if you just stopped // TRUE if you just stopped
bool EndOfPath() { bool endOfPath() {
return bEndOfPath; return bEndOfPath;
} }
// Change the pattern of a character to STOP // Change the pattern of a character to STOP
virtual void Stop(CORO_PARAM); virtual void stop(CORO_PARAM);
// Check if the character is moving // Check if the character is moving
bool IsMoving() { bool isMoving() {
return bMoving; return bMoving;
} }
// Move the character to a certain position // Move the character to a certain position
void Move(CORO_PARAM, RMPoint pt, bool *result = NULL); void move(CORO_PARAM, RMPoint pt, bool *result = NULL);
// Place the character in a certain position WITHOUT moving // Place the character in a certain position WITHOUT moving
void SetPosition(const RMPoint &pt, int newloc = -1); void setPosition(const RMPoint &pt, int newloc = -1);
// Wait for the end of movement // Wait for the end of movement
void WaitForEndMovement(CORO_PARAM); void waitForEndMovement(CORO_PARAM);
void SetFixedScroll(const RMPoint &fix) { void setFixedScroll(const RMPoint &fix) {
m_fixedScroll = fix; _fixedScroll = fix;
} }
void SetSpeed(int speed) { void setSpeed(int speed) {
curSpeed = speed; curSpeed = speed;
} }
}; };
@ -495,26 +495,26 @@ public:
class RMWipe : public RMGfxTask { class RMWipe : public RMGfxTask {
private: private:
bool m_bFading; bool _bFading;
bool m_bEndFade; bool _bEndFade;
bool m_bUnregister; bool _bUnregister;
uint32 m_hUnregistered; uint32 _hUnregistered;
int m_nFadeStep; int _nFadeStep;
uint32 m_hEndOfFade; uint32 _hEndOfFade;
bool m_bMustRegister; bool _bMustRegister;
RMItem m_wip0r; RMItem _wip0r;
public: public:
RMWipe(); RMWipe();
virtual ~RMWipe(); virtual ~RMWipe();
void DoFrame(RMGfxTargetBuffer &bigBuf); void doFrame(RMGfxTargetBuffer &bigBuf);
virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
void InitFade(int type); void initFade(int type);
void CloseFade(void); void closeFade(void);
void WaitForFadeEnd(CORO_PARAM); void waitForFadeEnd(CORO_PARAM);
virtual void Unregister(void); virtual void Unregister(void);
virtual void removeThis(CORO_PARAM, bool &result); virtual void removeThis(CORO_PARAM, bool &result);
@ -527,17 +527,17 @@ public:
*/ */
class RMLocation : public RMGfxTaskSetPrior { class RMLocation : public RMGfxTaskSetPrior {
public: public:
RMString m_name; // Name RMString _name; // Name
private: private:
RMColorMode m_cmode; // Color mode RMColorMode _cmode; // Color mode
RMGfxSourceBuffer *m_buf; // Location picture RMGfxSourceBuffer *_buf; // Location picture
int m_nItems; // Number of objects int _nItems; // Number of objects
RMItem *m_items; // Objects RMItem *_items; // Objects
RMPoint m_curScroll; // Current scroll position RMPoint _curScroll; // Current scroll position
RMPoint m_fixedScroll; RMPoint _fixedScroll;
public: public:
// @@@@@@@@@@@@@@@@@@@@@@@ // @@@@@@@@@@@@@@@@@@@@@@@
@ -556,14 +556,14 @@ public:
virtual ~RMLocation(); virtual ~RMLocation();
// Load variations // Load variations
bool Load(const char *lpszFileName); bool load(const char *lpszFileName);
bool Load(Common::File &file); bool load(Common::File &file);
bool Load(const byte *buf); bool load(const byte *buf);
bool Load(RMDataStream &ds); bool load(RMDataStream &ds);
bool LoadLOX(RMDataStream &ds); bool loadLOX(RMDataStream &ds);
// Unload // Unload
void Unload(void); void unload(void);
// Overloaded draw // Overloaded draw
virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@ -572,27 +572,27 @@ public:
void doFrame(RMGfxTargetBuffer *bigBuf); void doFrame(RMGfxTargetBuffer *bigBuf);
// Return the item at a given point // Return the item at a given point
RMItem *WhichItemIsIn(const RMPoint &pt); RMItem *whichItemIsIn(const RMPoint &pt);
// Return the item based on it's MPAL code // Return the item based on it's MPAL code
RMItem *GetItemFromCode(uint32 dwCode); RMItem *getItemFromCode(uint32 dwCode);
// Set the current scroll position // Set the current scroll position
void SetScrollPosition(const RMPoint &scroll); void setScrollPosition(const RMPoint &scroll);
// Sets an additinal offset for scrolling // Sets an additinal offset for scrolling
void SetFixedScroll(const RMPoint &scroll); void setFixedScroll(const RMPoint &scroll);
// Update the scrolling coordinates to display the specified point // Update the scrolling coordinates to display the specified point
void UpdateScrolling(const RMPoint &ptShowThis); void updateScrolling(const RMPoint &ptShowThis);
// Read the current scroll position // Read the current scroll position
RMPoint ScrollPosition() { RMPoint scrollPosition() {
return m_curScroll; return _curScroll;
} }
// Pause sound // Pause sound
void PauseSound(bool bPause); void pauseSound(bool bPause);
}; };
@ -606,21 +606,21 @@ private:
int nPeriods; int nPeriods;
private: private:
void ParseMessage(void); void parseMessage(void);
public: public:
RMMessage(); RMMessage();
RMMessage(uint32 dwId); RMMessage(uint32 dwId);
virtual ~RMMessage(); virtual ~RMMessage();
void Load(uint32 dwId); void load(uint32 dwId);
bool IsValid() { bool isValid() {
return lpMessage != NULL; return lpMessage != NULL;
} }
int NumPeriods() { int numPeriods() {
return nPeriods; return nPeriods;
} }
char *Period(int num) { char *period(int num) {
return lpPeriods[num]; return lpPeriods[num];
} }
char *operator[](int num) { char *operator[](int num) {

4
engines/tony/tony.cpp
View file

@ -137,7 +137,7 @@ Common::ErrorCode TonyEngine::init() {
return Common::kReadingFailed; return Common::kReadingFailed;
// Initialise the boxes // Initialise the boxes
_theBoxes.Init(); _theBoxes.init();
// Link to the custom graphics engine // Link to the custom graphics engine
_theEngine.initCustomDll(); _theEngine.initCustomDll();
@ -568,7 +568,7 @@ void TonyEngine::play(void) {
void TonyEngine::close(void) { void TonyEngine::close(void) {
closeMusic(); closeMusic();
CoroScheduler.closeEvent(_hEndOfFrame); CoroScheduler.closeEvent(_hEndOfFrame);
_theBoxes.Close(); _theBoxes.close();
_theEngine.close(); _theEngine.close();
_window.close(); _window.close();
delete[] _curThumbnail; delete[] _curThumbnail;

677
engines/tony/tonychar.cpp
View file

File diff suppressed because it is too large Load diff

112
engines/tony/tonychar.h
View file

@ -81,36 +81,36 @@ public:
}; };
private: private:
bool m_bShow; bool _bShow;
bool m_bShowOmbra; bool _bShowOmbra;
bool m_bCorpoDavanti; bool _bCorpoDavanti;
RMGfxSourceBuffer8AB m_ombra; RMGfxSourceBuffer8AB _ombra;
bool m_bActionPending; bool _bActionPending;
RMItem *m_ActionItem; RMItem *_ActionItem;
int m_Action; int _Action;
int m_ActionParm; int _ActionParm;
static bool m_bAction; static bool _bAction;
bool m_bPastorella; bool _bPastorella;
bool m_bIsStaticTalk; bool _bIsStaticTalk;
bool m_bIsTalking; bool _bIsTalking;
int m_nPatB4Talking; int _nPatB4Talking;
TALKTYPE m_nTalkType; TALKTYPE _nTalkType;
DIRECTION m_TalkDirection; DIRECTION _TalkDirection;
RMPoint m_nBodyOffset; RMPoint _nBodyOffset;
int m_nTimeLastStep; int _nTimeLastStep;
RMItem m_body; RMItem _body;
uint32 hActionThread; uint32 hActionThread;
protected: protected:
// Overload of the allocation allocation of sprites // Overload of the allocation allocation of sprites
virtual RMGfxSourceBuffer *NewItemSpriteBuffer(int dimx, int dimy, bool bPreRLE); virtual RMGfxSourceBuffer *newItemSpriteBuffer(int dimx, int dimy, bool bPreRLE);
// Watch thread which waits for the end of an action // Watch thread which waits for the end of an action
static void WaitEndOfAction(CORO_PARAM, const void *param); static void waitEndOfAction(CORO_PARAM, const void *param);
public: public:
enum PATTERNS { enum PATTERNS {
@ -365,87 +365,87 @@ public:
void init(void); void init(void);
// Free all memory // Free all memory
void Close(void); void close(void);
// Tony makes a frame, updating the movement, etc. // Tony makes a frame, updating the movement, etc.
void DoFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int curLoc); void doFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int curLoc);
// Draw method, which controls chararacter display // Draw method, which controls chararacter display
virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
// Show or hide // Show or hide
void Show(void); void show(void);
void Hide(bool bShowOmbra = false); void hide(bool bShowOmbra = false);
// Move and make an action, if necessary // Move and make an action, if necessary
void MoveAndDoAction(CORO_PARAM, RMPoint dst, RMItem *item, int nAction, int nActionParm = 0); void moveAndDoAction(CORO_PARAM, RMPoint dst, RMItem *item, int nAction, int nActionParm = 0);
// Tony stops (on the right side with respect to any subject) // Tony stops (on the right side with respect to any subject)
virtual void Stop(CORO_PARAM); virtual void stop(CORO_PARAM);
void StopNoAction(CORO_PARAM); void stopNoAction(CORO_PARAM);
// Set a pattern // Set a pattern
void SetPattern(int npatt, bool bPlayP0 = false); void setPattern(int npatt, bool bPlayP0 = false);
// Reads the current pattern // Reads the current pattern
int GetCurPattern(); int getCurPattern();
// Waits until the end of a pattern // Waits until the end of a pattern
void WaitForEndPattern(CORO_PARAM, uint32 hCustomSkip = CORO_INVALID_PID_VALUE) { void waitForEndPattern(CORO_PARAM, uint32 hCustomSkip = CORO_INVALID_PID_VALUE) {
RMCharacter::WaitForEndPattern(coroParam, hCustomSkip); RMCharacter::waitForEndPattern(coroParam, hCustomSkip);
} }
// Check if currently in an action // Check if currently in an action
bool InAction() { bool inAction() {
return (m_bActionPending && m_Action != 0) | m_bAction; return (_bActionPending && _Action != 0) | _bAction;
} }
// Check if there needs to be an update for scrolling movement // Check if there needs to be an update for scrolling movement
bool MustUpdateScrolling() { bool mustUpdateScrolling() {
return ((!InAction()) || (IsMoving())); return ((!inAction()) || (isMoving()));
} }
// Returns Tony's position // Returns Tony's position
RMPoint Position() { RMPoint position() {
return m_pos; return _pos;
} }
// Set the scrolling position // Set the scrolling position
void SetScrollPosition(const RMPoint &pt) { void setScrollPosition(const RMPoint &pt) {
RMCharacter::SetScrollPosition(pt); RMCharacter::setScrollPosition(pt);
} }
// Set the take animation // Set the take animation
void Take(int nWhere, int nPart); void take(int nWhere, int nPart);
void Put(int nWhere, int nPart); void put(int nWhere, int nPart);
// Start or End Talk // Start or End Talk
bool StartTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &bodyStartPat, bool startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &bodyStartPat,
int &headLoopPat, int &bodyLoopPat); int &headLoopPat, int &bodyLoopPat);
void StartTalk(CORO_PARAM, TALKTYPE nTalkType); void startTalk(CORO_PARAM, TALKTYPE nTalkType);
bool EndTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPat, int &finalPat, bool &bStatic); bool endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPat, int &finalPat, bool &bStatic);
void EndTalk(CORO_PARAM); void endTalk(CORO_PARAM);
// Start or End Static // Start or End Static
void StartStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat, void startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat,
int &bodyStartPat, int &bodyLoopPat); int &bodyStartPat, int &bodyLoopPat);
void StartStatic(CORO_PARAM, TALKTYPE nTalkType); void startStatic(CORO_PARAM, TALKTYPE nTalkType);
void EndStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, int &headEndPat); void endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, int &headEndPat);
void EndStatic(CORO_PARAM, TALKTYPE nTalkType); void endStatic(CORO_PARAM, TALKTYPE nTalkType);
// Tony disguises himself! // Tony disguises himself!
void SetPastorella(bool bIsPast) { void setPastorella(bool bIsPast) {
m_bPastorella = bIsPast; _bPastorella = bIsPast;
} }
int GetPastorella(void) { int getPastorella(void) {
return m_bPastorella; return _bPastorella;
} }
// Perform an action // Perform an action
void ExecuteAction(int nAction, int nActionItem, int nParm); void executeAction(int nAction, int nActionItem, int nParm);
void PlaySfx(int nSfx) { void playSfx(int nSfx) {
RMItem::PlaySfx(nSfx); RMItem::playSfx(nSfx);
} }
}; };