Fix duplicated CDvdRequestSys

Author: encounter

include/Kyoto/CDvdRequestManager.hpp

@@ -3,8 +3,19 @@
 
 class CDvdRequestSys {
 public:
+  CDvdRequestSys() {
+    if (mManagerInstalled != true) {
+      mManagerInstalled = true;
+    }
+  }
+  ~CDvdRequestSys() {
+    if (mManagerInstalled == true) {
+      mManagerInstalled = false;
+    }
+  }
+
+private:
   static bool mManagerInstalled;
 };
 
-
 #endif // _CDVDREQUESTMANAGER

include/MetroidPrime/CMain.hpp

@@ -8,6 +8,7 @@
 #include "Kyoto/Alloc/CMemorySys.hpp"
 #include "Kyoto/Basics/COsContext.hpp"
 #include "Kyoto/Basics/CStopwatch.hpp"
+#include "Kyoto/CDvdRequestManager.hpp"
 #include "Kyoto/Streams/CInputStream.hpp"
 #include "Kyoto/TReservedAverage.hpp"
 #include "MetroidPrime/CGameArchitectureSupport.hpp"
@@ -29,24 +30,6 @@ class CSaveRegion {
   static void* mNonVolatileSettingsBuf;
 };
 
-// TODO move to new header
-class CDvdRequestSys {
-public:
-  CDvdRequestSys() {
-    if (mManagerInstalled != true) {
-      mManagerInstalled = true;
-    }
-  }
-  ~CDvdRequestSys() {
-    if (mManagerInstalled == true) {
-      mManagerInstalled = false;
-    }
-  }
-
-private:
-  static bool mManagerInstalled;
-};
-
 class CMain {
 public:
   enum ERestartMode {