23 files changed, 125 insertions, 125 deletions

diff --git a/engines/mads/dialogs.h b/engines/mads/dialogs.h
index 6de6ea71c1..aad29f6551 100644
--- a/engines/mads/dialogs.h
+++ b/engines/mads/dialogs.h
@@ -96,7 +96,7 @@ public:
 
 #define TEXT_DIALOG_MAX_LINES 20
 
-class TextDialog: protected Dialog {
+class TextDialog : protected Dialog {
 private:
 	/**
 	 * Append text to the currently end line.
@@ -192,7 +192,7 @@ public:
 	virtual void show();
 };
 
-class MessageDialog: public TextDialog {
+class MessageDialog : public TextDialog {
 public:
 	MessageDialog(MADSEngine *vm, int lines, ...);
 
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes.h b/engines/mads/dragonsphere/dragonsphere_scenes.h
index 2d23381d25..a6c778eca7 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes.h
+++ b/engines/mads/dragonsphere/dragonsphere_scenes.h
@@ -677,7 +677,7 @@ public:
 };
 
 // TODO: Temporary, remove once implemented properly
-class DummyScene: public DragonsphereScene {
+class DummyScene : public DragonsphereScene {
 public:
 	DummyScene(MADSEngine *vm) : DragonsphereScene(vm) {
 		warning("Unimplemented scene");
diff --git a/engines/mads/dragonsphere/game_dragonsphere.h b/engines/mads/dragonsphere/game_dragonsphere.h
index b4c4c41d20..5147f75178 100644
--- a/engines/mads/dragonsphere/game_dragonsphere.h
+++ b/engines/mads/dragonsphere/game_dragonsphere.h
@@ -89,7 +89,7 @@ enum InventoryObject {
 };
 
 // HACK: A stub for now, remove from here once it's implemented properly
-class DragonsphereGlobals: public Globals {
+class DragonsphereGlobals : public Globals {
 public:
 	DragonsphereGlobals() {
 		resize(210);	// Rex has 210 globals
@@ -97,7 +97,7 @@ public:
 	virtual ~DragonsphereGlobals() {}
 };
 
-class GameDragonsphere: public Game {
+class GameDragonsphere : public Game {
 	friend class Game;
 protected:
 	GameDragonsphere(MADSEngine *vm);
@@ -125,7 +125,7 @@ public:
 };
 
 
-class Section1Handler: public SectionHandler {
+class Section1Handler : public SectionHandler {
 public:
 	Section1Handler(MADSEngine *vm) : SectionHandler(vm) {}
 
diff --git a/engines/mads/game_data.h b/engines/mads/game_data.h
index cf2d0bdf60..f15cd1a8f0 100644
--- a/engines/mads/game_data.h
+++ b/engines/mads/game_data.h
@@ -32,7 +32,7 @@ namespace MADS {
 class MADSEngine;
 class Game;
 
-class VisitedScenes: public SynchronizedList {
+class VisitedScenes : public SynchronizedList {
 public:
 	/**
 	 * Stores true when a previously visited scene is revisited
diff --git a/engines/mads/globals.h b/engines/mads/globals.h
index 92cd0bb403..a6c9b628dd 100644
--- a/engines/mads/globals.h
+++ b/engines/mads/globals.h
@@ -30,7 +30,7 @@
 
 namespace MADS {
 
-class Globals: public SynchronizedList {
+class Globals : public SynchronizedList {
 public:
 	Globals() {}
 
diff --git a/engines/mads/inventory.h b/engines/mads/inventory.h
index a2f35c333d..09ed67a826 100644
--- a/engines/mads/inventory.h
+++ b/engines/mads/inventory.h
@@ -77,7 +77,7 @@ public:
 	int getQuality(int qualityId) const;
 };
 
-class InventoryObjects: public Common::Array<InventoryObject> {
+class InventoryObjects : public Common::Array<InventoryObject> {
 private:
 	MADSEngine *_vm;
 
diff --git a/engines/mads/messages.h b/engines/mads/messages.h
index 241f493434..1eff14bfa5 100644
--- a/engines/mads/messages.h
+++ b/engines/mads/messages.h
@@ -72,7 +72,7 @@ struct RandomEntry {
 	RandomEntry() { _handle = _quoteId = -1; }
 };
 
-class RandomMessages: public Common::Array<RandomEntry> {
+class RandomMessages : public Common::Array<RandomEntry> {
 public:
 	Common::Rect _bounds;
 	int _randomSpacing;
@@ -147,7 +147,7 @@ public:
 
 #define TEXT_DISPLAY_SIZE 40
 
-class TextDisplayList: public Common::Array<TextDisplay> {
+class TextDisplayList : public Common::Array<TextDisplay> {
 private:
 	MADSEngine *_vm;
 public:
diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h
index 99a93f81cc..cb1ecfba28 100644
--- a/engines/mads/nebular/dialogs_nebular.h
+++ b/engines/mads/nebular/dialogs_nebular.h
@@ -33,7 +33,7 @@ namespace Nebular {
 
 enum CapitalizationMode { kUppercase = 0, kLowercase = 1, kUpperAndLower = 2 };
 
-class DialogsNebular: public Dialogs {
+class DialogsNebular : public Dialogs {
 	friend class Dialogs;
 private:
 	int _dialogWidth;
@@ -62,7 +62,7 @@ struct HOGANUS {
 	Common::String _word;
 };
 
-class CopyProtectionDialog: public TextDialog {
+class CopyProtectionDialog : public TextDialog {
 private:
 	HOGANUS _hogEntry;
 
diff --git a/engines/mads/nebular/game_nebular.h b/engines/mads/nebular/game_nebular.h
index ee30492792..6620deaea6 100644
--- a/engines/mads/nebular/game_nebular.h
+++ b/engines/mads/nebular/game_nebular.h
@@ -96,7 +96,7 @@ enum InventoryObject {
 	OBJ_LECITHIN = 54
 };
 
-class GameNebular: public Game {
+class GameNebular : public Game {
 	friend class Game;
 protected:
 	GameNebular(MADSEngine *vm);
@@ -127,7 +127,7 @@ public:
 };
 
 
-class Section1Handler: public SectionHandler {
+class Section1Handler : public SectionHandler {
 public:
 	Section1Handler(MADSEngine *vm) : SectionHandler(vm) {}
 
diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h
index 980e6ea1eb..88605a290e 100644
--- a/engines/mads/nebular/globals_nebular.h
+++ b/engines/mads/nebular/globals_nebular.h
@@ -280,7 +280,7 @@ enum {
 #define TELEPORTER_WORK_COUNT 6  // Total number that actually work
 
 
-class NebularGlobals: public Globals {
+class NebularGlobals : public Globals {
 public:
 	SynchronizedList _spriteIndexes;
 	SynchronizedList _sequenceIndexes;
diff --git a/engines/mads/nebular/nebular_scenes1.h b/engines/mads/nebular/nebular_scenes1.h
index 96d2bb95eb..1afa7fccc1 100644
--- a/engines/mads/nebular/nebular_scenes1.h
+++ b/engines/mads/nebular/nebular_scenes1.h
@@ -53,7 +53,7 @@ public:
 	Scene1xx(MADSEngine *vm) : NebularScene(vm) {}
 };
 
-class Scene101: public Scene1xx {
+class Scene101 : public Scene1xx {
 private:
 	bool _sittingFl;
 	bool _panelOpened;
diff --git a/engines/mads/nebular/nebular_scenes2.h b/engines/mads/nebular/nebular_scenes2.h
index e70444a256..c860db9470 100644
--- a/engines/mads/nebular/nebular_scenes2.h
+++ b/engines/mads/nebular/nebular_scenes2.h
@@ -49,7 +49,7 @@ public:
 	Scene2xx(MADSEngine *vm) : NebularScene(vm) {}
 };
 
-class Scene201: public Scene2xx {
+class Scene201 : public Scene2xx {
 private:
 	bool _pterodactylFlag;
 
@@ -63,7 +63,7 @@ public:
 	virtual void actions();
 };
 
-class Scene202: public Scene2xx {
+class Scene202 : public Scene2xx {
 private:
 	bool _activeMsgFl, _ladderTopFl, _waitingMeteoFl, _toStationFl, _toTeleportFl;
 	int _ladderHotspotId, _lastRoute, _stationCounter, _meteoFrame;
@@ -88,7 +88,7 @@ public:
 	void setRandomKernelMessage();
 };
 
-class Scene203: public Scene2xx {
+class Scene203 : public Scene2xx {
 private:
 	bool _rhotundaEat2Fl, _rhotundaEatFl;
 
@@ -103,7 +103,7 @@ public:
 	virtual void actions();
 };
 
-class Scene205: public Scene2xx {
+class Scene205 : public Scene2xx {
 private:
 	uint32 _lastFishTime, _chickenTime;
 	bool _beingKicked;
@@ -122,7 +122,7 @@ public:
 	virtual void actions();
 };
 
-class Scene207: public Scene2xx {
+class Scene207 : public Scene2xx {
 private:
 	bool _vultureFl, _spiderFl, _eyeFl;
 	int _spiderHotspotId, _vultureHotspotId;
@@ -142,7 +142,7 @@ public:
 	virtual void actions();
 };
 
-class Scene208: public Scene2xx {
+class Scene208 : public Scene2xx {
 private:
 	bool _rhotundaTurnFl, _boundingFl;
 	int32 _rhotundaTime;
@@ -161,7 +161,7 @@ public:
 	virtual void actions();
 };
 
-class Scene209: public Scene2xx {
+class Scene209 : public Scene2xx {
 private:
 	bool _dodgeFl, _forceDodgeFl, _shouldDodgeFl;
 	bool _pitchFl;
@@ -207,7 +207,7 @@ public:
 	virtual void actions();
 };
 
-class Scene210: public Scene2xx {
+class Scene210 : public Scene2xx {
 private:
 	int _curDialogNode;
 	int _nextHandsPlace;
@@ -246,7 +246,7 @@ public:
 	virtual void actions();
 };
 
-class Scene211: public Scene2xx {
+class Scene211 : public Scene2xx {
 private:
 	bool _ambushFl, _wakeFl;
 	int _monkeyFrame, _scrollY;
@@ -263,7 +263,7 @@ public:
 	virtual void actions();
 };
 
-class Scene212: public Scene2xx {
+class Scene212 : public Scene2xx {
 public:
 	Scene212(MADSEngine *vm) : Scene2xx(vm) {}
 	virtual void setup();
@@ -273,7 +273,7 @@ public:
 	virtual void actions();
 };
 
-class Scene213: public SceneTeleporter {
+class Scene213 : public SceneTeleporter {
 public:
 	Scene213(MADSEngine *vm) : SceneTeleporter(vm) {}
 
@@ -283,7 +283,7 @@ public:
 	virtual void actions();
 };
 
-class Scene214: public Scene2xx {
+class Scene214 : public Scene2xx {
 private:
 	uint32 _devilTime;
 	bool _devilRunningFl;
@@ -298,7 +298,7 @@ public:
 	virtual void actions();
 };
 
-class Scene215: public Scene2xx {
+class Scene215 : public Scene2xx {
 public:
 	Scene215(MADSEngine *vm) : Scene2xx(vm) {}
 
@@ -308,7 +308,7 @@ public:
 	virtual void actions();
 };
 
-class Scene216: public Scene2xx {
+class Scene216 : public Scene2xx {
 public:
 	Scene216(MADSEngine *vm) : Scene2xx(vm) {}
 
diff --git a/engines/mads/nebular/nebular_scenes3.h b/engines/mads/nebular/nebular_scenes3.h
index 30ab333e53..d44a81520a 100644
--- a/engines/mads/nebular/nebular_scenes3.h
+++ b/engines/mads/nebular/nebular_scenes3.h
@@ -80,7 +80,7 @@ public:
 	virtual void preActions();
 };
 
-class Scene301: public Scene3xx {
+class Scene301 : public Scene3xx {
 public:
 	Scene301(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -89,7 +89,7 @@ public:
 	virtual void step();
 };
 
-class Scene302: public Scene3xx {
+class Scene302 : public Scene3xx {
 private:
 	int _oldFrame;
 
@@ -102,7 +102,7 @@ public:
 	virtual void step();
 };
 
-class Scene303: public Scene3xx {
+class Scene303 : public Scene3xx {
 public:
 	Scene303(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -111,7 +111,7 @@ public:
 	virtual void step();
 };
 
-class Scene304: public Scene3xx {
+class Scene304 : public Scene3xx {
 private:
 	int _explosionSpriteId;
 
@@ -124,7 +124,7 @@ public:
 	virtual void step();
 };
 
-class Scene307: public Scene3xx {
+class Scene307 : public Scene3xx {
 private:
 	ForceField _forceField;
 
@@ -162,7 +162,7 @@ public:
 	virtual void actions();
 };
 
-class Scene308: public Scene3xx {
+class Scene308 : public Scene3xx {
 private:
 	ForceField _forceField;
 
@@ -175,7 +175,7 @@ public:
 	virtual void step();
 };
 
-class Scene309: public Scene3xx {
+class Scene309 : public Scene3xx {
 private:
 	ForceField _forceField;
 	int _characterSpriteIndexes[3];
@@ -191,7 +191,7 @@ public:
 	virtual void step();
 };
 
-class Scene310: public Scene3xx {
+class Scene310 : public Scene3xx {
 private:
 	ForceField _forceField;
 
@@ -204,7 +204,7 @@ public:
 	virtual void step();
 };
 
-class Scene311: public Scene3xx {
+class Scene311 : public Scene3xx {
 private:
 	bool _checkGuardFl;
 
@@ -218,7 +218,7 @@ public:
 	virtual void actions();
 };
 
-class Scene313: public Scene3xx {
+class Scene313 : public Scene3xx {
 public:
 	Scene313(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -227,7 +227,7 @@ public:
 	virtual void actions();
 };
 
-class Scene316: public Scene3xx {
+class Scene316 : public Scene3xx {
 private:
 	void handleRexInGrate();
 	void handleRoxInGrate();
@@ -242,7 +242,7 @@ public:
 	virtual void actions();
 };
 
-class Scene318: public Scene3xx {
+class Scene318 : public Scene3xx {
 private:
 	uint32 _dropTimer;
 
@@ -278,7 +278,7 @@ public:
 	virtual void actions();
 };
 
-class Scene319: public Scene3xx {
+class Scene319 : public Scene3xx {
 private:
 	Conversation _dialog1, _dialog2, _dialog3;
 
@@ -306,7 +306,7 @@ public:
 	virtual void actions();
 };
 
-class Scene320: public Scene300s {
+class Scene320 : public Scene300s {
 private:
 	void setRightView(int view);
 	void setLeftView(int view);
@@ -331,7 +331,7 @@ public:
 	virtual void actions();
 };
 
-class Scene321: public Scene3xx {
+class Scene321 : public Scene3xx {
 public:
 	Scene321(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -340,7 +340,7 @@ public:
 	virtual void step();
 };
 
-class Scene322: public SceneTeleporter {
+class Scene322 : public SceneTeleporter {
 public:
 	Scene322(MADSEngine *vm) : SceneTeleporter(vm) {}
 
@@ -350,7 +350,7 @@ public:
 	virtual void actions();
 };
 
-class Scene351: public Scene3xx {
+class Scene351 : public Scene3xx {
 public:
 	Scene351(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -360,7 +360,7 @@ public:
 	virtual void actions();
 };
 
-class Scene352: public Scene3xx {
+class Scene352 : public Scene3xx {
 private:
 	bool _vaultOpenFl;
 	bool _mustPutArmDownFl;
@@ -385,7 +385,7 @@ public:
 	virtual void actions();
 };
 
-class Scene353: public Scene3xx {
+class Scene353 : public Scene3xx {
 public:
 	Scene353(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -394,7 +394,7 @@ public:
 	virtual void actions();
 };
 
-class Scene354: public Scene3xx {
+class Scene354 : public Scene3xx {
 public:
 	Scene354(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -404,7 +404,7 @@ public:
 	virtual void actions();
 };
 
-class Scene357: public Scene3xx {
+class Scene357 : public Scene3xx {
 public:
 	Scene357(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -414,7 +414,7 @@ public:
 	virtual void actions();
 };
 
-class Scene358: public Scene3xx {
+class Scene358 : public Scene3xx {
 public:
 	Scene358(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -424,7 +424,7 @@ public:
 	virtual void actions();
 };
 
-class Scene359: public Scene3xx {
+class Scene359 : public Scene3xx {
 private:
 	int _cardHotspotId;
 
@@ -438,7 +438,7 @@ public:
 	virtual void actions();
 };
 
-class Scene360: public Scene3xx {
+class Scene360 : public Scene3xx {
 public:
 	Scene360(MADSEngine *vm) : Scene3xx(vm) {}
 
@@ -448,7 +448,7 @@ public:
 	virtual void actions();
 };
 
-class Scene361: public Scene3xx {
+class Scene361 : public Scene3xx {
 private:
 	void handleRexAction();
 	void handleRoxAction();
@@ -463,7 +463,7 @@ public:
 	virtual void actions();
 };
 
-class Scene366: public Scene300s {
+class Scene366 : public Scene300s {
 public:
 	Scene366(MADSEngine *vm) : Scene300s(vm) {}
 
@@ -472,7 +472,7 @@ public:
 	virtual void actions();
 };
 
-class Scene387: public Scene300s {
+class Scene387 : public Scene300s {
 public:
 	Scene387(MADSEngine *vm) : Scene300s(vm) {}
 
@@ -481,7 +481,7 @@ public:
 	virtual void actions();
 };
 
-class Scene388: public Scene300s {
+class Scene388 : public Scene300s {
 public:
 	Scene388(MADSEngine *vm) : Scene300s(vm) {}
 
@@ -490,7 +490,7 @@ public:
 	virtual void actions();
 };
 
-class Scene389: public Scene300s {
+class Scene389 : public Scene300s {
 private:
 	uint32 _monsterTime;
 
@@ -506,7 +506,7 @@ public:
 	virtual void actions();
 };
 
-class Scene390: public Scene300s {
+class Scene390 : public Scene300s {
 public:
 	Scene390(MADSEngine *vm) : Scene300s(vm) {}
 
@@ -515,7 +515,7 @@ public:
 	virtual void actions();
 };
 
-class Scene391: public Scene300s {
+class Scene391 : public Scene300s {
 public:
 	Scene391(MADSEngine *vm) : Scene300s(vm) {}
 
@@ -524,7 +524,7 @@ public:
 	virtual void actions();
 };
 
-class Scene399: public Scene300s {
+class Scene399 : public Scene300s {
 public:
 	Scene399(MADSEngine *vm) : Scene300s(vm) {}
 
diff --git a/engines/mads/nebular/nebular_scenes4.h b/engines/mads/nebular/nebular_scenes4.h
index 4544e0887f..fbd5ce81f0 100644
--- a/engines/mads/nebular/nebular_scenes4.h
+++ b/engines/mads/nebular/nebular_scenes4.h
@@ -50,7 +50,7 @@ public:
 	Scene4xx(MADSEngine *vm) : NebularScene(vm) {}
 };
 
-class Scene401: public Scene4xx {
+class Scene401 : public Scene4xx {
 private:
 	bool _northFl;
 	Common::Point _destPos;
@@ -67,7 +67,7 @@ public:
 	virtual void actions();
 };
 
-class Scene402: public Scene4xx {
+class Scene402 : public Scene4xx {
 private:
 	bool _lightOn;
 	bool _blowingSmoke;
@@ -128,7 +128,7 @@ public:
 	virtual void actions();
 };
 
-class Scene405: public Scene4xx {
+class Scene405 : public Scene4xx {
 public:
 	Scene405(MADSEngine *vm) : Scene4xx(vm) {}
 
@@ -139,7 +139,7 @@ public:
 	virtual void actions();
 };
 
-class Scene406: public Scene4xx {
+class Scene406 : public Scene4xx {
 private:
 	bool _hitStorageDoor;
 
@@ -154,7 +154,7 @@ public:
 	virtual void actions();
 };
 
-class Scene407: public Scene4xx {
+class Scene407 : public Scene4xx {
 private:
 	bool _fromNorth;
 	Common::Point _destPos;
@@ -170,7 +170,7 @@ public:
 	virtual void actions();
 };
 
-class Scene408: public Scene4xx {
+class Scene408 : public Scene4xx {
 public:
 	Scene408(MADSEngine *vm) : Scene4xx(vm) {}
 
@@ -180,7 +180,7 @@ public:
 	virtual void actions();
 };
 
-class Scene409: public SceneTeleporter {
+class Scene409 : public SceneTeleporter {
 public:
 	Scene409(MADSEngine *vm) : SceneTeleporter(vm) {}
 
@@ -190,7 +190,7 @@ public:
 	virtual void actions();
 };
 
-class Scene410: public Scene4xx {
+class Scene410 : public Scene4xx {
 public:
 	Scene410(MADSEngine *vm) : Scene4xx(vm) {}
 
@@ -201,7 +201,7 @@ public:
 	virtual void actions();
 };
 
-class Scene411: public Scene4xx {
+class Scene411 : public Scene4xx {
 private:
 	int _curAnimationFrame;
 	int _newIngredient;
@@ -237,7 +237,7 @@ public:
 	virtual void actions();
 };
 
-class Scene413: public Scene4xx {
+class Scene413 : public Scene4xx {
 private:
 	int _rexDeath;
 	int _canMove;
diff --git a/engines/mads/nebular/nebular_scenes5.h b/engines/mads/nebular/nebular_scenes5.h
index 4022f1c85b..2face26508 100644
--- a/engines/mads/nebular/nebular_scenes5.h
+++ b/engines/mads/nebular/nebular_scenes5.h
@@ -50,7 +50,7 @@ public:
 	Scene5xx(MADSEngine *vm) : NebularScene(vm) {}
 };
 
-class Scene501: public Scene5xx{
+class Scene501 : public Scene5xx{
 private:
 	int _mainSequenceId;
 	int _mainSpriteId;
@@ -70,7 +70,7 @@ public:
 	virtual void actions();
 };
 
-class Scene502: public SceneTeleporter {
+class Scene502 : public SceneTeleporter {
 public:
 	Scene502(MADSEngine *vm) : SceneTeleporter(vm) {}
 
@@ -80,7 +80,7 @@ public:
 	virtual void actions();
 };
 
-class Scene503: public Scene5xx{
+class Scene503 : public Scene5xx{
 private:
 	int _detonatorHotspotId;
 
@@ -93,7 +93,7 @@ public:
 	virtual void actions();
 };
 
-class Scene504: public Scene5xx{
+class Scene504 : public Scene5xx{
 private:
 	int _carAnimationMode;
 	int _carFrame;
@@ -109,7 +109,7 @@ public:
 	virtual void actions();
 };
 
-class Scene505: public Scene5xx{
+class Scene505 : public Scene5xx{
 private:
 	int _frame;
 	int _nextButtonId;
@@ -129,7 +129,7 @@ public:
 	virtual void actions();
 };
 
-class Scene506: public Scene5xx{
+class Scene506 : public Scene5xx{
 private:
 	Common::Point _doorPos;
 	Facing _heroFacing;
@@ -155,7 +155,7 @@ public:
 	virtual void actions();
 };
 
-class Scene507: public Scene5xx{
+class Scene507 : public Scene5xx{
 private:
 	int _penlightHotspotId;
 
@@ -168,7 +168,7 @@ public:
 	virtual void actions();
 };
 
-class Scene508: public Scene5xx{
+class Scene508 : public Scene5xx{
 private:
 	int _chosenObject;
 
@@ -184,7 +184,7 @@ public:
 	virtual void actions();
 };
 
-class Scene511: public Scene5xx{
+class Scene511 : public Scene5xx{
 private:
 	bool _handingLine;
 	bool _lineMoving;
@@ -204,7 +204,7 @@ public:
 	virtual void actions();
 };
 
-class Scene512: public Scene5xx{
+class Scene512 : public Scene5xx{
 private:
   int _fishingRodHotspotId;
   int _keyHotspotId;
@@ -218,7 +218,7 @@ public:
 	virtual void actions();
 };
 
-class Scene513: public Scene5xx{
+class Scene513 : public Scene5xx{
 public:
 	Scene513(MADSEngine *vm) : Scene5xx(vm) {}
 
@@ -228,7 +228,7 @@ public:
 	virtual void actions();
 };
 
-class Scene515: public Scene5xx{
+class Scene515 : public Scene5xx{
 public:
 	Scene515(MADSEngine *vm) : Scene5xx(vm) {}
 
@@ -238,7 +238,7 @@ public:
 	virtual void actions() {};
 };
 
-class Scene551: public Scene5xx{
+class Scene551 : public Scene5xx{
 public:
 	Scene551(MADSEngine *vm) : Scene5xx(vm) {}
 
diff --git a/engines/mads/nebular/nebular_scenes6.h b/engines/mads/nebular/nebular_scenes6.h
index 74467858bd..c5cac56626 100644
--- a/engines/mads/nebular/nebular_scenes6.h
+++ b/engines/mads/nebular/nebular_scenes6.h
@@ -50,7 +50,7 @@ public:
 	Scene6xx(MADSEngine *vm) : NebularScene(vm) {}
 };
 
-class Scene601: public Scene6xx{
+class Scene601 : public Scene6xx{
 public:
 	Scene601(MADSEngine *vm) : Scene6xx(vm) {}
 
@@ -60,7 +60,7 @@ public:
 	virtual void actions();
 };
 
-class Scene602: public Scene6xx{
+class Scene602 : public Scene6xx{
 private:
 	int _lastSpriteIdx;
 	int _lastSequenceIdx;
@@ -78,7 +78,7 @@ public:
 	virtual void actions();
 };
 
-class Scene603: public Scene6xx{
+class Scene603 : public Scene6xx{
 private:
 	int _compactCaseHotspotId;
 	int _noteHotspotId;
@@ -92,7 +92,7 @@ public:
 	virtual void actions();
 };
 
-class Scene604: public Scene6xx{
+class Scene604 : public Scene6xx{
 private:
 	int _timebombHotspotId;
 	int _bombMode;
@@ -115,7 +115,7 @@ public:
 	virtual void actions();
 };
 
-class Scene605: public Scene6xx{
+class Scene605 : public Scene6xx{
 public:
 	Scene605(MADSEngine *vm) : Scene6xx(vm) {}
 
@@ -125,7 +125,7 @@ public:
 	virtual void actions();
 };
 
-class Scene607: public Scene6xx{
+class Scene607 : public Scene6xx{
 private:
 	uint32 _dogTimer;
 	uint32 _lastFrameTime;
@@ -152,7 +152,7 @@ public:
 	virtual void actions();
 };
 
-class Scene608: public Scene6xx{
+class Scene608 : public Scene6xx{
 private:
 	int _carMode;
 	int _carFrame;
@@ -200,7 +200,7 @@ public:
 	virtual void actions();
 };
 
-class Scene609: public Scene6xx{
+class Scene609 : public Scene6xx{
 private:
 	int _videoDoorMode;
 
@@ -217,7 +217,7 @@ public:
 	virtual void actions();
 };
 
-class Scene610: public Scene6xx{
+class Scene610 : public Scene6xx{
 private:
 	int _handsetHotspotId;
 	int _checkVal;
@@ -237,7 +237,7 @@ public:
 	virtual void actions();
 };
 
-class Scene611: public Scene6xx{
+class Scene611 : public Scene6xx{
 private:
 	bool _seenRatFl;
 	bool _eyesRunningFl;
@@ -290,7 +290,7 @@ public:
 	virtual void actions();
 };
 
-class Scene612: public Scene6xx{
+class Scene612 : public Scene6xx{
 private:
 	int _actionMode;
 	int _cycleIndex;
@@ -307,7 +307,7 @@ public:
 	virtual void actions();
 };
 
-class Scene620: public Scene6xx{
+class Scene620 : public Scene6xx{
 public:
 	Scene620(MADSEngine *vm) : Scene6xx(vm) {}
 
diff --git a/engines/mads/nebular/nebular_scenes7.h b/engines/mads/nebular/nebular_scenes7.h
index 454c76ebe9..dfb3c0f16e 100644
--- a/engines/mads/nebular/nebular_scenes7.h
+++ b/engines/mads/nebular/nebular_scenes7.h
@@ -50,7 +50,7 @@ public:
 	Scene7xx(MADSEngine *vm) : NebularScene(vm) {}
 };
 
-class Scene701: public Scene7xx {
+class Scene701 : public Scene7xx {
 private:
 	int _fishingLineId;
 
@@ -65,7 +65,7 @@ public:
 	virtual void step();
 };
 
-class Scene702: public Scene7xx {
+class Scene702 : public Scene7xx {
 public:
 	Scene702(MADSEngine *vm) : Scene7xx(vm) {}
 
@@ -75,7 +75,7 @@ public:
 	virtual void actions();
 };
 
-class Scene703: public Scene7xx{
+class Scene703 : public Scene7xx{
 private:
 	int _monsterMode;
 	int _boatFrame;
@@ -106,7 +106,7 @@ public:
 	virtual void actions();
 };
 
-class Scene704: public Scene7xx{
+class Scene704 : public Scene7xx{
 private:
 	int _bottleHotspotId;
 	int _boatCurrentFrame;
@@ -131,7 +131,7 @@ public:
 	virtual void actions();
 };
 
-class Scene705: public Scene7xx{
+class Scene705 : public Scene7xx{
 private:
 	Conversation _dialog1;
 
@@ -149,7 +149,7 @@ public:
 	virtual void actions();
 };
 
-class Scene706: public Scene7xx{
+class Scene706 : public Scene7xx{
 private:
 	int _vaseHotspotId;
 	int _vaseMode;
@@ -172,7 +172,7 @@ public:
 	virtual void actions();
 };
 
-class Scene707: public SceneTeleporter {
+class Scene707 : public SceneTeleporter {
 public:
 	Scene707(MADSEngine *vm) : SceneTeleporter(vm) {}
 
@@ -182,7 +182,7 @@ public:
 	virtual void actions();
 };
 
-class Scene710: public Scene7xx {
+class Scene710 : public Scene7xx {
 public:
 	Scene710(MADSEngine *vm) : Scene7xx(vm) {}
 
@@ -192,7 +192,7 @@ public:
 	virtual void actions();
 };
 
-class Scene711: public SceneTeleporter {
+class Scene711 : public SceneTeleporter {
 public:
 	Scene711(MADSEngine *vm) : SceneTeleporter(vm) {}
 
@@ -202,7 +202,7 @@ public:
 	virtual void actions();
 };
 
-class Scene751: public Scene7xx{
+class Scene751 : public Scene7xx{
 private:
 	bool _rexHandingLine;
 
@@ -217,7 +217,7 @@ public:
 	virtual void actions();
 };
 
-class Scene752: public Scene7xx {
+class Scene752 : public Scene7xx {
 private:
 	int _cardId;
 
diff --git a/engines/mads/nebular/nebular_scenes8.h b/engines/mads/nebular/nebular_scenes8.h
index 150951dcaf..39e022e31f 100644
--- a/engines/mads/nebular/nebular_scenes8.h
+++ b/engines/mads/nebular/nebular_scenes8.h
@@ -52,7 +52,7 @@ public:
 	Scene8xx(MADSEngine *vm) : NebularScene(vm) {}
 };
 
-class Scene801: public Scene8xx{
+class Scene801 : public Scene8xx{
 private:
 	bool _walkThroughDoor;
 
@@ -67,7 +67,7 @@ public:
 	virtual void actions();
 };
 
-class Scene802: public Scene8xx{
+class Scene802 : public Scene8xx{
 public:
 	Scene802(MADSEngine *vm) : Scene8xx(vm) {}
 
@@ -78,7 +78,7 @@ public:
 	virtual void actions();
 };
 
-class Scene803: public Scene8xx{
+class Scene803 : public Scene8xx{
 public:
 	Scene803(MADSEngine *vm) : Scene8xx(vm) {}
 
@@ -89,7 +89,7 @@ public:
 	virtual void actions();
 };
 
-class Scene804: public Scene8xx {
+class Scene804 : public Scene8xx {
 private:
 	bool _messWithThrottle;
 	bool _movingThrottle;
@@ -111,7 +111,7 @@ public:
 	virtual void actions() {};
 };
 
-class Scene805: public Scene8xx{
+class Scene805 : public Scene8xx{
 public:
 	Scene805(MADSEngine *vm) : Scene8xx(vm) {}
 
@@ -122,7 +122,7 @@ public:
 	virtual void actions();
 };
 
-class Scene807: public SceneTeleporter {
+class Scene807 : public SceneTeleporter {
 public:
 	Scene807(MADSEngine *vm) : SceneTeleporter(vm) {}
 
@@ -132,7 +132,7 @@ public:
 	virtual void actions();
 };
 
-class Scene808: public Scene8xx{
+class Scene808 : public Scene8xx{
 private:
 	bool _goingTo803;
 
@@ -145,7 +145,7 @@ public:
 	virtual void actions();
 };
 
-class Scene810: public Scene8xx{
+class Scene810 : public Scene8xx{
 private:
 	bool _moveAllowed;
 
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h
index b5dee5b3ed..2113b103fb 100644
--- a/engines/mads/nebular/sound_nebular.h
+++ b/engines/mads/nebular/sound_nebular.h
@@ -131,7 +131,7 @@ struct RegisterValue {
 /**
  * Base class for the sound player resource files
  */
-class ASound: public Audio::AudioStream {
+class ASound : public Audio::AudioStream {
 private:
 	struct CachedDataEntry {
 		int _offset;
@@ -365,7 +365,7 @@ public:
 	virtual int getRate() const { return 11025; }
 };
 
-class ASound1: public ASound {
+class ASound1 : public ASound {
 private:
 	typedef int (ASound1::*CommandPtr)();
 	static const CommandPtr _commandList[42];
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index 0698e21a5f..8b40124f4e 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -246,7 +246,7 @@ public:
 		int tickDelay, int steps);
 };
 
-class Palette: public Fader {
+class Palette : public Fader {
 private:
 	/**
 	 * Initialises the first 16 palette indexes with the equivalent
diff --git a/engines/mads/phantom/game_phantom.h b/engines/mads/phantom/game_phantom.h
index 326a1dc077..7a84ee1c72 100644
--- a/engines/mads/phantom/game_phantom.h
+++ b/engines/mads/phantom/game_phantom.h
@@ -65,7 +65,7 @@ enum InventoryObject {
 };
 
 // HACK: A stub for now, remove from here once it's implemented properly
-class PhantomGlobals: public Globals {
+class PhantomGlobals : public Globals {
 public:
 	PhantomGlobals() {
 		resize(210);	// Rex has 210 globals
@@ -73,7 +73,7 @@ public:
 	virtual ~PhantomGlobals() {}
 };
 
-class GamePhantom: public Game {
+class GamePhantom : public Game {
 	friend class Game;
 protected:
 	GamePhantom(MADSEngine *vm);
@@ -101,7 +101,7 @@ public:
 };
 
 
-class Section1Handler: public SectionHandler {
+class Section1Handler : public SectionHandler {
 public:
 	Section1Handler(MADSEngine *vm) : SectionHandler(vm) {}
 
diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h
index e585ead542..cd295a28b6 100644
--- a/engines/mads/phantom/phantom_scenes.h
+++ b/engines/mads/phantom/phantom_scenes.h
@@ -503,7 +503,7 @@ public:
 };
 
 // TODO: Temporary, remove once implemented properly
-class DummyScene: public PhantomScene {
+class DummyScene : public PhantomScene {
 public:
 	DummyScene(MADSEngine *vm) : PhantomScene(vm) {
 		warning("Unimplemented scene");
diff --git a/engines/mads/sprites.h b/engines/mads/sprites.h
index f807e733b7..324122e348 100644
--- a/engines/mads/sprites.h
+++ b/engines/mads/sprites.h
@@ -107,7 +107,7 @@ struct SpriteFrameHeader {
 	uint32 reserved8;
 };
 
-class MSprite: public MSurface {
+class MSprite : public MSurface {
 private:
 	void loadSprite(Common::SeekableReadStream *source, const Common::Array<RGB6> &palette);
 public: