diff options
-rw-r--r-- | engines/tony/custom.cpp | 1 | ||||
-rw-r--r-- | engines/tony/font.cpp | 8 | ||||
-rw-r--r-- | engines/tony/game.h | 4 | ||||
-rw-r--r-- | engines/tony/loc.cpp | 7 | ||||
-rw-r--r-- | engines/tony/mpal/mpal.cpp | 12 | ||||
-rw-r--r-- | engines/tony/tony.cpp | 2 | ||||
-rw-r--r-- | engines/tony/tonychar.cpp | 6 |
7 files changed, 19 insertions, 21 deletions
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index 4b3c533a92..254fab91da 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -139,7 +139,6 @@ void LoadChangedHotspot(Common::InSaveFile *f) { * ChangeLocation -> theEngine.ChangeLocation() * AddInventory -> theEngine.AddInventory() */ - void MCharResetCodes(void) { for (int i = 0; i < 10; i++) GLOBALS.MCharacter[i].item = GLOBALS.Loc->GetItemFromCode(GLOBALS.MCharacter[i].code); diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index 972bd081bf..efca78301c 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -51,8 +51,8 @@ RMFont::~RMFont() { /** * Dumps a font to a buffer - * @param buf Buffer contenente il font - * @param nChars Numero di caratteri (max 256) + * @param buf Buffer for font contents + * @param nChars Number of characters (max 256) * @param dimx X dimension in pixels * @param dimy Y dimension in pixels * @@ -2209,7 +2209,7 @@ void RMTextDialogScrolling::Draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPri } void RMTextDialogScrolling::ClipOnScreen(RMGfxPrimitive *prim) { - // Non dobbiamo fare nulla! + // We must not do anything! } @@ -2283,7 +2283,7 @@ void RMTextItemName::Draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive CORO_BEGIN_CODE(_ctx); - // Se non c'e' testo, e' inutile continuare + // If there is no text, it's pointless to continue if (m_buf == NULL) return; diff --git a/engines/tony/game.h b/engines/tony/game.h index 532a457b8f..20b5f347bc 100644 --- a/engines/tony/game.h +++ b/engines/tony/game.h @@ -283,12 +283,12 @@ public: protected: - // Inizializza tutto per il nuovo stato + // Initialisation and state change void InitState(CORO_PARAM); void CloseState(void); void ChangeState(CORO_PARAM, STATE newState); - // Repaaint the options menu + // Repaint the options menu void RefreshAll(CORO_PARAM); void RefreshThumbnails(void); }; diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp index ef59b3f916..43e673b046 100644 --- a/engines/tony/loc.cpp +++ b/engines/tony/loc.cpp @@ -1520,7 +1520,7 @@ void RMCharacter::Stop(CORO_PARAM) { bMoving = false; - // Non si sa mai... + // You never know.. status = STAND; minpath = 0; @@ -1609,9 +1609,8 @@ void RMCharacter::Move(CORO_PARAM, RMPoint pt, bool *result) { pathcount = 1; pathend = pt; } else { - // @@@ Questo caso è se un hotspot è dentro un box - // ma non c'è un path per arrivarci. Usiamo quindi - // la invscanline per cercare un punto intorno + // @@@ This case is whether a hotspot is inside a box, but there is + // a path to get there. We use the InvScanLine to search around a point _ctx->dest = InvScanLine(pt); pt = _ctx->dest; diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index 5cb6546343..0b56317f6f 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -647,7 +647,7 @@ void ScriptThread(CORO_PARAM, const void *param) { // debugC(DEBUG_BASIC, kTonyDebugMPAL, "PlayScript(): Moments: %u\n",s->nMoments); for (_ctx->i = 0; _ctx->i < s->nMoments; _ctx->i++) { - // Dorme il tempo necessario per arrivare al momento successivo + // Sleep for the required time if (s->Moment[_ctx->i].dwTime == -1) { CORO_INVOKE_4(CoroScheduler.waitForMultipleObjects, _ctx->numHandles, cfHandles, true, CORO_INFINITE); _ctx->dwStartTime = _vm->GetTime(); @@ -878,7 +878,7 @@ void LocationPollThread(CORO_PARAM, const void *param) { } UnlockItems(); - /* Se non e' rimasto nessuno possiamo uscire */ + /* If there is nothing left, we can exit */ if (_ctx->nRealItems == 0) { GlobalFree(_ctx->il); CORO_KILL_SELF(); @@ -1170,7 +1170,7 @@ void GroupThread(CORO_PARAM, const void *param) { } } - /* Se siamo qui, vuol dire che non abbiamo trovato il gruppo richiesto */ + /* If we are here, it means that we have not found the requested group */ GLOBALS.mpalError = 1; UnlockDialogs(); @@ -2750,7 +2750,7 @@ const char *DLG600[] = { "Tony", "Jack", "Jack", NULL, "Jack", NULL, NULL, NULL, case num: \ if (nPers >= (int)(sizeof(DLG##num) / sizeof(const char *)) || DLG##num[nPers] == NULL) \ { \ - warning("ERROR: Il personaggio #%d non esiste nel dialogo %d!\n", nPers, nDlg); \ + warning("ERROR: The character #%d does not exist in dialog %d!\n", nPers, nDlg); \ return "ERROR"; \ } \ else \ @@ -2819,7 +2819,7 @@ const char *GetPersonName(uint16 nDlg, int nPers) { HANDLE_DIALOG(600); default: - warning("ERROR: Il dialogo %d non esiste!\n", (int)nDlg); + warning("ERROR: Dialog %d does not exist!", (int)nDlg); return "ERROR"; } } @@ -2872,7 +2872,7 @@ void mpalDumpDialog(LPMPALDIALOG dlg) { break; if (dlg->Periods[j] == NULL) - warning("ERROR: Dialogo %d, Periodo %d non trovato!\n", (int)dlg->nObj, (int)curCmd->arg2); + warning("ERROR: Dialog %d, Period %d not found!", (int)dlg->nObj, (int)curCmd->arg2); else { frase = (char *)GlobalLock(dlg->Periods[j]); strcpy(copia, frase); diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp index c9abea04e0..e539fa1a39 100644 --- a/engines/tony/tony.cpp +++ b/engines/tony/tony.cpp @@ -609,7 +609,7 @@ void TonyEngine::PauseLoop(void) { } void TonyEngine::Pause(bool bPause) { - // Se non e' cambiato lo stato di pausing, non fare nulla + // If the new status already matches the current one, do nothing if (m_bPaused == bPause) return; diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp index 04b6193cd2..593a05d863 100644 --- a/engines/tony/tonychar.cpp +++ b/engines/tony/tonychar.cpp @@ -178,7 +178,7 @@ void RMTony::Draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) { CORO_BEGIN_CODE(_ctx); - // Richiama il Draw() della classe madre se tony è visibile + // Call the Draw() of the parent class if Tony is visible if (m_bShow && bDrawNow) { if (m_bCorpoDavanti) { prim->Dst().SetEmpty(); @@ -189,7 +189,7 @@ void RMTony::Draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) { } if (m_bIsTalking || m_bIsStaticTalk) { - // Offset inverso per lo scrolling + // Offest direction from scrolling prim->Dst().SetEmpty(); prim->Dst().Offset(-m_curScroll); prim->Dst().Offset(m_pos); @@ -217,7 +217,7 @@ void RMTony::MoveAndDoAction(CORO_PARAM, RMPoint dst, RMItem *item, int nAction, CORO_BEGIN_CODE(_ctx); - // Fa il movimento normale, ma si ricorda se deve poi eseguire un azione + // Makes normal movement, but remember if you must then perform an action if (item == NULL) { m_bActionPending = false; m_ActionItem = NULL; |