change everything to use a common types file

1 files changed, 26 insertions, 19 deletions

diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index 0280d8a4..c8c4765e 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -1,22 +1,22 @@
 #pragma once
 
-#include "types.h"
 #include "egg/core/eggHeap.h"
+#include <common.h>
 
-namespace EGG
-{
+
+namespace EGG {
 
 class Display;
 class XfbManager;
 class Video;
 
 class ConfigurationData {
-public: 
+public:
     // vtable at 0x0 | 8056ea8c
-    /* vt 0x08 | 00000000 */ virtual Video* getVideo() = 0;
-    /* vt 0x0C | 00000000 */ virtual Heap* getSystemHeap() = 0;
-    /* vt 0x10 | 00000000 */ virtual Display* getDisplay() = 0;
-    /* vt 0x14 | 00000000 */ virtual XfbManager* getXfbMgr() = 0;
+    /* vt 0x08 | 00000000 */ virtual Video *getVideo() = 0;
+    /* vt 0x0C | 00000000 */ virtual Heap *getSystemHeap() = 0;
+    /* vt 0x10 | 00000000 */ virtual Display *getDisplay() = 0;
+    /* vt 0x14 | 00000000 */ virtual XfbManager *getXfbMgr() = 0;
     /* vt 0x18 | 00000000 */ virtual void getPerfView() = 0;
     /* vt 0x1C | 00000000 */ virtual void getScnMgr() = 0;
     /* vt 0x20 | 00000000 */ virtual void getAudioMgr() = 0;
@@ -25,29 +25,36 @@ public:
     /* vt 0x2C | 80064ea0 */ virtual void initRenderMode();
     /* vt 0x30 | 80497170 */ virtual void initMemory();
     /* vt 0x34 | 804972f0 */ virtual void run();
+
 public:
     /* 0x04 */ u32 mRoot1HeapStart;
     /* 0x08 */ u32 mRoot1HeapEnd;
     /* 0x0C */ u32 mRoot2HeapStart;
     /* 0x10 */ u32 mRoot2HeapEnd;
     /* 0x14 */ u32 mMemSize;
-    /* 0x18 */ Heap* mRootHeapMem1;
-    /* 0x1C */ Heap* mRootHeapMem2;
-    /* 0x20 */ Heap* mRootHeapDebug;
-    /* 0x24 */ Heap* mSystemHeap;
-    /* 0x28 */ Thread* mSystemThread;
+    /* 0x18 */ Heap *mRootHeapMem1;
+    /* 0x1C */ Heap *mRootHeapMem2;
+    /* 0x20 */ Heap *mRootHeapDebug;
+    /* 0x24 */ Heap *mSystemHeap;
+    /* 0x28 */ Thread *mSystemThread;
     /* 0x2C */ u32 field_0x2C;
-    /* 0x30 */ u32 mSystemHeapStart; 
+    /* 0x30 */ u32 mSystemHeapStart;
     /* 0x34 */ u32 mSystemHeapSize;
     /* 0x38 */ u32 mGraphicsFifoSize;
     /* 0x3C */ u32 field_0x3C;
 };
 class BaseSystem {
 public:
-    /* 80576780 */ static ConfigurationData* mConfigData;
-    static XfbManager* getXfbMgr() { return mConfigData->getXfbMgr(); }
-    static Display* getDisplay() { return mConfigData->getDisplay(); }
-    static Video* getVideo() { return mConfigData->getVideo(); }
+    /* 80576780 */ static ConfigurationData *mConfigData;
+    static XfbManager *getXfbMgr() {
+        return mConfigData->getXfbMgr();
+    }
+    static Display *getDisplay() {
+        return mConfigData->getDisplay();
+    }
+    static Video *getVideo() {
+        return mConfigData->getVideo();
+    }
 };
 
-} // namespace EGG
\ No newline at end of file
+} // namespace EGG