--- Daodan/src/Oni/Oni.h	2015/03/23 23:29:19	1017
+++ Daodan/src/Oni/Oni.h	2021/10/24 02:50:48	1163
@@ -8,7 +8,14 @@
 
 #define ONICALL __fastcall
 
-
+typedef struct {
+	short x;
+	short y;
+} IMtPoint;
+
+// The following headers were written when Daodan used -fpack-struct, and
+// should be rewritten
+#pragma pack(push, 1)
 #include "stdtypes.h"
 #include "BFW_Motoko_Draw.h"
 #include "BFW_ScriptLang.h"
@@ -16,6 +23,9 @@
 #include "GameState.h"
 #include "GL.h"
 #include "OBJt.h"
+#pragma pack(pop)
+
+#include "Input.h"
 
 #define DDmAssert(expr) assert(expr);
 
@@ -33,11 +43,6 @@ typedef struct {
 	int16_t bottom;
 } UUtRect;
 
-typedef struct {
-	uint32_t input;
-	float analog;
-} LItDeviceInput;
-
 #include "Symbols_Var.h"
 #include "Symbols_Func.h"