2 files changed, 26 insertions, 28 deletions
diff --git a/engines/avalanche/enhanced2.cpp b/engines/avalanche/enhanced2.cpp
index 7a9a58f50d..2ee3f3d0aa 100644
--- a/engines/avalanche/enhanced2.cpp
+++ b/engines/avalanche/enhanced2.cpp
@@ -31,31 +31,27 @@
 
 namespace Avalanche {
 
-	namespace Enhanced {
-
-	bool isenh() {
-		warning("STUB: Enhanced::isenh()");
-		return true;
-	}
-
-	void readkeye() {
-		warning("STUB: Enhanced::readkeye()");
-	}
-
-	bool keypressede() {
-	/*
-	 function fancystuff:boolean;
-	  inline( $B4/ $11/  { MOV AH,11 }
-			  $CD/ $16/  { INT 16 }
-			  $B8/ $00/ $00/ { MOV AX, 0000 }
-			  $74/ $01/  { JZ 0112 (or wherever- the next byte after $40, anyway) }
-			  $40);      { INC AX }
-	*/
-	
-		warning("STUB: Enhanced::keypressede()");
-		return true;
-	}
+bool Enhanced::isenh() {
+	warning("STUB: Enhanced::isenh()");
+	return true;
+}
+
+void Enhanced::readkeye() {
+	warning("STUB: Enhanced::readkeye()");
+}
 
-	} // End of namespace Enhanced
+bool Enhanced::keypressede() {
+/*
+	function fancystuff:boolean;
+	inline( $B4/ $11/  { MOV AH,11 }
+			$CD/ $16/  { INT 16 }
+			$B8/ $00/ $00/ { MOV AX, 0000 }
+			$74/ $01/  { JZ 0112 (or wherever- the next byte after $40, anyway) }
+			$40);      { INC AX }
+*/
+	
+	warning("STUB: Enhanced::keypressede()");
+	return true;
+}
 
 } // End of namespace Avalanche
diff --git a/engines/avalanche/enhanced2.h b/engines/avalanche/enhanced2.h
index 98ef781213..2ba42e006f 100644
--- a/engines/avalanche/enhanced2.h
+++ b/engines/avalanche/enhanced2.h
@@ -36,8 +36,8 @@
 
 namespace Avalanche {
 
-	namespace Enhanced {
-
+class Enhanced {
+public:
 	byte shiftstate;	/*ABSOLUTE $40:$17;*/
 	bool atbios; // BIOS type
 	char inchar, extd;
@@ -45,8 +45,10 @@ namespace Avalanche {
 	void readkeye();
 
 	bool keypressede();
+private:
+	bool isenh();
 
-	} // End of namespace Enhanced
+};
 
 } // End of namespace Avalanche