Index: Daodan/src/BFW_LocalInput.h =================================================================== --- Daodan/src/BFW_LocalInput.h (revision 474) +++ Daodan/src/BFW_LocalInput.h (revision 474) @@ -0,0 +1,7 @@ +#pragma once +#ifndef BFW_LOCALINPUT_H +#define BFW_LOCALINPUT_H + + + +#endif Index: Daodan/src/BFW_ScriptLang.h =================================================================== --- Daodan/src/BFW_ScriptLang.h (revision 473) +++ Daodan/src/BFW_ScriptLang.h (revision 474) @@ -33,5 +33,5 @@ } sl_callinfo; -typedef uint16_t (ONICALL *sl_func)(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret); +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); Index: Daodan/src/Daodan.c =================================================================== --- Daodan/src/Daodan.c (revision 473) +++ Daodan/src/Daodan.c (revision 474) @@ -53,9 +53,9 @@ bool patch_cheater = true; -bool patch_newweapon = true; +// bool patch_newweapon = true; bool opt_usedaodanbsl = true; bool opt_border = true; -bool opt_shadow = true; +bool opt_shadow = false; bool opt_topmost = false; Index: Daodan/src/Daodan_BSL.c =================================================================== --- Daodan/src/Daodan_BSL.c (revision 473) +++ Daodan/src/Daodan_BSL.c (revision 474) @@ -17,5 +17,5 @@ #include "Daodan_Character.h" -uint16_t ONICALL bsl_int32mul(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_int32mul(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { ret->value_int32 = args[0].value_int32 * args[1].value_int32; @@ -24,5 +24,5 @@ } -uint16_t ONICALL bsl_mul(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_mul(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { double val1; @@ -44,5 +44,5 @@ } -uint16_t ONICALL bsl_int32div(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_int32div(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { ret->value_int32 = args[0].value_int32 / args[1].value_int32; @@ -51,5 +51,5 @@ } -uint16_t ONICALL bsl_div(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_div(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { double val1; @@ -71,5 +71,5 @@ } -uint16_t ONICALL bsl_int32rand(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_int32rand(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int32_t start = 0; @@ -94,5 +94,5 @@ } -uint16_t ONICALL bsl_getkills(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_getkills(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -106,5 +106,5 @@ } -uint16_t ONICALL bsl_getdamage(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_getdamage(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -118,5 +118,5 @@ } -uint16_t ONICALL bsl_returnoffset(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_returnoffset(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { //int offset = 140; @@ -130,5 +130,5 @@ -uint16_t ONICALL bsl_powerup(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_powerup(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -191,5 +191,5 @@ } -uint16_t ONICALL bsl_health(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_health(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -211,5 +211,5 @@ } -uint16_t ONICALL bsl_regen(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_regen(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -232,5 +232,5 @@ -uint16_t ONICALL bsl_maxhealth(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_maxhealth(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -253,5 +253,5 @@ } -uint16_t ONICALL bsl_getattacker(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_getattacker(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { //broken @@ -272,5 +272,5 @@ -uint16_t ONICALL bsl_chrname(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_chrname(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -295,5 +295,5 @@ -uint16_t ONICALL bsl_count(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_count(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { //testing numargs... @@ -303,5 +303,5 @@ } -uint16_t ONICALL bsl_dprintcolored(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_dprintcolored(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { //TODO: figure out why our implementation of dprint shows after dev mode is turned off @@ -330,5 +330,5 @@ -uint16_t ONICALL bsl_nametoindex(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_nametoindex(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { ret->type = sl_int32; @@ -337,5 +337,5 @@ } -uint16_t ONICALL bsl_getactiveoffset(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +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); @@ -394,5 +394,5 @@ {"Fire3", Action2_Fire3 } }; -uint16_t ONICALL bsl_holdkey(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_holdkey(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { int index; @@ -425,5 +425,5 @@ } -uint16_t ONICALL bsl_isheld(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_isheld(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { // int index; @@ -506,5 +506,5 @@ /* -uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret) { if (numargs < 2) @@ -522,5 +522,5 @@ } */ -uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +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) @@ -577,5 +577,5 @@ // Widescreen patch for talking heads. -uint16_t ONICALL cinematic_start_patch(sl_callinfo* callinfo, unsigned int numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret) +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)); Index: Daodan/src/Daodan_Cheater.c =================================================================== --- Daodan/src/Daodan_Cheater.c (revision 473) +++ Daodan/src/Daodan_Cheater.c (revision 474) @@ -9,36 +9,36 @@ oniCheatCode DDr_CheatTable[] = { - { "shapeshifter", "Change Characters Enabled", "Change Characters Disabled", cheat_shapeshifter }, - { "liveforever", "Invincibility Enabled", "Invincibility Disabled", cheat_liveforever }, - { "touchofdeath", "Omnipotence Enabled", "Omnipotence Disabled", cheat_touchofdeath }, - { "canttouchthis", "Unstoppable Enabled", "Unstoppable Disabled", cheat_canttouchthis }, - { "fatloot", "Fat Loot Received", NULL, cheat_fatloot }, - { "glassworld", "Glass Furniture Enabled", "Glass Furniture Disabled", cheat_glassworld }, - { "winlevel", "Instantly Win Level", NULL, cheat_winlevel }, - { "loselevel", "Instantly Lose Level", NULL, cheat_loselevel }, - { "bighead", "Big Head Enabled", "Big Head Disabled", cheat_bighead }, - { "minime", "Mini Mode Enabled", "Mini Mode Disabled", cheat_minime }, - { "superammo", "Super Ammo Mode Enabled", "Super Ammo Mode Disabled", cheat_superammo }, - { "thedayismine", "Developer Access Enabled", "Developer Access Disabled", cheat_thedayismine }, - { "reservoirdogs", "Last Man Standing Enabled", "Last Man Standing Disabled", cheat_reservoirdogs }, - { "roughjustice", "Gatling Guns Enabled", "Gatling Guns Disabled", cheat_roughjustice }, - { "chenille", "Daodan Power Enabled", "Daodan Power Disabled", cheat_chenille }, - { "behemoth", "Godzilla Mode Enabled", "Godzilla Mode Disabled", cheat_behemoth }, - { "elderrune", "Regeneration Enabled", "Regeneration Disabled", cheat_elderrune }, - { "moonshadow", "Phase Cloak Enabled", "Phase Cloak Disabled", cheat_moonshadow }, - { "munitionfrenzy", "Weapons Locker Created", NULL, cheat_munitionfrenzy }, - { "fistsoflegend", "Fists Of Legend Enabled", "Fists Of Legend Disabled", cheat_fistsoflegend }, - { "killmequick", "Ultra Mode Enabled", "Ultra Mode Disabled", cheat_killmequick }, - { "carousel", "Slow Motion Enabled", "Slow Motion Disabled", cheat_carousel }, - { "bigbadboss", "Boss Shield Enabled", "Boss Shield Disabled", cheat_bigbadboss }, - { "bulletproof", "Force Field Enabled", "Force Field Disabled", cheat_bulletproof }, - { "kangaroo", "Alex Okita Mode Enabled", "Alex Okita Mode Disabled", cheat_kangaroo }, - { "himynameisalex", "Kangaroo Jump Enabled", "Kangaroo Jump Disabled", cheat_kangaroo }, - { "marypoppins", "Jet Pack Mode Enabled", "Jet Pack Mode Disabled", cheat_marypoppins }, - { "buddha", "Unkillable Enabled", "Unkillable Disabled", cheat_buddha }, - { "shinobi", "Ninja Mode Enabled (good luck!)", "Ninja Mode Disabled", cheat_shinobi }, - { "x", "Developer Access Enabled", "Developer Access Disabled", cheat_x }, - { "testcheat", "Testing...", "", cheat_testcheat }, - { "tellmetheversion","Daodan v.3.0", "", cheat_tellmetheversion}, + { "shapeshifter", "Change Characters Enabled", "Change Characters Disabled", cheat_shapeshifter }, + { "liveforever", "Invincibility Enabled", "Invincibility Disabled", cheat_liveforever }, + { "touchofdeath", "Omnipotence Enabled", "Omnipotence Disabled", cheat_touchofdeath }, + { "canttouchthis", "Unstoppable Enabled", "Unstoppable Disabled", cheat_canttouchthis }, + { "fatloot", "Fat Loot Received", NULL, cheat_fatloot }, + { "glassworld", "Glass Furniture Enabled", "Glass Furniture Disabled", cheat_glassworld }, + { "winlevel", "Instantly Win Level", NULL, cheat_winlevel }, + { "loselevel", "Instantly Lose Level", NULL, cheat_loselevel }, + { "bighead", "Big Head Enabled", "Big Head Disabled", cheat_bighead }, + { "minime", "Mini Mode Enabled", "Mini Mode Disabled", cheat_minime }, + { "superammo", "Super Ammo Mode Enabled", "Super Ammo Mode Disabled", cheat_superammo }, + { "thedayismine", "Developer Access Enabled", "Developer Access Disabled", cheat_thedayismine }, + { "reservoirdogs", "Last Man Standing Enabled", "Last Man Standing Disabled", cheat_reservoirdogs }, + { "roughjustice", "Gatling Guns Enabled", "Gatling Guns Disabled", cheat_roughjustice }, + { "chenille", "Daodan Power Enabled", "Daodan Power Disabled", cheat_chenille }, + { "behemoth", "Godzilla Mode Enabled", "Godzilla Mode Disabled", cheat_behemoth }, + { "elderrune", "Regeneration Enabled", "Regeneration Disabled", cheat_elderrune }, + { "moonshadow", "Phase Cloak Enabled", "Phase Cloak Disabled", cheat_moonshadow }, + { "munitionfrenzy", "Weapons Locker Created", NULL, cheat_munitionfrenzy }, + { "fistsoflegend", "Fists Of Legend Enabled", "Fists Of Legend Disabled", cheat_fistsoflegend }, + { "killmequick", "Ultra Mode Enabled", "Ultra Mode Disabled", cheat_killmequick }, + { "carousel", "Slow Motion Enabled", "Slow Motion Disabled", cheat_carousel }, + { "bigbadboss", "Boss Shield Enabled", "Boss Shield Disabled", cheat_bigbadboss }, + { "bulletproof", "Force Field Enabled", "Force Field Disabled", cheat_bulletproof }, + { "kangaroo", "Alex Okita Mode Enabled", "Alex Okita Mode Disabled", cheat_kangaroo }, + { "himynameisalex", "Kangaroo Jump Enabled", "Kangaroo Jump Disabled", cheat_kangaroo }, + { "marypoppins", "Jet Pack Mode Enabled", "Jet Pack Mode Disabled", cheat_marypoppins }, + { "buddha", "Unkillable Enabled", "Unkillable Disabled", cheat_buddha }, + { "shinobi", "Ninja Mode Enabled (good luck!)", "Ninja Mode Disabled", cheat_shinobi }, + { "x", "Developer Access Enabled", "Developer Access Disabled", cheat_x }, + { "testcheat", "Testing...", "", cheat_testcheat }, + { "tellmetheversion", "Daodan v.3.0", "", cheat_tellmetheversion }, {0} }; @@ -240,7 +240,5 @@ } case cheat_tellmetheversion: - { return 1; - } case cheat_x: return ONrCheater(cheat_thedayismine); @@ -255,4 +253,5 @@ } +// Biggest hack in the entire thing ^_^ __stdcall void FallingFrames(void* Ebp) { Index: Daodan/src/daodan_gl.c =================================================================== --- Daodan/src/daodan_gl.c (revision 473) +++ Daodan/src/daodan_gl.c (revision 474) @@ -242,7 +242,4 @@ Rect.right = Rect.left + gl->DisplayMode.Width; Rect.bottom = Rect.top + gl->DisplayMode.Height; - //http://msdn.microsoft.com/en-us/library/ms632665(VS.85).aspx - //dwStyle - //[in] Specifies the window style of the window whose required size is to be calculated. Note that you cannot specify the WS_OVERLAPPED style. AdjustWindowRect(&Rect, WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_CAPTION, TRUE); @@ -270,5 +267,4 @@ if (gl_gamma_ramp_valid) - //Its working now daodan_set_gamma(ONrPersist_GetGamma()); else