rewrote config class; cleanup; code restructuring

svn-id: r4903

common/timer.cpp

@@ -18,12 +18,16 @@
  * $Header$
  */
 
+#ifndef __MORPHOS__
+
 #include "stdafx.h"
-#include "scumm.h"
 #include "scummsys.h"
 #include "timer.h"
+#include "scumm/scumm.h"
+
+// FIXME - this shouldn't use Scumm, but rather Engine (so that e.g. we can
+// reuse the code for Simon).
 
-#ifndef __MORPHOS__
 static Scumm * scumm;
 
 Timer::Timer(Scumm * parent) {
@@ -154,5 +158,5 @@ void Timer::releaseProcedure (TimerProc procedure) {
 	}
 	_timerRunning = true;
 }
-#endif
 
+#endif