2 files changed, 44 insertions, 46 deletions

diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid2.cpp
index 56420180aa..be98b4e579 100644
--- a/engines/avalanche/enid2.cpp
+++ b/engines/avalanche/enid2.cpp
@@ -45,6 +45,8 @@ Enid::Enid(AvalancheEngine *vm) {
 	_vm = vm;
 }
 
+//  CHECKME: useless?
+#if 0
 const Common::String Enid::kCrlf = Common::String(char(15)) + Common::String(char(12));
 const char Enid::kTab = '\t';
 const char Enid::kEof = '\n';
@@ -60,17 +62,16 @@ const Common::String Enid::kEdnaFirst =
 	"1234567890" +kCrlf; // 11
 
 const Common::String Enid::kEdnaId = Common::String("TT\xB1\x30\x01\x75\xB1\x99\xB1");
-
 const int16 Enid::kAge = 18;
 const Common::String Enid::kWasHere = "Thomas was here ";
-
 const Enid::FourType Enid::kAvariciusFile = "Avvy";
 
-
-
-void Enid::addon(Common::String x) {
-	//month[0]--;
-	_month = _month + x;
+/**
+ * Expand month name
+ * @remarks	Originally called 'addon'
+ */
+void Enid::expandMonthName(Common::String x) {
+	_month += x;
 }
 
 Common::String Enid::expandDate(byte d, byte m, uint16 y) {
@@ -83,10 +84,10 @@ Common::String Enid::expandDate(byte d, byte m, uint16 y) {
 	_month = months[m];
 	switch (_month[_month.size()]) {
 	case '#':
-		addon("uary");
+		expandMonthName("uary");
 		break;
 	case '*':
-		addon("ber");
+		expandMonthName("ber");
 		break;
 	}
 
@@ -161,10 +162,6 @@ void Enid::showHeader() {
 	_vm->_scrolls->display(Common::String("Dir: ") + _path + "\r\r\4");
 }
 
-void Enid::dir(Common::String where) { // OK, it worked in Avaricius, let's do it in Avalot!
-	warning("STUB: Enid::dir()");
-}
-
 void Enid::avvyBackground() {    
 	// Not really a filing procedure,
 	// but it's only called just before edna_load, so I thought I'd put it
@@ -289,13 +286,17 @@ void Enid::ednaReload() {
 	}
 }
 
-void Enid::backToBootstrap(byte what) {
-	warning("STUB: Enid::back_to_bootstrap()");
-}
-
 bool Enid::thereWasAProblem() {
 	return _bug;
 }
 
+#endif
+
+void Enid::dir(Common::String where) { // OK, it worked in Avaricius, let's do it in Avalot!
+	warning("STUB: Enid::dir()");
+}
+void Enid::backToBootstrap(byte what) {
+	warning("STUB: Enid::back_to_bootstrap()");
+}
 
 } // End of namespace Avalanche.
diff --git a/engines/avalanche/enid2.h b/engines/avalanche/enid2.h
index 6f76a74718..1cf14d10de 100644
--- a/engines/avalanche/enid2.h
+++ b/engines/avalanche/enid2.h
@@ -38,42 +38,39 @@ class AvalancheEngine;
 class Enid {
 public:
 	Enid(AvalancheEngine *vm);
-	void ednaSave(Common::String name);
-	void ednaLoad(Common::String name);
-	void ednaReload(); // From Bootstrap's storage.
 	void dir(Common::String where);
-	void avvyBackground();
 	void backToBootstrap(byte what);
-	bool thereWasAProblem();
 
 private:
 	AvalancheEngine *_vm;
 
-	static const Common::String kCrlf;
-	static const char kTab, kEof;
-	static const Common::String kEdnaFirst, kEdnaId, kWasHere;
-	static const int16 kAge;
+//  CHECKME: useless?
+//	static const Common::String kCrlf;
+//	static const char kTab, kEof;
+//	static const Common::String kEdnaFirst, kEdnaId, kWasHere;
+//	static const int16 kAge;
+//	void expandMonthName(Common::String x);
+//	Common::String expandDate(byte d, byte m, uint16 y);
+//	void ednaSave(Common::String name);
+//	void showBug(char icon, Common::String strn);
+//	bool testBug(byte what);
+//	void loadError(Common::String x, char icon);
+//	void ednaLoad(Common::String name);
+//	void showHeader();
+//	void toSundry(sundry &sund);
+//	void fromSundry(sundry sund);
+//	void avvyBackground();
+//	void ednaReload(); // From Bootstrap's storage.
+//	void restoreDna();
+//	bool thereWasAProblem();
+
+//	typedef char FourType[5];
+//	static const FourType kAvariciusFile;
+
+//	bool _bug;
+//	Common::String _path, _groi;
+//	Common::String _month, _day;
 
-	typedef char FourType[5];
-	static const FourType kAvariciusFile;
-
-	bool _bug;
-	Common::String _path, _groi;
-	Common::String _month, _day;
-
-	void addon(Common::String x);
-	Common::String expandDate(byte d, byte m, uint16 y);
-
-	void showBug(char icon, Common::String strn);
-	bool testBug(byte what);
-
-	void loadError(Common::String x, char icon);
-	void showHeader();
-
-	void toSundry(sundry &sund);
-	void fromSundry(sundry sund);
-
-	void restoreDna();
 };
 
 } // End of namespace Avalanche.