Strip trailing whitespaces in the whole code base.

svn-id: r40867

9 files changed, 130 insertions, 130 deletions

diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp
index 0c1e731d80..b7f9af427e 100644
--- a/engines/agos/charset-fontdata.cpp
+++ b/engines/agos/charset-fontdata.cpp
@@ -1770,104 +1770,104 @@ static const byte english_elvira1Font[] = {
 };
 
 static const byte english_pnFont[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 
-	0x00, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x24, 0x7E, 0x24, 0x24, 0x7E, 0x24, 0x00, 
-	0x00, 0x08, 0x3E, 0x28, 0x3E, 0x0A, 0x3E, 0x08, 
-	0x00, 0x62, 0x64, 0x08, 0x10, 0x26, 0x46, 0x00, 
-	0x00, 0x10, 0x28, 0x10, 0x2A, 0x44, 0x3A, 0x00, 
-	0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00, 
-	0x00, 0x20, 0x10, 0x10, 0x10, 0x10, 0x20, 0x00, 
-	0x00, 0x00, 0x14, 0x08, 0x3E, 0x08, 0x14, 0x00, 
-	0x00, 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10, 
-	0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 
-	0x00, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 
-	0x00, 0x3C, 0x46, 0x4A, 0x52, 0x62, 0x3C, 0x00, 
-	0x00, 0x18, 0x28, 0x08, 0x08, 0x08, 0x3E, 0x00, 
-	0x00, 0x3C, 0x42, 0x02, 0x3C, 0x40, 0x7E, 0x00, 
-	0x00, 0x3C, 0x42, 0x0C, 0x02, 0x42, 0x3C, 0x00, 
-	0x00, 0x08, 0x18, 0x28, 0x48, 0x7E, 0x08, 0x00, 
-	0x00, 0x7E, 0x40, 0x7C, 0x02, 0x42, 0x3C, 0x00, 
-	0x00, 0x3C, 0x40, 0x7C, 0x42, 0x42, 0x3C, 0x00, 
-	0x00, 0x7E, 0x02, 0x04, 0x08, 0x10, 0x10, 0x00, 
-	0x00, 0x3C, 0x42, 0x3C, 0x42, 0x42, 0x3C, 0x00, 
-	0x00, 0x3C, 0x42, 0x42, 0x3E, 0x02, 0x3C, 0x00, 
-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 
-	0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x20, 
-	0x00, 0x00, 0x04, 0x08, 0x10, 0x08, 0x04, 0x00, 
-	0x00, 0x00, 0x00, 0x3E, 0x00, 0x3E, 0x00, 0x00, 
-	0x00, 0x00, 0x10, 0x08, 0x04, 0x08, 0x10, 0x00, 
-	0x00, 0x3C, 0x42, 0x04, 0x08, 0x00, 0x08, 0x00, 
-	0x00, 0x3C, 0x4A, 0x56, 0x5E, 0x40, 0x3C, 0x00, 
-	0x00, 0x3C, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 
-	0x00, 0x7C, 0x42, 0x7C, 0x42, 0x42, 0x7C, 0x00, 
-	0x00, 0x3C, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x00, 
-	0x00, 0x78, 0x44, 0x42, 0x42, 0x44, 0x78, 0x00, 
-	0x00, 0x7E, 0x40, 0x7C, 0x40, 0x40, 0x7E, 0x00, 
-	0x00, 0x7E, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x00, 
-	0x00, 0x3C, 0x42, 0x40, 0x4E, 0x42, 0x3C, 0x00, 
-	0x00, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x42, 0x00, 
-	0x00, 0x3E, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00, 
-	0x00, 0x02, 0x02, 0x02, 0x42, 0x42, 0x3C, 0x00, 
-	0x00, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42, 0x00, 
-	0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7E, 0x00, 
-	0x00, 0x42, 0x66, 0x5A, 0x42, 0x42, 0x42, 0x00, 
-	0x00, 0x42, 0x62, 0x52, 0x4A, 0x46, 0x42, 0x00, 
-	0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 
-	0x00, 0x7C, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x00, 
-	0x00, 0x3C, 0x42, 0x42, 0x52, 0x4A, 0x3C, 0x00, 
-	0x00, 0x7C, 0x42, 0x42, 0x7C, 0x44, 0x42, 0x00, 
-	0x00, 0x3C, 0x40, 0x3C, 0x02, 0x42, 0x3C, 0x00, 
-	0x00, 0xFE, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 
-	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 
-	0x00, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 
-	0x00, 0x42, 0x42, 0x42, 0x42, 0x5A, 0x24, 0x00, 
-	0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00, 
-	0x00, 0x82, 0x44, 0x28, 0x10, 0x10, 0x10, 0x00, 
-	0x00, 0x7E, 0x04, 0x08, 0x10, 0x20, 0x7E, 0x00, 
-	0x00, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00, 
-	0x00, 0x00, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00, 
-	0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x70, 0x00, 
-	0x00, 0x10, 0x38, 0x54, 0x10, 0x10, 0x10, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 
-	0x00, 0x1C, 0x22, 0x78, 0x20, 0x20, 0x7E, 0x00, 
-	0x00, 0x00, 0x38, 0x04, 0x3C, 0x44, 0x3C, 0x00, 
-	0x00, 0x20, 0x20, 0x3C, 0x22, 0x22, 0x3C, 0x00, 
-	0x00, 0x00, 0x1C, 0x20, 0x20, 0x20, 0x1C, 0x00, 
-	0x00, 0x04, 0x04, 0x3C, 0x44, 0x44, 0x3C, 0x00, 
-	0x00, 0x00, 0x38, 0x44, 0x78, 0x40, 0x3C, 0x00, 
-	0x00, 0x0C, 0x10, 0x18, 0x10, 0x10, 0x10, 0x00, 
-	0x00, 0x00, 0x3C, 0x44, 0x44, 0x3C, 0x04, 0x38, 
-	0x00, 0x40, 0x40, 0x78, 0x44, 0x44, 0x44, 0x00, 
-	0x00, 0x10, 0x00, 0x30, 0x10, 0x10, 0x38, 0x00, 
-	0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x24, 0x18, 
-	0x00, 0x20, 0x28, 0x30, 0x30, 0x28, 0x24, 0x00, 
-	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0C, 0x00, 
-	0x00, 0x00, 0x68, 0x54, 0x54, 0x54, 0x54, 0x00, 
-	0x00, 0x00, 0x78, 0x44, 0x44, 0x44, 0x44, 0x00, 
-	0x00, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 
-	0x00, 0x00, 0x78, 0x44, 0x44, 0x78, 0x40, 0x40, 
-	0x00, 0x00, 0x3C, 0x44, 0x44, 0x3C, 0x04, 0x06, 
-	0x00, 0x00, 0x1C, 0x20, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x38, 0x40, 0x38, 0x04, 0x78, 0x00, 
-	0x00, 0x10, 0x38, 0x10, 0x10, 0x10, 0x0C, 0x00, 
-	0x00, 0x00, 0x44, 0x44, 0x44, 0x44, 0x38, 0x00, 
-	0x00, 0x00, 0x44, 0x44, 0x28, 0x28, 0x10, 0x00, 
-	0x00, 0x00, 0x44, 0x54, 0x54, 0x54, 0x28, 0x00, 
-	0x00, 0x00, 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 
-	0x00, 0x00, 0x44, 0x44, 0x44, 0x3C, 0x04, 0x38, 
-	0x00, 0x00, 0x7C, 0x08, 0x10, 0x20, 0x7C, 0x00, 
-	0x00, 0x0E, 0x08, 0x30, 0x08, 0x08, 0x0E, 0x00, 
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 
-	0x00, 0x70, 0x10, 0x0C, 0x10, 0x10, 0x70, 0x00, 
-	0x00, 0x14, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x3C, 0x42, 0x99, 0xA1, 0xA1, 0x99, 0x42, 0x3C, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x00,
+	0x00, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x24, 0x7E, 0x24, 0x24, 0x7E, 0x24, 0x00,
+	0x00, 0x08, 0x3E, 0x28, 0x3E, 0x0A, 0x3E, 0x08,
+	0x00, 0x62, 0x64, 0x08, 0x10, 0x26, 0x46, 0x00,
+	0x00, 0x10, 0x28, 0x10, 0x2A, 0x44, 0x3A, 0x00,
+	0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00,
+	0x00, 0x20, 0x10, 0x10, 0x10, 0x10, 0x20, 0x00,
+	0x00, 0x00, 0x14, 0x08, 0x3E, 0x08, 0x14, 0x00,
+	0x00, 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+	0x00, 0x3C, 0x46, 0x4A, 0x52, 0x62, 0x3C, 0x00,
+	0x00, 0x18, 0x28, 0x08, 0x08, 0x08, 0x3E, 0x00,
+	0x00, 0x3C, 0x42, 0x02, 0x3C, 0x40, 0x7E, 0x00,
+	0x00, 0x3C, 0x42, 0x0C, 0x02, 0x42, 0x3C, 0x00,
+	0x00, 0x08, 0x18, 0x28, 0x48, 0x7E, 0x08, 0x00,
+	0x00, 0x7E, 0x40, 0x7C, 0x02, 0x42, 0x3C, 0x00,
+	0x00, 0x3C, 0x40, 0x7C, 0x42, 0x42, 0x3C, 0x00,
+	0x00, 0x7E, 0x02, 0x04, 0x08, 0x10, 0x10, 0x00,
+	0x00, 0x3C, 0x42, 0x3C, 0x42, 0x42, 0x3C, 0x00,
+	0x00, 0x3C, 0x42, 0x42, 0x3E, 0x02, 0x3C, 0x00,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00,
+	0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x20,
+	0x00, 0x00, 0x04, 0x08, 0x10, 0x08, 0x04, 0x00,
+	0x00, 0x00, 0x00, 0x3E, 0x00, 0x3E, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x08, 0x04, 0x08, 0x10, 0x00,
+	0x00, 0x3C, 0x42, 0x04, 0x08, 0x00, 0x08, 0x00,
+	0x00, 0x3C, 0x4A, 0x56, 0x5E, 0x40, 0x3C, 0x00,
+	0x00, 0x3C, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00,
+	0x00, 0x7C, 0x42, 0x7C, 0x42, 0x42, 0x7C, 0x00,
+	0x00, 0x3C, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x00,
+	0x00, 0x78, 0x44, 0x42, 0x42, 0x44, 0x78, 0x00,
+	0x00, 0x7E, 0x40, 0x7C, 0x40, 0x40, 0x7E, 0x00,
+	0x00, 0x7E, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x00,
+	0x00, 0x3C, 0x42, 0x40, 0x4E, 0x42, 0x3C, 0x00,
+	0x00, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x42, 0x00,
+	0x00, 0x3E, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00,
+	0x00, 0x02, 0x02, 0x02, 0x42, 0x42, 0x3C, 0x00,
+	0x00, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42, 0x00,
+	0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7E, 0x00,
+	0x00, 0x42, 0x66, 0x5A, 0x42, 0x42, 0x42, 0x00,
+	0x00, 0x42, 0x62, 0x52, 0x4A, 0x46, 0x42, 0x00,
+	0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00,
+	0x00, 0x7C, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x00,
+	0x00, 0x3C, 0x42, 0x42, 0x52, 0x4A, 0x3C, 0x00,
+	0x00, 0x7C, 0x42, 0x42, 0x7C, 0x44, 0x42, 0x00,
+	0x00, 0x3C, 0x40, 0x3C, 0x02, 0x42, 0x3C, 0x00,
+	0x00, 0xFE, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x5A, 0x24, 0x00,
+	0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00,
+	0x00, 0x82, 0x44, 0x28, 0x10, 0x10, 0x10, 0x00,
+	0x00, 0x7E, 0x04, 0x08, 0x10, 0x20, 0x7E, 0x00,
+	0x00, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00,
+	0x00, 0x00, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00,
+	0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x70, 0x00,
+	0x00, 0x10, 0x38, 0x54, 0x10, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x00, 0x1C, 0x22, 0x78, 0x20, 0x20, 0x7E, 0x00,
+	0x00, 0x00, 0x38, 0x04, 0x3C, 0x44, 0x3C, 0x00,
+	0x00, 0x20, 0x20, 0x3C, 0x22, 0x22, 0x3C, 0x00,
+	0x00, 0x00, 0x1C, 0x20, 0x20, 0x20, 0x1C, 0x00,
+	0x00, 0x04, 0x04, 0x3C, 0x44, 0x44, 0x3C, 0x00,
+	0x00, 0x00, 0x38, 0x44, 0x78, 0x40, 0x3C, 0x00,
+	0x00, 0x0C, 0x10, 0x18, 0x10, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x3C, 0x44, 0x44, 0x3C, 0x04, 0x38,
+	0x00, 0x40, 0x40, 0x78, 0x44, 0x44, 0x44, 0x00,
+	0x00, 0x10, 0x00, 0x30, 0x10, 0x10, 0x38, 0x00,
+	0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x24, 0x18,
+	0x00, 0x20, 0x28, 0x30, 0x30, 0x28, 0x24, 0x00,
+	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0C, 0x00,
+	0x00, 0x00, 0x68, 0x54, 0x54, 0x54, 0x54, 0x00,
+	0x00, 0x00, 0x78, 0x44, 0x44, 0x44, 0x44, 0x00,
+	0x00, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+	0x00, 0x00, 0x78, 0x44, 0x44, 0x78, 0x40, 0x40,
+	0x00, 0x00, 0x3C, 0x44, 0x44, 0x3C, 0x04, 0x06,
+	0x00, 0x00, 0x1C, 0x20, 0x20, 0x20, 0x20, 0x00,
+	0x00, 0x00, 0x38, 0x40, 0x38, 0x04, 0x78, 0x00,
+	0x00, 0x10, 0x38, 0x10, 0x10, 0x10, 0x0C, 0x00,
+	0x00, 0x00, 0x44, 0x44, 0x44, 0x44, 0x38, 0x00,
+	0x00, 0x00, 0x44, 0x44, 0x28, 0x28, 0x10, 0x00,
+	0x00, 0x00, 0x44, 0x54, 0x54, 0x54, 0x28, 0x00,
+	0x00, 0x00, 0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+	0x00, 0x00, 0x44, 0x44, 0x44, 0x3C, 0x04, 0x38,
+	0x00, 0x00, 0x7C, 0x08, 0x10, 0x20, 0x7C, 0x00,
+	0x00, 0x0E, 0x08, 0x30, 0x08, 0x08, 0x0E, 0x00,
+	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+	0x00, 0x70, 0x10, 0x0C, 0x10, 0x10, 0x70, 0x00,
+	0x00, 0x14, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x3C, 0x42, 0x99, 0xA1, 0xA1, 0x99, 0x42, 0x3C,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) {
diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index d52bcc175a..8bdb35d3ae 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.cpp
@@ -539,7 +539,7 @@ void AGOSEngine::dumpBitmap(const char *filename, const byte *offs, uint16 w, ui
 				src += 5;
 			} while (--count);
 			dst += w;
-		} 
+		}
 	} else if (flags & 0x80) {
 		for (i = 0; i != w; i += 2) {
 			byte *c = vc10_depackColumn(&state);
@@ -580,7 +580,7 @@ void AGOSEngine::palLoad(byte *pal, const byte *vga1, int a, int b) {
 	const byte *src;
 	uint16 num, palSize;
 	byte *palptr = (byte *)&pal[0];
-	
+
 	if (getGameType() == GType_FF || getGameType() == GType_PP) {
 		num = 256;
 		palSize = 768;
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index 58599ce5f6..0472b1192b 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -354,11 +354,11 @@ void AGOSEngine::drawIcon(WindowBlock *window, uint icon, uint x, uint y) {
 			dst += _dxSurfacePitch;
 		}
 	} else {
-		uint8 palette[4];	
-		palette[0] = *src >> 4;	
-		palette[1] = *src++ & 0xf;	
-		palette[2] = *src >> 4;	
-		palette[3] = *src++ & 0xf;	
+		uint8 palette[4];
+		palette[0] = *src >> 4;
+		palette[1] = *src++ & 0xf;
+		palette[2] = *src >> 4;
+		palette[3] = *src++ & 0xf;
 		for (int yp = 0; yp < 24; ++yp, src += 6) {
 			// Get bit-set representing the 24 pixels for the line
 			uint32 v1 = (READ_BE_UINT16(src) << 8) | *(src + 4);
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index a8c1bf4bfa..cf6e808384 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -463,9 +463,9 @@ bool AGOSEngine::processSpecialKeys() {
 			_lastMinute = t1;
 		}
 	}
-	
+
 	if (shouldQuit())
-		_exitCutscene = true;		
+		_exitCutscene = true;
 
 	switch (_keyPressed.keycode) {
 	case Common::KEYCODE_UP:
@@ -694,7 +694,7 @@ void AGOSEngine_PN::interact(char *buffer, uint8 size) {
 		_inputting = true;
 		_inputReady = true;
 	}
-	
+
 	while (!shouldQuit() && _inputReady) {
 		if (!_noScanFlag && _scanFlag) {
 			buffer[0] = 1;
@@ -744,7 +744,7 @@ void AGOSEngine_PN::clearCursor(WindowBlock *window) {
 
 bool AGOSEngine_PN::processSpecialKeys() {
 	if (shouldQuit())
-		_exitCutscene = true;		
+		_exitCutscene = true;
 
 	switch (_keyPressed.keycode) {
 	case Common::KEYCODE_ESCAPE:
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index f6cac8c36a..4278ed11e6 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -704,7 +704,7 @@ static bool getBit(Common::Stack<uint32> &dataList, uint32 &srcVal) {
 
 static uint32 copyBits(Common::Stack<uint32> &dataList, uint32 &srcVal, int numBits) {
 	uint32 destVal = 0;
-	
+
 	for (int i = 0; i < numBits; ++i) {
 		bool f = getBit(dataList, srcVal);
 		destVal = (destVal << 1) | (f ? 1 : 0);
diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp
index 2dbd4e52fb..62ca94e387 100644
--- a/engines/agos/script_pn.cpp
+++ b/engines/agos/script_pn.cpp
@@ -147,7 +147,7 @@ void AGOSEngine_PN::opn_opcode01() {
 	int32 sp = varval() + varval();
 	_variableArray[12] = sp % 65536;
 	_variableArray[13] = sp / 65536;
-	if (sp > 65535) 
+	if (sp > 65535)
 		sp=65535;
 	writeval(str, (int)sp);
 	setScriptReturn(true);
@@ -329,7 +329,7 @@ void AGOSEngine_PN::opn_opcode25() {
 void AGOSEngine_PN::opn_opcode26() {
 	while ((_stackbase->classnum != -1) && (_stackbase != NULL))
 		junkstack();
-	dumpstack(); 
+	dumpstack();
 	setScriptReturn(true);
 }
 
@@ -371,10 +371,10 @@ void AGOSEngine_PN::opn_opcode31() {
 			slot = matchSaveGame(_saveFile, countSaveGames());
 			strcpy(bf, genSaveName(slot));
 			break;
-		case 1: 
+		case 1:
 			strcpy(bf, "test.sav");
 			break;
-		case 2: 
+		case 2:
 			// NOTE: Is this case ever used?
 			error("opn_opcode31: case 2");
 			break;
@@ -776,7 +776,7 @@ void AGOSEngine_PN::writeval(uint8 *ptr, int val) {
 	_workptr = ptr;
 	_linct = 255;
 
-	if ((a = readfromline()) < 247) 
+	if ((a = readfromline()) < 247)
 		error("writeval: Write to constant (%d)", a);
 
 	switch (a) {
@@ -836,7 +836,7 @@ int AGOSEngine_PN::actCallD(int n) {
 	funcentry(pf, n);
 	addstack(-1);
 	funccpy(pf);
-	setposition(n, 0); 
+	setposition(n, 0);
 	return(doline(1));
 }
 
@@ -1065,7 +1065,7 @@ void AGOSEngine_PN::dumpstack() {
 	if (_stackbase == NULL)
 		error("dumpstack: Stack underflow or unknown longjmp");
 
-	a = _stackbase->nextframe; 
+	a = _stackbase->nextframe;
 	free((char *)_stackbase);
 	_stackbase = a;
 }
@@ -1076,7 +1076,7 @@ void AGOSEngine_PN::junkstack() {
 	if (_stackbase == NULL)
 		error("junkstack: Stack underflow or unknown longjmp");
 
-	a = _stackbase->nextframe; 
+	a = _stackbase->nextframe;
 	if (_stackbase->classnum == -1)
 		free((char *)_stackbase->savearea);
 	free((char *)_stackbase);
@@ -1100,7 +1100,7 @@ void AGOSEngine_PN::popstack(int type) {
 	b = 0;
 	while (a < 6)
 		_variableArray[b++] = _stackbase->flag[a++];
-	b = 24; 
+	b = 24;
 	a = 0;
 	while (a < 8)
 		_variableArray[b++] = _stackbase->param[a++];
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 6f5fb391e5..4a88e3aad1 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.cpp
@@ -56,7 +56,7 @@ byte *AGOSEngine::uncompressToken(byte a, byte *ptr) {
 	if (a == 0xFF || a == 0xFE || a == 0xFD) {
 		if (a == 0xFF)
 			ptr2 = _twoByteTokenStrings;
-		if (a == 0xFE) 
+		if (a == 0xFE)
 			ptr2 = _secondTwoByteTokenStrings;
 		if (a == 0xFD)
 			ptr2 = _thirdTwoByteTokenStrings;
@@ -79,7 +79,7 @@ byte *AGOSEngine::uncompressToken(byte a, byte *ptr) {
 					count1++;
 				}
 				ptr1 = _byteTokenStrings;		/* Find it */
-				while (count1--)	{			
+				while (count1--)	{
 					while (*ptr1++)
 						;
 				}
@@ -224,7 +224,7 @@ l1:		_stringTabPtr[i++] = mem;
 				;
 			mem++;
 		}
-	
+
 		_stringTabPos = i;
 	}
 }
@@ -936,7 +936,7 @@ char *AGOSEngine_PN::unctok(char *c, int n) {
 	*c = 0;
 	return c;
 }
-	
+
 void AGOSEngine_PN::uncomstr(char *c, uint32 x) {
 	if (x > _textBaseSize)
 		error("UNCOMSTR: TBASE over-run\n");
@@ -1441,7 +1441,7 @@ void AGOSEngine_PN::getResponse(uint16 charNum, uint16 objNum, uint16 &msgNum1,
 		}
 		ptr++;
 	}
-		
+
 	while ((num = *ptr++) != 0) {
 		if (num == objNum) {
 			msgNum2 = *ptr++;
@@ -1534,7 +1534,7 @@ char *AGOSEngine_PN::getMessage(char *msg, uint16 num) {
 					char *tmpPtr = strPtr1;
 					char *strPtr2 = strPtr1;
 
-					while (*strPtr2 != 0 && *strPtr2 != 32) 
+					while (*strPtr2 != 0 && *strPtr2 != 32)
 						strPtr2++;
 
 					while (*strPtr2) {
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index aee42f001b..742ac48ac8 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -540,7 +540,7 @@ int AGOSEngine::startSubroutine(Subroutine *sub) {
 
 	// WORKAROUND: If the game is saved, right after Simon is thrown in the dungeon of Sordid's Fortress of Doom,
 	// the saved game fails to load correctly. When loading the saved game, the sequence of Simon waking is started,
-	// before the scene is actually reloaded, due to a script bug. We manually add the extra script code from the 
+	// before the scene is actually reloaded, due to a script bug. We manually add the extra script code from the
 	// updated DOS CD release, which fixed this particular script bug.
 	if (getGameType() == GType_SIMON2 && sub->id == 12101) {
 		const byte bit = 228;
@@ -577,7 +577,7 @@ restart:
 	}
 
 	// WORKAROUND: Feeble walks in the incorrect direction, when looking at the Vent in the Research and Testing area of
-	// the Company Central Command Compound. We manually add the extra script code from the updated English 2CD release, 
+	// the Company Central Command Compound. We manually add the extra script code from the updated English 2CD release,
 	// which fixed this particular script bug.
 	if (getGameType() == GType_FF && _language == Common::EN_ANY) {
 		if (sub->id == 39125 && readVariable(84) == 2) {
diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp
index c348401968..2486f09626 100644
--- a/engines/agos/verb.cpp
+++ b/engines/agos/verb.cpp
@@ -754,7 +754,7 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) {
 
 	if (_clickOnly)
 		return;
- 
+
 	if (best_ha->flags & kBFInvertTouch) {
 		if (!(best_ha->flags & kBFBoxSelected)) {
 			hitarea_leave(best_ha, false);
@@ -763,7 +763,7 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) {
 	} else {
 		if (mode == 0)
 			return;
- 
+
 		if (!(best_ha->flags & kBFInvertSelect))
 			return;
 
@@ -1145,7 +1145,7 @@ void AGOSEngine_PN::hitBox1(HitArea *ha) {
 		_mousePrintFG++;
 		_mouseString1 = _mouseString;
 		_mouseString = (const char*)"showname \0";
-	
+
 	}
 }