Changeset 677 for Daodan/src

Timestamp:

Mar 3, 2013, 12:46:33 AM (12 years ago)

Author:

alloc

Message:

Daodan: Updated src to work with MinGW

Location:

Daodan/src

Files:

• BFW_ScriptLang.h (modified) (2 diffs)
• BFW_Utility.h (modified) (2 diffs)
• Daodan.c (modified) (18 diffs)
• Daodan.h (modified) (2 diffs)
• Daodan_BSL.c (modified) (31 diffs)
• Daodan_Character.c (modified) (1 diff)
• Daodan_Character.h (modified) (1 diff)
• Daodan_Cheater.c (modified) (13 diffs)
• Daodan_Cheater.h (modified) (2 diffs)
• Daodan_Console.c (modified) (3 diffs)
• Daodan_Console.h (modified) (3 diffs)
• Daodan_Patch.c (modified) (4 diffs)
• Daodan_Patch.h (modified) (2 diffs)
• Daodan_Persistence.h (modified) (1 diff)
• Daodan_Utility.c (modified) (6 diffs)
• Daodan_Utility.h (modified) (2 diffs)
• Daodan_Win32.c (modified) (5 diffs)
• Daodan_WindowHack.c (modified) (4 diffs)
• Daodan_WindowHack.h (modified) (1 diff)
• Flatline.c (deleted)
• Flatline.h (deleted)
• Flatline_BSL.c (deleted)
• Flatline_BSL.h (deleted)
• Flatline_Net.c (deleted)
• Flatline_Server.c (deleted)
• Flatline_Server.h (deleted)
• Flatline_Win32.c (deleted)
• Flatline_Win32.h (deleted)
• Oni.h (modified) (2 diffs)
• Oni_Character.h (modified) (3 diffs)
• Oni_GameState.h (added)
• Oni_Persistence.h (modified) (1 diff)
• Oni_Symbols.S (deleted)
• Oni_Symbols.c (added)
• Oni_Symbols.h (added)
• binkw32.def (modified) (1 diff)
• bool.h (added)
• dSFMT (added)
• dSFMT/html (added)
• daodan_gl.c (modified) (8 diffs)
• daodan_gl.h (modified) (1 diff)
• defs.h (added)
• inifile.h (modified) (1 diff)
• inifile_reader.c (modified) (2 diffs)
• inifile_test.c (deleted)
• oni_gl.h (modified) (2 diffs)
• oni_stdio.h (modified) (1 diff)

Daodan/src/BFW_ScriptLang.h

@@ -5 +5 @@
 #include "Daodan.h"
 
-#include <stdint.h>
-#include <stdbool.h>
+//#include <stdint.h>
+#include "bool.h"
 
 typedef enum {
@@ -33 +33 @@
 } sl_callinfo;
 
-typedef uint16_t (ONICALL *sl_func)(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret);
 
-uint16_t ONICALL SLrScript_Command_Register_ReturnType(char* name, char* desc, char* argfmt, sl_type type, sl_func callback);
-uint16_t ONICALL SLrScript_Command_Register_Void(char* name, char* desc, char* argfmt, sl_func callback);
-uint16_t ONICALL SLrGlobalVariable_Register_Int32(char* name, char* desc, int32_t* data);
-uint16_t ONICALL SLrGlobalVariable_Register_Float(char* name, char* desc, float* data);
-uint16_t ONICALL SLrGlobalVariable_Register_Bool(char* name, char* desc, uint32_t* data);
-uint16_t ONICALL SLrGlobalVariable_Register_String(char* name, char* desc, char* data);
+
+
 
 #endif

Daodan/src/BFW_Utility.h

@@ -4 +4 @@
 
 #include <stdio.h>
-#include <stdint.h>
+//#include <stdint.h>
 #include "Daodan.h"
 
-void __cdecl UUrStartupMessage(const char* fmt, ...);
-int64_t ONICALL UUrMachineTime_High();
-double  ONICALL UUrMachineTime_High_Frequency();
-int64_t ONICALL UUrMachineTime_Sixtieths();
-void    ONICALL UUrPlatform_Initialize();
-void    ONICALL UUrPlatform_Terminate();
+//void __cdecl UUrStartupMessage(const char* fmt, ...);
 
 typedef struct {
@@ -23 +18 @@
 
 void* TestContext;
-void ONICALL COrTextArea_Print(uint32_t area, uint32_t priority, uint32_t textshade, uint32_t textshadowshade, const char* text, uint32_t unk_alwaws_0, uint32_t fadetime);
-int ONICALL COrMessage_Print(char* Message, char* Key, void* noidea);
+//void ONICALL COrTextArea_Print(uint32_t area, uint32_t priority, uint32_t textshade, uint32_t textshadowshade, const char* text, uint32_t unk_alwaws_0, uint32_t fadetime);
+
 void ONICALL COrMessage_Remove(char* Key);
-int16_t ONICALL TSrContext_DrawText(uint32_t TSrContext, char* Text, int alpha, uint32_t usuallyzero, OniRectangle* pRect);
-int16_t ONICALL TSrContext_New( void* FontInstance, int size, int hthsik1,int hthsik2,int hthsik3, void* TSrContext); //int16_t TSrContext_New( TSFF*, size 7, ??? 1, ??? 1, ??? 0, TSrContext*);
-int16_t ONICALL TMrInstance_GetDataPtr(int, char*, void*);      //int TMrInstance_GetDataPtr( Type 'TSFF', char* "Tahoma", ptr);
-char* ONICALL TMrInstance_GetInstanceName(void* InstancePointer);
-int __cdecl AUrMessageBox(int Buttons, char *Message, ...);
+//int16_t ONICALL TMrInstance_GetDataPtr(int, char*, void*);    //int TMrInstance_GetDataPtr( Type 'TSFF', char* "Tahoma", ptr);
+
+//int __cdecl AUrMessageBox(int Buttons, char *Message, ...);
 
 extern uint32_t COgConsoleLines;

Daodan/src/Daodan.c

@@ -9 +9 @@
 #include "Daodan_BSL.h"
 #include "Daodan_Console.h"
-
 #include "Daodan_WindowHack.h"
 
@@ -48 +47 @@
 bool patch_usegettickcount = true;
 bool patch_cheatsenabled = true;
-bool patch_usedaodangl = true;
-bool patch_windowhack = false;
+bool patch_usedaodangl = false;
+bool patch_windowhack = true;
 bool patch_daodaninit = true;
 bool patch_bsl = true;
 bool patch_cheater = true;
-
-// bool patch_newweapon = true;
-
+bool patch_newweapon = true;
 bool opt_usedaodanbsl = true;
 bool opt_border = true;
@@ -61 +58 @@
 bool opt_topmost = false;
 
+typedef int (__cdecl *CHINESEPROC)(DWORD WINAPI); 
+bool patch_chinese = false;
 bool DDrPatch_Init()
 {
@@ -68 +67 @@
         if (patch_fonttexturecache)
         {
-                DDrPatch_Byte  (OniExe + 0x00020ea7, 0x20);
-                DDrPatch_Byte  (OniExe + 0x00020f4a, 0x40);
+                DDrPatch_Byte(OniExe + 0x00020ea7, 0x20);
+                DDrPatch_Byte(OniExe + 0x00020f4a, 0x40);
         }
         
@@ -83 +82 @@
         if (patch_pathfinding)
         {
+                const char pathfinding[2] = {0x90 , 0xE9 };
                 DDrPatch_Byte  (OniExe + 0x0010b03b, 0x20);
                 DDrPatch_Byte  (OniExe + 0x0010b04c, 0x20);
+
+                //other stuff
+                DDrPatch_Const(0x440789, pathfinding);
         }
         
@@ -99 +102 @@
         if (patch_directinput)
                 DDrPatch_Byte  (OniExe + 0x00002e6d, 0xeb);
-        
+
         if (patch_wpfadetime)
         {
@@ -108 +111 @@
                 
                 // Sets the fadetime to 4800 by default
-                DDrPatch_Int16 (OniExe + 0x0011ab0e, 0x12c0);
-        }
-        
+                DDrPatch_Int16 ((OniExe + 0x0011ab0e), 0x12c0);
+        }
+        
+        // FIXME: add switches
+        //pathfinding fix
+
+        
+
         
         // Hackish fix for Konoko not kicking guns
+        // Don't use this, it breaks stairs.
         if (patch_kickguns)
         {
@@ -167 +176 @@
         if (patch_cheattable)
         {
-                DDrPatch_Int32 (OniExe + 0x000f616b, (int)&DDr_CheatTable[0].name);
+                DDrPatch_Int32 (0x004f616b, (int)&DDr_CheatTable[0].name);
                 DDrPatch_Int32 (OniExe + 0x000f617a, (int)&DDr_CheatTable[0].message_on);
         }
@@ -179 +188 @@
 
         //Test newweap patch
-//      if (patch_newweapon) {
+        if (patch_newweapon) {
                 
                 //Makes it always say "Recieved weapon_name."
                 //Needs check for loc_4DFC66
-                DDrPatch_NOOP( OniExe + 0x000E4DF8,2);
+                //DDrPatch_NOOP( OniExe + 0x000E4DF8,2);
 
                 //Adds Weapon name and ammo meter to pickup autoprompt
@@ -191 +200 @@
                 
                 //Moves location of colors
-                DDrPatch_Int32( OniExe + 0x0002E3D5, (int)&DDrDSayColors[0].Char );
-                DDrPatch_Int32( OniExe + 0x0002E3DA, (int)&DDrDSayColors[0].Char );
-//      }
+                //DDrPatch_Int32( 0x0042E3D5, (int)&DDrDSayColors );
+                //DDrPatch_Int32( 0x0042E3DA, (int)&DDrDSayColors );
+        }
         
         // Disable loading the vtuneapi.dll
-        if (patch_killvtune)
-                DDrPatch_Byte  (OniExe + 0x00026340, 0xC3);
+        //if (patch_killvtune)
+                //DDrPatch_Byte  (OniExe + 0x00026340, 0xC3);
         
         // Disable Oni's internal CLrGetCommandLine function (to eventually replace it with our own)
@@ -207 +216 @@
                 DDrPatch_Int32 (OniExe + 0x000d3570, 0xc3c03366);
         
+        if (patch_bsl)
+        {
+                //Calculating the value of the needed offset is much more reliable when the compiler does it for you.
+
+                //TODO: fix moonshadow.
+                Character * Chr = 0;
+                int NoPath = (int)&(Chr[0].RegenHax) & 0x000000FF;
+                const char regen_patch[] =
+                {0x90, 0x90, 0x90, 0x90, 0x90,                          // mov    al, _WPgRegenerationCheat     -> NOOP
+                0x90, 0x90,                                                                     // test   al, al                                        -> NOOP
+                0x90, 0x90,                                                                     // jz     short loc_51BB98                      -> NOOP
+                0x8B, 0x86, (char)NoPath, 0x01, 0x00, 0x00, // mov     eax, [esi+Character.field_1E8]
+                                                                                                        //      -> mov     eax, [esi+Character.RegenHax]
+                0x85, 0xC0,                                                                     // test eax, eax
+                0x74, 0x21                                                                      // jnz 0x21 -> jz 0x21
+                };      
+                DDrPatch_Const(0x0051BB64, regen_patch);
+        }
+        
+        if(patch_chinese)
+        {
+                HMODULE dll = LoadLibrary("xfhsm_oni.dll");
+                if( dll )
+                {
+                        void* proc = GetProcAddress( dll, "InstallHook" );
+                        if(proc)
+                        {
+                                ((CHINESEPROC)proc)(GetCurrentThreadId());
+                        }
+                }
+        }
+
+        //Fix crappy ai2_shownames
+        if(1)
+        {
+                //Set distance above head to 4.0
+                DDrPatch_Int32(0x0048C998, 0x005296C8);
+                //texture height
+                DDrPatch_Byte( 0x0048C9DF, 0x3F );
+                //texture       width
+                DDrPatch_NOOP( (char*)0x0048C9CA, 6 );
+                //Set the text color to whatever we like ;)
+                DDrPatch_NOOP( 0x0048C898, 6 );
+                DDrPatch_Byte( 0x0048C898, 0x8B );
+                DDrPatch_Byte( 0x0048C899, 0xCE );
+//FLATLINE?             DDrPatch_MakeCall( 0x0048C8A3, FLrHook_DebugNameShadeHack);
+                
+                //Make the background black for additive blending
+//FLATLINE?             DDrPatch_MakeCall( 0x0048C802, FLrHook_DebugNameTextureInit );
+        }
+
+        if(1)
+        {
+                //DDrPatch_NOOP( 0x004E1957, 6 );
+                //DDrPatch_MakeCall( 0x004E17F6, FLrHook_Lasers );
+        }
+
+        //Flatline related stuff
+//      DDrPatch_MakeCall(0x004FBCEA, DDrText_Hook);
+        
+//FLATLINE?     DDrPatch_Int32( 0x004B24D2, FLrSpawnHack);
+
+//FLATLINE?     DDrPatch_NOOP(0x004C26CB, 6);
+
+//FLATLINE?     DDrPatch_MakeCall( 0x004C26CB, FLrHook_DoorOpen); 
+//FLATLINE?     DDrPatch_MakeCall( 0x004EE3CF, FLrHook_ConsoleActivate);
         return true;
 }
@@ -216 +291 @@
         if (newsection)
         {
-                if (!stricmp(section, "options"))
+                if (!_stricmp(section, "options"))
                         ini_section = s_options;
-                else if (!stricmp(section, "patch"))
+                else if (!_stricmp(section, "patch"))
                         ini_section = s_patch;
-                else if (!stricmp(section, "bsl"))
+                else if (!_stricmp(section, "bsl"))
                         ini_section = s_bsl;
-                else if (!stricmp(section, "language"))
+                else if (!_stricmp(section, "language"))
                         ini_section = s_language;
                 else
@@ -234 +309 @@
         {
                 case s_options:
-                        if (!stricmp(name, "usedaodanbsl"))
-                                opt_usedaodanbsl = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "border"))
-                                opt_border = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "shadow"))
-                                opt_shadow = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "topmost"))
-                                opt_topmost = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "multibyte"))
-                                patch_multibyte = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "debug"))
-                                AKgDebug_DebugMaps = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "debugfiles"))
-                                BFgDebugFileEnable = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "findsounds"))
-                                SSgSearchOnDisk = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "ignore_private_data"))
-                                opt_ignore_private_data = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "sound"))
-                                opt_sound = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "switch"))
-                                M3gResolutionSwitch = !stricmp(inifile_cleanstr(value), "true");
+                        if (!_stricmp(name, "usedaodanbsl"))
+                                opt_usedaodanbsl = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "border"))
+                                opt_border = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "shadow"))
+                                opt_shadow = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "topmost"))
+                                opt_topmost = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "multibyte"))
+                                patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "debug"))
+                                AKgDebug_DebugMaps = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "debugfiles"))
+                                BFgDebugFileEnable = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "findsounds"))
+                                SSgSearchOnDisk = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "ignore_private_data"))
+                                opt_ignore_private_data = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "sound"))
+                                opt_sound = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "switch"))
+                                M3gResolutionSwitch = !_stricmp(inifile_cleanstr(value), "true");
+                        //else if (!_stricmp(name, "devmode"))
+                                //turn_dev_mode_on = !_stricmp(inifile_cleanstr(value), "true");
                         else
                                 DDrStartupMessage("unrecognised option \"%s\"", name);
                         break;
                 case s_patch:
-                        if (!stricmp(name, "fonttexturecache"))
-                                patch_fonttexturecache = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "largetextures"))
-                                patch_largetextures = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "levelplugins"))
-                                patch_levelplugins = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "pathfinding"))
-                                patch_pathfinding = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "projaware"))
-                                patch_projaware = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "directinput"))
-                                patch_directinput = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "wpfadetime"))
-                                patch_wpfadetime = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "kickguns"))
-                                patch_kickguns = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "cooldowntimer"))
-                                patch_cooldowntimer = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "throwtest"))
-                                patch_throwtest = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "alttab"))
-                                patch_alttab = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "particledisablebit"))
-                                patch_particledisablebit = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "multibyte"))
-                                patch_multibyte = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "cheattable"))
-                                patch_cheattable = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "argb8888"))
-                                patch_argb8888 = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "killvtune"))
-                                patch_killvtune = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "getcmdline"))
-                                patch_getcmdline = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "disablecmdline"))
-                                patch_disablecmdline = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "safeprintf"))
-                                patch_safeprintf = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "daodandisplayenum"))
-                                patch_daodandisplayenum = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "usegettickcount"))
-                                patch_usegettickcount = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "cheatsenabled"))
-                                patch_cheatsenabled = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "usedaodangl"))
-                                patch_usedaodangl = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "windowhack"))
-                                patch_windowhack = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "daodaninit"))
-                                patch_daodaninit = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "bsl"))
-                                patch_bsl = !stricmp(inifile_cleanstr(value), "true");
-                        else if (!stricmp(name, "cheater"))
-                                patch_cheater = !stricmp(inifile_cleanstr(value), "true");
+                        if (!_stricmp(name, "fonttexturecache"))
+                                patch_fonttexturecache = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "largetextures"))
+                                patch_largetextures = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "levelplugins"))
+                                patch_levelplugins = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "pathfinding"))
+                                patch_pathfinding = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "projaware"))
+                                patch_projaware = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "directinput"))
+                                patch_directinput = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "wpfadetime"))
+                                patch_wpfadetime = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "kickguns"))
+                                patch_kickguns = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "cooldowntimer"))
+                                patch_cooldowntimer = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "throwtest"))
+                                patch_throwtest = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "alttab"))
+                                patch_alttab = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "particledisablebit"))
+                                patch_particledisablebit = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "multibyte"))
+                                patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "cheattable"))
+                                patch_cheattable = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "argb8888"))
+                                patch_argb8888 = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "killvtune"))
+                                patch_killvtune = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "getcmdline"))
+                                patch_getcmdline = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "disablecmdline"))
+                                patch_disablecmdline = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "safeprintf"))
+                                patch_safeprintf = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "daodandisplayenum"))
+                                patch_daodandisplayenum = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "usegettickcount"))
+                                patch_usegettickcount = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "cheatsenabled"))
+                                patch_cheatsenabled = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "usedaodangl"))
+                                patch_usedaodangl = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "windowhack"))
+                                patch_windowhack = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "daodaninit"))
+                                patch_daodaninit = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "bsl"))
+                                patch_bsl = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "cheater"))
+                                patch_cheater = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "newweap"))
+                                patch_newweapon = !_stricmp(inifile_cleanstr(value), "true");
                         else
                                 DDrStartupMessage("unrecognised patch \"%s\"", name);
                         break;
                 case s_language:
-                        if (!stricmp(name, "savepoint"))
+                        if (!_stricmp(name, "chinese"))
+                                patch_chinese = true;
+                        else if (!_stricmp(name, "savepoint"))
                         {
-                                char* str = strdup(value);
+                                char* str = _strdup(value);
                                 DDrPatch_Int32(OniExe + 0x000fd730, (int)str);
                                 DDrPatch_Int32(OniExe + 0x000fd738, (int)str);
                         }
-                        else if (!stricmp(name, "syndicatewarehouse"))
+                        else if (!_stricmp(name, "syndicatewarehouse"))
                         {
-                                char* str = strdup(value);
+                                char* str = _strdup(value);
                                 DDrPatch_Int32(OniExe + 0x000fd71a, (int)str);
                                 DDrPatch_Int32(OniExe + 0x0010ef75, (int)str);
                         }
-                        else if (!stricmp(name, "damn"))
-                                DDrPatch_StrDup(OniExe + 0x0010fb6e, value);
-                        else if (!stricmp(name, "blam"))
-                                DDrPatch_StrDup(OniExe + 0x0010fb73, value);
-                        else if (!stricmp(name, "shapeshifter_on"))
-                                DDr_CheatTable[0].message_on = strdup(value);
-                        else if (!stricmp(name, "shapeshifter_off"))
-                                DDr_CheatTable[0].message_off = strdup(value);
-                        else if (!stricmp(name, "liveforever_on"))
-                                DDr_CheatTable[1].message_on = strdup(value);
-                        else if (!stricmp(name, "liveforever_off"))
-                                DDr_CheatTable[1].message_off = strdup(value);
-                        else if (!stricmp(name, "touchofdeath_on"))
-                                DDr_CheatTable[2].message_on = strdup(value);
-                        else if (!stricmp(name, "touchofdeath_off"))
-                                DDr_CheatTable[2].message_off = strdup(value);
-                        else if (!stricmp(name, "canttouchthis_on"))
-                                DDr_CheatTable[3].message_on = strdup(value);
-                        else if (!stricmp(name, "canttouchthis_off"))
-                                DDr_CheatTable[3].message_off = strdup(value);
-                        else if (!stricmp(name, "fatloot_on"))
-                                DDr_CheatTable[4].message_on = strdup(value);
-                        else if (!stricmp(name, "glassworld_on"))
-                                DDr_CheatTable[5].message_on = strdup(value);
-                        else if (!stricmp(name, "glassworld_off"))
-                                DDr_CheatTable[5].message_off = strdup(value);
-                        else if (!stricmp(name, "winlevel_on"))
-                                DDr_CheatTable[6].message_on = strdup(value);
-                        else if (!stricmp(name, "loselevel_on"))
-                                DDr_CheatTable[7].message_on = strdup(value);
-                        else if (!stricmp(name, "bighead_on"))
-                                DDr_CheatTable[8].message_on = strdup(value);
-                        else if (!stricmp(name, "bighead_off"))
-                                DDr_CheatTable[8].message_off = strdup(value);
-                        else if (!stricmp(name, "minime_on"))
-                                DDr_CheatTable[9].message_on = strdup(value);
-                        else if (!stricmp(name, "minime_off"))
-                                DDr_CheatTable[9].message_off = strdup(value);
-                        else if (!stricmp(name, "superammo_on"))
-                                DDr_CheatTable[10].message_on = strdup(value);
-                        else if (!stricmp(name, "superammo_off"))
-                                DDr_CheatTable[10].message_off = strdup(value);
-                        else if (!stricmp(name, "devmode_on"))
+                        else if (!_stricmp(name, "damn"))
+                                DDrPatch__strdup(OniExe + 0x0010fb6e, value);
+                        else if (!_stricmp(name, "blam"))
+                                DDrPatch__strdup(OniExe + 0x0010fb73, value);
+                        else if (!_stricmp(name, "shapeshifter_on"))
+                                DDr_CheatTable[0].message_on = _strdup(value);
+                        else if (!_stricmp(name, "shapeshifter_off"))
+                                DDr_CheatTable[0].message_off = _strdup(value);
+                        else if (!_stricmp(name, "liveforever_on"))
+                                DDr_CheatTable[1].message_on = _strdup(value);
+                        else if (!_stricmp(name, "liveforever_off"))
+                                DDr_CheatTable[1].message_off = _strdup(value);
+                        else if (!_stricmp(name, "touchofdeath_on"))
+                                DDr_CheatTable[2].message_on = _strdup(value);
+                        else if (!_stricmp(name, "touchofdeath_off"))
+                                DDr_CheatTable[2].message_off = _strdup(value);
+                        else if (!_stricmp(name, "canttouchthis_on"))
+                                DDr_CheatTable[3].message_on = _strdup(value);
+                        else if (!_stricmp(name, "canttouchthis_off"))
+                                DDr_CheatTable[3].message_off = _strdup(value);
+                        else if (!_stricmp(name, "fatloot_on"))
+                                DDr_CheatTable[4].message_on = _strdup(value);
+                        else if (!_stricmp(name, "glassworld_on"))
+                                DDr_CheatTable[5].message_on = _strdup(value);
+                        else if (!_stricmp(name, "glassworld_off"))
+                                DDr_CheatTable[5].message_off = _strdup(value);
+                        else if (!_stricmp(name, "winlevel_on"))
+                                DDr_CheatTable[6].message_on = _strdup(value);
+                        else if (!_stricmp(name, "loselevel_on"))
+                                DDr_CheatTable[7].message_on = _strdup(value);
+                        else if (!_stricmp(name, "bighead_on"))
+                                DDr_CheatTable[8].message_on = _strdup(value);
+                        else if (!_stricmp(name, "bighead_off"))
+                                DDr_CheatTable[8].message_off = _strdup(value);
+                        else if (!_stricmp(name, "minime_on"))
+                                DDr_CheatTable[9].message_on = _strdup(value);
+                        else if (!_stricmp(name, "minime_off"))
+                                DDr_CheatTable[9].message_off = _strdup(value);
+                        else if (!_stricmp(name, "superammo_on"))
+                                DDr_CheatTable[10].message_on = _strdup(value);
+                        else if (!_stricmp(name, "superammo_off"))
+                                DDr_CheatTable[10].message_off = _strdup(value);
+                        else if (!_stricmp(name, "devmode_on"))
                         {
-                                char* str = strdup(value);
+                                char* str = _strdup(value);
                                 DDr_CheatTable[11].message_on = str;
                                 DDr_CheatTable[cheat_x].message_on = str;
                         }
-                        else if (!stricmp(name, "devmode_off"))
+                        else if (!_stricmp(name, "devmode_off"))
                         {
-                                char* str = strdup(value);
+                                char* str = _strdup(value);
                                 DDr_CheatTable[11].message_off = str;
                                 DDr_CheatTable[cheat_x].message_off = str;
                         }
-                        else if (!stricmp(name, "reservoirdogs_on"))
-                                DDr_CheatTable[12].message_on = strdup(value);
-                        else if (!stricmp(name, "reservoirdogs_off"))
-                                DDr_CheatTable[12].message_off = strdup(value);
-                        else if (!stricmp(name, "roughjustice_on"))
-                                DDr_CheatTable[13].message_on = strdup(value);
-                        else if (!stricmp(name, "roughjustice_off"))
-                                DDr_CheatTable[13].message_off = strdup(value);
-                        else if (!stricmp(name, "chenille_on"))
-                                DDr_CheatTable[14].message_on = strdup(value);
-                        else if (!stricmp(name, "chenille_off"))
-                                DDr_CheatTable[14].message_off = strdup(value);
-                        else if (!stricmp(name, "behemoth_on"))
-                                DDr_CheatTable[15].message_on = strdup(value);
-                        else if (!stricmp(name, "behemoth_off"))
-                                DDr_CheatTable[15].message_off = strdup(value);
-                        else if (!stricmp(name, "elderrune_on"))
-                                DDr_CheatTable[16].message_on = strdup(value);
-                        else if (!stricmp(name, "elderrune_off"))
-                                DDr_CheatTable[16].message_off = strdup(value);
-                        else if (!stricmp(name, "moonshadow_on"))
-                                DDr_CheatTable[17].message_on = strdup(value);
-                        else if (!stricmp(name, "moonshadow_off"))
-                                DDr_CheatTable[17].message_off = strdup(value);
-                        else if (!stricmp(name, "munitionfrenzy_on"))
-                                DDr_CheatTable[18].message_on = strdup(value);
-                        else if (!stricmp(name, "fistsoflegend_on"))
-                                DDr_CheatTable[19].message_on = strdup(value);
-                        else if (!stricmp(name, "fistsoflegend_off"))
-                                DDr_CheatTable[19].message_off = strdup(value);
-                        else if (!stricmp(name, "killmequick_on"))
-                                DDr_CheatTable[20].message_on = strdup(value);
-                        else if (!stricmp(name, "killmequick_off"))
-                                DDr_CheatTable[20].message_off = strdup(value);
-                        else if (!stricmp(name, "carousel_on"))
-                                DDr_CheatTable[21].message_on = strdup(value);
-                        else if (!stricmp(name, "carousel_off"))
-                                DDr_CheatTable[21].message_off = strdup(value);
+                        else if (!_stricmp(name, "reservoirdogs_on"))
+                                DDr_CheatTable[12].message_on = _strdup(value);
+                        else if (!_stricmp(name, "reservoirdogs_off"))
+                                DDr_CheatTable[12].message_off = _strdup(value);
+                        else if (!_stricmp(name, "roughjustice_on"))
+                                DDr_CheatTable[13].message_on = _strdup(value);
+                        else if (!_stricmp(name, "roughjustice_off"))
+                                DDr_CheatTable[13].message_off = _strdup(value);
+                        else if (!_stricmp(name, "chenille_on"))
+                                DDr_CheatTable[14].message_on = _strdup(value);
+                        else if (!_stricmp(name, "chenille_off"))
+                                DDr_CheatTable[14].message_off = _strdup(value);
+                        else if (!_stricmp(name, "behemoth_on"))
+                                DDr_CheatTable[15].message_on = _strdup(value);
+                        else if (!_stricmp(name, "behemoth_off"))
+                                DDr_CheatTable[15].message_off = _strdup(value);
+                        else if (!_stricmp(name, "elderrune_on"))
+                                DDr_CheatTable[16].message_on = _strdup(value);
+                        else if (!_stricmp(name, "elderrune_off"))
+                                DDr_CheatTable[16].message_off = _strdup(value);
+                        else if (!_stricmp(name, "moonshadow_on"))
+                                DDr_CheatTable[17].message_on = _strdup(value);
+                        else if (!_stricmp(name, "moonshadow_off"))
+                                DDr_CheatTable[17].message_off = _strdup(value);
+                        else if (!_stricmp(name, "munitionfrenzy_on"))
+                                DDr_CheatTable[18].message_on = _strdup(value);
+                        else if (!_stricmp(name, "fistsoflegend_on"))
+                                DDr_CheatTable[19].message_on = _strdup(value);
+                        else if (!_stricmp(name, "fistsoflegend_off"))
+                                DDr_CheatTable[19].message_off = _strdup(value);
+                        else if (!_stricmp(name, "killmequick_on"))
+                                DDr_CheatTable[20].message_on = _strdup(value);
+                        else if (!_stricmp(name, "killmequick_off"))
+                                DDr_CheatTable[20].message_off = _strdup(value);
+                        else if (!_stricmp(name, "carousel_on"))
+                                DDr_CheatTable[21].message_on = _strdup(value);
+                        else if (!_stricmp(name, "carousel_off"))
+                                DDr_CheatTable[21].message_off = _strdup(value);
                         else
                                 DDrStartupMessage("unrecognised language item \"%s\"", name);
@@ -435 +516 @@
 void DDrConfig()
 {
+
         if (GetFileAttributes("daodan.ini") == INVALID_FILE_ATTRIBUTES)
         {
+                FILE* fp;
                 DDrStartupMessage("daodan.ini doesn't exist, creating");
-                FILE* fp = fopen("daodan.ini", "w");
+                fp = fopen("daodan.ini", "w");
                 if (fp)
                 {
@@ -458 +541 @@
 }
 
+void DDrException() {
+        int* i = 0;
+        *i = 1;
+}
+#include <stdio.h>
+
+//this was broken 
+FILE** _UUgError_WarningFile = (FILE**)0x005711B4;
+FILE *__fastcall DDrPrintWarning(int filename, int linenumber, unsigned __int16 errornum, int message)
+{
+
+        FILE *v4; // eax@1
+        FILE *result; // eax@4
+        char v6[512]; // [sp+0h] [bp-100h]@1
+        FILE* UUgError_WarningFile = *_UUgError_WarningFile;
+        sprintf_s(
+                v6, 512,
+                "Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
+                errornum,
+                filename,
+                linenumber,
+                message);
+
+        if ( UUgError_WarningFile 
+                || (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
+        { 
+                oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
+                oni_fflush(UUgError_WarningFile);
+        }
+        //oni_fprintf(stdout, v6);
+        //sprintf(&v6, "%s", message);
+        *_UUgError_WarningFile = UUgError_WarningFile;
+        result = UUgError_WarningFile;
+        return result; 
+}
+
 void __cdecl DDrMain(int argc, char* argv[])
 {
-        DDrStartupMessage("daodan attached!");
-        
-        opt_ignore_private_data = false;
-        opt_sound = true;
-        
-        DDrConfig();
-        DDrStartupMessage("parsing command line...");
         int i;
         char* section;
         char* option;
         bool falseoption;
+
+        DDrStartupMessage("daodan attached!");
+        
+        opt_ignore_private_data = false;
+        opt_sound = true;
+        
+        DDrConfig();
+        DDrStartupMessage("parsing command line...");
         for (i = 1; i < argc; i ++)
         {
@@ -520 +640 @@
                 DDrPatch_MakeJump(UUrMachineTime_Sixtieths, DDrMachineTime_Sixtieths);
         }
-        
+
         // Cheats always enabled
         if (patch_cheatsenabled)
                 DDrPatch_MakeJump(ONrPersist_GetWonGame, DDrPersist_GetWonGame);
-        
+
         // Windowed mode
         if (patch_usedaodangl)
         {
+        DDrPatch_NOOP((char*)0x004032B7, 6);
+        DDrPatch_MakeCall((char*)0x004032B7, LIiP_SetCursorPosHook);
+        
+        DDrPatch_NOOP((char*)0x00403349, 6);
+        DDrPatch_MakeCall((char*)0x00403349, LIiP_SetCursorPosHook);
                 DDrPatch_MakeJump(ONrPlatform_Initialize, DDrPlatform_Initialize);
                 DDrPatch_MakeJump(gl_platform_initialize, daodangl_platform_initialize);
         }
-        
         // Hacked windowed mode (for when daodangl isn't working properly)
-        if (patch_windowhack)
+        else if (patch_windowhack)
                 DDrWindowHack_Install();
         
@@ -542 +666 @@
         if (patch_bsl)
                 SLrDaodan_Patch();
-        
+                
         if (patch_cheater)
         {
                 DDrPatch_MakeCall(OniExe + 0x000f618f, DDrCheater);
                 DDrPatch_Int16(OniExe + 0x000deb45, 0x5590);
+#if 1
                 DDrPatch_MakeCall(OniExe + 0x000deb47, FallingFrames);
+#endif
                 DDrPatch_MakeJump(OniExe + 0x0010f021, DDrCheater_LevelLoad);
         }
-        
-        init_daodan_gl();
-        
-        ONiMain(argc, argv);
+
+        //DDrPatch_MakeJump(0x004378c0, DDrException);
+        DDrPatch_MakeJump(0x004245A0, DDrPrintWarning);
+        //init_daodan_gl();
+        
+        ONiMain(argc, argv);
 }
 /*
@@ -586 +714 @@
                         DDrONiModule = GetModuleHandle(NULL);
                         
-                        if (*(uint32_t*)((void*)OniExe + 0x0011acd0) == 0x09d36852)
+                        if (*(uint32_t*)(OniExe + 0x0011acd0) == 0x09d36852)
                                 DDrPatch_MakeCall(OniExe + 0x0010fb49, DDrMain);
                         else

Daodan/src/Daodan.h

@@ -4 +4 @@
 
 #include <windows.h>
-#include <stdbool.h>
+#include "bool.h"
 
 #define ONICALL __fastcall
@@ -15 +15 @@
 extern bool opt_topmost;
 
+
+
+
 #endif

Daodan/src/Daodan_BSL.c

@@ -1 +1 @@
 #include <stdio.h>
-#include <stdbool.h>
+#include "bool.h"
 #include <time.h>
-#include <ffi.h>
+//#include <ffi.h>
 #include <math.h>
 #include "inifile.h"
-
 #include "Daodan_BSL.h"
-#include "Flatline_BSL.h"
 #include "Daodan_Utility.h"
 #include "Daodan_Patch.h"
@@ -15 +13 @@
 #include "Oni_Character.h"
 #include "oni_gl.h"
-#include "dSFMT\dSFMT.h"
 #include "Daodan_Character.h"
-
+#include "BFW_Utility.h"
 
 
@@ -91 +88 @@
         }
         
-        ret->value_int32 = start + (dsfmt_gv_genrand_uint32() % (uint32_t)(end - start + 1));
+        ret->value_int32 = start + (rand() % (uint32_t)(end - start + 1));
         ret->type = sl_int32;
         return 0;
@@ -102 +99 @@
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        int* killcount = ONgGameState + index * 0x16A0 + 0x1260 + 0x1670;
-        ret->value_int32 = *killcount;
+        //killcount = ONgGameState->CharacterStorage[index].Kills;
+                //ONgGameState + index * 0x16A0 + 0x1260 + 0x1670;
+        ret->value_int32 = ONgGameState->CharacterStorage[index].Kills;
         ret->type = sl_int32;
         return 0;
@@ -114 +112 @@
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        int* killcount = ONgGameState + index * 0x16A0 + 0x1260 + 0x1674;
-        ret->value_int32 = *killcount;
-        ret->type = sl_int32;
-        return 0;
-}
-
-uint16_t ONICALL bsl_returnoffset(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
-{
-        //int offset = 140;
-        //if (== 1) offset = 148;
-        //else index = args[0].value_int32;
-        int* killcount = ONgGameState + args[0].value_int32;
-        ret->value_int32 = *killcount;
-        ret->type = sl_int32;
-        return 0;
-}
+        ret->value_int32 = ONgGameState->CharacterStorage[index].Damage;
+        ret->type = sl_int32;
+        return 0;
+}
+
 
 
@@ -135 +122 @@
 {
         int index;
+        void* returnval;
+        bool is_lsi = 0;
+        Character* Chr = ONgGameState->CharacterStorage;
+
         if (numargs < 2 || args[1].type != sl_str32) return 1;
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        void* returnval;
-        bool is_lsi = 0;
-        Character* Chr = ONgGameState + 0x1260;
+
+        
+
         if(!strcmp(args[1].value_str32,"ammo")) 
         {
-                returnval = &(Chr[index].Inventory_.AmmoUsed);
+                returnval = &(Chr[index].Inventory.AmmoUsed);
         }
         else if(!strcmp(args[1].value_str32,"hypo")) 
         {
-                returnval = &(Chr[index].Inventory_.HypoUsed);
+                returnval = &(Chr[index].Inventory.HypoUsed);
         }
         else if(!strcmp(args[1].value_str32,"cells")) 
         {
-                returnval = &(Chr[index].Inventory_.CellsUsed);
+                returnval = &(Chr[index].Inventory.CellsUsed);
         }
         else if(!strcmp(args[1].value_str32,"invis")) 
         {
-                returnval = &(Chr[index].Inventory_.CloakUsed);
+                returnval = &(Chr[index].Inventory.CloakUsed);
         }
         else if(!strcmp(args[1].value_str32,"shield")) 
         {
-                returnval = &(Chr[index].Inventory_.ShieldUsed);
+                returnval = &(Chr[index].Inventory.ShieldUsed);
         }
         else if(!strcmp(args[1].value_str32,"lsi")) 
         {
-                returnval = &(Chr[index].Inventory_.hasLSI);
+                returnval = &(Chr[index].Inventory.hasLSI);
                 is_lsi = 1;
         }
@@ -196 +187 @@
 {
         int index;
+        Character* Chr;
+        int* health;
         if (numargs == 0) index = 0;
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        Character* Chr = ONgGameState + 0x1260 ;
-        int* health = &Chr[index].Health;
+        Chr = ONgGameState->CharacterStorage;
+        health = &Chr[index].Health;
 
         ret->value_int32 = *health;
         ret->type = sl_int32;
 
-        if (numargs >= 2) {
+        if (args[1].value_int32) {
                 *health = args[1].value_int32;
         }
@@ -216 +209 @@
 {
         int index;
+        Character* Chr;
         if (numargs == 0) index = 0;
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        Character* Chr = ONgGameState + 0x1260 ;
-        int* health = (int*)Chr[index].ScriptNoPath;
+        Chr = ONgGameState->CharacterStorage ;
+        
         
         /*
@@ -233 +227 @@
         DDrConsole_PrintF("NoPath %s", Chr[index].ScriptNoPath);
         */
-        ret->value_int32 = *health;
+        ret->value_int32 = Chr[index].RegenHax;
         ret->type = sl_int32;
 
         if (numargs >= 2) {
-                *health = args[1].value_int32;
-        }
-        return 0;
-}
-
+                Chr[index].RegenHax = args[1].value_int32;
+        }
+        return 0;
+}
+
+//wow this is broken.
 uint16_t ONICALL bsl_distance(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) {
-        
-        if (numargs < 2) return 1;
         int index;
         int index2;
+        Character* Chr = ONgGameState->CharacterStorage;
+        Character* Char1;
+        Character* Char2;
+
+        if (numargs < 2) return 1;
+
         if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
@@ -254 +253 @@
         else index2 = args[1].value_int32;
         if (index2 == -1) index2 = args[1].value_int32;
-        
-        Character* Chr = ONgGameState + 0x1260;
-        Character* Char1 = &Chr[index];
-        Character* Char2 = &Chr[index2];
+                Char1 = &Chr[index];
+        Char2 = &Chr[index2];
+
 
         ret->value_float = sqrt( pow((Char1->Location.X - Char2->Location.X), 2) + pow((Char1->Location.Y - Char2->Location.Y), 2) + pow((Char1->Location.Z - Char2->Location.Z),2));
@@ -264 +262 @@
 }
 uint16_t ONICALL bsl_location(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) {
-        int index;
+        int index, i;
+        float* loc;
+        Character* Chr;
+                numargs = 0;
+        for(i = 0; args[i].type < sl_void; i++)
+        {
+                numargs++;
+        }
+
+
         if (numargs < 2) return 1;
         if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
         if (index == -1) index = args[0].value_int32;
-        Character* Chr = ONgGameState + 0x1260;
-        float* loc;
-        if (!strcmp(args[1].value_str32,"X") || !strcmp(args[1].value_str32,"x"))
-        loc = &(Chr[index].Position.X);
-        else if (!strcmp(args[1].value_str32,"Y") || !strcmp(args[1].value_str32,"y"))
-        loc = &(Chr[index].Position.Y);
-        else if (!strcmp(args[1].value_str32,"Z") || !strcmp(args[1].value_str32,"z"))
-        loc = &(Chr[index].Position.Z);
+        Chr = ONgGameState->CharacterStorage;
+        if(numargs == 3)
+        {
+                if (!strcmp(args[1].value_str32,"X") || !strcmp(args[1].value_str32,"x"))
+                        loc = &(Chr[index].Position.X);
+                else if (!strcmp(args[1].value_str32,"Y") || !strcmp(args[1].value_str32,"y"))
+                        loc = &(Chr[index].Position.Y);
+                else if (!strcmp(args[1].value_str32,"Z") || !strcmp(args[1].value_str32,"z"))
+                        loc = &(Chr[index].Position.Z);
+        }
         else if (numargs == 4) {
-                //currently broken. crashes oni.
-                Chr[index].Position.X = args[1].value_float;
-                Chr[index].Position.Y = args[2].value_float;
-                Chr[index].Position.Z = args[3].value_float;
+                ActiveCharacter* Active = (ActiveCharacter*)ONrGetActiveCharacter(&Chr[index]);
+                Chr[index].Location.X = args[1].value_float;
+                Chr[index].Location.Y = args[2].value_float;
+                Chr[index].Location.Z = args[3].value_float;
+                if(Active)
+                {
+                        Active->PhyContext->Position = Chr[index].Location;
+                }
                 ret->value_float = 1;
                 ret->type = sl_float;
@@ -304 +317 @@
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        Character* Chr = ONgGameState + 0x1260 ;
+        if(1) {
+        Character* Chr = ONgGameState->CharacterStorage ;
         int* maxhealth = &Chr[index].MaxHealth;
         int oldmaxhealth = Chr[index].MaxHealth;
@@ -317 +331 @@
         ret->type = sl_int32;
         return 0;
+        }
 }
 
@@ -327 +342 @@
         else    if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        
-        Character* Chr = ONgGameState + 0x1260;
+        if(1) {
+        Character* Chr = ONgGameState->CharacterStorage;
         ActiveCharacter* Active = (ActiveCharacter*)ONrGetActiveCharacter(&Chr[index]);
-        if ((int)Active == 0) return 1;
+        if (!Active) return 1;
 //      ret->value_int32 = Active->LastDamageSourceCharacter;
         ret->type = sl_int32;
         return 0;
+        } 
 }
 
@@ -341 +357 @@
 {
         int index;
+        char* name;
+
         if (numargs == 0) index = 0;
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
@@ -349 +367 @@
                 return 0;
         }
-        char* name = ONgGameState + 0x1260  + index * 0x16A0 + 0x14;
+        name = &ONgGameState->CharacterStorage[index].Name;
         if (numargs == 2) {
                 strncpy(name, (char*)args[1].value_str32, 31);
@@ -374 +392 @@
         RGBA color;
         RGBA shade;
-        
+        int i;
+        numargs = 0;
+        for(i = 0; args[i].type < sl_void; i++)
+        {
+                numargs++;
+        }
         if(numargs == 0) return 0;
         if(numargs > 1 ) color.R = (char)args[1].value_int32;
@@ -405 +428 @@
 }
 
-uint16_t ONICALL bsl_getactiveoffset(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
-{
-        DDrConsole_PrintF("Character: 0x%x",(int)ONgGameState + 0x1260);
-        DDrConsole_PrintF("ActiveChar: 0x%x",(int)ONrGetActiveCharacter((void*)((int)ONgGameState + 0x1260)));
-        return 0;
-}
 typedef struct {
 char Name[16];
@@ -463 +480 @@
 };
 uint16_t ONICALL bsl_holdkey(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
-        {
-                int index;
-                
-                if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
-                else index = args[0].value_int32;
-                
-                Character* Chr = ONgGameState + 0x1260;
-        ActiveCharacter* Active = (ActiveCharacter*)ONrGetActiveCharacter(&Chr[index]);
-        if ((int)Active == 0) return 1;
-        int i = 2;
-        int j = 0;
+{
+        uint32_t index;
+        uint32_t i = 2;
+        uint32_t j = 0;
         int Input1 = 0;
         int Input2 = 0;
+        Character* Chr;
+        ActiveCharacter* Active;
+        if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
+        else index = args[0].value_int32;
+
+        Chr = &(ONgGameState->CharacterStorage[index]);
+        Active = ONrGetActiveCharacter(Chr);
+        if (!Active) return 1;
+
         for(i = 1; i < numargs - 1; i++) {
                 for(j = 0; j < 32; j++) {
@@ -489 +508 @@
         }
         Active->Input.Current.Actions1 = Active->Input.Current.Actions1 | Input1;
-        Active->Input.Current.Actions2 = Active->Input.Current.Actions1 | Input2;
+        Active->Input.Current.Actions2 = Active->Input.Current.Actions2 | Input2;
         if( Input1 + Input2 == 0 ) {
                 DDrConsole_PrintF("Func \"%s\", File \"%s\", Line %d: semantic error, \"%s\": No valid keys given.", callinfo->name, callinfo->calllocation, callinfo->linenumber, callinfo->name);
@@ -512 +531 @@
 //              else index = args[0].value_int32;
 
-//              Character* Chr = ONgGameState + 0x1260;
+//              Character* Chr = ONgGameState->CharacterStorage;
 //      ActiveCharacter* Active = (ActiveCharacter*)ONrGetActiveCharacter(&Chr[index]);
 //      if ((int)Active == 0) return 1;
-        int i = 2;
-        int j = 0;
+        uint32_t i = 2;
+        uint32_t j = 0;
         int Input1 = 0;
         int Input2 = 0;
@@ -536 +555 @@
         ret->value_int32 = 0;
         ret->type = sl_int32;
-        if ( ((*(int*)(ONgGameState + 0xB8 + 0x10) & Input1) == Input1)  && ((*(int*)(ONgGameState + 0xB8 + 0x14) & Input2) == Input2)) ret->value_int32 = 1;
+        if ( (ONgGameState->Input.Current.Actions1 == Input1)  && (ONgGameState->Input.Current.Actions2 == Input2)) ret->value_int32 = 1;
         return 0;
 }
@@ -547 +566 @@
 //              else index = args[0].value_int32;
 
-//              Character* Chr = ONgGameState + 0x1260;
+//              Character* Chr = ONgGameState->CharacterStorage;
 //      ActiveCharacter* Active = (ActiveCharacter*)ONrGetActiveCharacter(&Chr[index]);
 //      if ((int)Active == 0) return 1;
+
         int i = 2;
         int j = 0;
         int Input1 = 0;
         int Input2 = 0;
-        for(i = 0; i < numargs; i++) {
+/*
+        numargs = 0;
+        for(i = 0; args[i].type <= sl_void; i++)
+        {
+                //DDrConsole_PrintF("%i", args[i].type );
+                numargs++;
+
+        }
+        if(numargs < 1 || args[0].value == 0)  return;
+        //for(i = 0; i < numargs; i++) {
+        */
+        i = 0;
                 for(j = 0; j < 32; j++) {
                         //DDrConsole_PrintF("Testing %s against %s 0x%x", args[i].value_str32, Actions1[j].Name, Actions1[j].Bit);
@@ -567 +598 @@
         
                 }
-                }
-        //DDrConsole_PrintF("Waiting...");
-        if ( ((*(int*)(ONgGameState + 0xB8 + 0x10) & Input1) == Input1)  && ((*(int*)(ONgGameState + 0xB8 + 0x14) & Input2) == Input2)) {
+        //      }
+        DDrConsole_PrintF("Waiting...");
+        if ( 
+                (( ONgGameState->Input.Current.Actions1 & Input1) == Input1)  && 
+                (( ONgGameState->Input.Current.Actions2 & Input2) == Input2) 
+        )
+        {
+        DDrConsole_PrintF("Found key!");
         }
         else {
@@ -576 +612 @@
         *dontuse1 = 1;
         }
-/*
-        __asm__(
-                "movl 0x10(%esp), %edx\n\t"
-                "movl    $1,(%eax)\n\t"
-                );
-        //ret->type = sl_void
-*/      return 0;
-}
-
+        return 0;
+}
+
+
+uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
+{
+        char output[1024];
+        char buffer[1024];
+        int i;
+        char* placeinoutput = output;
+        char* placeininput = args[0].value_str32;
+        int formatnum = 0;
+        //fix the broken bsl numargs...
+        numargs = 0;
+        
+        for(i = 0; args[i].type < sl_void; i++)
+        {
+                numargs++;
+        }
+        
+        
+        if (numargs < 1)
+                return 1;
+        
+        while(1)
+        {
+                int size;
+                //s is the pointer to the args
+                char* s = strchr(placeininput , '%');
+                //we didnt find a %, break!
+                if(!s)
+                {
+                        strcpy(placeinoutput, placeininput);
+                        break;
+                }
+                size = (int)s - (int)placeininput ;
+                //we found one, so copy the portion of string
+                
+
+                
+                memcpy( placeinoutput,placeininput, size);
+                placeininput += size;
+                placeinoutput += size;
+
+                memset( placeinoutput, '%', (int)pow(2, formatnum));
+                placeinoutput += (int)pow(2, formatnum);
+
+
+                placeininput += 1;
+                *placeinoutput = 0;
+                formatnum++;
+                
+        }
+        //strcpy( output, args[0].value_str32 );
+
+        for(i = 1; i < numargs; i++)    {
+                //sprintf(output, output, args[i].value_str32);
+                memcpy(buffer, output, 1024);
+                if(args[i].value == 0) break;
+                switch(args[i].type)
+                {
+                case sl_bool:
+                case sl_int32:
+                        sprintf(output, buffer, args[i].value_int32);
+                        break;
+                case sl_float:
+                        //crashes oni, why?
+                //      sprintf(output, output, args[i].value_float);
+                        break;
+                case sl_str32:
+                        sprintf(output, buffer, args[i].value_str32);
+                        break;
+                case sl_void:
+                default:
+                        break;
+                }       
+        }
+        //output[32] = 0;
+        ret->value_str32 = output;
+        ret->type = sl_str32;
+        return 0;
+}
+
+//Sorry rossy, I broke this. FFI isnt in windows
 /*
 uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
 {
-        if (numargs < 2)
-                return 1;
-        
-        char output[255];
-        int i;
-        for(i = 1; i < numargs; i++)    {
-                sprintf(output, args[0].value_str32, args[i].value_str32);
-        }
-        
-        ret->value_str32 = output;
-        ret->type = sl_str32;
-        return 0;
-}
-*/
-uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
-{
-        if (numargs < 1 || args[0].type != sl_str32)
-        {
-                DDrConsole_PrintF("Func \"%s\", File \"%s\", Line %d: semantic error, \"%s\": parameter list does not match: format:string arg1 arg2 ...", callinfo->name, callinfo->calllocation, callinfo->linenumber, callinfo->name);
-                return 0;
-        }
-        
-        if (!args[0].value_str32)
-                args[0].value_str32 = "";
-        
-        int ffi_ret;
+        
+        
+                int ffi_ret;
         char* str = NULL;
         int size = 0;
@@ -620 +708 @@
         ffi_type* ffi_args[256];
         void* values[256];
+        int i;
+                numargs = 0;
+        for(i = 0; args[i].type <= sl_void; i++)
+        {
+                //DDrConsole_PrintF("%i", args[i].type );
+                numargs++;
+
+        }
+
+        if (numargs < 1 || args[0].type != sl_str32)
+        {
+                DDrConsole_PrintF("Func \"%s\", File \"%s\", Line %d: semantic error, \"%s\": parameter list does not match: format:string arg1 arg2 ...", callinfo->name, callinfo->calllocation, callinfo->linenumber, callinfo->name);
+                return 0;
+        }
+        
+        if (!args[0].value_str32)
+                args[0].value_str32 = "";
+        
+        
         
         ffi_args[0] = &ffi_type_pointer;
@@ -626 +733 @@
         values[1] = &size;
         
-        int i;
+
         for(i = 2; i < numargs + 2; i ++)
         {
@@ -647 +754 @@
         if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, i, &ffi_type_sint32, ffi_args) != FFI_OK)
                 return 1;
-        ffi_call(&cif, (void*)snprintf, (void*)&ffi_ret, values);
+        ffi_call(&cif, (void*)_snprintf, (void*)&ffi_ret, values);
         str = malloc(ffi_ret + 1);
         size = ffi_ret + 1;
-        ffi_call(&cif, (void*)snprintf, (void*)&ffi_ret, values);
+        ffi_call(&cif, (void*)_snprintf, (void*)&ffi_ret, values);
         ret->value_str32 = str;
         ret->type = sl_str32;
         return 0;
 }
-
+*/
 // Widescreen patch for talking heads.
 uint16_t ONICALL cinematic_start_patch(sl_callinfo* callinfo, unsigned int numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
 {
-        args[1].value_int32 = (double)args[1].value_int32 / (double)(gl->DisplayMode.Width) * (4.0 / 3.0 * (double)(gl->DisplayMode.Height));
+        args[1].value_int32 = (double)args[1].value_int32 / (double)(gl_eng->DisplayMode.Width) * (4.0 / 3.0 * (double)(gl_eng->DisplayMode.Height));
         return ((sl_func)(OniExe + 0x000f3830))(callinfo, numargs, args, dontuse1, dontuse2, ret);
 }
@@ -666 +773 @@
 bool SLrIniCallback(char* section, bool newsection, char* name, char* value)
 {
-        if (newsection && !stricmp(section, "bsl"))
+        if (newsection && !_stricmp(section, "bsl"))
                 ini_inbsl = true;
         
         if (ini_inbsl)
         {
+                char* type = value;
                 bool isptr = false;
                 sl_type bsl_type;
@@ -680 +788 @@
                 }
                 
-                char* type = value;
+                
                 
                 for (; *type; type++)
@@ -753 +861 @@
 }
 
+void ONICALL SLrDaodan_Register_ReturnType(char* name, char* desc, char* argfmt, sl_type type, sl_func callback) {
+        char argfmt2[512];
+        uint16_t errornum;
+        sprintf_s(argfmt2, 512, "%s [|]", argfmt);
+        errornum = SLrScript_Command_Register_ReturnType(name, desc, argfmt2, type, callback);
+        if(errornum)
+        {
+                DDrStartupMessage("Registration of script command %s failed with error %i", name, errornum);
+        }
+
+}
+
+void* TSrTest = 0;
+uint16_t ONICALL new_text(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
+{
+        void* TSFFTahoma;
+        int returnval;
+
+        if(!TSrTest){
+                TMrInstance_GetDataPtr( 'TSFF', "Tahoma", &TSFFTahoma);
+        returnval = TSrContext_New( TSFFTahoma, 7, 1, 1,  0, &TSrTest);
+        }
+        DDrPatch_MakeCall(0x004FBCEA, DDrText_Hook);
+        
+        *dontuse2 = 1;
+        return 0;
+}
+
 void SLrDaodan_Initalize()
 {
-
-
-        //Calculating the value of the needed offset is much more reliable when the compiler does it for you.
-
-        //TODO: fix moonshadow.
-        Character * Chr = 0;
-        char NoPath = (char)(0x100 - (int)(Chr->ScriptNoPath));
-        const char regen_patch[] =
-                {0x90, 0x90, 0x90, 0x90, 0x90,  // mov     al, _WPgRegenerationCheat
-                0x90, 0x90,                                             // test    al, al
-                0x90, 0x90,                                             // jz      short loc_51BB98
-                0x8B, 0x86, NoPath};    
-        DDrPatch_Const(OniExe + 0x0011BB64, regen_patch);
-
-        SLrConfig();
+        SLrConfig();
+
+        SLrScript_Command_Register_Void("debug_daodan","Adds text to screen", "", new_text);
 
         SLrScript_Command_Register_ReturnType("int32mul", "Multiplies two numbers", "n1:int n2:int", sl_int32, bsl_int32mul);
         SLrScript_Command_Register_ReturnType("mul", "Multiplies two numbers", "[int1:int|float1:float] [int2:int|float2:float]", sl_float, bsl_mul);
-        
         SLrScript_Command_Register_ReturnType("int32div", "Divides two numbers", "n1:int n2:int", sl_int32, bsl_int32div);
         SLrScript_Command_Register_ReturnType("div", "Divides two numbers", "[int1:int|float1:float] [int2:int|float2:float]", sl_float, bsl_div);
-        
-        dsfmt_gv_init_gen_rand((uint32_t)time(NULL));
+        srand((uint32_t)time(NULL));
         SLrScript_Command_Register_ReturnType("int32rand", "Returns a pseudo-random number between two numbers (inclusive).", "start:int end:int", sl_int32, bsl_int32rand);
-        
-        SLrScript_Command_Register_ReturnType("d_getkills","Gets the number of kills a character has", "[ai_name:str | script_id:int]", sl_int32, bsl_getkills);
+        SLrScript_Command_Register_ReturnType("d_getkills","Gets the number of kills a character has", "[ai_name:string | script_id:int] [|]", sl_int32, bsl_getkills);
         SLrScript_Command_Register_ReturnType("d_getdamage","Gets the amount of damage a character has caused", "[ai_name:string | script_id:int]", sl_int32, bsl_getdamage);
-        SLrScript_Command_Register_ReturnType("d_name","Gets or sets a character's name", "[ai_name:str | script_id:int] [newname:string]", sl_str32, bsl_chrname);
+        SLrScript_Command_Register_ReturnType("d_name","Gets or sets a character's name", "[ai_name:string | script_id:int] [newname:string|]", sl_str32, bsl_chrname);
         SLrScript_Command_Register_ReturnType("d_getindex","Converts a character's name to its index", "ai_name:string", sl_int32, bsl_nametoindex);
-        SLrScript_Command_Register_ReturnType("d_health","Gets or sets a character's health", "[ai_name:str | script_id:int] [newhealth:int]", sl_str32, bsl_health);
-        SLrScript_Command_Register_ReturnType("d_regen","Gets or sets a character's health", "[ai_name:str | script_id:int] [newhealth:int]", sl_str32, bsl_regen);
-        SLrScript_Command_Register_ReturnType("d_maxhealth","Gets or sets a character's maximum health", "[ai_name:str | script_id:int] [newmaxhealth:int] [scalehealth:bool]", sl_str32, bsl_maxhealth);
-        SLrScript_Command_Register_ReturnType("d_powerup","Gets or sets a character's powerups", "ai_name:str|script_id:int powerup:str", sl_int32, bsl_powerup);
-        SLrScript_Command_Register_ReturnType("d_holdkey","Makes a character hold a key", "[ai_name:string | script_id:int] keys frames:int", sl_int32, bsl_holdkey);
-        SLrScript_Command_Register_ReturnType("d_isheld","Checks if player is holding a key", "keys", sl_int32, bsl_isheld);
-        SLrScript_Command_Register_ReturnType("d_location","Returns the X, Y or Z coord of a character", "ai_name:str | script_id:int xyz:string [newlocation:float]", sl_float, bsl_location);
-        SLrScript_Command_Register_ReturnType("d_distance","Returns the distance between two characters", "ai_name:str | script_id:int ai_name:str | script_id:int ", sl_float, bsl_distance);
-        SLrScript_Command_Register_Void("d_waitforkey","Waits for a keypress from the player", "keys", bsl_waitforkey);
+        SLrScript_Command_Register_ReturnType("d_health","Gets or sets a character's health", "[ai_name:string | script_id:int] [newhealth:int]", sl_str32, bsl_health);
+        SLrScript_Command_Register_ReturnType("d_regen","Gets or sets a character's regeneration abilities", "[ai_name:string | script_id:int] [newhealth:int]", sl_str32, bsl_regen);
+        SLrScript_Command_Register_ReturnType("d_maxhealth","Gets or sets a character's maximum health", "[ai_name:string | script_id:int] [newmaxhealth:int] [scalehealth:bool]", sl_str32, bsl_maxhealth);
+        SLrScript_Command_Register_ReturnType("d_powerup","Gets or sets a character's powerups", "[ai_name:string | script_id:int] powerup:string", sl_int32, bsl_powerup);
+        //d_holdkey is broken!
+        SLrScript_Command_Register_ReturnType("d_holdkey","Makes a character hold a key", "[ai_name:string | script_id:int] frames:int keys:string", sl_int32, bsl_holdkey);
+        SLrScript_Command_Register_ReturnType("d_isheld","Checks if player is holding a key", "[ai_name:string | script_id:int] [keys:string]", sl_int32, bsl_isheld);
+        SLrScript_Command_Register_ReturnType("d_location","Returns the X, Y or Z coord of a character", "", sl_float, bsl_location);
+        SLrScript_Command_Register_ReturnType("d_distance","Returns the distance between two characters", "ai_name:string | script_id:int ai_name:string | script_id:int", sl_float, bsl_distance);
+        SLrScript_Command_Register_Void("d_waitforkey","Waits for a keypress from the player", "key:string", bsl_waitforkey);
 
         //broken, only works for one damage type.
-        //SLrScript_Command_Register_ReturnType("d_getattacker","Gets the last person to hurt a character", "[ai_name:string | script_id:int]", sl_int32, bsl_getattacker);
+        //SLrDaodan_Register_ReturnType("d_getattacker","Gets the last person to hurt a character", "[ai_name:string | script_id:int]", sl_int32, bsl_getattacker);
         
         //used for debugging.
-        SLrScript_Command_Register_ReturnType("d_active","Returns a hex offset. ;)", "[ai_name:string | script_id:int]", sl_int32, bsl_getactiveoffset);
-
-        SLrScript_Command_Register_ReturnType("sprintf", "C-style sprintf.", "format:string arg1 arg2 ...", sl_str32, bsl_sprintf);
-        
-        SLrScript_Command_Register_ReturnType("st", "prints to console in color", "text:string [color: r b g] [color: r b g]", sl_void, bsl_dprintcolored);
-        
-        //Flatline
-        SLrFlatline_Initialize();
-
+//      SLrDaodan_Register_ReturnType("d_active","Returns a hex offset. ;)", "[ai_name:string | script_id:int]", sl_int32, bsl_getactiveoffset);
+
+        SLrScript_Command_Register_Void("sprintf", "C-style sprintf.", "", bsl_sprintf);
+        SLrScript_Command_Register_ReturnType("st", "prints to console in color", "", sl_void, bsl_dprintcolored);
+        SLrScript_Command_Register_ReturnType("d_dprint", "prints to console in color", "", sl_void, bsl_dprintcolored);
 }
 

Daodan/src/Daodan_Character.c

@@ -19 +19 @@
 
 uint32_t DDrGetCharacterIndexFromName(char* input) {
-        Character **characterlist;                                                              //pointer to array of Character pointers
-        characterlist = ONgGameState + 0x00167500;                              //Character List
-        int* total_characters = ONgGameState + 0x00167700;              //Max number of characters
         int i;
-        for(i = 0; i < *total_characters; i++) {
+        Character **characterlist = ONgGameState->PresentCharacterList;                                                         //pointer to array of Character pointers
+        int total_characters = ONgGameState->PresentCharacterListCount;         //Max number of characters
+        for(i = 0; i < total_characters; i++) {
                 if (characterlist[i] != 0)                                                      //anti Blam!
                         if (!strcmp(characterlist[i]->Name, input)) {   //checks for the same name

Daodan/src/Daodan_Character.h

@@ -4 +4 @@
 
 #include "Daodan.h"
-#include <stdint.h>
+//#include <stdint.h>
 
 int DDr_TeamToTeamID(const char* team_string);

Daodan/src/Daodan_Cheater.c

@@ -1 +1 @@
 #include <string.h>
-#include <stdbool.h>
-
+#include "bool.h"
+#include <math.h>
 #include "Oni.h"
 #include "Oni_Character.h"
@@ -7 +7 @@
 #include "Daodan.h"
 #include "Daodan_Cheater.h"
+union MSVC_EVIL_FLOAT_HACK
+{
+   unsigned __int8 Bytes[4];
+   float Value;
+};
+static union MSVC_EVIL_FLOAT_HACK INFINITY_HACK = {{0x00, 0x00, 0x80, 0x7F}};
+#define INFINITY (INFINITY_HACK.Value)
 
 oniCheatCode DDr_CheatTable[] = {
@@ -76 +83 @@
 #define ONCC_bodysize_max (0x00000C8C) /* float */
 
-#define kangaroo_h     (60)
-#define kangaroo_jp    (0.06)
-#define marypoppins_jp (0.14)
+#define kangaroo_h     (short)(60)
+#define kangaroo_jp    (float)(0.06)
+#define marypoppins_jp (float)(0.14)
 
 uint16_t cheat_oldshield = 0;
@@ -88 +95 @@
 float cheat_oldheight2 = 135;
 bool inc_fallingframes = true;
-
+extern bool patch_bsl;
 uint8_t ONICALL DDrCheater(uint32_t cheat)
 {
@@ -95 +102 @@
                 case cheat_bigbadboss:
                 {
-                        char* player = *((char**)(ONgGameState + GSA_player));
-                        if (*(unsigned int*)(player + CHR_flags) & chr_bossshield)
-                        {
-                                *(unsigned int*)(player + CHR_flags) = *(unsigned int*)(player + CHR_flags) & ~chr_bossshield;
-                                return 0;
-                        }
-                        else
-                        {
-                                *(unsigned int*)(player + CHR_flags) = *(unsigned int*)(player + CHR_flags) | chr_bossshield;
+                        GameState* GameState = ONgGameState;
+
+                        Character* player = ONgGameState->PlayerCharacter;
+                        //char* player = *((char**)(ONgGameState + GSA_player));
+                        if (player->Flags & chr_bossshield)
+                        {
+                                player->Flags = player->Flags & ~chr_bossshield;
+                                return 0;
+                        }
+                        else
+                        {
+                                player->Flags = player->Flags | chr_bossshield;
                                 return 1;
                         }
@@ -109 +119 @@
                 case cheat_bulletproof:
                 {
-                        char* player = *((char**)(ONgGameState + GSA_player));
-                        if (*(unsigned int*)(player + CHR_flags) & chr_weaponimmune)
-                        {
-                                *(unsigned int*)(player + CHR_flags) = *(unsigned int*)(player + CHR_flags) & ~chr_weaponimmune;
-                                *(unsigned short*)(player + CHR_shield) = cheat_oldshield;
-                                return 0;
-                        }
-                        else
-                        {
-                                *(unsigned int*)(player + CHR_flags) = *(unsigned int*)(player + CHR_flags) | chr_weaponimmune;
-                                cheat_oldshield = *(unsigned short*)(player + CHR_shield);
-                                *(unsigned short*)(player + CHR_shield) = 100;
+                        Character* player = ONgGameState->PlayerCharacter;
+                        if (player->Flags  & chr_weaponimmune)
+                        {
+                                player->Flags  = player->Flags  & ~chr_weaponimmune;
+                                player->Inventory.ShieldUsed  = cheat_oldshield;
+                                return 0;
+                        }
+                        else
+                        {
+                                player->Flags  |=  chr_weaponimmune;
+                                cheat_oldshield = player->Inventory.ShieldUsed;
+                                player->Inventory.ShieldUsed = 100;
                                 return 1;
                         }
@@ -126 +136 @@
                 case cheat_kangaroo:
                 {
-                        char* player = *((char**)(ONgGameState + GSA_player));
-                        char* oncc = *(char**)(player + CHR_oncc);
+                        Character* player = ONgGameState->PlayerCharacter;
+                        //char* oncc = *(char**)(player + CHR_oncc);
                         if (!inc_fallingframes)
                                 inc_fallingframes = true;
-                        if (*(unsigned int*)(oncc + ONCC_jet_timer) == kangaroo_h)
-                        {
-                                *(float*)(oncc + ONCC_jet_accel) = cheat_oldjet_accel;
-                                *(unsigned short*)(oncc + ONCC_jet_timer) = cheat_oldjet_timer;
-                                *(float*)(oncc + ONCC_height1) = cheat_oldheight1;
-                                *(float*)(oncc + ONCC_height2) = cheat_oldheight2;
-                                return 0;
-                        }
-                        else if (*(unsigned int*)(oncc + ONCC_jet_timer) == 0xFFFF)
-                        {
-                                *(float*)(oncc + ONCC_jet_accel) = kangaroo_jp;
-                                *(unsigned short*)(oncc + ONCC_jet_timer) = kangaroo_h;
-                                *(float*)(oncc + ONCC_height1) = 0x7f800000;
-                                *(float*)(oncc + ONCC_height2) = 0x7f800000;
-                                return 1;
-                        }
-                        else
-                        {
-                                cheat_oldjet_accel = *(float*)(oncc + ONCC_jet_accel);
-                                cheat_oldjet_timer = *(unsigned short*)(oncc + ONCC_jet_timer);
-                                cheat_oldheight1 = *(float*)(oncc + ONCC_height1);
-                                cheat_oldheight2 = *(float*)(oncc + ONCC_height2);
-                                *(float*)(oncc + ONCC_jet_accel) = kangaroo_jp;
-                                *(unsigned short*)(oncc + ONCC_jet_timer) = kangaroo_h;
-                                *(float*)(oncc + ONCC_height1) = 0x7f800000;
-                                *(float*)(oncc + ONCC_height2) = 0x7f800000;
+                        if (player->ONCC->JetpackTimer == kangaroo_h)
+                        {
+                                player->ONCC->JumpAcceleration = cheat_oldjet_accel;
+                                player->ONCC->JetpackTimer  = cheat_oldjet_timer;
+                                player->ONCC->MaxFallingHeightWithoutDamage = cheat_oldheight1;
+                                player->ONCC->MaxFallingHeightWithDamage = cheat_oldheight2;
+                                return 0;
+                        }
+                        else if (player->ONCC->JetpackTimer == 0xFFFF)
+                        {
+                                player->ONCC->JumpAcceleration = kangaroo_jp;
+                                player->ONCC->JetpackTimer  = kangaroo_h;
+                                player->ONCC->MaxFallingHeightWithoutDamage = INFINITY;
+                                player->ONCC->MaxFallingHeightWithDamage  = INFINITY;
+                                return 1;
+                        }
+                        else
+                        {
+                                cheat_oldjet_accel = player->ONCC->JumpAcceleration;
+                                cheat_oldjet_timer = player->ONCC->JetpackTimer;
+                                cheat_oldheight1 = player->ONCC->MaxFallingHeightWithoutDamage ;
+                                cheat_oldheight2 = player->ONCC->MaxFallingHeightWithDamage;
+                                player->ONCC->JumpAcceleration = kangaroo_jp;
+                                player->ONCC->JetpackTimer = kangaroo_h;
+                                player->ONCC->MaxFallingHeightWithoutDamage  = INFINITY;
+                                player->ONCC->MaxFallingHeightWithDamage  = INFINITY;
                                 return 1;
                         }
@@ -161 +171 @@
                 case cheat_marypoppins:
                 {
-                        char* player = *((char**)(ONgGameState + GSA_player));
-                        char* oncc = *(char**)(player + CHR_oncc);
+                        Character* player = ONgGameState->PlayerCharacter;
                         if (!inc_fallingframes)
                         {
                                 inc_fallingframes = true;
-                                if (*(unsigned int*)(oncc + ONCC_jet_timer) == 0xFFFF)
+                                if (player->ONCC->JetpackTimer == 0xFFFF)
                                 {
-                                        *(float*)(oncc + ONCC_jet_accel) = cheat_oldjet_accel;
-                                        *(unsigned short*)(oncc + ONCC_jet_timer) = cheat_oldjet_timer;
-                                        *(float*)(oncc + ONCC_height1) = cheat_oldheight1;
-                                        *(float*)(oncc + ONCC_height2) = cheat_oldheight2;
+                                        player->ONCC->JumpAcceleration = cheat_oldjet_accel;
+                                        player->ONCC->JetpackTimer = cheat_oldjet_timer;
+                                        player->ONCC->MaxFallingHeightWithoutDamage = cheat_oldheight1;
+                                        player->ONCC->MaxFallingHeightWithDamage = cheat_oldheight2;
                                 }
                                 return 0;
                         }
-                        else if (*(unsigned int*)(oncc + ONCC_jet_timer) == kangaroo_h)
-                        {
-                                *(float*)(oncc + ONCC_jet_accel) = marypoppins_jp;
-                                *(unsigned short*)(oncc + ONCC_jet_timer) = 0xFFFF;
-                                *(float*)(oncc + ONCC_height1) = 0x7f800000;
-                                *(float*)(oncc + ONCC_height2) = 0x7f800000;
+                        else if (player->ONCC->JetpackTimer == kangaroo_h)
+                        {
+                                player->ONCC->JumpAcceleration = marypoppins_jp;
+                                player->ONCC->JetpackTimer = 0xFFFF;
+                                player->ONCC->MaxFallingHeightWithoutDamage = 0x7f800000;
+                                player->ONCC->MaxFallingHeightWithDamage = 0x7f800000;
                                 inc_fallingframes = false;
                                 return 1;
@@ -186 +195 @@
                         else
                         {
-                                cheat_oldjet_accel = *(float*)(oncc + ONCC_jet_accel);
-                                cheat_oldjet_timer = *(unsigned short*)(oncc + ONCC_jet_timer);
-                                cheat_oldheight1 = *(float*)(oncc + ONCC_height1);
-                                cheat_oldheight2 = *(float*)(oncc + ONCC_height2);
-                                *(float*)(oncc + ONCC_jet_accel) = marypoppins_jp;
-                                *(unsigned short*)(oncc + ONCC_jet_timer) = 0xFFFF;
-                                *(float*)(oncc + ONCC_height1) = 0x7f800000;
-                                *(float*)(oncc + ONCC_height2) = 0x7f800000;
+                                cheat_oldjet_accel = player->ONCC->JumpAcceleration;
+                                cheat_oldjet_timer = player->ONCC->JetpackTimer;
+                                cheat_oldheight1 = player->ONCC->MaxFallingHeightWithoutDamage;
+                                cheat_oldheight2 = player->ONCC->MaxFallingHeightWithDamage ;
+                                player->ONCC->JumpAcceleration = marypoppins_jp;
+                                player->ONCC->JetpackTimer = 0xFFFF;
+                                player->ONCC->MaxFallingHeightWithoutDamage = 0x7f800000;
+                                player->ONCC->MaxFallingHeightWithDamage = 0x7f800000;
                                 inc_fallingframes = false;
                                 return 1;
@@ -200 +209 @@
                 case cheat_buddha:
                 {
-                        char* player = *((char**)(ONgGameState + GSA_player));
-                        if (*(unsigned int*)(player + CHR_flags) & chr_unkillable)
-                        {
-                                *(unsigned int*)(player + CHR_flags) = *(unsigned int*)(player + CHR_flags) & ~chr_unkillable;
-                                return 0;
-                        }
-                        else
-                        {
-                                *(unsigned int*)(player + CHR_flags) = *(unsigned int*)(player + CHR_flags) | chr_unkillable;
+                        Character* player = ONgGameState->PlayerCharacter;
+                        if (player->Flags& chr_unkillable)
+                        {
+                                player->Flags= player->Flags& ~chr_unkillable;
+                                return 0;
+                        }
+                        else
+                        {
+                                player->Flags= player->Flags| chr_unkillable;
                                 return 1;
                         }
@@ -214 +223 @@
                 case cheat_shinobi:
                 {
-                        Character* player = (Character*)*((void**)(ONgGameState + GSA_player));
+                        Character* player = ONgGameState->PlayerCharacter;
                         if (player->MaxHealth == 1)
                         {
@@ -237 +246 @@
                 case cheat_testcheat:
                 {
-                        char* player = *((char**)(ONgGameState + GSA_player));
-                        *(unsigned int*)(player + CHR_flags) = *(unsigned int*)(player + CHR_flags) | chr_noncombatant;
+                        Character* player = ONgGameState->PlayerCharacter;
+                        player->Flags = player->Flags | chr_noncombatant;
                         return 1;
                 }
+                case cheat_elderrune:
+                {
+                        if(patch_bsl) {
+                                int* Regeneration = &ONgGameState->PlayerCharacter->RegenHax;
+                                if(*Regeneration)
+                                {
+                                        *Regeneration = 0;
+                                        return 0;
+                                }
+                                else
+                                {
+                                        *Regeneration = 1;
+                                        return 1;
+                                }
+                        }
+                        else
+                        {
+                                return ONrCheater(cheat_elderrune);
+                        }
+                }
+
                 case cheat_tellmetheversion:
                         return 1;
@@ -256 +286 @@
 
 // Biggest hack in the entire thing ^_^
-__stdcall void FallingFrames(void* Ebp)
+void __stdcall FallingFrames(void* Ebp)
 {
         if (inc_fallingframes)
-                ++*((unsigned int*)(Ebp + 0xf6));
+                ++*((unsigned int*)((char*)Ebp + 0xf6));
 }
+ 

Daodan/src/Daodan_Cheater.h

@@ -3 +3 @@
 #define DAODAN_CHEATER_H
 
-#include <stdint.h>
+//#include <stdint.h>
 
 typedef struct {
@@ -46 +46 @@
 
 extern oniCheatCode DDr_CheatTable[];
-
+extern int turn_dev_mode_on;
 uint8_t ONICALL DDrCheater(uint32_t cheat);
 void __stdcall FallingFrames(void* Ebp);

Daodan/src/Daodan_Console.c

@@ -1 +1 @@
 #include <stdlib.h>
 #include <stdarg.h>
-#include <stdint.h>
+//#include <stdint.h>
 
 #include "Daodan_Console.h"
 #include "BFW_Utility.h"
+#include "Oni_Symbols.h"
 
 void DDrConsole_Print(const char* text)
@@ -20 +21 @@
 void DDrConsole_PrintF(const char* fmt, ...)
 {
+        char* buffer;
         va_list ap;
         va_start(ap, fmt);
-        char* buffer = malloc(vsnprintf(NULL, 0, fmt, ap) + 1);
+        buffer = malloc(vsnprintf(NULL, 0, fmt, ap) + 1);
         
         vsprintf(buffer, fmt, ap);
@@ -33 +35 @@
 
 TStColorFormattingCharacter DDrDSayColors[] = {
-        {'r', 0, 0, 0xFFEB5050},        //red
-        {'y', 0, 0, 0xFFFCFF1C},        //yellow
-        {'b', 0, 0, 0xFF93BBE9},        //blue
-        {'u', 0, 0, 0xFFF67603},        //umber
-        {'g', 0, 0, 0xFFA2DAA5},        //green
-        {'l', 0, 0, 0xFFBE90D9},        //lilac
-        {'o', 0, 0, 0xFFFBA500},        //orange
-        {'c', 0, 0, 0xFF93EAEB},        //cyan
+        {'r', 0, 0xFFEB5050},   //red
+        {'y', 0, 0xFFFCFF1C},   //yellow
+        {'b', 0, 0xFF93BBE9},   //blue
+        {'u', 0, 0xFFF67603},   //umber
+        {'g', 0, 0xFFA2DAA5},   //green
+        {'l', 0, 0xFFBE90D9},   //lilac
+        {'o', 0, 0xFFFBA500},   //orange
+        {'c', 0, 0xFF93EAEB},   //cyan
                                                                 //New Colors Here...
-        {'k', 0, 0, 0xFF000000},        //black
-        {'v', 0, 0, 0xFFEB40EB},        //violet
-        {'w', 0, 0, 0xFFFFFFFF},        //white...
-        {'e', 0, 0, 0xFF505050},        //darkgrey
-        {'f', 0, 0, 0xFFAAAAAA},        //grey
+        {'k', 0, 0xFF000000},   //black
+        {'v', 0, 0xFFEB40EB},   //violet
+        {'w', 0, 0xFFFFFFFF},   //white...
+        {'e', 0, 0xFF505050},   //darkgrey
+        {'f', 0, 0xFFAAAAAA},   //grey
         {0}                                                     //POWER RANGERS GO!
 };

Daodan/src/Daodan_Console.h

@@ -3 +3 @@
 #define DAODAN_CONSOLE_H
 
-#include <stdint.h>
+//#include <stdint.h>
 
 #include "Daodan.h"
@@ -24 +24 @@
 typedef struct {
         char Char;
-        char ignored;
-        char alsoignored;
+        short ignored;
         int Color; //ARGB Color;
 } TStColorFormattingCharacter;
@@ -31 +30 @@
 extern TStColorFormattingCharacter* TStColorFormattingCharacters;
 extern TStColorFormattingCharacter DDrDSayColors[];
+
+#ifdef __cplusplus
+extern "C"
+#endif
 void DDrConsole_Print(const char* text);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 void DDrConsole_PrintColored(const char* text, int priority, RGBA color, RGBA shade);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 void DDrConsole_PrintF(const char* fmt, ...);
 

Daodan/src/Daodan_Patch.c

@@ -10 +10 @@
         if (VirtualProtect(from, 5, PAGE_EXECUTE_READWRITE, &oldp))
         {
-                *(char*)from++ = 0xe9; // jmp rel32
+                *((char*)from) = 0xe9; // jmp rel32
+                from = (char*)from + 1;
                 *(int*)from = (unsigned int)to - (unsigned int)from - 4;
                 VirtualProtect(from, 5, oldp, &oldp);
@@ -25 +26 @@
         if (VirtualProtect(from, 5, PAGE_EXECUTE_READWRITE, &oldp))
         {
-                *(char*)from++ = 0xe8; // call rel32
+                *((char*)from) = 0xe8; // call rel32
+                from = (char*)from + 1;
                 *(int*)from = (unsigned int)to - (unsigned int)from - 4;
                 VirtualProtect(from, 5, oldp, &oldp);
@@ -90 +92 @@
 }
 
-bool DDrPatch_StrDup(int* dest, const char* value)
+bool DDrPatch__strdup(int* dest, const char* value)
 {
         DWORD oldp;
@@ -96 +98 @@
         if (VirtualProtect(dest, 4, PAGE_EXECUTE_READWRITE, &oldp))
         {
-                *dest = (int)strdup(value);
+                *dest = (int)_strdup(value);
                 VirtualProtect(dest, 4, oldp, &oldp);
                 return true;

Daodan/src/Daodan_Patch.h

@@ -3 +3 @@
 #define DAODAN_PATCH_H
 
-#include <stdbool.h>
+#include "bool.h"
 
 #define DDrPatch_Const(d, c) DDrPatch_String(d, c, sizeof(c))
 
-#define OniExe ((void*)0x00400000)
+#define OniExe ((char*)0x00400000)
 
 bool DDrPatch_MakeJump(void* from, void* to);
@@ -15 +15 @@
 bool DDrPatch_Int32(int* dest, int value);
 bool DDrPatch_Int16(short* dest, short value);
-bool DDrPatch_StrDup(int* dest, const char* value);
+bool DDrPatch__strdup(int* dest, const char* value);
 bool DDrPatch_NOOP(char* dest, unsigned int length);
 

Daodan/src/Daodan_Persistence.h

@@ -3 +3 @@
 #define DAODAN_PERSISTENCE_H
 
-#include <stdint.h>
+//#include <stdint.h>
 
 #include "Daodan.h"

Daodan/src/Daodan_Utility.c

@@ -2 +2 @@
 #include <stdlib.h>
 #include <stdarg.h>
-#include <stdint.h>
+//#include <stdint.h>
 #include "oni_stdio.h"
 
@@ -13 +13 @@
 void __cdecl DDrStartupMessage(const char* fmt, ...)
 {
+
+        char* buffer;
         va_list ap;
         va_start(ap, fmt);
-        char* buffer = malloc(vsnprintf(NULL, 0, fmt, ap) + 1);
+
+        buffer = malloc(vsnprintf(NULL, 0, fmt, ap) + 1);
         
         vsprintf(buffer, fmt, ap);
@@ -85 +88 @@
 }
         
-void ONICALL DDrWeapon2Message(int* weapon, void* output_ptr) {
+void ONICALL DDrWeapon2Message(int* weapon, void* output_ptr) 
+{
         char buffer[128] = {0};
         char* weapon_string = (char*)(*(weapon + 1)+0x5C);
@@ -91 +95 @@
         int16_t maxammo = *(int16_t *)(*(weapon + 1)+0xC0);
         float ratio = (float)ammo / (float)maxammo;
-        char ammocolor = ' ';
-        if(ratio >= .9) ammocolor = 'g';
-        else if (ratio >= .5) ammocolor = 'y';
-        else if (ratio >= .2) ammocolor = 'o';
-        else ammocolor = 'r';
+        
+        char ammocolor;
+        if              (ratio >= .9)   ammocolor = 'g';
+        else if (ratio >= .5)   ammocolor = 'y';
+        else if (ratio >= .2)   ammocolor = 'o';
+        else                                    ammocolor = 'r';
+
         DDrMake_Weapon_Message( weapon_string, buffer); //gets the name of the weapon and formats it...probably doesn't need to be in seperate func.
-        sprintf(SSrMessage_Find("autoprompt_weapon"), "%s |[%s.%i/%i]|", buffer, &ammocolor, ammo, maxammo); //copies the new string to ONGS
+        sprintf(SSrMessage_Find("autoprompt_weapon"), "%s |[%c.%i/%i]|", buffer, ammocolor, ammo, maxammo); //copies the new string to ONGS
         ONiGameState_FindAutoPromptMessage("weapon", output_ptr);       //does what the code i replaced does. Basically tells the game to show the msg.
 }
 
 
-void ONICALL DDrMake_Weapon_Message(char* weapon_string, char* output_ptr) {
+void ONICALL DDrMake_Weapon_Message(char* weapon_string, char* output_ptr) 
+{
         char* weapon_msg = NULL;        //The normal "You have recieved X" message.
         char weapon_name[64] = {'\0'};  //The stripped weapon name
@@ -112 +119 @@
         //this probably could be reorganized
         if(weapon_msg) {        //SSrMsgblah returns NULL if it can't find the message key
-                memcpy(weapon_name, weapon_msg, (strstr(weapon_msg," received.") - weapon_msg )); //strips uneeded characters
+                memcpy(weapon_name, weapon_msg, (strstr(weapon_msg,"] ") - weapon_msg + 1)); //strips uneeded characters
                 sprintf(output_ptr, "Press [c.Q] to pick up %s", weapon_name);
         }
@@ -120 +127 @@
         
 }
+
+typedef struct
+{
+        uint16_t x;
+        uint16_t y;
+
+} IMtPoint2D;
+IMtPoint2D Point = {256, 250};
+extern void* TSrTest;
+extern void* TSrScores;
+unsigned int lastPasteTime;
+
+//TODO: Fix what happens when you hold down paste
+//Check if console is open
+void DDrPasteHack()
+{
+        COtTextArea* cons = *(COtTextArea**)0x00571B74;
+        char* clipboardText = 0;
+        if(ONgGameState->Input.Current.Actions1 & Action_Console && GetKeyState(0x56) & 0x80 && GetKeyState(VK_CONTROL) & 0x80 )
+        {
+                if(cons && cons->text_entries && cons->num_text_entries)
+                {
+                        //why abs()? so we dont have to reset the timer after a level load.
+                        if( abs(ONgGameState->GameTime - lastPasteTime) > 60) {
+                                //DDrConsole_Print(cons->text_entries[0].text);
+                                if(OpenClipboard(ONgPlatformData.Window))
+                                {
+                                        unsigned short charsUsed = strlen(cons->text_entries[0].text);
+                                        //get rid of the v character
+                                        if(charsUsed) charsUsed--;
+                                        clipboardText = GetClipboardData(CF_TEXT);
+                                        if(clipboardText && strlen(clipboardText) + charsUsed < 502)
+                                        {
+                                                strcpy_s( cons->text_entries[0].text + charsUsed, 502 - charsUsed - 1, clipboardText);
+                                                lastPasteTime = ONgGameState->GameTime;
+                                        }
+                                        CloseClipboard();
+                                }
+
+                        }
+                        else
+                        {
+                                //need to hook whatever controls however often you can repeat characters...i guess.
+                                //cons->text_entries[0].text[strlen(cons->text_entries[0].text) - 1] = 0;
+                        }
+                }
+        }
+}
+
+void ONICALL DDrText_Hook()
+{
+
+        if(TSrTest)
+        {
+                TSrContext_DrawText(TSrTest, "FINALLY THIS BLOODY TEXT THING WORKS\n Gotta call it at the right point...", 128, 0, &Point);     
+
+        }
+
+
+        DDrPasteHack();
+        
+        COrConsole_StatusLine_Display();
+
+}

Daodan/src/Daodan_Utility.h

@@ -3 +3 @@
 #define DAODAN_UTILITY_H
 
-#include <stdint.h>
+//#include <stdint.h>
 #include "Daodan.h"
 
+#ifdef __cplusplus
+extern "C"
+#endif
 void __cdecl DDrStartupMessage(const char* fmt, ...);
 int64_t ONICALL DDrMachineTime_High();
@@ -12 +15 @@
 void ONICALL DDrMake_Weapon_Message(char* weapon_string, char* output_ptr);
 void ONICALL DDrWeapon2Message(int* weapon, void* output_ptr);
+void ONICALL DDrText_Hook();
 #endif

Daodan/src/Daodan_Win32.c

@@ -7 +7 @@
 
 #include "Oni.h"
-
+extern HWND onihwnd;
 short ONICALL DDrPlatform_Initialize(ONtPlatformData *PlatformData)
 {
@@ -13 +13 @@
         RECT Rect;
         const int Width = 640, Height = 480;
+        HINSTANCE temp_Instance = PlatformData->Instance;
 
         PlatformData->Instance = g_Instance;
@@ -22 +23 @@
         WndClass.hInstance = PlatformData->Instance;
         WndClass.hCursor = LoadCursor(NULL, IDC_ARROW);
-        WndClass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-        WndClass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+        WndClass.hIcon = LoadIcon(g_Instance, MAKEINTRESOURCE(103) );
+        WndClass.hIconSm = LoadIcon(g_Instance, MAKEINTRESOURCE(103));
         WndClass.hbrBackground = GetStockObject(BLACK_BRUSH);
         WndClass.lpszMenuName = NULL;
@@ -36 +37 @@
         Rect.bottom = Rect.top + Height;
         AdjustWindowRect(&Rect, WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_POPUP | WS_TILEDWINDOW , FALSE);
-        PlatformData->Window = CreateWindowEx(0, "ONI ", "ONI ", WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_POPUP | WS_TILEDWINDOW, Rect.left, Rect.top, Rect.right - Rect.left, Rect.bottom - Rect.top, NULL, NULL, PlatformData->Instance, NULL);
-        
+        PlatformData->Window = CreateWindowEx(0, "ONI ", "ONI ",  WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_POPUP | WS_TILEDWINDOW, Rect.left, Rect.top, Rect.right - Rect.left, Rect.bottom - Rect.top, NULL, NULL, PlatformData->Instance, NULL);
+        onihwnd = PlatformData->Window;
         ShowWindow(PlatformData->Window, SW_SHOWNORMAL);
         UpdateWindow(PlatformData->Window);
@@ -45 +46 @@
         // I dont know why this is needed but Oni doesn't init without it.
         ONgPlatformData.Window = PlatformData->Window;
-        //ONgPlatformData.Instance = PlatformData->Instance;
+        ONgPlatformData.Instance = PlatformData->Instance;
         
         return 0;

Daodan/src/Daodan_WindowHack.c

@@ -61 +61 @@
 {
         MSG Msg;
-        
+        RECT re;
         WNDCLASSEX wc;
         
@@ -78 +78 @@
         RegisterClassEx(&wc);
         
-        RECT re;
+        
         re.left = (GetSystemMetrics(SM_CXSCREEN) / 2) - (640 / 2);
         re.top = (GetSystemMetrics(SM_CYSCREEN) / 2) - (480 / 2);
@@ -109 +109 @@
 BOOL WINAPI glpi_SetWindowPosHook(HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags)
 {
+        RECT re;
         SetWindowLong(onihwnd, GWL_STYLE, WS_CHILD | WS_VISIBLE);
         SetCursor(LoadCursor(NULL, IDC_ARROW));
         
-        RECT re;
+        
         re.left = (GetSystemMetrics(SM_CXSCREEN) / 2) - (cx / 2);
         re.top = (GetSystemMetrics(SM_CYSCREEN) / 2) - (cy / 2);
@@ -129 +130 @@
         if (GetAsyncKeyState(VK_F4) || dragging)
         {
-                lpPoint->x = gl->DisplayMode.Width / 2;
-                lpPoint->y = gl->DisplayMode.Height / 2;
+                lpPoint->x = gl_eng->DisplayMode.Width / 2;
+                lpPoint->y = gl_eng->DisplayMode.Height / 2;
         }
         else

Daodan/src/Daodan_WindowHack.h

@@ -4 +4 @@
 
 void DDrWindowHack_Install();
+BOOL WINAPI LIiP_GetCursorPosHook(LPPOINT lpPoint);
+BOOL WINAPI LIiP_SetCursorPosHook(int X, int Y);
 
 #endif

Daodan/src/Oni.h

@@ -4 +4 @@
 
 #include "Daodan.h"
-
-#include <stdint.h>
+#include "oni_gl.h"
+//#include <stdint.h>
 #include <windows.h>
-
+#include "Oni_GameState.h"
 typedef unsigned char onibool;
 
@@ -15 +15 @@
         HWND Window;
 } ONtPlatformData;
-
+/*
 void __cdecl ONiMain(int ArgCount, char *ArgList[]);
 short ONICALL ONrPlatform_Initialize(ONtPlatformData *PlatformData);
 LRESULT CALLBACK ONrPlatform_WindowProc(HWND Window, UINT Message, WPARAM WParam, LPARAM LParam);
+*/
+//uint8_t ONICALL ONrCheater(uint32_t cheat);
 
-uint8_t ONICALL ONrCheater(uint32_t cheat);
-
-char* ONICALL SSrMessage_Find(char* message_key); //Returns a prompt message from a message key
-void ONICALL ONiGameState_FindAutoPromptMessage(char* Note, void* ptr);
+//char* ONICALL SSrMessage_Find(char* message_key); //Returns a prompt message from a message key
+//void ONICALL ONiGameState_FindAutoPromptMessage(char* Note, void* ptr);
 
 //
 void ONICALL TMrInstance_GetDataPtr_List( 
-        char Tag[4], //as in 'ONWC'
-        int MaxCount, //# of elements in PointerList
+        char Tag[4],            //as in 'ONWC'
+        int MaxCount,           //# of elements in PointerList
         void** PointerList, //Where the found pointers go
         int* FoundCount         //Where the number of pointers found go.
         ); 
 
-extern HINSTANCE g_Instance;
-extern ONtPlatformData ONgPlatformData;
-
-extern void* ONgGameState;
-extern onibool ai2_deaf;
-
-extern char M3gResolutionSwitch;
-
-extern char opt_sound;
-extern uint32_t opt_ignore_private_data;
-
-extern char AKgDebug_DebugMaps;
-extern char BFgDebugFileEnable;
-extern char SSgSearchOnDisk;
-
-
+#include "Oni_Symbols.h"
 
 #endif

Daodan/src/Oni_Character.h

@@ -3 +3 @@
 #define ONI_CHARACTER_H
 
-#include "Oni.h"
-#include <stdint.h>
-#include <stdbool.h>
-
-typedef struct {
-        float X;
-        float Y;
-        float Z;        
-} Vector3; //probably move to utilities...
-
-typedef struct {
-        float X;
-        float Y;
-        float Z;
-        float W;
-} Quaternion;
-
-typedef struct {
-        float RotationScale[9];
-        Vector3 Translation;
-} Matrix4x3;
-
-typedef struct {
-        Vector3 Center;
-        float Radius;
-} Sphere;
-
-typedef struct {
-        Sphere Sphere_; //fix this name
-        int Child1;
-        int Child2;     
-} SphereTreeNode;
-
-typedef struct {
-        Vector3 Min;
-        Vector3 Max;
-} BoundingBox;
-
-
-enum { //action flags
-        Action_Escape                    = 1,
-        Action_Console                   = 2,
-        Action_PauseScreen               = 4,
-        Action_Cutscene_1                = 8,
-        Action_Cutscene_2                = 0x10,
-        Action_F4                        = 0x20,
-        Action_F5                        = 0x40,
-        Action_F6                        = 0x80,
-        Action_F7                        = 0x100,
-        Action_F8                        = 0x200,
-        Action_StartRecord               = 0x400,
-        Action_StopRecord                = 0x800,
-        Action_PlayRecord                = 0x1000,
-        Action_F12                       = 0x2000,
-        Action_Unknown1                  = 0x4000,
-        Action_LookMode                  = 0x8000,
-        Action_Screenshot                = 0x10000,
-        Action_Unknown2                  = 0x20000,
-        Action_Unknown3                  = 0x40000,
-        Action_Unknown4                  = 0x80000,
-        Action_Unknown5                  = 0x100000,
-        Action_Forward                   = 0x200000,
-        Action_Backward                  = 0x400000,
-        Action_TurnLeft                  = 0x800000,
-        Action_TurnRight                 = 0x1000000,
-        Action_StepLeft                  = 0x2000000,
-        Action_StepRight                 = 0x4000000,
-        Action_Jump                      = 0x8000000,
-        Action_Crouch                    = 0x10000000,
-        Action_Punch                     = 0x20000000,
-        Action_Kick                      = 0x40000000,
-        Action_Block                     = 0x80000000,
-        //used in second action field
-        Action2_Walk                     = 1,
-        Action2_Action                   = 2,
-        Action2_Hypo                     = 4,
-        Action2_Reload                   = 8,
-        Action2_Swap                     = 0x10,
-        Action2_Drop                     = 0x20,
-        Action2_Fire1                    = 0x40,
-        Action2_Fire2                    = 0x80,
-        Action2_Fire3                    = 0x100,
-};
-
-
-typedef struct {
-        int32_t Actions1;
-        int32_t Actions2;
-} InputAction;
-
-
-typedef struct {
-        float MouseDeltaX;
-        float MouseDeltaY;
-        float field_8;
-        float field_C;
-        InputAction Current;
-        InputAction Stopped;
-        InputAction Start;
-        InputAction Stop;
-} GameInput;
-
-typedef struct {
-        int Type;                               //'CHAR' etc.
-        int ObjectId;                   //not needed
-        int Flags;                              //The flags of the object...not used for CHAR
-        Vector3 Position;               //Position of Object
-        Vector3 Rotation;               //Rotation of Object
-        int EditorCallbacks;    //Lets try not to mess with it for now. :P
-        int field_28;                   //unknown
-} OSD_Header;
-
-typedef struct {
-        int32_t Flags;
-        int32_t Frame;
-        int32_t field_8;
-        int32_t field_C;
-        int32_t field_10;
-        int32_t field_14;
-        int32_t field_18;
-        int32_t field_1C;
-        int32_t FILMInstance;
-} PlayingFilm;
-
-typedef enum {
-        chr_isplayer          = 1 << 0,
-        chr_randomskin        = 1 << 1,
-        chr_notprespawned     = 1 << 2,
-        chr_noncombatant      = 1 << 3,
-        chr_multispawnable    = 1 << 4,
-        chr_unkillable        = 1 << 5,
-        chr_superammo         = 1 << 6,
-        chr_omniscient        = 1 << 8,
-        chr_haslsi            = 1 << 9,
-        chr_boss              = 1 << 10,
-        chr_upgradedifficulty = 1 << 11,
-        chr_noautodrop        = 1 << 12,
-        chr_dontaim           = 1 << 13,
-        chr_nocollision       = 1 << 17,
-        chr_noshadow          = 1 << 24,
-        chr_invincible        = 1 << 25,
-        chr_bossshield        = 1 << 30,
-        chr_weaponimmune      = 1 << 31,
-} chr_flags;
-/*
-enum {
-chr_isplayer                    =               0x00000001,     //is player character
-chr_randomskin                  =               0x00000002,     //gets random skin from ONCV
-chr_notprespawned               =               0x00000004,     //isn't spawned at level creation
-chr_noncombatant                =               0x00000008,     //doesn't fight
-chr_multispawnable              =               0x00000010,     //can spawn up to 5 without forcing
-chr_unknown                             =               0x00000020,     //
-chr_unkillable                  =               0x00000040,     //can only be brought to 1 hp
-chr_superammo                   =               0x00000080,     //infinite ammo
-chr_omniscient                  =               0x00000100,     //touchofdeath
-chr_haslsi                              =               0x00000200,     //drops an lsi
-chr_boss                                =               0x00000400,     //is a boss character
-chr_upgradedifficulty   =               0x00000800,     //upgrade the difficulty if you play on med\hard
-chr_noautodrop                  =               0x00001000,     //uses drop fields instead of has fields on death
-}; //
-*/
-
-typedef struct {
-        uint32_t Options;                               //A bitset. Someone had better define these
-        char Class[64];                                 //Name of the ONCC we use. ONCCName in idb
-        char Name[32];                                  //Name of the character. ie: ai2_spawn Muro
-        char Weapon[64];                                //Name of the weapon he holds. ONWCName in idb
-        char ScriptSpawn[32];                   //Script function called when char spawns
-        char ScriptDie[32];                             //Script function called when char dies
-        char ScriptAware[32];                   //Script function called when char detects something
-        char ScriptAlarm[32];                   //Script function called when char is alarmed at something
-        char ScriptHurt[32];                    //Script function called when char is hurt for the first time
-        char ScriptDefeat[32];                  //Script function called when char is at 1 HP
-        char ScriptNoPath[32];                  //Script function called when char loses path. Broken.
-        char ScriptNoAmmo[32];                  //Script function called when char is out of ammo for the first time. Char must have ammo at spawn.
-        int32_t AdditionalHealth;               //Additional Health given to the character
-        int16_t AmmoUsed;                               //Ammo given for the char to use
-        int16_t AmmoDropped;                    //Ammo the char drops
-        int16_t CellsUsed;                              //Cells given for the char to use
-        int16_t CellsDropped;                   //Cells the char drops
-        int16_t HypoUsed;                               //Hypo given for the char to use
-        int16_t HypoDropped;                    //Hypo the char drops
-        int16_t ShieldUsed;                             //Bullet shield given for the char to use
-        int16_t ShieldDropped;                  //Bullet shield the char drops
-        int16_t CloakUsed;                              //Phase Cloak given for the char to use
-        int16_t CloakDropped;                   //Phase Cloak the char drops
-        int16_t NCIUsed;                                //Don't use this...
-        int16_t NCIDropped;                             //Don't use this...
-        int32_t TeamID;                                 //Team ID
-        int32_t AmmoPercent;                    //Percent of weapon ammo full
-        int32_t JobID;                                  //Job ID...
-                                                                        //0 - none 
-                                                                        //1 - idle 
-                                                                        //2 - guard (never used in Oni) 
-                                                                        //3 - patrol 
-                                                                        //4 - teambattle (never used in Oni)
-        int16_t PatrolID;                               //patrol path ID (reference to the Patrol_Path.BINA file)
-        int16_t CombatID;                               //combat ID (reference to the Combat.BINA file)
-        int16_t MeleeID;                                //melee ID (reference to the Melee Profile.BINA file)
-        int16_t NeutralID;                              //neutral ID (reference to the Neutral.BINA file)
-        int32_t AlarmGroups;                    //Bitset. http://wiki.oni2.net/CHAR
-        int32_t InitialAlertLevel;              //0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t MinimalAlertLevel;              //0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t StartJobAlertLevel;             //0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t InvestigatingAlertLevel;//0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t PursuitStrongLow;
-        int32_t PursuitWeakLow;
-        int32_t PursuitStrongHigh;
-        int32_t PursuitWeakHigh;
-        int32_t Pursuit5;
-        int32_t field_1FC;
-} CharacterOSD;
-
-typedef struct {
-        OSD_Header Header;
-        CharacterOSD OSD;
-} CharacterObject;
-
-typedef struct {
-        Vector3 Center;
-        float Radius;
-} BoundingSphere;
-
-typedef struct {
-        int32_t ONCP; //probably pointer
-        int32_t field_4;        //who knows?
-        int32_t Instance; //probably link to actual particle
-        int32_t Bone; //duh
-} AttachedParticle;
-
-typedef struct { //Inventory
-        int32_t Weapons[3];
-        int16_t field_1A0; //10 bucks says this is the current weapon
-        int16_t AmmoUsed;                               //Ammo given for the char to use
-        int16_t HypoUsed;                               //Hypo given for the char to use
-        int16_t CellsUsed;                              //Cells given for the char to use
-        int16_t AmmoDropped;                    //Ammo the char drops
-        int16_t HypoDropped;                    //Hypo the char drops
-        int16_t CellsDropped;                   //Cells the char drops
-        int16_t field_1A;       //who knows? InverseHypoRegenRate?
-        int16_t field_1C;       
-        int16_t field_1E;
-        char hasLSI;
-        char field_1B5;
-        int16_t field_1B6;
-        int16_t ShieldUsed;                             //Bullet shield given for the char to use
-        int16_t CloakUsed;                              //Phase Cloak given for the char to use
-        int32_t field_28;                       //probably bullet shield dropped
-        int32_t DoorKeys;               //Lol. We can use this later for other sorts of items.
-} Inventory;
-
-typedef struct {
-        uint32_t SphereTree;
-        Vector3 ObBox[8];
-        Vector3 * ObBowPtr;
-        Vector3 Velocity;
-        Quaternion field_74;
-        Vector3 Position;
-        Quaternion Rotation;
-        float Scale;
-        Matrix4x3 Matrix;
-        Matrix4x3 InitMatrix;
-        float field_104;
-        float Gravity;
-        float field_10C;
-        float field_110;
-        float Friction_1;
-        float Friction_2;
-        Vector3 Force;
-        uint32_t Flags;
-        uint32_t Type;
-        char AnimState[0x18];
-        void* Callbacks;
-        void* Owner;
-} PhyContext;
-
-typedef struct { //ActiveCharacter
-        int16_t Number;
-        int16_t field_2; //probably Number is an int32
-        PhyContext * PhyContext_;
-        SphereTreeNode SphereTree1;             //probably SphereTree[7]...
-        SphereTreeNode SphereTree3[4];
-        SphereTreeNode SphereTree2[2];
-        int16_t field_B0;
-        int16_t field_B2;
-        int16_t field_B4;
-        int16_t field_B6;
-        Vector3 field_B8;
-        Vector3 AccelerateWith;
-        int32_t field_D0;
-        Vector3 field_D4;
-        int32_t field_E0;
-        int32_t field_E4;
-        int32_t field_E8;
-        int32_t field_EC;
-        float SomePhyPosY;
-        int16_t field_F4;
-        int16_t IsInAirTimer;
-        Vector3 FallingVelocity;
-        Vector3 JumpVelocity;
-        char StartJumpPending;
-        char field_111;
-        int16_t field_112;
-        Vector3 field_114;
-        int32_t LastDamageSourceCharacter;
-        int32_t field_11C;
-        int32_t field_120;
-        int32_t field_124;
-        int32_t field_128;
-        int32_t field_12C;
-        BoundingSphere BoundingSphere_; //fix this name
-        Vector3 field_140;
-        Vector3 field_14C;
-        int32_t field_158;
-        int32_t field_15C;
-        Vector3 Location;
-        int32_t field_16C[6]; //16C-184 ???
-        int32_t AkiraNode;
-        int32_t GraphNode;
-        int32_t PelvisHeight;
-        int32_t MovementStatePtr;
-        int32_t ActiveWeapon;           //NOTE: FIGURE OUT THIS MESS OF INVENTORY...
-        int32_t field_198;              //maybe weap 3, maybe not...
-        int32_t InventoryWeapon;
-        int16_t field_1A0;      //unused?
-        int16_t AmmoUsable;                             //Ammo given for the char to use
-        int16_t HypoUsable;                             //Hypo given for the char to use
-        int16_t CellsUsable;                            //Cells given for the char to use
-        int16_t AmmoDropped;                    //Ammo the char drops
-        int16_t HypoDropped;                    //Hypo the char drops
-        int16_t CellsDropped;                   //Cells the char drops
-        int16_t field_1AE;      
-        int16_t InverseHypoRegenRate;
-        int16_t ShieldDropped;
-        int16_t CloakDropped;
-        int16_t field_1B4;
-        int16_t field_1B6;
-        int16_t ShieldUsable;
-        int16_t CloakUsable;
-        int16_t field_1BC[9]; //1BC-1E0
-        int32_t NotIdleStartTime;
-        int32_t TimeToIdle;
-        int32_t field_1E8[1315]; //1E8-1648 what the hell is all this?
-        BoundingBox BoundingBox_; //fix this name
-        int32_t field_1660;
-        int32_t field_1664;
-        int32_t ShieldPower; //Same as Boss Shield Power???
-        int32_t field_166C;
-        int32_t NumberOfKills; //^_^
-        int32_t InflictedDamage; //^_^
-        int32_t field_1678[260];        //1678-1A88 more wtf
-        int32_t field_1A88; //here starts animation junk? It was 4 bools in idb O_o
-        int32_t Executor_AimingDirection; //possibly throw junk?
-        int32_t field_1A98;
-        int32_t field_1A9C;
-        int32_t Executor_ActualMovementMode;
-        int32_t field_1AA4;
-        int32_t field_1AA8;
-        int32_t field_1AAC;
-        int32_t Executor_HasFacingOverride; //a bool...
-        float   Executor_AimingSpeed; 
-        onibool field_1AB8; //actually a bitset...
-        onibool Executor_HasMoveOverride;
-        int16_t field_1ABA;
-        int32_t field_1ABC;
-        int32_t field_1AC0;
-        int32_t field_1AC4;
-        int32_t Executor_FacingOverride;
-        int32_t Executor_HasAttackOverride; //another bool :P
-        int32_t field_1AD0;
-        int32_t field_1AD4;
-        int32_t field_1AD8;
-        int32_t field_1ADC;
-        int32_t field_1AE0;
-        int32_t field_1AE4;
-        int32_t Executor_HasThrowOverride; //another another bool
-        int32_t field_1AEC;
-        int32_t field_1AF0;
-        int32_t field_1AF4;
-        int32_t Animation;
-        int16_t AnimationToState;
-        int16_t AnimationFromState;
-        int16_t AnimationType;
-        int16_t NextAnimationType;
-        int16_t field_1B04;
-        int16_t field_1B06;
-        int32_t Stitch; //bool
-        float StitchHeight;
-        int16_t InterpolationFromState;
-        int16_t field_1B12;
-        Vector3 StitchVelocity;
-        int16_t InterpolationCurrentFrame;
-        int16_t InterpolationLength;
-        Quaternion InterpolationStartRotations[19];
-        int32_t field_1C54;
-        int32_t field_1C58;
-        int32_t field_1C5C;
-        int32_t field_1C60;
-        int32_t Overlay;
-        int32_t field_1C68;
-        int32_t field_1C6C;
-        int32_t field_1C70;
-        int32_t field_1C74;
-        int32_t field_1C78;
-        int32_t field_1C7C;
-        int32_t field_1C80;
-        int32_t field_1C84;
-        int16_t Frame;
-        int16_t SoftPause;
-        int16_t HardPause;
-        int16_t field1C8E;
-        int32_t field1C90;
-        int16_t field1C94;
-        int16_t field1C96;
-        int16_t Dizzy;
-        int16_t field1C9A;
-        int32_t field1C9C;
-        int16_t AnimationVarient;
-        int16_t TimeToPeace;
-        int16_t NumAnimationAttachedParticles;
-        int16_t field_1CA6; //spacing
-        AttachedParticle AnimationAttachedParticles[16];
-        int32_t TRAMParticles;
-        onibool FixedParticlesAttached;
-        onibool FixedParticlesStarted;
-        int16_t NumFixedParticles;
-        AttachedParticle FixedParticles[16];
-        int16_t CurrentAnimationType;
-        int16_t field_1EB2; //spacing
-        int32_t field_1EB4;
-        int32_t field_1EB8;
-        int32_t field_1EBC;
-        int32_t field_1EC0;
-        int32_t field_1EC4;
-        int32_t field_1EC8;
-        int32_t field_1ED0;
-        int32_t field_1ED4;
-        int32_t field_1ED8;
-        int32_t field_1EE0;
-        int32_t field_1EE4;
-        int32_t field_1EE8;
-        Quaternion Rotations[19];
-        Quaternion OverlayRotations[19];
-        int32_t field_2150;
-        int32_t field_2154;
-        GameInput Input;
-        InputAction PreviousActions;
-        int32_t SprintTimer;
-        int32_t field_2194;
-        Vector3 field_2198;
-        int32_t field_21A4;
-        int32_t field_21A8;
-        int32_t field_21AC;
-        Vector3 field_21B0;
-        float HeadFacing;
-        float HeadPitch;
-        int32_t field_21C4;
-        int32_t field_21C8;
-        int32_t field_21D0;
-        int32_t field_21D4;
-        onibool field_21D8;
-        onibool field_21D9;
-        onibool field_21DA;
-        onibool field_21DB;
-        onibool field_21DC;
-        onibool field_21DD;
-        onibool field_21DE;
-        onibool field_21DF;
-        onibool field_21E0;
-        onibool HasAlternateTrigger;
-        onibool field_21E2;
-        onibool ReleaseTrigger;
-        onibool ReleaseAlternateTrigger;
-        onibool TurningLeft;
-        onibool TurningRight;
-        onibool field_21E7;
-        int32_t field_21E8;
-        int32_t field_21EC;
-        int32_t field_21F0;
-        PlayingFilm PlayingFilm_; //fix this name
-        int32_t field_2218[24]; //2218-2278
-        Matrix4x3 BoneMatrices[19];
-        Matrix4x3 WeaponMatrix;
-        int32_t field_2638[113]; //2638-27FC
-        int16_t ShadowIndex;
-        int16_t field_27FE;
-        int16_t field_2780;
-        onibool ShieldParts[19]; 
-        onibool field_2815; //padding...
-        onibool field_2816;
-        onibool field_2817;
-        int32_t field_2818[8];
-} ActiveCharacter;
-
-//This struct is good. 
-typedef struct { //Character
-        char Number;
-        char field_2;
-        int16_t ActiveCharacterIndex;
-        int32_t Flags;
-        int32_t field_8;
-        int32_t* ONCC;                  //change type to ONCC when we get that far...
-        int16_t field_10;
-        int16_t Team;
-        char Name[32];
-        float BodySize;
-        int32_t Health;
-        int32_t MaxHealth;
-        int32_t ASIA_ID; //might be 16 with 2 byte padding
-        int32_t field_44;
-        char ScriptSpawn[32];                   //Script function called when char spawns
-        char ScriptDie[32];                             //Script function called when char dies
-        char ScriptAware[32];                   //Script function called when char detects something
-        char ScriptAlarm[32];                   //Script function called when char is alarmed at something
-        char ScriptHurt[32];                    //Script function called when char is hurt for the first time
-        char ScriptDefeat[32];                  //Script function called when char is at 1 HP
-        char ScriptNoAmmo[32];                  //Script function called when char is out of ammo for the first time. Char must have ammo at spawn.
-        char ScriptNoPath[32];                  //Script function called when char loses path. Broken.
-        Vector3 Position;
-        Vector3 LastPosition;
-        Vector3 Location;
-        float Facing;
-        float DesiredFacing;
-        float CosmeticFacing;
-        float field_178;
-        float field_17C;
-        float field_180;
-        int32_t BNV;
-        int32_t GraphNode;
-        float PelvisHeight;
-        float field_190;
-        Inventory Inventory_; //is there a better way to do this?
-        Vector3 Velocity;
-        int32_t field_1D0;
-        int32_t Recoil;
-        int32_t field_1D8;
-        int32_t field_1DC;
-        int32_t LastNotIdleGameTime;
-        int32_t IdleDelay;
-        int32_t Type;
-        int32_t field_1EC;
-        int32_t CombatFlags;
-        int32_t JobId;
-        int32_t Goal;
-        int32_t field_1FC;
-        int32_t field_200;
-        int32_t field_204;
-        int32_t field_208[428]; //208-8B8   
-        int32_t CombatState;    //I think....
-        int32_t field_8BC; 
-        int32_t PatrolPathOSD[10];      //actually another struct. Not needed atm.
-        int32_t PatrolPathPoints[5][64]; //64 of another struct 
-        int32_t field_DE8[98];  //DE8-F70
-        int32_t CombatStatePtr;
-        int32_t KnowledgeState[4]; //Another struct
-        int32_t field_F84;
-        int32_t AlertDecayTimer;
-        int32_t field_F8C;
-        int32_t field_F90;
-        int32_t InitialAlertLevel;              //0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t MinimalAlertLevel;              //0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t StartJobAlertLevel;             //0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t InvestigatingAlertLevel;//0 - lull, 1 - low, 2 - medium, 3 - high, 4 - combat
-        int32_t StartleTime;
-        int32_t field_FA8;
-        int32_t field_FAC;
-        int32_t field_FB0;
-        int32_t PursuitStrongLow;
-        int32_t PursuitWeakLow;
-        int32_t PursuitStrongHigh;
-        int32_t PursuitWeakHigh;
-        int32_t Pursuit5;
-        int32_t field_FC8[4];
-        int32_t AlarmGroups; //a bitset
-        int32_t field_FDC[17]; //FDC-1020
-        int32_t DazeTimer;
-        int32_t field_1024[17]; //1024-1068
-        int32_t MeleePtr; //probably MELE. Looks somewhat important.
-        int32_t field_106C[270]; //106C-14A4 skipping lots of junk and a little pathfinding stuff that we might want later.
-        int32_t MovementMode;
-        int32_t field_14A8;
-        int32_t field_14AC;
-        int32_t MovementModifiers; //hopefully sprinting, pistol, rifle, etc.
-        int32_t field_14B4[101]; //14B4-1648 Glossing over a few other things we don't need having to do with AI direction.
-        BoundingBox BoundingBox_;
-        int32_t field_1660;
-        int32_t BossShieldPower;        //a multiplier? or just a flag? who knows
-        int32_t field_1668[6];
-        int32_t CurrentConsoleActionMarker; //not sure.
-        int32_t field_1684[7];
-} Character;
+//#include <stdint.h>
+#include "bool.h"
 
 enum {
@@ -605 +16 @@
         team_syndicateaccessory,
 };
+/*
 int16_t ONICALL ONrGameState_NewCharacter(CharacterObject* CHAR, void* AISA, void* flag, uint32_t* list_location);
 int32_t* ONICALL ONrGetActiveCharacter(void* CharacterPtr);
 //int16_t ONICALL ONrGameState_GetPlayerCharacter();
-
+*/
 //probably need to name these better.
+/*
 #define char_unkillable        (1 <<  5)
 #define char_superammo         (1 <<  6)
@@ -620 +33 @@
 #define char_bossshield        (1 << 30)
 #define char_weaponimmune      (1 << 31)
-
+*/
 
 //We need a Oni_Structs #include file.
 
-typedef struct {
-        uint32_t TimerMode;
-        char TimerName[32];
-        uint32_t TimerDuration;
-        uint32_t field_28;
-        uint32_t field_2C;
-        uint32_t Letterbox[3];
-        uint32_t field_3C;
-        uint32_t field_40;
-        uint32_t CutsceneSyncMark;
-        uint32_t SomeCutsceneSyncMarkField;
-        uint32_t field_4C;
-        uint32_t SplashScreenMachineTime;
-        uint32_t field_54;
-        uint32_t field_58;
-        uint32_t field_5C;
-        uint32_t field_60;
-        uint32_t field_64;
-        uint32_t field_68;
-        uint32_t field_6C;
-        uint32_t field_70;
-        uint32_t FadeStartTime;
-        uint32_t FadeEndTime;
-        uint32_t field_7C;
-        uint32_t Camera;
-        char PathFindingGraph[0x28];
-        struct Character *PlayerCharacter;
-        uint32_t field_B0;
-        uint32_t field_B4;
-        GameInput Input;
-        uint32_t field_E8;
-        uint32_t field_EC;
-        uint32_t ScreenshotEveryFrame; //bool?
-        uint32_t field_F4;
-        char field_F8;
-        char field_F9;
-        char field_FA;
-        char field_FB;
-        uint32_t field_FC;
-        uint32_t field_100;
-        uint32_t SlowMo;        //bool
-        uint32_t SlowMotion;
-        uint32_t field_10C;
-        uint32_t field_110;
-        uint32_t field_114;
-        char SplashScreenTextureName[32];
-        uint32_t field_138;
-        uint32_t field_13C;
-        uint32_t field_140;
-        uint32_t GameTime;
-        uint32_t field_148;
-        uint32_t field_14C;
-        uint32_t Level;
-        uint32_t field_154;
-        char MotionBlur[0x44][64];
-        uint32_t MotionBlurCount;
-        uint16_t field_125C;
-        uint16_t field_125E;
-        Character CharacterStorage[128];
-        uint16_t CharacterCount;
-        uint16_t padding_1;
-        uint32_t field_B6264;
-        char ActiveCharacters[0x2838][64]; //Active Character Struct isn't the proper size atm.
-        uint16_t ActiveCharactersCount;
-        char Shadows[32][0x804];
-        uint32_t field_1670EA;
-        uint32_t ShadowCount;
-        ActiveCharacter* ActiveCharacterList[128]; //or just Character*? Anyways, we wont need to use this.
-        uint32_t ActiveCharacterListCount;
-        uint32_t ActiveCharacterListLock;
-        Character* LivingCharacterList[128]; 
-        uint32_t LivingCharacterListCount;
-        uint32_t LivingCharacterListLock;
-        ActiveCharacter* PresentCharacterList[128];
-        uint32_t PresentCharacterListCount;
-        uint32_t PresentCharacterListLock;
-        void* ObjectList;
-        char DoorArray[8];
-        char Sky[0x290];
-        uint32_t field_1679A4;
-        uint32_t Triggers;
-        char IsGamePaused;
-        char IsInputEnabled;
-        char field_1679AE;
-        char field_1679AF;
-        uint32_t LockedActions1;
-        uint32_t LockedActions2;
-        uint32_t field_1679B8;
-        uint32_t WinLose;
-        uint32_t ConditionSoundsCount;
-        uint32_t ConditionSounds[5];
-        uint16_t LevelNumber;
-        uint16_t padding_5;
-        uint16_t field_1679DC;
-} GameState;
+typedef enum {
+        ONcCharacterFlag_Dead_1_Animating               =       0x00000001,     // health is 0
+        ONcCharacterFlag_Dead                                   =       ONcCharacterFlag_Dead_1_Animating,
+        ONcCharacterFlag_Dead_2_Moving                  =       0x00000002,     // no longer animating
+        ONcCharacterFlag_Dead_3_Cosmetic                =       0x00000004,     // no longer moving
+        ONcCharacterFlag_Dead_4_Gone                    =       0x00000008,     // dead except but still drawn
 
+        ONcCharacterFlag_HastyAnim                              =       0x00000010,     // do this queued animation ASAP
+        ONcCharacterFlag_Unkillable                             =       0x00000020,     // the character cannot be killed, only defeated
+        ONcCharacterFlag_InfiniteAmmo                   =       0x00000040,     // the character always has infinite ammo
+        ONcCharacterFlag_PleaseBlock                    =       0x00000080,     // set if the character should block, cleared once block begins
+        
+        ONcCharacterFlag_Unstoppable                    =       0x00000100,     // this character cannot be knocked down, staggered, stunned, etc
+        ONcCharacterFlag_ScriptControl                  =       0x00000200,     // set if the character is completely under script control
+        ONcCharacterFlag_DeathLock                              =       0x00000400,     // this character should never die all the way
+        ONcCharacterFlag_WasUpdated                             =       0x00000800,     // this character's animation was changed
+                
+        ONcCharacterFlag_BeingThrown                    =       0x00001000,     // this character is being thrown
+        ONcCharacterFlag_DontUseGunVarient              =       0x00002000,     // this character should not use a weapon varient
+        ONcCharacterFlag_Draw                                   =       0x00004000,     // DoFrame has been executed for this character
+        ONcCharacterFlag_InUse                                  =       0x00008000,     // this character is active and in use
+
+        ONcCharacterFlag_DontUseFightVarient    =       0x00010000,
+        ONcCharacterFlag_NoCollision                    =       0x00020000,     // no collision for this character
+        ONcCharacterFlag_Teleporting                    =       0x00040000,     // this character is teleporting and does not accept collision
+        ONcCharacterFlag_NoCorpse                               =       0x00080000,     // no corpse for this character
+
+        ONcCharacterFlag_ActiveLock                             =       0x00100000,     // the character is locked active
+        ONcCharacterFlag_ChrAnimate                             =       0x00200000,     // the character is currently runing a chr_animate command
+        ONcCharacterFlag_AIMovement                             =       0x00400000,     // the character is using AI movement
+        ONcCharacterFlag_NeutralUninterruptable =       0x00800000,     // running an uninterruptable neutral interaction
+
+        ONcCharacterFlag_NoShadow                               =       0x01000000,     // 
+        ONcCharacterFlag_Invincible                             =       0x02000000,     // character is invincible
+        ONcCharacterFlag_NoAutoDrop                             =       0x04000000,     // character should not automatically drop items when killed (invisibility, shield, LSI)
+        ONcCharacterFlag_RestrictedMovement             =       0x08000000,     // character cannot move fast (used for player holding barabbas' gun)
+
+        ONcCharacterFlag_Boss                                   =       0x10000000,     // character is a boss (used for final muro group fight)
+        ONcCharacterFlag_FinalFlash                             =       0x20000000,     // 'final flash' has been played for this character's death
+        ONcCharacterFlag_BossShield                             =       0x40000000, // this character has the boss shield
+        ONcCharacterFlag_WeaponImmune                   =       0x80000000      // this character is immune to weapon damage
+
+} ONtCharacterFlags;
+
+typedef enum {
+        ONcCharacterFlag2_WeaponEmpty                   =       0x00000001, // character's weapon is empty, punch instead
+        ONcCharacterFlag2_UltraMode                             =       0x00000002
+
+} ONtCharacterFlags2;
 
 #endif

Daodan/src/Oni_Persistence.h

@@ -3 +3 @@
 #define ONI_PERSISTENCE_H
 
-#include <stdint.h>
+//#include <stdint.h>
 #include "Daodan.h"
-
+/*
 float ONICALL ONrPersist_GetGamma();
 uint8_t ONICALL ONrPersist_GetWonGame();
-
+*/
 #endif

Daodan/src/binkw32.def

@@ -1 @@
-LIBRARY binkw32.dll
+LIBRARY
+
 EXPORTS
-        BinkBufferBlit@12          = _BinkBufferBlit@12          @1
-        BinkBufferCheckWinPos@12   = _BinkBufferCheckWinPos@12   @2
-        BinkBufferClear@8          = _BinkBufferClear@8          @3
-        BinkBufferClose@4          = _BinkBufferClose@4          @4
-        BinkBufferGetDescription@4 = _BinkBufferGetDescription@4 @5
-        BinkBufferGetError@0       = _BinkBufferGetError@0       @6
-        BinkBufferLock@4           = _BinkBufferLock@4           @7
-        BinkBufferOpen@16          = _BinkBufferOpen@16          @8
-        BinkBufferSetDirectDraw@8  = _BinkBufferSetDirectDraw@8  @9
-        BinkBufferSetHWND@8        = _BinkBufferSetHWND@8        @10
-        BinkBufferSetOffset@12     = _BinkBufferSetOffset@12     @11
-        BinkBufferSetResolution@12 = _BinkBufferSetResolution@12 @12
-        BinkBufferSetScale@12      = _BinkBufferSetScale@12      @13
-        BinkBufferUnlock@4         = _BinkBufferUnlock@4         @14
-        BinkCheckCursor@20         = _BinkCheckCursor@20         @15
-        BinkClose@4                = _BinkClose@4                @16
-        BinkCloseTrack@4           = _BinkCloseTrack@4           @17
-        BinkCopyToBuffer@28        = _BinkCopyToBuffer@28        @18
-        BinkDDSurfaceType@4        = _BinkDDSurfaceType@4        @19
-        BinkDoFrame@4              = _BinkDoFrame@4              @20
-        BinkGetError@0             = _BinkGetError@0             @21
-        BinkGetKeyFrame@12         = _BinkGetKeyFrame@12         @22
-        BinkGetRealtime@12         = _BinkGetRealtime@12         @23
-        BinkGetRects@8             = _BinkGetRects@8             @24
-        BinkGetSummary@8           = _BinkGetSummary@8           @25
-        BinkGetTrackData@8         = _BinkGetTrackData@8         @26
-        BinkGetTrackID@8           = _BinkGetTrackID@8           @27
-        BinkGetTrackMaxSize@8      = _BinkGetTrackMaxSize@8      @28
-        BinkGetTrackType@8         = _BinkGetTrackType@8         @29
-        BinkGoto@12                = _BinkGoto@12                @30
-        BinkIsSoftwareCursor@8     = _BinkIsSoftwareCursor@8     @31
-        BinkLogoAddress@0          = _BinkLogoAddress@0          @32
-        BinkNextFrame@4            = _BinkNextFrame@4            @33
-        BinkOpen@8                 = _BinkOpen@8                 @34
-        BinkOpenDirectSound@4      = _BinkOpenDirectSound@4      @35
-        BinkOpenMiles@4            = _BinkOpenMiles@4            @36
-        BinkOpenTrack@8            = _BinkOpenTrack@8            @37
-        BinkOpenWaveOut@4          = _BinkOpenWaveOut@4          @38
-        BinkPause@8                = _BinkPause@8                @39
-        BinkRestoreCursor@4        = _BinkRestoreCursor@4        @40
-        BinkService@4              = _BinkService@4              @41
-        BinkSetError@4             = _BinkSetError@4             @42
-        BinkSetFrameRate@8         = _BinkSetFrameRate@8         @43
-        BinkSetIO@4                = _BinkSetIO@4                @44
-        BinkSetIOSize@4            = _BinkSetIOSize@4            @45
-        BinkSetPan@8               = _BinkSetPan@8               @46
-        BinkSetSimulate@4          = _BinkSetSimulate@4          @47
-        BinkSetSoundOnOff@8        = _BinkSetSoundOnOff@8        @48
-        BinkSetSoundSystem@8       = _BinkSetSoundSystem@8       @49
-        BinkSetSoundTrack@4        = _BinkSetSoundTrack@4        @50
-        BinkSetVideoOnOff@8        = _BinkSetVideoOnOff@8        @51
-        BinkSetVolume@8            = _BinkSetVolume@8            @52
-        BinkWait@4                 = _BinkWait@4                 @53
-        ExpandBink@56              = _ExpandBink@56              @54
-        ExpandBundleSizes@8        = _ExpandBundleSizes@8        @55
-        RADSetMemory@8             = _RADSetMemory@8             @56
-        RADTimerRead@0             = _RADTimerRead@0             @57
-        YUV_blit_16a1bpp@52        = _YUV_blit_16a1bpp@52        @58
-        YUV_blit_16a1bpp_mask@52   = _YUV_blit_16a1bpp_mask@52   @59
-        YUV_blit_16a4bpp@52        = _YUV_blit_16a4bpp@52        @60
-        YUV_blit_16a4bpp_mask@52   = _YUV_blit_16a4bpp_mask@52   @61
-        YUV_blit_16bpp@48          = _YUV_blit_16bpp@48          @62
-        YUV_blit_16bpp_mask@48     = _YUV_blit_16bpp_mask@48     @63
-        YUV_blit_24bpp@48          = _YUV_blit_24bpp@48          @64
-        YUV_blit_24bpp_mask@48     = _YUV_blit_24bpp_mask@48     @65
-        YUV_blit_24rbpp@48         = _YUV_blit_24rbpp@48         @66
-        YUV_blit_24rbpp_mask@48    = _YUV_blit_24rbpp_mask@48    @67
-        YUV_blit_32abpp@52         = _YUV_blit_32abpp@52         @68
-        YUV_blit_32abpp_mask@52    = _YUV_blit_32abpp_mask@52    @69
-        YUV_blit_32bpp@48          = _YUV_blit_32bpp@48          @70
-        YUV_blit_32bpp_mask@48     = _YUV_blit_32bpp_mask@48     @71
-        YUV_blit_32rabpp@52        = _YUV_blit_32rabpp@52        @72
-        YUV_blit_32rabpp_mask@52   = _YUV_blit_32rabpp_mask@52   @73
-        YUV_blit_32rbpp@48         = _YUV_blit_32rbpp@48         @74
-        YUV_blit_32rbpp_mask@48    = _YUV_blit_32rbpp_mask@48    @75
-        YUV_blit_UYVY@48           = _YUV_blit_UYVY@48           @76
-        YUV_blit_UYVY_mask@48      = _YUV_blit_UYVY_mask@48      @77
-        YUV_blit_YUY2@48           = _YUV_blit_YUY2@48           @78
-        YUV_blit_YUY2_mask@48      = _YUV_blit_YUY2_mask@48      @79
-        YUV_blit_YV12@52           = _YUV_blit_YV12@52           @80
-        YUV_init@4                 = _YUV_init@4                 @81
-        radfree@4                  = _radfree@4                  @82
-        radmalloc@4                = _radmalloc@4                @83
+
+        _BinkBufferBlit@12          = REALBINK._BinkBufferBlit@12          @1
+        _BinkBufferCheckWinPos@12   = REALBINK._BinkBufferCheckWinPos@12   @2
+        _BinkBufferClear@8          = REALBINK._BinkBufferClear@8          @3
+        _BinkBufferClose@4          = REALBINK._BinkBufferClose@4          @4
+        _BinkBufferGetDescription@4 = REALBINK._BinkBufferGetDescription@4 @5
+        _BinkBufferGetError@0       = REALBINK._BinkBufferGetError@0       @6
+        _BinkBufferLock@4           = REALBINK._BinkBufferLock@4           @7
+        _BinkBufferOpen@16          = REALBINK._BinkBufferOpen@16          @8
+        _BinkBufferSetDirectDraw@8  = REALBINK._BinkBufferSetDirectDraw@8  @9
+        _BinkBufferSetHWND@8        = REALBINK._BinkBufferSetHWND@8        @10
+        _BinkBufferSetOffset@12     = REALBINK._BinkBufferSetOffset@12     @11
+        _BinkBufferSetResolution@12 = REALBINK._BinkBufferSetResolution@12 @12
+        _BinkBufferSetScale@12      = REALBINK._BinkBufferSetScale@12      @13
+        _BinkBufferUnlock@4         = REALBINK._BinkBufferUnlock@4         @14
+        _BinkCheckCursor@20         = REALBINK._BinkCheckCursor@20         @15
+        _BinkClose@4                = REALBINK._BinkClose@4                @16
+        _BinkCloseTrack@4           = REALBINK._BinkCloseTrack@4           @17
+        _BinkCopyToBuffer@28        = REALBINK._BinkCopyToBuffer@28        @18
+        _BinkDDSurfaceType@4        = REALBINK._BinkDDSurfaceType@4        @19
+        _BinkDoFrame@4              = REALBINK._BinkDoFrame@4              @20
+        _BinkGetError@0             = REALBINK._BinkGetError@0             @21
+        _BinkGetKeyFrame@12         = REALBINK._BinkGetKeyFrame@12         @22
+        _BinkGetRealtime@12         = REALBINK._BinkGetRealtime@12         @23
+        _BinkGetRects@8             = REALBINK._BinkGetRects@8             @24
+        _BinkGetSummary@8           = REALBINK._BinkGetSummary@8           @25
+        _BinkGetTrackData@8         = REALBINK._BinkGetTrackData@8         @26
+        _BinkGetTrackID@8           = REALBINK._BinkGetTrackID@8           @27
+        _BinkGetTrackMaxSize@8      = REALBINK._BinkGetTrackMaxSize@8      @28
+        _BinkGetTrackType@8         = REALBINK._BinkGetTrackType@8         @29
+        _BinkGoto@12                = REALBINK._BinkGoto@12                @30
+        _BinkIsSoftwareCursor@8     = REALBINK._BinkIsSoftwareCursor@8     @31
+        _BinkLogoAddress@0          = REALBINK._BinkLogoAddress@0          @32
+        _BinkNextFrame@4            = REALBINK._BinkNextFrame@4            @33
+        _BinkOpen@8                 = REALBINK._BinkOpen@8                 @34
+        _BinkOpenDirectSound@4      = REALBINK._BinkOpenDirectSound@4      @35
+        _BinkOpenMiles@4            = REALBINK._BinkOpenMiles@4            @36
+        _BinkOpenTrack@8            = REALBINK._BinkOpenTrack@8            @37
+        _BinkOpenWaveOut@4          = REALBINK._BinkOpenWaveOut@4          @38
+        _BinkPause@8                = REALBINK._BinkPause@8                @39
+        _BinkRestoreCursor@4        = REALBINK._BinkRestoreCursor@4        @40
+        _BinkService@4              = REALBINK._BinkService@4              @41
+        _BinkSetError@4             = REALBINK._BinkSetError@4             @42
+        _BinkSetFrameRate@8         = REALBINK._BinkSetFrameRate@8         @43
+        _BinkSetIO@4                = REALBINK._BinkSetIO@4                @44
+        _BinkSetIOSize@4            = REALBINK._BinkSetIOSize@4            @45
+        _BinkSetPan@8               = REALBINK._BinkSetPan@8               @46
+        _BinkSetSimulate@4          = REALBINK._BinkSetSimulate@4          @47
+        _BinkSetSoundOnOff@8        = REALBINK._BinkSetSoundOnOff@8        @48
+        _BinkSetSoundSystem@8       = REALBINK._BinkSetSoundSystem@8       @49
+        _BinkSetSoundTrack@4        = REALBINK._BinkSetSoundTrack@4        @50
+        _BinkSetVideoOnOff@8        = REALBINK._BinkSetVideoOnOff@8        @51
+        _BinkSetVolume@8            = REALBINK._BinkSetVolume@8            @52
+        _BinkWait@4                 = REALBINK._BinkWait@4                 @53
+        _ExpandBink@56              = REALBINK._ExpandBink@56              @54
+        _ExpandBundleSizes@8        = REALBINK._ExpandBundleSizes@8        @55
+        _RADSetMemory@8             = REALBINK._RADSetMemory@8             @56
+        _RADTimerRead@0             = REALBINK._RADTimerRead@0             @57
+        _YUV_blit_16a1bpp@52        = REALBINK._YUV_blit_16a1bpp@52        @58
+        _YUV_blit_16a1bpp_mask@52   = REALBINK._YUV_blit_16a1bpp_mask@52   @59
+        _YUV_blit_16a4bpp@52        = REALBINK._YUV_blit_16a4bpp@52        @60
+        _YUV_blit_16a4bpp_mask@52   = REALBINK._YUV_blit_16a4bpp_mask@52   @61
+        _YUV_blit_16bpp@48          = REALBINK._YUV_blit_16bpp@48          @62
+        _YUV_blit_16bpp_mask@48     = REALBINK._YUV_blit_16bpp_mask@48     @63
+        _YUV_blit_24bpp@48          = REALBINK._YUV_blit_24bpp@48          @64
+        _YUV_blit_24bpp_mask@48     = REALBINK._YUV_blit_24bpp_mask@48     @65
+        _YUV_blit_24rbpp@48         = REALBINK._YUV_blit_24rbpp@48         @66
+        _YUV_blit_24rbpp_mask@48    = REALBINK._YUV_blit_24rbpp_mask@48    @67
+        _YUV_blit_32abpp@52         = REALBINK._YUV_blit_32abpp@52         @68
+        _YUV_blit_32abpp_mask@52    = REALBINK._YUV_blit_32abpp_mask@52    @69
+        _YUV_blit_32bpp@48          = REALBINK._YUV_blit_32bpp@48          @70
+        _YUV_blit_32bpp_mask@48     = REALBINK._YUV_blit_32bpp_mask@48     @71
+        _YUV_blit_32rabpp@52        = REALBINK._YUV_blit_32rabpp@52        @72
+        _YUV_blit_32rabpp_mask@52   = REALBINK._YUV_blit_32rabpp_mask@52   @73
+        _YUV_blit_32rbpp@48         = REALBINK._YUV_blit_32rbpp@48         @74
+        _YUV_blit_32rbpp_mask@48    = REALBINK._YUV_blit_32rbpp_mask@48    @75
+        _YUV_blit_UYVY@48           = REALBINK._YUV_blit_UYVY@48           @76
+        _YUV_blit_UYVY_mask@48      = REALBINK._YUV_blit_UYVY_mask@48      @77
+        _YUV_blit_YUY2@48           = REALBINK._YUV_blit_YUY2@48           @78
+        _YUV_blit_YUY2_mask@48      = REALBINK._YUV_blit_YUY2_mask@48      @79
+        _YUV_blit_YV12@52           = REALBINK._YUV_blit_YV12@52           @80
+        _YUV_init@4                 = REALBINK._YUV_init@4                 @81
+        _radfree@4                  = REALBINK._radfree@4                  @82
+        _radmalloc@4                = REALBINK._radmalloc@4                @83
+
+

Daodan/src/daodan_gl.c

@@ -5 +5 @@
 #include "Oni_Persistence.h"
 #include "Daodan_Utility.h"
-
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include "Daodan_Win32.h"
 #include "BFW_Utility.h"
 
@@ -45 +47 @@
         { 1920, 1440, 0, 0 },
 };
-
-short daodan_resdepths[] = { 16, 32 };
-
+//Just going to always use 32 bits for now...
+//short daodan_resdepths[] = { 16, 32 };
+short daodan_resdepths[] = { 32 };
 DEVMODE orig_devmode, cur_devmode, new_devmode;
 
@@ -83 +85 @@
 {
         unsigned int vmodes = 0;
-        unsigned int screen_x = orig_devmode.dmPelsWidth;
-        unsigned int screen_y = orig_devmode.dmPelsHeight;
-        
-        int i, j;
+        unsigned int screen_x = GetSystemMetrics(SM_CXSCREEN);
+        unsigned int screen_y = GetSystemMetrics(SM_CYSCREEN);
+        
+        uint16_t i, j;
         
         DDrStartupMessage("listing display modes");
-        
+        /*
         if (!M3gResolutionSwitch)
                 daodan_resdepths[0] = orig_devmode.dmBitsPerPel;
-        
+        */
         for (i = 0; i < builtin_depths; i ++)
         {
@@ -179 +181 @@
                 
                 update_cdmode();
-                gl->DisplayMode.Width = cur_devmode.dmPelsWidth;
-                gl->DisplayMode.Height = cur_devmode.dmPelsHeight;
+                gl_eng->DisplayMode.Width = cur_devmode.dmPelsWidth;
+                gl_eng->DisplayMode.Height = cur_devmode.dmPelsHeight;
                 if (cur_devmode.dmBitsPerPel > depth)
-                        gl->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
+                        gl_eng->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
         }
         else
@@ -188 +190 @@
                 update_cdmode();
                 if (cur_devmode.dmBitsPerPel > depth)
-                        gl->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
+                        gl_eng->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
         }
         return 1;
 }
-
-void daodan_set_gamma(float gamma)
-{
-        WORD ramp[3][256];
-        int i;
-
-        if (!gl_gamma_ramp_valid)
-                return;
-
-        gamma = (1.0f - gamma) * 1.2f + 0.4f;
-
-        for (i = 0; i < 256; i++) 
-        {
-                int value = (int)(pow(gl_gamma_ramp[i] / 65535.0f, gamma) * 65535.0f);
-
-                if (value < 0)
-                        value = 0;
-                else if (value > 65535)
-                        value = 65535;
-
-                ramp[0][i] = ramp[1][i] = ramp[2][i] = value;
-        }
-        
-        if (gl_api->wglSetDeviceGammaRamp3DFX)
-                gl_api->wglSetDeviceGammaRamp3DFX(gl->HDC, ramp);
-        else
-                SetDeviceGammaRamp(gl->HDC, ramp);
-}
-
 int ONICALL daodangl_platform_initialize()
 {
         static M3tDisplayMode lastmode = {0, 0, 0, 0};
         
-        if (lastmode.Width != gl->DisplayMode.Width || lastmode.Height != gl->DisplayMode.Height || lastmode.Depth != gl->DisplayMode.Depth)
-                if (!daodan_set_display_mode(gl->DisplayMode.Width, gl->DisplayMode.Height, gl->DisplayMode.Depth))
-                        if (gl->DisplayMode.Width != 640 || gl->DisplayMode.Height != 480 || gl->DisplayMode.Depth != 16)
+        if (lastmode.Width != gl_eng->DisplayMode.Width || lastmode.Height != gl_eng->DisplayMode.Height || lastmode.Depth != gl_eng->DisplayMode.Depth)
+                if (!daodan_set_display_mode(gl_eng->DisplayMode.Width, gl_eng->DisplayMode.Height, gl_eng->DisplayMode.Depth))
+                        if (gl_eng->DisplayMode.Width != 640 || gl_eng->DisplayMode.Height != 480 || gl_eng->DisplayMode.Depth != 16)
                         {
-                                gl->DisplayMode.Width = 640;
-                                gl->DisplayMode.Height = 480;
+                                gl_eng->DisplayMode.Width = 640;
+                                gl_eng->DisplayMode.Height = 480;
                                 if (!daodan_set_display_mode(640, 480, 16))
                                         goto exit_err;
                         }
 
-        if (lastmode.Width != gl->DisplayMode.Width || lastmode.Height != gl->DisplayMode.Height)
+        if (lastmode.Width != gl_eng->DisplayMode.Width || lastmode.Height != gl_eng->DisplayMode.Height)
         {
                 RECT Rect;
-                Rect.left = (GetSystemMetrics(SM_CXSCREEN) / 2) - (gl->DisplayMode.Width / 2);
-                Rect.top = (GetSystemMetrics(SM_CYSCREEN) / 2) - (gl->DisplayMode.Height / 2);
-                Rect.right = Rect.left + gl->DisplayMode.Width;
-                Rect.bottom = Rect.top + gl->DisplayMode.Height;
+                Rect.left = (GetSystemMetrics(SM_CXSCREEN) / 2) - (gl_eng->DisplayMode.Width / 2);
+                Rect.top = (GetSystemMetrics(SM_CYSCREEN) / 2) - (gl_eng->DisplayMode.Height / 2);
+                Rect.right = Rect.left + gl_eng->DisplayMode.Width;
+                Rect.bottom = Rect.top + gl_eng->DisplayMode.Height;
                 AdjustWindowRect(&Rect, WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_CAPTION |WS_TILEDWINDOW , FALSE);
                 
@@ -247 +220 @@
         }
 
-        if (gl->HDC == NULL)
-                if ((gl->HDC = GetDC(ONgPlatformData.Window)) == NULL)
+        if (gl_eng->HDC == NULL)
+                if ((gl_eng->HDC = GetDC(ONgPlatformData.Window)) == NULL)
                         goto exit_err;
         
@@ -255 +228 @@
                 DDrStartupMessage("Using 3DFX gamma adjustment");
 
-                if (gl_api->wglGetDeviceGammaRamp3DFX(gl->HDC, gl_gamma_ramp))
+                if (gl_api->wglGetDeviceGammaRamp3DFX(gl_eng->HDC, gl_gamma_ramp))
                         gl_gamma_ramp_valid = 1;
         }
@@ -262 +235 @@
                 DDrStartupMessage("Using standard Windows gamma adjustment");
 
-                if (GetDeviceGammaRamp(gl->HDC, gl_gamma_ramp))
+                if (GetDeviceGammaRamp(gl_eng->HDC, gl_gamma_ramp))
                         gl_gamma_ramp_valid = 1;
         }
-        
+        /*
         if (gl_gamma_ramp_valid)
                 daodan_set_gamma(ONrPersist_GetGamma());  
-        else
+        else*/
                 DDrStartupMessage("gamma adjustment not supported");
         
-        if (!gl_platform_set_pixel_format(gl->HDC))
-                if (gl->DisplayMode.Depth != 16)
+        if (!gl_platform_set_pixel_format(gl_eng->HDC))
+                if (gl_eng->DisplayMode.Depth != 16)
                 {
-                        if (!daodan_set_display_mode(gl->DisplayMode.Width, gl->DisplayMode.Height, 16))
+                        if (!daodan_set_display_mode(gl_eng->DisplayMode.Width, gl_eng->DisplayMode.Height, 16))
                                 goto exit_err;
                         
-                        if (!gl_platform_set_pixel_format(gl->HDC))
+                        if (!gl_platform_set_pixel_format(gl_eng->HDC))
                                 goto exit_err;
                 }
 
-        lastmode.Width = gl->DisplayMode.Width;
-        lastmode.Height = gl->DisplayMode.Height;
-        lastmode.Depth = gl->DisplayMode.Depth;
+        lastmode.Width = gl_eng->DisplayMode.Width;
+        lastmode.Height = gl_eng->DisplayMode.Height;
+        lastmode.Depth = gl_eng->DisplayMode.Depth;
         return 1;
 

Daodan/src/daodan_gl.h

@@ -15 +15 @@
 void daodan_set_gamma(float gamma);
 int ONICALL daodangl_platform_initialize();
-
+ daodan_init_msaa();
 #endif

Daodan/src/inifile.h

@@ -3 +3 @@
 #define INIFILE_H
 
-#include <stdbool.h>
-#include <stdint.h>
+#include "bool.h"
+//#include <stdint.h>
 
 enum {inifile_cantread = -20};

Daodan/src/inifile_reader.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
+#include "bool.h"
 #include <string.h>
 #include <ctype.h>
@@ -113 +113 @@
                         if (inisection[0])
                                 free(inisection);
-                        inisection = strdup(readptr + 1); // Skip the first [
+                        inisection = _strdup(readptr + 1); // Skip the first [
                         newsection = true;
                 }

Daodan/src/oni_gl.h

@@ -3 +3 @@
 #define ONI_GL_H
 
-#include <GL/GL.h>
+#include <GL/gl.h>
 
 #include "Daodan.h"
@@ -440 +440 @@
 } gl_api_t;
 
-extern gl_engine_t* gl;
-extern gl_api_t* gl_api;
-
-extern WORD gl_gamma_ramp[3 * 256];
-extern int gl_gamma_ramp_valid;
-
-unsigned int ONICALL gl_enumerate_valid_display_modes(M3tDisplayMode modes[16]);
-int ONICALL gl_platform_set_pixel_format(HDC hdc);
-int ONICALL gl_platform_initialize();
+
+
 
 #endif

Daodan/src/oni_stdio.h

@@ -4 +4 @@
 
 #include <stdio.h>
-
+/*
 FILE* __cdecl oni_fopen(const char*, const char*);
 int   __cdecl oni_fprintf(FILE*, const char*, ...);
 int   __cdecl oni_fflush(FILE*);
-
+*/
 #endif