From b8282316712c1969d9f7e8c1d80a673eeb4b2ced Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 12 Jun 2012 08:03:51 +0200 Subject: TONY: Translate some more comments into English --- engines/tony/gfxcore.cpp | 13 ++--- engines/tony/gfxcore.h | 2 +- engines/tony/sound.h | 138 ++++++++++++++++++++--------------------------- engines/tony/utils.cpp | 2 +- 4 files changed, 64 insertions(+), 91 deletions(-) (limited to 'engines') diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp index 8be4cbd5f5..83769ee78b 100644 --- a/engines/tony/gfxcore.cpp +++ b/engines/tony/gfxcore.cpp @@ -837,7 +837,7 @@ void RMGfxSourceBuffer8RLE::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPri x1 = (prim->getDst()._x1 + _dimx - 1) - u; for (y = 0; y < height; y++) { - // Decompressione + // Decompression RLEDecompressLineFlipped(buf + x1, src + 2, u, width); // Next line @@ -1379,7 +1379,7 @@ RLEWordFlippedDoCopy2: } /****************************************************************************\ -* Metodi di RMGfxSourceBuffer8RLEWord +* Methods for RMGfxSourceBuffer8RLEWord \****************************************************************************/ RMGfxSourceBuffer8RLEWordAB::~RMGfxSourceBuffer8RLEWordAB() { @@ -1526,7 +1526,7 @@ RLEWordDoCopy2: /****************************************************************************\ -* Metodi di RMGfxSourceBuffer8AA +* Methods for RMGfxSourceBuffer8AA \****************************************************************************/ byte RMGfxSourceBuffer8AA::_megaAABuf[256 * 1024]; @@ -1542,9 +1542,6 @@ void RMGfxSourceBuffer8AA::prepareImage(void) { void RMGfxSourceBuffer8AA::calculateAA(void) { - // I suck, you suck, he sucks, we suck, they all suck ---> ANTI ALIASING SUX! - // ************************************************************ - int x, y; byte *src, *srcaa; @@ -1631,7 +1628,7 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri // x1 = prim->Dst().x1; - // Poisition into the destination buffer + // Position into the destination buffer buf = bigBuf; buf += y1 * bigBuf.getDimx(); @@ -1710,7 +1707,7 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri mybuf[0] = (r << 10) | (g << 5) | b; } - // Skippa alla linea successiva + // Skip to the next line buf += bigBuf.getDimx(); } } diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h index 17ad303fbd..9a00ed1646 100644 --- a/engines/tony/gfxcore.h +++ b/engines/tony/gfxcore.h @@ -36,7 +36,7 @@ namespace Tony { /****************************************************************************\ -* Prototipi di classi +* Class prototype \****************************************************************************/ // Class Name Family Treee Abstract? diff --git a/engines/tony/sound.h b/engines/tony/sound.h index 4669dff568..8f4a509930 100644 --- a/engines/tony/sound.h +++ b/engines/tony/sound.h @@ -296,44 +296,37 @@ public: * * Function: bool SetLoop(bool bLoop); * - * Description: Attiva o disattiva il loop dello sfx. + * Description: Enables or disables SFX loop * - * Input: bool bLoop TRUE per attivare il loop, FALSE per - * disattivarlo + * Input: bool bLoop True to activate the loop, else False * - * Note: Il loop deve essere attivato PRIMA di eseguire il play - * dello sfx. Qualsiasi modifica effettuata durante il play - * non avra' effetto fino a che lo sfx non viene fermato, - * e poi rimesso in play. + * Note: The loop must be activated before the SFX starts to play, + * else the effect will only be noticable next time the SFX is + * played * \****************************************************************************/ void SetLoop(bool bLoop); - - /****************************************************************************\ * * Function: void SetVolume(int dwVolume); * - * Description: Cambia il volume dello sfx + * Description: Set SFX Volume * - * Input: int dwVolume Volume da settare (0-63) + * Input: int dwVolume Volume to set (0-63) * \****************************************************************************/ void SetVolume(int dwVolume); - - /****************************************************************************\ * * Function: void GetVolume(int * lpdwVolume); * - * Description: Chiede il volume dello sfx + * Description: Get SFX volume * - * Input: int * lpdwVolume Variabile in cui verra' inserito - * il volume corrente + * Input: int * lpdwVolume Will contain the current volume * \****************************************************************************/ @@ -348,7 +341,7 @@ public: class FPSTREAM { /****************************************************************************\ - * Attributi + * Attributes \****************************************************************************/ private: @@ -356,26 +349,26 @@ private: /* HWND hwnd; LPDIRECTSOUND lpDS; - LPDIRECTSOUNDBUFFER lpDSBuffer; // Buffer DirectSound circolare - LPDIRECTSOUNDNOTIFY lpDSNotify; // Notify degli hotspot nel buffer + LPDIRECTSOUNDBUFFER lpDSBuffer; // DirectSound circular buffer + LPDIRECTSOUNDNOTIFY lpDSNotify; // Notify hotspots in the buffer */ - byte *lpTempBuffer; // Buffer temporaneo per decompressione + byte *lpTempBuffer; // Temporary buffer use for decompression - uint32 dwBufferSize; // Dimensione del buffer in bytes - uint32 dwSize; // Dimensione dello stream in bytes - uint32 dwCodec; // CODEC utilizzato + uint32 dwBufferSize; // Buffer size (bytes) + uint32 dwSize; // Stream size (bytes) + uint32 dwCodec; // CODEC used - HANDLE hThreadEnd; // Evento per chiudere il thread - Common::File _file; // Handle del file di stream - HANDLE hPlayThread; // Handle del thread di play - HANDLE hHot1, hHot2, hHot3; // Eventi settati da DirectSoundNotify + HANDLE hThreadEnd; // Event used to close thread + Common::File _file; // File handle used for the stream + HANDLE hPlayThread; // Handle of the Play thread + HANDLE hHot1, hHot2, hHot3; // Events set by DirectSoundNotify HANDLE hPlayThread_PlayFast; HANDLE hPlayThread_PlayNormal; - bool bSoundSupported; // TRUE se il suono e' attivo - bool bFileLoaded; // TRUE se e' stato aperto un file - bool bLoop; // TRUE se bisogna loopare lo stream - bool bDoFadeOut; // TRUE se bisogna fare un fade out + bool bSoundSupported; // True if the sound is active + bool bFileLoaded; // True if the file is open + bool bLoop; // True if the stream should loop + bool bDoFadeOut; // True if fade out is required bool bSyncExit; bool bPaused; int lastVolume; @@ -385,14 +378,14 @@ private: bool CreateBuffer(int nBufSize); public: - bool bIsPlaying; // TRUE se si sta playando lo stream + bool bIsPlaying; // True if the stream is playing private: static void PlayThread(FPSTREAM *This); /****************************************************************************\ - * Metodi + * Methods \****************************************************************************/ public: @@ -401,84 +394,75 @@ public: * * Function: FPSTREAM(bool bSoundOn); * - * Description: Costruttore di default. *NON* bisogna dichiarare direttamente - * un oggetto, ma crearlo piuttosto tramite FPSOUND::CreateStream() + * Description: Default contractor. *DO NOT* declare the object directly: use + * FPSOUND::CreateStream() indtead * \****************************************************************************/ FPSTREAM(bool bSoundOn); - /****************************************************************************\ * * Function: ~FPSTREAM(); * - * Description: Distruttore di default. Si preoccupa anche di fermare stream - * eventualmente in esecuzione, e disallocare la memoria da - * essi occupata. + * Description: Destructor by default. Stops the playing stream (if any) and + * frees the memory used by them * \****************************************************************************/ ~FPSTREAM(); - /****************************************************************************\ * * Function: Release(); * - * Description: Rilascia la memoria dell'oggetto. Deve essere richiamata quando - * l'oggetto non serve piu' e **SOLO SE** l'oggetto e' stato - * creato con la FPSOUND::CreateStream(). + * Description: Releases memory used by object. Must be used when the object + * is no longer used. *ONLY*¨for objects created by + * FPSOUND::CreateStream(). * - * Note: Eventuali puntatori all'oggetto non sono piu' validi dopo - * questa chiamata. + * Note: Object pointers are no longer valid after this call. * \****************************************************************************/ void Release(); - /****************************************************************************\ * * Function: bool LoadFile(char *lpszFileName, uint32 dwCodec=FPCODEC_RAW); * - * Description: Apre un file di stream. + * Description: Open a file for a stream. * - * Input: char *lpszFile Nome del file di stream da aprire - * uint32 dwCodec CODEC da utilizzare per decomprimere - * i campioni sonori + * Input: char *lpszFile Filename to be opened + * uint32 dwCodec CODEC to be used to decompress + * sound samples * - * Return: TRUE se tutto OK, FALSE in caso di errore + * Return: True if everything is OK, False otherwise * \****************************************************************************/ bool LoadFile(const char *lpszFileName, uint32 dwCodec = FPCODEC_RAW, int nSync = 2000); - - /****************************************************************************\ * * Function: UnloadFile(); * - * Description: Chiude un file di stream eventualmente aperto. E' necessario - * richiamare questa funzione per disallocare la memoria - * occupata dallo stream. + * Description: Close a file stream (if opened). This function must be + * called to free the memory used by the stream * - * Return: Il distruttore della classe per sicurezza richiama la - * UnloadFile() se non e' stata richiamata esplicitamente. + * Return: Just to be sure, the destructor of this class calls + * UnloadFile() if it has not been mentioned explicitly * \****************************************************************************/ bool UnloadFile(); - /****************************************************************************\ * * Function: bool Play(); * - * Description: Suona lo stream caricato. + * Description: Play the loaded stream. * - * Return: TRUE se tutto OK, FALSE in caso di errore. + * Return: True if everything is OK, False otherwise * \****************************************************************************/ @@ -486,59 +470,52 @@ public: void PlayFast(void); void Prefetch(void); - /****************************************************************************\ * * Function: bool Stop(); * - * Description: Ferma il play dello stream. + * Description: Stops the play of the stream. * - * Return: TRUE se tutto OK, FALSE in caso di errore. + * Return: True if everything is OK, False otherwise * \****************************************************************************/ bool Stop(bool bSync = false); void WaitForSync(FPSTREAM *toplay); - /****************************************************************************\ * * Function: void Pause(bool bPause); * - * Description: Pause dell'effetto sonoro + * Description: Pause sound effect * \****************************************************************************/ void Pause(bool bPause); - /****************************************************************************\ * * Function: bool SetLoop(bool bLoop); * - * Description: Attiva o disattiva il loop dello stream. + * Description: Enable of disable stream loop * - * Input: bool bLoop TRUE per attivare il loop, FALSE per - * disattivarlo + * Input: bool bLoop True to enable loop, false otherwise * - * Note: Il loop deve essere attivato PRIMA di eseguire il play - * dello stream. Qualsiasi modifica effettuata durante il play - * non avra' effetto fino a che lo stream non viene fermato, - * e poi rimesso in play. + * Note: The loop must be activated BEFORE you play back the stream. + * Any changes made during play will not have 'effect until + * the stream is not stopped, and then comes back into play. * \****************************************************************************/ void SetLoop(bool bLoop); - - /****************************************************************************\ * * Function: void SetVolume(int dwVolume); * - * Description: Cambia il volume dello stream + * Description: Change stream colume * - * Input: int dwVolume Volume da settare (0-63) + * Input: int dwVolume Volume to be set (0-63) * \****************************************************************************/ @@ -550,10 +527,9 @@ public: * * Function: void GetVolume(LPINT lpdwVolume); * - * Description: Chiede il volume dello stream + * Description: Get stream volume * - * Input: LPINT lpdwVolume Variabile in cui verra' inserito - * il volume corrente + * Input: LPINT lpdwVolume Will contain the current stream volume * \****************************************************************************/ diff --git a/engines/tony/utils.cpp b/engines/tony/utils.cpp index 6d790c0e68..8e751a811a 100644 --- a/engines/tony/utils.cpp +++ b/engines/tony/utils.cpp @@ -57,7 +57,7 @@ RMString::~RMString() { * Copy constructor */ RMString::RMString(const RMString &str) { - // Richiama l'overload su '=' per copiare + // Use the overloaded '=' when copying _string = NULL; _length = 0; _realLength = 0; -- cgit v1.2.3