Some fixes to comply with our coding guidelines.

svn-id: r44624

1 files changed, 24 insertions, 24 deletions

diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 2116243b54..65cba8c5d8 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -54,13 +54,13 @@ struct GameFlags {
 
 	Common::Platform platform;
 
-	bool isDemo					: 1;
-	bool useAltShapeHeader		: 1;	// alternative shape header (uses 2 bytes more, those are unused though)
-	bool isTalkie				: 1;
-	bool useHiResOverlay		: 1;
-	bool use16ColorMode			: 1;
-	bool useDigSound			: 1;
-	bool useInstallerPackage	: 1;
+	bool isDemo               : 1;
+	bool useAltShapeHeader    : 1;    // alternative shape header (uses 2 bytes more, those are unused though)
+	bool isTalkie             : 1;
+	bool useHiResOverlay      : 1;
+	bool use16ColorMode       : 1;
+	bool useDigSound          : 1;
+	bool useInstallerPackage  : 1;
 
 	byte gameID;
 };
@@ -82,21 +82,21 @@ struct AudioDataStruct {
 
 // TODO: this is just the start of makeing the debug output of the kyra engine a bit more useable
 // in the future we maybe merge some flags  and/or create new ones
-enum kDebugLevels {
-	kDebugLevelScriptFuncs = 1 << 0,		// prints debug output of o#_* functions
-	kDebugLevelScript = 1 << 1,				// prints debug output of "EMCInterpreter" functions
-	kDebugLevelSprites = 1 << 2,			// prints debug output of "Sprites" functions
-	kDebugLevelScreen = 1 << 3,				// prints debug output of "Screen" functions
-	kDebugLevelSound = 1 << 4,				// prints debug output of "Sound" functions
-	kDebugLevelAnimator = 1 << 5,			// prints debug output of "ScreenAnimator" functions
-	kDebugLevelMain = 1 << 6,				// prints debug output of common "KyraEngine(_v#)" functions && "TextDisplayer" functions
-	kDebugLevelGUI = 1 << 7,				// prints debug output of "KyraEngine*" gui functions
-	kDebugLevelSequence = 1 << 8,			// prints debug output of "SeqPlayer" functions
-	kDebugLevelMovie = 1 << 9,				// prints debug output of movie specific funtions
-	kDebugLevelTimer = 1 << 10				// prints debug output of "TimerManager" functions
+enum DebugLevels {
+	kDebugLevelScriptFuncs = 1 <<  0, ///< debug level for o#_* functions
+	kDebugLevelScript      = 1 <<  1, ///< debug level for "EMCInterpreter" functions
+	kDebugLevelSprites     = 1 <<  2, ///< debug level for "Sprites" functions
+	kDebugLevelScreen      = 1 <<  3, ///< debug level for "Screen" functions
+	kDebugLevelSound       = 1 <<  4, ///< debug level for "Sound" functions
+	kDebugLevelAnimator    = 1 <<  5, ///< debug level for "ScreenAnimator" functions
+	kDebugLevelMain        = 1 <<  6, ///< debug level for common "KyraEngine(_v#)" functions && "TextDisplayer" functions
+	kDebugLevelGUI         = 1 <<  7, ///< debug level for "KyraEngine*" gui functions
+	kDebugLevelSequence    = 1 <<  8, ///< debug level for "SeqPlayer" functions
+	kDebugLevelMovie       = 1 <<  9, ///< debug level for movie specific funtions
+	kDebugLevelTimer       = 1 << 10  ///< debug level for "TimerManager" functions
 };
 
-enum kMusicDataID {
+enum MusicDataID {
 	kMusicIntro = 0,
 	kMusicIngame,
 	kMusicFinale
@@ -118,7 +118,7 @@ class KyraEngine_v1 : public Engine {
 friend class Debugger;
 friend class ::KyraMetaEngine;
 friend class GUI;
-friend class SoundMidiPC;		// For _eventMan
+friend class SoundMidiPC;    // For _eventMan
 public:
 	KyraEngine_v1(OSystem *system, const GameFlags &flags);
 	virtual ~KyraEngine_v1();
@@ -282,7 +282,7 @@ protected:
 	virtual void removeHandItem() = 0;
 
 	// game flags
-	uint8 _flagsTable[100];	// TODO: check this value
+	uint8 _flagsTable[100]; // TODO: check this value
 
 	// sound
 	Audio::SoundHandle _speechHandle;
@@ -335,8 +335,8 @@ protected:
 		byte gameID;
 		uint32 flags;
 
-		bool originalSave;	// savegame from original interpreter
-		bool oldHeader;		// old scummvm save header
+		bool originalSave;  // savegame from original interpreter
+		bool oldHeader;     // old scummvm save header
 
 		Graphics::Surface *thumbnail;
 	};