Changeset 439 for Daodan

Timestamp:

Jul 17, 2009, 10:34:48 AM (15 years ago)

Author:

rossy

Message:

Daodan_BSL

Location:

Daodan

Files:

• build.bat (modified) (1 diff)
• build/binkw32.dll (modified) ( previous)
• src/BFW_ScriptingLanguage.h (added)
• src/Daodan.c (modified) (8 diffs)
• src/Daodan_BSL.c (added)
• src/Daodan_BSL.h (added)
• src/Oni_Symbols.S (modified) (1 diff)

Daodan/build.bat

@@ -1 @@
-gcc -O3 -s -Wall -shared -fomit-frame-pointer -o build\binkw32.dll src\Oni_Symbols.S src\Daodan.c src\Daodan_DLLStubs.c src\Daodan_Patch.c src\Daodan_Utility.c src\Daodan_Win32.c src\Daodan_Cheater.c src\Daodan_Persistence.c src\Daodan_WindowHack.c src\daodan_gl.c src\Daodan_Character.c src\Daodan_Console.c src\inifile_reader.c -lgdi32
+gcc -O3 -s -Wall -shared -fomit-frame-pointer -o build\binkw32.dll src\Oni_Symbols.S src\Daodan.c src\Daodan_DLLStubs.c src\Daodan_Patch.c src\Daodan_Utility.c src\Daodan_Win32.c src\Daodan_Cheater.c src\Daodan_Persistence.c src\Daodan_WindowHack.c src\daodan_gl.c src\Daodan_Character.c src\Daodan_Console.c src\Daodan_BSL.c src\inifile_reader.c -lgdi32

Daodan/src/Daodan.c

@@ -7 +7 @@
 #include "Daodan_Cheater.h"
 #include "Daodan_Persistence.h"
+#include "Daodan_BSL.h"
 
 #include "Daodan_WindowHack.h"
@@ -45 +46 @@
 bool patch_usedaodangl = false;
 bool patch_windowhack = true;
+bool patch_daodaninit = true;
+
+bool opt_usedaodanbsl = true;
 
 bool DDrPatch_Init()
@@ -165 +169 @@
 }
 
-enum {s_unknown, s_patch, s_language} ini_section;
+enum {s_unknown, s_options, s_patch, s_language} ini_section;
 
 bool DDrIniCallback(char* section, bool newsection, char* name, char* value)
@@ -171 +175 @@
         if (newsection)
         {
-                if (!stricmp(section, "patch"))
+                if (!stricmp(section, "options"))
+                        ini_section = s_options;
+                else if (!stricmp(section, "patch"))
                         ini_section = s_patch;
                 else if (!stricmp(section, "language"))
@@ -184 +190 @@
         switch (ini_section)
         {
+                case s_options:
+                        if (!stricmp(name, "usedaodanbsl"))
+                                opt_usedaodanbsl = !stricmp(value, "true");
+                        break;
                 case s_patch:
                         if (!stricmp(name, "fonttexturecache"))
@@ -227 +237 @@
                         else if (!stricmp(name, "windowhack"))
                                 patch_windowhack = !stricmp(value, "true");
+                        else if (!stricmp(name, "daodaninit"))
+                                patch_daodaninit = !stricmp(value, "true");
                         else
                                 DDrStartupMessage("unrecognised patch \"%s\"", name);
@@ -364 +376 @@
 }
 
+void ONICALL DDrGame_Init()
+{
+        if (opt_usedaodanbsl)
+                SLrDaodan_Initalize();
+}
+
 void __cdecl DDrMain(int argc, char* argv[])
 {
@@ -400 +418 @@
         if (patch_windowhack)
                 DDrWindowHack_Install();
+        
+        if (patch_daodaninit)
+                DDrPatch_MakeCall(OniExe + 0x000d345a, DDrGame_Init);
         
         init_daodan_gl();

Daodan/src/Oni_Symbols.S

@@ -2 +2 @@
 
 // MSVC6.0 stdlib
-symbol ( _oni_malloc                         , 0x0011fc24 )
-symbol ( _oni_free                           , 0x0011fbf5 )
+symbol ( _oni_malloc                               , 0x0011fc24 )
+symbol ( _oni_free                                 , 0x0011fbf5 )
 
-symbol ( _oni_fopen                          , 0x0011ea9f )
-symbol ( _oni_fflush                         , 0x0011eab2 )
-symbol ( _oni_fprintf                        , 0x0011ebbf )
-symbol ( _oni_vsprintf                       , 0x0011e860 )
+symbol ( _oni_fopen                                , 0x0011ea9f )
+symbol ( _oni_fflush                               , 0x0011eab2 )
+symbol ( _oni_fprintf                              , 0x0011ebbf )
+symbol ( _oni_vsprintf                             , 0x0011e860 )
 
 // Oni Engine
-symbol ( _ONiMain                            , 0x000d3280 )
-symbol ( @ONrPlatform_Initialize@4           , 0x0010f670 )
-symbol ( _ONrPlatform_WindowProc@16          , 0x0010f7a0 )
+symbol ( _ONiMain                                  , 0x000d3280 )
+symbol ( @ONrPlatform_Initialize@4                 , 0x0010f670 )
+symbol ( _ONrPlatform_WindowProc@16                , 0x0010f7a0 )
 
-symbol ( _g_Instance                         , 0x0021f9e4 )
-symbol ( _ONgPlatformData                    , 0x0023100c )
-symbol ( _ONgGameState                       , 0x001ece7c )
+symbol ( _g_Instance                               , 0x0021f9e4 )
+symbol ( _ONgPlatformData                          , 0x0023100c )
+symbol ( _ONgGameState                             , 0x001ece7c )
 
 //Oni Persistance
-symbol ( @ONrPersist_GetGamma@0              , 0x0010f450 )
-symbol ( @ONrPersist_GetWonGame@0            , 0x0010f660 )
+symbol ( @ONrPersist_GetGamma@0                    , 0x0010f450 )
+symbol ( @ONrPersist_GetWonGame@0                  , 0x0010f660 )
 
 // BFW_Utility
-symbol ( _UUrStartupMessage                  , 0x00024860 )
-symbol ( @UUrMachineTime_High@0              , 0x00026480 )
-symbol ( @UUrMachineTime_High_Frequency@0    , 0x000264b0 )
-symbol ( @UUrMachineTime_Sixtieths@0         , 0x000263e0 )
-symbol ( _ONgFileStartup                     , 0x001711b8 )
+symbol ( _UUrStartupMessage                        , 0x00024860 )
+symbol ( @UUrMachineTime_High@0                    , 0x00026480 )
+symbol ( @UUrMachineTime_High_Frequency@0          , 0x000264b0 )
+symbol ( @UUrMachineTime_Sixtieths@0               , 0x000263e0 )
+symbol ( _ONgFileStartup                           , 0x001711b8 )
 
-symbol ( @UUrPlatform_Initialize@0           , 0x00026010 )
-symbol ( @UUrPlatform_Terminate@0            , 0x00026310 )
+symbol ( @UUrPlatform_Initialize@0                 , 0x00026010 )
+symbol ( @UUrPlatform_Terminate@0                  , 0x00026310 )
 
-symbol ( _AUrMessageBox                      , 0x000378c0 )
+symbol ( _AUrMessageBox                            , 0x000378c0 )
 
 // Motoko
 
-symbol ( _M3gResolutionSwitch                , 0x00131634 )
+symbol ( _M3gResolutionSwitch                      , 0x00131634 )
 
 // OpenGL
-symbol ( @gl_enumerate_valid_display_modes@4 , 0x000083a0 )
-symbol ( @gl_platform_set_pixel_format@4     , 0x00007b50 )
-symbol ( @gl_platform_initialize@0           , 0x00007da0 )
+symbol ( @gl_enumerate_valid_display_modes@4       , 0x000083a0 )
+symbol ( @gl_platform_set_pixel_format@4           , 0x00007b50 )
+symbol ( @gl_platform_initialize@0                 , 0x00007da0 )
 
-symbol ( _gl                                 , 0x00160600 )
-symbol ( _gl_api                             , 0x00160604 )
-symbol ( _gl_gamma_ramp                      , 0x0015fdfc )
-symbol ( _gl_gamma_ramp_valid                , 0x001603fc )
+symbol ( _gl                                       , 0x00160600 )
+symbol ( _gl_api                                   , 0x00160604 )
+symbol ( _gl_gamma_ramp                            , 0x0015fdfc )
+symbol ( _gl_gamma_ramp_valid                      , 0x001603fc )
 
 // Character
-symbol ( @ONrGameState_NewCharacter@16       , 0x000dac50 )
-symbol ( @ONrGameState_GetPlayerCharacter@0  , 0x000b63a7 )
+symbol ( @ONrGameState_NewCharacter@16             , 0x000dac50 )
+symbol ( @ONrGameState_GetPlayerCharacter@0        , 0x000b63a7 )
 
 // Console
-symbol ( @COrTextArea_Print@28               , 0x00031340 )
-symbol ( _COgConsoleLines                    , 0x001cb468 )
-symbol ( _COgFadeTimeValue                   , 0x00133f68 )
-symbol ( _COgDefaultTextShade                , 0x00133f70 )
-symbol ( _COgDefaultTextShadow               , 0x00133f74 )
+symbol ( @COrTextArea_Print@28                     , 0x00031340 )
+symbol ( _COgConsoleLines                          , 0x001cb468 )
+symbol ( _COgFadeTimeValue                         , 0x00133f68 )
+symbol ( _COgDefaultTextShade                      , 0x00133f70 )
+symbol ( _COgDefaultTextShadow                     , 0x00133f74 )
+
+// ScriptingLanguage
+symbol ( @SLrScript_Command_Register_ReturnType@20 , 0x00077b20 )