TONY: Miscellaneous comment translations and comment cleanup

5 files changed, 9 insertions, 61 deletions

diff --git a/engines/tony/font.h b/engines/tony/font.h
index b7488399a4..6acfea7295 100644
--- a/engines/tony/font.h
+++ b/engines/tony/font.h
@@ -341,7 +341,7 @@ public:
 
 
 /**
- * Gestisce la schermata di scelta delle voci di un dialogo
+ * Manages the selection of screen items in a box
  */
 class RMDialogChoice : public RMGfxWoodyBuffer {
 private:
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index 02eb996562..8fe05abb3b 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -1422,7 +1422,7 @@ bool RMOptionScreen::LoadThumbnailFromSaveState(int nState, byte *lpDestBuf, RMS
 
 		cmpbuf = new byte[160 * 120 * 4];
 
-		// Se la versione >= 5, è compresso!
+		// Read in the compressed data
 		cmpsize = f->readUint32LE();
 		f->read(cmpbuf, cmpsize);
 
diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp
index 170870a89b..6ec10b3aaa 100644
--- a/engines/tony/gfxcore.cpp
+++ b/engines/tony/gfxcore.cpp
@@ -1800,7 +1800,7 @@ void RMGfxSourceBuffer8RLEWordAA::Init(RMDataStream &ds, int dimx, int dimy, boo
 	RMGfxSourceBuffer8RLE::Init(ds, dimx, dimy, bLoadPalette);
 
 	if (!bNeedRLECompress) {
-		// Carica la maschera di antialiasing
+		// Load the anti-aliasing mask
 		m_aabuf = new byte[dimx * dimy];
 		ds.Read(m_aabuf, dimx * dimy);
 	}
diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp
index a90b1ecdb5..d14b6972c8 100644
--- a/engines/tony/loc.cpp
+++ b/engines/tony/loc.cpp
@@ -1964,7 +1964,7 @@ bool RMLocation::Load(Common::File &file) {
 	int size;
 	bool bRet;
 
-	// Calcola la lunghezza del file
+	// Get the file size
 	size = file.size();
 	file.seek(0);
 
diff --git a/engines/tony/mpal/mpaldll.h b/engines/tony/mpal/mpaldll.h
index 8216e7b166..90fa31ef1d 100644
--- a/engines/tony/mpal/mpaldll.h
+++ b/engines/tony/mpal/mpaldll.h
@@ -44,20 +44,11 @@ namespace MPAL {
 
 #define HEX_VERSION             0x0170
 
-/*
-  Safe
-
-#define MAX_ACTIONS_PER_ITEM    40
-#define MAX_COMMANDS_PER_ITEM   256
-#define MAX_COMMANDS_PER_ACTION 64
-#define MAX_DESCRIBE_SIZE				128
-*/
 
 #define MAX_ACTIONS_PER_ITEM    40
 #define MAX_COMMANDS_PER_ITEM   128
 #define MAX_COMMANDS_PER_ACTION 128
-#define MAX_DESCRIBE_SIZE				64
-
+#define MAX_DESCRIBE_SIZE		64
 
 
 #define MAX_MOMENTS_PER_SCRIPT  256
@@ -65,22 +56,6 @@ namespace MPAL {
 #define MAX_COMMANDS_PER_MOMENT 32
 
 
-
-
-
-/*
-   Secure version!
-
-#define MAX_GROUPS_PER_DIALOG   128
-#define MAX_COMMANDS_PER_DIALOG 640
-#define MAX_COMMANDS_PER_GROUP  64
-#define MAX_CHOICES_PER_DIALOG  64
-#define MAX_SELECTS_PER_CHOICE  33
-#define MAX_PLAYGROUPS_PER_SELECT 9
-#define MAX_PERIODS_PER_DIALOG  640
-
-*/
-
 #define MAX_GROUPS_PER_DIALOG   128
 #define MAX_COMMANDS_PER_DIALOG 480
 #define MAX_COMMANDS_PER_GROUP  64
@@ -89,17 +64,6 @@ namespace MPAL {
 #define MAX_PLAYGROUPS_PER_SELECT 9
 #define MAX_PERIODS_PER_DIALOG  400
 
-/*
-  Before Rufus:
-
-#define MAX_GROUPS_PER_DIALOG   128
-#define MAX_COMMANDS_PER_DIALOG 512
-#define MAX_COMMANDS_PER_GROUP  32
-#define MAX_CHOICES_PER_DIALOG  64
-#define MAX_SELECTS_PER_CHOICE  32
-#define MAX_PLAYGROUPS_PER_SELECT 4
-#define MAX_PERIODS_PER_DIALOG  512
-*/
 
 #define NEED_LOCK_MSGS
 
@@ -242,29 +206,13 @@ struct MPALITEM {
 
 	struct command Command[MAX_COMMANDS_PER_ITEM];
 
-  // Array of structures containing various managed activities. In practice, of
-  // every action we know what commands to run, including those defined in
-  // structures above
-/*
-  struct
-  {
-    byte    num;			// Numero dell'azione
-    uint16    wTime;		// In caso di idle, il tempo che deve passare
-    byte    perc;			// Percentuale di eseguire l'idle
-    HGLOBAL when;			// Espressione da calcolare: se !=0, allora
-							//  l'azione puo' essere eseguita
-    uint16    wParm;		// Parametro per l'azione
-
-    byte nCmds;				// Numero comandi da eseguire
-    uint32 CmdNum[MAX_COMMANDS_PER_ACTION]; // Comando da eseguire
-
-  } Action[MAX_ACTIONS_PER_ITEM];
-	*/
+	// Pointer to array of structures containing various managed activities. In practice, of
+	// every action we know what commands to run, including those defined in structures above
 	struct ItemAction *Action;
 
 } PACKED_STRUCT;
-typedef MPALITEM*       LPMPALITEM;
-typedef LPMPALITEM*     LPLPMPALITEM;
+typedef MPALITEM *LPMPALITEM;
+typedef LPMPALITEM *LPLPMPALITEM;
 
 
 /**