reorganized repo, implemented mxcore

ISLE/isle.cpp

@@ -1,10 +1,10 @@
 #include "isle.h"
 
 #include "define.h"
-#include "../lib/legoomni.h"
+#include "legoomni.h"
-#include "../lib/mxdirectdraw.h"
+#include "mxdirectdraw.h"
-#include "../lib/mxdsaction.h"
+#include "mxdsaction.h"
-#include "../lib/mxomni.h"
+#include "mxomni.h"
 #include "res/resource.h"
 
 RECT windowRect = {0, 0, 640, 480};

ISLE/isle.h

@@ -3,8 +3,8 @@
 
 #include <Windows.h>
 
-#include "../lib/define.h"
+#include "mxresult.h"
-#include "../lib/mxvideoparam.h"
+#include "mxvideoparam.h"
 
 class Isle
 {

ISLE/main.cpp

@@ -3,7 +3,7 @@
 
 #include "define.h"
 #include "isle.h"
-#include "../lib/legoomni.h"
+#include "legoomni.h"
 
 BOOL findExistingInstance(void)
 {
@@ -31,6 +31,9 @@ BOOL startDirectSound(void)
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
+  // TEMP: Load our recompiled library if available
+  LoadLibraryA("LEGO2");
+
   // Look for another instance, if we find one, bring it to the foreground instead
   if (!findExistingInstance()) {
     return 0;

LEGO1/dllmain.cpp

@@ -0,0 +1,6 @@
+#include <Windows.h>
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+  return TRUE;
+}

LEGO1/mxbool.h

@@ -0,0 +1,6 @@
+#ifndef MXBOOL_H
+#define MXBOOL_H
+
+typedef unsigned char MxBool;
+
+#endif // MXBOOL_H

LEGO1/mxcore.cpp

@@ -0,0 +1,35 @@
+#include "mxcore.h"
+
+#include <string.h>
+
+unsigned int g_mxcoreCount = 0;
+
+MxCore::MxCore()
+{
+  m_id = g_mxcoreCount;
+  g_mxcoreCount++;
+}
+
+MxCore::~MxCore()
+{
+}
+
+long MxCore::Notify(MxParam &p)
+{
+  return 0;
+}
+
+long MxCore::FUN_10001f70()
+{
+  return 0;
+}
+
+const char *MxCore::GetClassName() const
+{
+  return "MxCore";
+}
+
+MxBool MxCore::IsClass(const char *name) const
+{
+  return strcmp(name, "MxCore") == 0;
+}

LEGO1/mxcore.h

@@ -0,0 +1,23 @@
+#ifndef MXCORE_H
+#define MXCORE_H
+
+#include "mxbool.h"
+
+class MxParam;
+
+class MxCore
+{
+public:
+  __declspec(dllexport) MxCore();
+  __declspec(dllexport) virtual ~MxCore();
+  __declspec(dllexport) virtual long Notify(MxParam &p);
+  virtual long FUN_10001f70();
+  virtual const char *GetClassName() const;
+  virtual MxBool IsClass(const char *name) const;
+
+private:
+  unsigned int m_id;
+
+};
+
+#endif // MXCORE_H

LEGO1/mxresult.h

@@ -1,8 +1,8 @@
-#ifndef MX_DEFINE
+#ifndef MXRESULT_H
-#define MX_DEFINE
+#define MXRESULT_H
 
 typedef unsigned long MxResult;
 const MxResult SUCCESS = 0;
 const MxResult FAILURE = 0xFFFFFFFFL;
 
-#endif // MX_DEFINE
+#endif // MXRESULT_H

lib/mxcore.h

@@ -1,14 +0,0 @@
-#ifndef MXCORE_H
-#define MXCORE_H
-
-class MxCore
-{
-public:
-  virtual ~MxCore();
-
-private:
-  unsigned int m_id;
-
-};
-
-#endif // MXCORE_H