From 638b06660141677421aa7a342a606b0e4e593389 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sat, 16 Jun 2012 11:09:08 +0200 Subject: TONY: Translate some Italian terms, rename enums --- engines/tony/custom.cpp | 420 +++++++++++++++++++++++----------------------- engines/tony/font.h | 10 +- engines/tony/game.cpp | 2 +- engines/tony/game.h | 26 +-- engines/tony/globals.cpp | 4 +- engines/tony/globals.h | 20 +-- engines/tony/inventory.h | 4 +- engines/tony/loc.h | 10 +- engines/tony/sound.h | 2 +- engines/tony/tony.h | 4 +- engines/tony/tonychar.cpp | 12 +- engines/tony/tonychar.h | 24 +-- 12 files changed, 267 insertions(+), 271 deletions(-) (limited to 'engines/tony') diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index eea134e442..9acdc84932 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -92,7 +92,7 @@ const MusicFileEntry musicFiles[] = { }; -const char *staccFileNames[] = { +const char *jingleFileNames[] = { "S00.ADP", "S01.ADP", "S02.ADP", "S03.ADP", "S04.ADP", "S05.ADP", @@ -499,8 +499,8 @@ DECLARE_CUSTOM_FUNCTION(SendFullscreenMessage)(CORO_PARAM, uint32 nMsg, uint32 n CORO_END_CODE; } -DECLARE_CUSTOM_FUNCTION(NoOcchioDiBue)(CORO_PARAM, uint32, uint32, uint32, uint32) { - GLOBALS._bNoOcchioDiBue = true; +DECLARE_CUSTOM_FUNCTION(NoBullsEye)(CORO_PARAM, uint32, uint32, uint32, uint32) { + GLOBALS._bNoBullsEye = true; } DECLARE_CUSTOM_FUNCTION(CloseLocation)(CORO_PARAM, uint32, uint32, uint32, uint32) { @@ -509,7 +509,7 @@ DECLARE_CUSTOM_FUNCTION(CloseLocation)(CORO_PARAM, uint32, uint32, uint32, uint3 CORO_BEGIN_CODE(_ctx); - if (!GLOBALS._bNoOcchioDiBue) { + if (!GLOBALS._bNoBullsEye) { GLOBALS.InitWipe(1); CORO_INVOKE_0(GLOBALS.WaitWipeEnd); } @@ -531,7 +531,7 @@ DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint CORO_BEGIN_CODE(_ctx); - if (!GLOBALS._bNoOcchioDiBue) { + if (!GLOBALS._bNoBullsEye) { GLOBALS.InitWipe(1); CORO_INVOKE_0(GLOBALS.WaitWipeEnd); } @@ -555,7 +555,7 @@ DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint _vm->playMusic(4, tappetiFile[GLOBALS._lastTappeto], 0, true, 2000); } - if (!GLOBALS._bNoOcchioDiBue) { + if (!GLOBALS._bNoBullsEye) { GLOBALS.InitWipe(2); } @@ -564,12 +564,12 @@ DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint _ctx->h = mpalQueryDoAction(0, nLoc, 0); - if (!GLOBALS._bNoOcchioDiBue) { + if (!GLOBALS._bNoBullsEye) { CORO_INVOKE_0(GLOBALS.WaitWipeEnd); GLOBALS.CloseWipe(); } - GLOBALS._bNoOcchioDiBue = false; + GLOBALS._bNoBullsEye = false; // On Enter? if (_ctx->h != CORO_INVALID_PID_VALUE) @@ -1372,7 +1372,7 @@ DECLARE_CUSTOM_FUNCTION(AbortGame)(CORO_PARAM, uint32, uint32, uint32, uint32) { _vm->abortGame(); } -DECLARE_CUSTOM_FUNCTION(TremaSchermo)(CORO_PARAM, uint32 nScosse, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(ShakeScreen)(CORO_PARAM, uint32 nScosse, uint32, uint32, uint32) { CORO_BEGIN_CONTEXT; uint32 i; uint32 curTime; @@ -2131,7 +2131,7 @@ void ThreadFadeOutMusic(CORO_PARAM, const void *nMusic) { if (!GLOBALS._bFadeOutStop) _vm->setMusicVolume(nChannel, 0); - // If there is a stacchetto, stop all + // If a jingle is played, stop it if (nChannel == 2) _vm->stopMusic(2); @@ -2142,55 +2142,51 @@ void ThreadFadeOutMusic(CORO_PARAM, const void *nMusic) { CORO_END_CODE; } -DECLARE_CUSTOM_FUNCTION(FadeInSonoriz)(CORO_PARAM, uint32, uint32, uint32, uint32) { - CoroScheduler.createProcess(ThreadFadeInMusic, &GLOBALS._curSonoriz, sizeof(int)); +DECLARE_CUSTOM_FUNCTION(FadeInSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) { + CoroScheduler.createProcess(ThreadFadeInMusic, &GLOBALS._curSoundEffect, sizeof(int)); } -DECLARE_CUSTOM_FUNCTION(FadeOutSonoriz)(CORO_PARAM, uint32, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(FadeOutSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) { GLOBALS._bFadeOutStop = false; - CoroScheduler.createProcess(ThreadFadeOutMusic, &GLOBALS._curSonoriz, sizeof(int)); + CoroScheduler.createProcess(ThreadFadeOutMusic, &GLOBALS._curSoundEffect, sizeof(int)); } -DECLARE_CUSTOM_FUNCTION(FadeOutStacchetto)(CORO_PARAM, uint32, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(FadeOutJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) { GLOBALS._bFadeOutStop = false; int channel = 2; CoroScheduler.createProcess(ThreadFadeOutMusic, &channel, sizeof(int)); } -DECLARE_CUSTOM_FUNCTION(FadeInStacchetto)(CORO_PARAM, uint32, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(FadeInJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) { int channel = 2; CoroScheduler.createProcess(ThreadFadeInMusic, &channel, sizeof(int)); } -DECLARE_CUSTOM_FUNCTION(StopSonoriz)(CORO_PARAM, uint32, uint32, uint32, uint32) { - _vm->stopMusic(GLOBALS._curSonoriz); +DECLARE_CUSTOM_FUNCTION(StopSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) { + _vm->stopMusic(GLOBALS._curSoundEffect); } -DECLARE_CUSTOM_FUNCTION(StopStacchetto)(CORO_PARAM, uint32, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(StopJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) { _vm->stopMusic(2); } -DECLARE_CUSTOM_FUNCTION(MuteSonoriz)(CORO_PARAM, uint32, uint32, uint32, uint32) { - _vm->setMusicVolume(GLOBALS._curSonoriz, 0); +DECLARE_CUSTOM_FUNCTION(MuteSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) { + _vm->setMusicVolume(GLOBALS._curSoundEffect, 0); } -DECLARE_CUSTOM_FUNCTION(DemuteSonoriz)(CORO_PARAM, uint32, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(DemuteSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) { GLOBALS._bFadeOutStop = true; - _vm->setMusicVolume(GLOBALS._curSonoriz, 64); + _vm->setMusicVolume(GLOBALS._curSoundEffect, 64); } -DECLARE_CUSTOM_FUNCTION(MuteStacchetto)(CORO_PARAM, uint32, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(MuteJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) { _vm->setMusicVolume(2, 0); } -DECLARE_CUSTOM_FUNCTION(DemuteStacchetto)(CORO_PARAM, uint32, uint32, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(DemuteJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) { _vm->setMusicVolume(2, 64); } - - - - void CustPlayMusic(uint32 nChannel, const char *mFN, uint32 nFX, bool bLoop, int nSync = 0) { if (nSync == 0) nSync = 2000; @@ -2199,18 +2195,18 @@ void CustPlayMusic(uint32 nChannel, const char *mFN, uint32 nFX, bool bLoop, int debug("End CustPlayMusic"); } -DECLARE_CUSTOM_FUNCTION(PlaySonoriz)(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bNoLoop, uint32) { +DECLARE_CUSTOM_FUNCTION(PlaySoundEffect)(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bNoLoop, uint32) { if (nFX == 0 || nFX == 1 || nFX == 2) { - debug("PlaySonoriz stop fadeout"); + debug("PlaySoundEffect stop fadeout"); GLOBALS._bFadeOutStop = true; } GLOBALS._lastMusic = nMusic; - CustPlayMusic(GLOBALS._curSonoriz, musicFiles[nMusic].name, nFX, bNoLoop ? false : true, musicFiles[nMusic].sync); + CustPlayMusic(GLOBALS._curSoundEffect, musicFiles[nMusic].name, nFX, bNoLoop ? false : true, musicFiles[nMusic].sync); } -DECLARE_CUSTOM_FUNCTION(PlayStacchetto)(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bLoop, uint32) { - CustPlayMusic(2, staccFileNames[nMusic], nFX, bLoop); +DECLARE_CUSTOM_FUNCTION(PlayJingle)(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bLoop, uint32) { + CustPlayMusic(2, jingleFileNames[nMusic], nFX, bLoop); } DECLARE_CUSTOM_FUNCTION(PlayItemSfx)(CORO_PARAM, uint32 nItem, uint32 nSFX, uint32, uint32) { @@ -2230,7 +2226,7 @@ void RestoreMusic(CORO_PARAM) { CORO_BEGIN_CODE(_ctx); - CORO_INVOKE_4(PlaySonoriz, GLOBALS._lastMusic, 0, 0, 0); + CORO_INVOKE_4(PlaySoundEffect, GLOBALS._lastMusic, 0, 0, 0); if (GLOBALS._lastTappeto != 0) CustPlayMusic(4, tappetiFile[GLOBALS._lastTappeto], 0, true); @@ -2249,28 +2245,28 @@ void LoadMusic(Common::InSaveFile *f) { } -DECLARE_CUSTOM_FUNCTION(StacchettoFadeStart)(CORO_PARAM, uint32 nStacc, uint32 bLoop, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(JingleFadeStart)(CORO_PARAM, uint32 nJingle, uint32 bLoop, uint32, uint32) { CORO_BEGIN_CONTEXT; CORO_END_CONTEXT(_ctx); CORO_BEGIN_CODE(_ctx); - CORO_INVOKE_4(FadeOutSonoriz, 0, 0, 0, 0); - CORO_INVOKE_4(MuteStacchetto, 0, 0, 0, 0); - CORO_INVOKE_4(PlayStacchetto, nStacc, 0, bLoop, 0); - CORO_INVOKE_4(FadeInStacchetto, 0, 0, 0, 0); + CORO_INVOKE_4(FadeOutSoundEffect, 0, 0, 0, 0); + CORO_INVOKE_4(MuteJingle, 0, 0, 0, 0); + CORO_INVOKE_4(PlayJingle, nJingle, 0, bLoop, 0); + CORO_INVOKE_4(FadeInJingle, 0, 0, 0, 0); CORO_END_CODE; } -DECLARE_CUSTOM_FUNCTION(StacchettoFadeEnd)(CORO_PARAM, uint32 nStacc, uint32 bLoop, uint32, uint32) { +DECLARE_CUSTOM_FUNCTION(JingleFadeEnd)(CORO_PARAM, uint32 nJingle, uint32 bLoop, uint32, uint32) { CORO_BEGIN_CONTEXT; CORO_END_CONTEXT(_ctx); CORO_BEGIN_CODE(_ctx); - CORO_INVOKE_4(FadeOutStacchetto, 0, 0, 0, 0); - CORO_INVOKE_4(FadeInSonoriz, 0, 0, 0, 0); + CORO_INVOKE_4(FadeOutJingle, 0, 0, 0, 0); + CORO_INVOKE_4(FadeInSoundEffect, 0, 0, 0, 0); CORO_END_CODE; } @@ -2396,146 +2392,146 @@ DECLARE_CUSTOM_FUNCTION(DoCredits)(CORO_PARAM, uint32 nMsg, uint32 dwTime, uint3 BEGIN_CUSTOM_FUNCTION_MAP() ASSIGN(1, CustLoadLocation) -ASSIGN(2, MySleep) +ASSIGN(2, MySleep) ASSIGN(3, SetPointer) ASSIGN(5, MoveTony) -ASSIGN(6, FaceToMe) -ASSIGN(7, BackToMe) -ASSIGN(8, LeftToMe) -ASSIGN(9, RightToMe) -ASSIGN(10, SendTonyMessage) -ASSIGN(11, ChangeBoxStatus) -ASSIGN(12, ChangeLocation) -ASSIGN(13, DisableTony) -ASSIGN(14, EnableTony) -ASSIGN(15, WaitForPatternEnd) -ASSIGN(16, SetLocStartPosition) -ASSIGN(17, ScrollLocation) -ASSIGN(18, MoveTonyAndWait) -ASSIGN(19, ChangeHotspot) -ASSIGN(20, AddInventory) -ASSIGN(21, RemoveInventory) -ASSIGN(22, ChangeInventoryStatus) -ASSIGN(23, SetTonyPosition) -ASSIGN(24, SendFullscreenMessage) -ASSIGN(25, SaveTonyPosition) -ASSIGN(26, RestoreTonyPosition) -ASSIGN(27, DisableInput) -ASSIGN(28, EnableInput) -ASSIGN(29, StopTony) - -ASSIGN(30, TonyTakeUp1) -ASSIGN(31, TonyTakeMid1) -ASSIGN(32, TonyTakeDown1) -ASSIGN(33, TonyTakeUp2) -ASSIGN(34, TonyTakeMid2) -ASSIGN(35, TonyTakeDown2) - -ASSIGN(72, TonyPutUp1) -ASSIGN(73, TonyPutMid1) -ASSIGN(74, TonyPutDown1) -ASSIGN(75, TonyPutUp2) -ASSIGN(76, TonyPutMid2) -ASSIGN(77, TonyPutDown2) - -ASSIGN(36, TonyOnTheFloor) -ASSIGN(37, TonyGetUp) -ASSIGN(38, TonyShepherdess) -ASSIGN(39, TonyWhistle) - -ASSIGN(40, TonyRide) -ASSIGN(41, TonyFianchi) -ASSIGN(42, TonySing) -ASSIGN(43, TonyIndicate) -ASSIGN(44, TonyScaredWithHands) -ASSIGN(49, TonyScaredWithoutHands) -ASSIGN(45, TonyWithGlasses) -ASSIGN(46, TonyWithWorm) -ASSIGN(47, TonyWithHammer) -ASSIGN(48, TonyWithRope) -ASSIGN(90, TonyWithRabbitANIM) -ASSIGN(91, TonyWithRecipeANIM) -ASSIGN(92, TonyWithCardsANIM) -ASSIGN(93, TonyWithSnowmanANIM) -ASSIGN(94, TonyWithSnowmanStart) -ASSIGN(95, TonyWithSnowmanEnd) -ASSIGN(96, TonyWithRabbitStart) -ASSIGN(97, TonyWithRabbitEnd) -ASSIGN(98, TonyWithRecipeStart) -ASSIGN(99, TonyWithRecipeEnd) -ASSIGN(100, TonyWithCardsStart) -ASSIGN(101, TonyWithCardsEnd) -ASSIGN(102, TonyWithNotebookStart) -ASSIGN(103, TonyWithNotebookEnd) -ASSIGN(104, TonyWithMegaphoneStart) -ASSIGN(105, TonyWithMegaphoneEnd) -ASSIGN(106, TonyWithBeardStart) -ASSIGN(107, TonyWithBeardEnd) -ASSIGN(108, TonyGiggle) -ASSIGN(109, TonyDisgusted) -ASSIGN(110, TonyNaah) -ASSIGN(111, TonyMacbeth) -ASSIGN(112, TonySniffLeft) -ASSIGN(113, TonySniffRight) -ASSIGN(114, TonyScaredStart) -ASSIGN(115, TonyScaredEnd) -ASSIGN(116, TonyWithSecretary) - -ASSIGN(50, CharSetCode) -ASSIGN(51, CharSetColor) -ASSIGN(52, CharSetTalkPattern) -ASSIGN(53, CharSendMessage) -ASSIGN(54, CharSetStartEndTalkPattern) - -ASSIGN(60, MCharSetCode) -ASSIGN(61, MCharSetColor) -ASSIGN(62, MCharSetCurrentGroup) -ASSIGN(63, MCharSetNumTalksInGroup) -ASSIGN(64, MCharSetNumTexts) -ASSIGN(65, MCharSendMessage) -ASSIGN(66, MCharSetPosition) -ASSIGN(67, MCharSetAlwaysBack) -ASSIGN(68, MCharResetCode) - -ASSIGN(70, StartDialog) -ASSIGN(71, SendDialogMessage) - -ASSIGN(80, TakeOwnership) -ASSIGN(81, ReleaseOwnership) - -ASSIGN(86, PlaySonoriz) -ASSIGN(87, PlayStacchetto) -ASSIGN(88, FadeInSonoriz) -ASSIGN(89, FadeOutSonoriz) -ASSIGN(123, FadeInStacchetto) -ASSIGN(124, FadeOutStacchetto) -ASSIGN(125, MuteSonoriz) -ASSIGN(126, DemuteSonoriz) -ASSIGN(127, MuteStacchetto) -ASSIGN(128, DemuteStacchetto) -ASSIGN(84, StopSonoriz) -ASSIGN(85, StopStacchetto) -ASSIGN(83, PlayItemSfx) -ASSIGN(129, StacchettoFadeStart) -ASSIGN(130, StacchettoFadeEnd) - -ASSIGN(120, TremaSchermo) -ASSIGN(121, AutoSave) -ASSIGN(122, AbortGame) -ASSIGN(131, NoOcchioDiBue) -ASSIGN(132, SendFullscreenMsgStart) -ASSIGN(133, SendFullscreenMsgEnd) -ASSIGN(134, CustEnableGUI) -ASSIGN(135, CustDisableGUI) -ASSIGN(136, ClearScreen) -ASSIGN(137, PatIrqFreeze) -ASSIGN(138, TonySetPerorate) -ASSIGN(139, OpenInitLoadMenu) -ASSIGN(140, OpenInitOptions) -ASSIGN(141, SyncScrollLocation) -ASSIGN(142, CloseLocation) -ASSIGN(143, SetAlwaysDisplay) -ASSIGN(144, DoCredits) +ASSIGN(6, FaceToMe) +ASSIGN(7, BackToMe) +ASSIGN(8, LeftToMe) +ASSIGN(9, RightToMe) +ASSIGN(10, SendTonyMessage) +ASSIGN(11, ChangeBoxStatus) +ASSIGN(12, ChangeLocation) +ASSIGN(13, DisableTony) +ASSIGN(14, EnableTony) +ASSIGN(15, WaitForPatternEnd) +ASSIGN(16, SetLocStartPosition) +ASSIGN(17, ScrollLocation) +ASSIGN(18, MoveTonyAndWait) +ASSIGN(19, ChangeHotspot) +ASSIGN(20, AddInventory) +ASSIGN(21, RemoveInventory) +ASSIGN(22, ChangeInventoryStatus) +ASSIGN(23, SetTonyPosition) +ASSIGN(24, SendFullscreenMessage) +ASSIGN(25, SaveTonyPosition) +ASSIGN(26, RestoreTonyPosition) +ASSIGN(27, DisableInput) +ASSIGN(28, EnableInput) +ASSIGN(29, StopTony) + +ASSIGN(30, TonyTakeUp1) +ASSIGN(31, TonyTakeMid1) +ASSIGN(32, TonyTakeDown1) +ASSIGN(33, TonyTakeUp2) +ASSIGN(34, TonyTakeMid2) +ASSIGN(35, TonyTakeDown2) + +ASSIGN(72, TonyPutUp1) +ASSIGN(73, TonyPutMid1) +ASSIGN(74, TonyPutDown1) +ASSIGN(75, TonyPutUp2) +ASSIGN(76, TonyPutMid2) +ASSIGN(77, TonyPutDown2) + +ASSIGN(36, TonyOnTheFloor) +ASSIGN(37, TonyGetUp) +ASSIGN(38, TonyShepherdess) +ASSIGN(39, TonyWhistle) + +ASSIGN(40, TonyRide) +ASSIGN(41, TonyFianchi) +ASSIGN(42, TonySing) +ASSIGN(43, TonyIndicate) +ASSIGN(44, TonyScaredWithHands) +ASSIGN(49, TonyScaredWithoutHands) +ASSIGN(45, TonyWithGlasses) +ASSIGN(46, TonyWithWorm) +ASSIGN(47, TonyWithHammer) +ASSIGN(48, TonyWithRope) +ASSIGN(90, TonyWithRabbitANIM) +ASSIGN(91, TonyWithRecipeANIM) +ASSIGN(92, TonyWithCardsANIM) +ASSIGN(93, TonyWithSnowmanANIM) +ASSIGN(94, TonyWithSnowmanStart) +ASSIGN(95, TonyWithSnowmanEnd) +ASSIGN(96, TonyWithRabbitStart) +ASSIGN(97, TonyWithRabbitEnd) +ASSIGN(98, TonyWithRecipeStart) +ASSIGN(99, TonyWithRecipeEnd) +ASSIGN(100, TonyWithCardsStart) +ASSIGN(101, TonyWithCardsEnd) +ASSIGN(102, TonyWithNotebookStart) +ASSIGN(103, TonyWithNotebookEnd) +ASSIGN(104, TonyWithMegaphoneStart) +ASSIGN(105, TonyWithMegaphoneEnd) +ASSIGN(106, TonyWithBeardStart) +ASSIGN(107, TonyWithBeardEnd) +ASSIGN(108, TonyGiggle) +ASSIGN(109, TonyDisgusted) +ASSIGN(110, TonyNaah) +ASSIGN(111, TonyMacbeth) +ASSIGN(112, TonySniffLeft) +ASSIGN(113, TonySniffRight) +ASSIGN(114, TonyScaredStart) +ASSIGN(115, TonyScaredEnd) +ASSIGN(116, TonyWithSecretary) + +ASSIGN(50, CharSetCode) +ASSIGN(51, CharSetColor) +ASSIGN(52, CharSetTalkPattern) +ASSIGN(53, CharSendMessage) +ASSIGN(54, CharSetStartEndTalkPattern) + +ASSIGN(60, MCharSetCode) +ASSIGN(61, MCharSetColor) +ASSIGN(62, MCharSetCurrentGroup) +ASSIGN(63, MCharSetNumTalksInGroup) +ASSIGN(64, MCharSetNumTexts) +ASSIGN(65, MCharSendMessage) +ASSIGN(66, MCharSetPosition) +ASSIGN(67, MCharSetAlwaysBack) +ASSIGN(68, MCharResetCode) + +ASSIGN(70, StartDialog) +ASSIGN(71, SendDialogMessage) + +ASSIGN(80, TakeOwnership) +ASSIGN(81, ReleaseOwnership) + +ASSIGN(86, PlaySoundEffect) +ASSIGN(87, PlayJingle) +ASSIGN(88, FadeInSoundEffect) +ASSIGN(89, FadeOutSoundEffect) +ASSIGN(123, FadeInJingle) +ASSIGN(124, FadeOutJingle) +ASSIGN(125, MuteSoundEffect) +ASSIGN(126, DemuteSoundEffect) +ASSIGN(127, MuteJingle) +ASSIGN(128, DemuteJingle) +ASSIGN(84, StopSoundEffect) +ASSIGN(85, StopJingle) +ASSIGN(83, PlayItemSfx) +ASSIGN(129, JingleFadeStart) +ASSIGN(130, JingleFadeEnd) + +ASSIGN(120, ShakeScreen) +ASSIGN(121, AutoSave) +ASSIGN(122, AbortGame) +ASSIGN(131, NoBullsEye) +ASSIGN(132, SendFullscreenMsgStart) +ASSIGN(133, SendFullscreenMsgEnd) +ASSIGN(134, CustEnableGUI) +ASSIGN(135, CustDisableGUI) +ASSIGN(136, ClearScreen) +ASSIGN(137, PatIrqFreeze) +ASSIGN(138, TonySetPerorate) +ASSIGN(139, OpenInitLoadMenu) +ASSIGN(140, OpenInitOptions) +ASSIGN(141, SyncScrollLocation) +ASSIGN(142, CloseLocation) +ASSIGN(143, SetAlwaysDisplay) +ASSIGN(144, DoCredits) ASSIGN(200, MustSkipIdleStart); ASSIGN(201, MustSkipIdleEnd); @@ -2573,37 +2569,37 @@ void setupGlobalVars(RMTony *tony, RMPointer *ptr, RMGameBoxes *box, RMLocation for (i = 0; i < 200; i++) GLOBALS._tappeti[i] = 0; - GLOBALS._tappeti[6] = T_GRILLI; - GLOBALS._tappeti[7] = T_GRILLI; - GLOBALS._tappeti[8] = T_GRILLIOV; - GLOBALS._tappeti[10] = T_GRILLI; - GLOBALS._tappeti[12] = T_GRILLI; - GLOBALS._tappeti[13] = T_GRILLIOV; - GLOBALS._tappeti[15] = T_GRILLI; - GLOBALS._tappeti[16] = T_GRILLIVENTO; - GLOBALS._tappeti[18] = T_GRILLI; - GLOBALS._tappeti[19] = T_GRILLIVENTO; - GLOBALS._tappeti[20] = T_GRILLI; - GLOBALS._tappeti[23] = T_GRILLI; - GLOBALS._tappeti[26] = T_MAREMETA; - GLOBALS._tappeti[27] = T_GRILLI; - GLOBALS._tappeti[28] = T_GRILLIVENTO; - GLOBALS._tappeti[31] = T_GRILLI; - GLOBALS._tappeti[33] = T_MARE; - GLOBALS._tappeti[35] = T_MARE; - GLOBALS._tappeti[36] = T_GRILLI; - GLOBALS._tappeti[37] = T_GRILLI; - GLOBALS._tappeti[40] = T_GRILLI; - GLOBALS._tappeti[41] = T_GRILLI; - GLOBALS._tappeti[42] = T_GRILLI; - GLOBALS._tappeti[45] = T_GRILLI; - GLOBALS._tappeti[51] = T_GRILLI; - GLOBALS._tappeti[52] = T_GRILLIVENTO1; - GLOBALS._tappeti[53] = T_GRILLI; - GLOBALS._tappeti[54] = T_GRILLI; - GLOBALS._tappeti[57] = T_VENTO; - GLOBALS._tappeti[58] = T_VENTO; - GLOBALS._tappeti[60] = T_VENTO; + GLOBALS._tappeti[6] = TAPPETI_GRILLI; + GLOBALS._tappeti[7] = TAPPETI_GRILLI; + GLOBALS._tappeti[8] = TAPPETI_GRILLIOV; + GLOBALS._tappeti[10] = TAPPETI_GRILLI; + GLOBALS._tappeti[12] = TAPPETI_GRILLI; + GLOBALS._tappeti[13] = TAPPETI_GRILLIOV; + GLOBALS._tappeti[15] = TAPPETI_GRILLI; + GLOBALS._tappeti[16] = TAPPETI_GRILLIVENTO; + GLOBALS._tappeti[18] = TAPPETI_GRILLI; + GLOBALS._tappeti[19] = TAPPETI_GRILLIVENTO; + GLOBALS._tappeti[20] = TAPPETI_GRILLI; + GLOBALS._tappeti[23] = TAPPETI_GRILLI; + GLOBALS._tappeti[26] = TAPPETI_MAREMETA; + GLOBALS._tappeti[27] = TAPPETI_GRILLI; + GLOBALS._tappeti[28] = TAPPETI_GRILLIVENTO; + GLOBALS._tappeti[31] = TAPPETI_GRILLI; + GLOBALS._tappeti[33] = TAPPETI_MARE; + GLOBALS._tappeti[35] = TAPPETI_MARE; + GLOBALS._tappeti[36] = TAPPETI_GRILLI; + GLOBALS._tappeti[37] = TAPPETI_GRILLI; + GLOBALS._tappeti[40] = TAPPETI_GRILLI; + GLOBALS._tappeti[41] = TAPPETI_GRILLI; + GLOBALS._tappeti[42] = TAPPETI_GRILLI; + GLOBALS._tappeti[45] = TAPPETI_GRILLI; + GLOBALS._tappeti[51] = TAPPETI_GRILLI; + GLOBALS._tappeti[52] = TAPPETI_GRILLIVENTO1; + GLOBALS._tappeti[53] = TAPPETI_GRILLI; + GLOBALS._tappeti[54] = TAPPETI_GRILLI; + GLOBALS._tappeti[57] = TAPPETI_VENTO; + GLOBALS._tappeti[58] = TAPPETI_VENTO; + GLOBALS._tappeti[60] = TAPPETI_VENTO; diff --git a/engines/tony/font.h b/engines/tony/font.h index 328d501e27..f24223d551 100644 --- a/engines/tony/font.h +++ b/engines/tony/font.h @@ -178,22 +178,22 @@ private: int _maxLineLength; public: - enum HORALIGN { + enum HorAlign { HLEFT, HLEFTPAR, HCENTER, HRIGHT }; - enum VERALIGN { + enum VerAlign { VTOP, VCENTER, VBOTTOM }; private: - HORALIGN _aHorType; - VERALIGN _aVerType; + HorAlign _aHorType; + VerAlign _aVerType; byte _textR, _textG, _textB; protected: @@ -206,7 +206,7 @@ public: static void unload(); // Set the alignment type - void setAlignType(HORALIGN aHor, VERALIGN aVer) { + void setAlignType(HorAlign aHor, VerAlign aVer) { _aHorType = aHor; _aVerType = aVer; } diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp index 03479d96a5..cca55f00dd 100644 --- a/engines/tony/game.cpp +++ b/engines/tony/game.cpp @@ -1003,7 +1003,7 @@ int RMOptionScreen::priority() { return 190; } -void RMOptionScreen::changeState(CORO_PARAM, STATE newState) { +void RMOptionScreen::changeState(CORO_PARAM, OptionScreenState newState) { CORO_BEGIN_CONTEXT; CORO_END_CONTEXT(_ctx); diff --git a/engines/tony/game.h b/engines/tony/game.h index 9ac8f76bcc..bd15b962e6 100644 --- a/engines/tony/game.h +++ b/engines/tony/game.h @@ -70,7 +70,7 @@ private: void updateCursor(); public: - enum POINTER { + enum PointerType { PTR_NONE = 0, PTR_FRECCIASU, PTR_FRECCIAGIU, @@ -107,15 +107,15 @@ public: } // Sets a new pointer - void setSpecialPointer(POINTER ptr) { + void setSpecialPointer(PointerType ptr) { _nCurSpecialPointer = ptr; if (_nCurSpecialPointer && _nCurSpecialPointer != PTR_CUSTOM) _specialPointer[ptr - 1]->setPattern(1); updateCursor(); } - POINTER getSpecialPointer(void) { - return (POINTER)_nCurSpecialPointer; + PointerType getSpecialPointer(void) { + return (PointerType)_nCurSpecialPointer; } // Set the new custom pointer @@ -251,17 +251,17 @@ private: bool _bNoLoadSave; bool _bAlterGfx; - enum STATE { - MENUGAME, - MENUGFX, - MENUSOUND, - MENULOAD, - MENUSAVE, + enum OptionScreenState { + MENUGAME, + MENUGFX, + MENUSOUND, + MENULOAD, + MENUSAVE, MENUNONE }; - STATE _nState; - STATE _nLastState; + OptionScreenState _nState; + OptionScreenState _nLastState; public: RMOptionScreen(); @@ -291,7 +291,7 @@ protected: // Initialisation and state change void initState(CORO_PARAM); void closeState(void); - void changeState(CORO_PARAM, STATE newState); + void changeState(CORO_PARAM, OptionScreenState newState); // Repaint the options menu void refreshAll(CORO_PARAM); diff --git a/engines/tony/globals.cpp b/engines/tony/globals.cpp index 45ab5f8722..9115dafd63 100644 --- a/engines/tony/globals.cpp +++ b/engines/tony/globals.cpp @@ -80,9 +80,9 @@ Globals::Globals() { _nCfgSFXVolume = 0; _bIdleExited = false; _bSkipSfxNoLoop = false; - _bNoOcchioDiBue = false; + _bNoBullsEye = false; _curDialog = 0; - _curSonoriz = 0; + _curSoundEffect = 0; _bFadeOutStop = false; // OSystem::MutexRef vdb; diff --git a/engines/tony/globals.h b/engines/tony/globals.h index 2301e621aa..33ed36751a 100644 --- a/engines/tony/globals.h +++ b/engines/tony/globals.h @@ -35,13 +35,13 @@ namespace Tony { -#define T_GRILLI 1 -#define T_GRILLIOV 2 -#define T_GRILLIVENTO 3 -#define T_GRILLIVENTO1 4 -#define T_VENTO 5 -#define T_MARE 6 -#define T_MAREMETA 7 +#define TAPPETI_GRILLI 1 +#define TAPPETI_GRILLIOV 2 +#define TAPPETI_GRILLIVENTO 3 +#define TAPPETI_GRILLIVENTO1 4 +#define TAPPETI_VENTO 5 +#define TAPPETI_MARE 6 +#define TAPPETI_MAREMETA 7 #define MAX_PATH 255 @@ -207,9 +207,9 @@ public: int _nCfgSFXVolume; bool _bSkipSfxNoLoop; bool _bIdleExited; - bool _bNoOcchioDiBue; + bool _bNoBullsEye; int _curDialog; - int _curSonoriz; + int _curSoundEffect; bool _bFadeOutStop; RMTony *_tony; @@ -237,7 +237,7 @@ public: uint32 _dwTonyNumTexts; bool _bTonyInTexts; bool _bStaticTalk; - RMTony::TALKTYPE _nTonyNextTalkType; + RMTony::CharacterTalkType _nTonyNextTalkType; RMPoint _startLocPos[256]; uint32 _mut[10]; diff --git a/engines/tony/inventory.h b/engines/tony/inventory.h index b739e16f72..e010a09dd5 100644 --- a/engines/tony/inventory.h +++ b/engines/tony/inventory.h @@ -46,7 +46,7 @@ struct RMInventoryItem { class RMInventory : public RMGfxWoodyBuffer { private: - enum STATE { + enum InventoryState { CLOSED, OPENING, OPENED, @@ -64,7 +64,7 @@ protected: uint32 _curPutTime; int _curPos; - STATE _state; + InventoryState _state; bool _bHasFocus; int _nSelectObj; int _nCombine; diff --git a/engines/tony/loc.h b/engines/tony/loc.h index 4231c99eab..00fcb579c8 100644 --- a/engines/tony/loc.h +++ b/engines/tony/loc.h @@ -314,7 +314,7 @@ protected: class RMBox { public: - struct T_HOTSPOT { + struct Hotspot { int _hotx, _hoty; // Hotspot coordinates int _destination; // Hotspot destination }; @@ -324,7 +324,7 @@ public: int _adj[MAXBOXES]; // List of adjacent bounding boxes int _numHotspot; // Hotspot number uint8 _destZ; // Z value for the bounding box - T_HOTSPOT _hotspot[MAXHOTSPOT]; // List of hotspots + Hotspot _hotspot[MAXHOTSPOT]; // List of hotspots bool _bActive; bool _bReversed; @@ -388,7 +388,7 @@ public: class RMCharacter : protected RMItem { public: - enum PATTERNS { + enum Patterns { PAT_STANDUP = 1, PAT_STANDDOWN, PAT_STANDLEFT, @@ -400,7 +400,7 @@ public: }; private: - enum STATUS { + enum CharacterStatus { STAND, WALK }; @@ -416,7 +416,7 @@ private: short _pathLength, _pathCount; int _curBox; - STATUS _status; + CharacterStatus _status; int _curSpeed; bool _bEndOfPath; uint32 _hEndOfPath; diff --git a/engines/tony/sound.h b/engines/tony/sound.h index 24e7f34921..abd7e06cae 100644 --- a/engines/tony/sound.h +++ b/engines/tony/sound.h @@ -44,7 +44,7 @@ namespace Tony { class FPSTREAM; class FPSFX; -enum CODECS { +enum SoundCodecs { FPCODEC_RAW, FPCODEC_ADPCM }; diff --git a/engines/tony/tony.h b/engines/tony/tony.h index 43bc23c636..8df2da697c 100644 --- a/engines/tony/tony.h +++ b/engines/tony/tony.h @@ -104,7 +104,7 @@ public: Globals _globals; Debugger *_debugger; - enum DATADIR { + enum DataDir { DD_BASE = 1, DD_SAVE, DD_SHOTS, @@ -161,7 +161,7 @@ public: void close(); void abortGame(); - void getDataDirectory(DATADIR dir, char *path); + void getDataDirectory(DataDir dir, char *path); void switchFullscreen(bool bFull); void optionScreen(void); diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp index 0f16bc45c3..17f046fb92 100644 --- a/engines/tony/tonychar.cpp +++ b/engines/tony/tonychar.cpp @@ -550,7 +550,7 @@ void RMTony::put(int nWhere, int nPart) { } -bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &bodyStartPat, +bool RMTony::startTalkCalculate(CharacterTalkType nTalkType, int &headStartPat, int &bodyStartPat, int &headLoopPat, int &bodyLoopPat) { assert(!_bIsTalking); @@ -1109,7 +1109,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body return true; } -void RMTony::startTalk(CORO_PARAM, TALKTYPE nTalkType) { +void RMTony::startTalk(CORO_PARAM, CharacterTalkType nTalkType) { CORO_BEGIN_CONTEXT; int headStartPat, bodyStartPat; int headLoopPat, bodyLoopPat; @@ -1518,7 +1518,7 @@ void RMTony::endTalk(CORO_PARAM) { CORO_END_CODE; } -void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat, +void RMTony::startStaticCalculate(CharacterTalkType nTalk, int &headPat, int &headLoopPat, int &bodyStartPat, int &bodyLoopPat) { int nPat = getCurPattern(); @@ -1725,7 +1725,7 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat } } -void RMTony::startStatic(CORO_PARAM, TALKTYPE nTalk) { +void RMTony::startStatic(CORO_PARAM, CharacterTalkType nTalk) { CORO_BEGIN_CONTEXT; int headPat, headLoopPat; int bodyStartPat, bodyLoopPat; @@ -1760,7 +1760,7 @@ void RMTony::startStatic(CORO_PARAM, TALKTYPE nTalk) { } -void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, int &headEndPat) { +void RMTony::endStaticCalculate(CharacterTalkType nTalk, int &bodyEndPat, int &finalPat, int &headEndPat) { switch (_talkDirection) { case UP: case LEFT: @@ -1896,7 +1896,7 @@ void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, } } -void RMTony::endStatic(CORO_PARAM, TALKTYPE nTalk) { +void RMTony::endStatic(CORO_PARAM, CharacterTalkType nTalk) { CORO_BEGIN_CONTEXT; int bodyEndPat; int finalPat; diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h index e5231d89fd..203d391fbe 100644 --- a/engines/tony/tonychar.h +++ b/engines/tony/tonychar.h @@ -36,12 +36,12 @@ namespace Tony { class RMTony : public RMCharacter { private: - enum DIRECTION { + enum CharacterDirection { UP, DOWN, LEFT, RIGHT }; public: - enum TALKTYPE { + enum CharacterTalkType { TALK_NORMAL, TALK_FIANCHI, TALK_SING, @@ -97,8 +97,8 @@ private: bool _bIsStaticTalk; bool _bIsTalking; int _nPatB4Talking; - TALKTYPE _nTalkType; - DIRECTION _talkDirection; + CharacterTalkType _nTalkType; + CharacterDirection _talkDirection; RMPoint _nBodyOffset; int _nTimeLastStep; @@ -114,7 +114,7 @@ protected: static void waitEndOfAction(CORO_PARAM, const void *param); public: - enum PATTERNS { + enum CharacterPatterns { PAT_TAKEUP_UP1 = 9, PAT_TAKEUP_UP2, PAT_TAKEUP_MID1, @@ -247,7 +247,7 @@ public: PAT_WITHSECRETARY }; - enum BODYPATTERNS { + enum CharacterBodyPatterns { BPAT_STANDUP = 1, BPAT_STANDDOWN, BPAT_STANDLEFT, @@ -421,18 +421,18 @@ public: void put(int nWhere, int nPart); // Start or End Talk - bool startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &bodyStartPat, + bool startTalkCalculate(CharacterTalkType nTalkType, int &headStartPat, int &bodyStartPat, int &headLoopPat, int &bodyLoopPat); - void startTalk(CORO_PARAM, TALKTYPE nTalkType); + void startTalk(CORO_PARAM, CharacterTalkType nTalkType); bool endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPat, int &finalPat, bool &bStatic); void endTalk(CORO_PARAM); // Start or End Static - void startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat, + void startStaticCalculate(CharacterTalkType nTalk, int &headPat, int &headLoopPat, int &bodyStartPat, int &bodyLoopPat); - void startStatic(CORO_PARAM, TALKTYPE nTalkType); - void endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, int &headEndPat); - void endStatic(CORO_PARAM, TALKTYPE nTalkType); + void startStatic(CORO_PARAM, CharacterTalkType nTalkType); + void endStaticCalculate(CharacterTalkType nTalk, int &bodyEndPat, int &finalPat, int &headEndPat); + void endStatic(CORO_PARAM, CharacterTalkType nTalkType); // Tony disguises himself! void setShepherdess(bool bIsPast) { -- cgit v1.2.3