Skip to content

Commit

Permalink
3.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
aap committed Sep 6, 2017
1 parent 78bb6df commit b9e5c4e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
4 changes: 4 additions & 0 deletions src/debugmenu_public.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ typedef void (*DebugMenuEntrySetAddress_TYPE)(DebugMenuEntry *e, void *addr);

struct DebugMenuAPI
{
bool isLoaded;
DebugMenuAddInt8_TYPE addint8;
DebugMenuAddInt16_TYPE addint16;
DebugMenuAddInt32_TYPE addint32;
Expand Down Expand Up @@ -70,6 +71,8 @@ inline void DebugMenuEntrySetAddress(DebugMenuEntry *e, void *addr)

inline bool DebugMenuLoad(void)
{
if(gDebugMenuAPI.isLoaded)
return true;
HMODULE mod = LoadLibrary("debugmenu.dll");
if(mod == 0){
char modulePath[MAX_PATH];
Expand Down Expand Up @@ -97,6 +100,7 @@ inline bool DebugMenuLoad(void)
gDebugMenuAPI.setwrap = (DebugMenuEntrySetWrap_TYPE)GetProcAddress(mod, "DebugMenuEntrySetWrap");
gDebugMenuAPI.setstrings = (DebugMenuEntrySetStrings_TYPE)GetProcAddress(mod, "DebugMenuEntrySetStrings");
gDebugMenuAPI.setaddress = (DebugMenuEntrySetAddress_TYPE)GetProcAddress(mod, "DebugMenuEntrySetAddress");
gDebugMenuAPI.isLoaded = true;
return true;
}

Expand Down
32 changes: 16 additions & 16 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -925,27 +925,27 @@ installMenu(void)
menu.neoBloodDrops = DebugMenuAddVarBool32("SkyGFX", "Neo-style Blood drops", &config->neoBloodDrops, nil);
}

DebugMenuAddVarBool8("SkyGFX| Misc", "Blur PS2 Colour Filter", (int8_t*)&CPostEffects::m_bBlurColourFilter, nil);
DebugMenuAddVarBool8("SkyGFX|Misc", "Blur PS2 Colour Filter", (int8_t*)&CPostEffects::m_bBlurColourFilter, nil);
if(iCanHasSunGlare)
menu.doglare = DebugMenuAddVarBool32("SkyGFX| Misc", "Sun Glare", &config->doglare, nil);
menu.neoShininess = DebugMenuAddVar("SkyGFX| Misc", "Neo Car Shininess", &config->neoShininess, nil, 0.1f, 0.0f, 10.0f);
menu.neoSpecularity = DebugMenuAddVar("SkyGFX| Misc", "Neo Car Specularity", &config->neoSpecularity, nil, 0.1f, 0.0f, 10.0f);
menu.fixGrassPlacement = DebugMenuAddVarBool32("SkyGFX| Misc", "Fix Grass Placement", &config->fixGrassPlacement, nil);
menu.lightningIlluminatesWorld = DebugMenuAddVar("SkyGFX| Misc", "Lightning illuminates", &config->lightningIlluminatesWorld, nil, 1, 0, 1, lightningStr);
menu.doglare = DebugMenuAddVarBool32("SkyGFX|Misc", "Sun Glare", &config->doglare, nil);
menu.neoShininess = DebugMenuAddVar("SkyGFX|Misc", "Neo Car Shininess", &config->neoShininess, nil, 0.1f, 0.0f, 10.0f);
menu.neoSpecularity = DebugMenuAddVar("SkyGFX|Misc", "Neo Car Specularity", &config->neoSpecularity, nil, 0.1f, 0.0f, 10.0f);
menu.fixGrassPlacement = DebugMenuAddVarBool32("SkyGFX|Misc", "Fix Grass Placement", &config->fixGrassPlacement, nil);
menu.lightningIlluminatesWorld = DebugMenuAddVar("SkyGFX|Misc", "Lightning illuminates", &config->lightningIlluminatesWorld, nil, 1, 0, 1, lightningStr);
DebugMenuEntrySetWrap(menu.lightningIlluminatesWorld, true);

menu.dualPassDefault = DebugMenuAddVarBool32("SkyGFX| Advanced", "Dual-pass Default", &config->dualPassDefault, nil);
menu.dualPassBuilding = DebugMenuAddVarBool32("SkyGFX| Advanced", "Dual-pass Buildings", &config->dualPassBuilding, nil);
menu.dualPassVehicle = DebugMenuAddVarBool32("SkyGFX| Advanced", "Dual-pass Vehicles", &config->dualPassVehicle, nil);
menu.dualPassPed = DebugMenuAddVarBool32("SkyGFX| Advanced", "Dual-pass Peds", &config->dualPassPed, nil);
menu.dualPassGrass = DebugMenuAddVarBool32("SkyGFX| Advanced", "Dual-pass Grass", &config->dualPassGrass, nil);
menu.ps2ModulateBuilding = DebugMenuAddVarBool32("SkyGFX| Advanced", "PS2-modulate Buildings", &config->ps2ModulateBuilding, nil);
menu.ps2ModulateGrass = DebugMenuAddVarBool32("SkyGFX| Advanced", "PS2-modulate Grass", &config->ps2ModulateGrass, nil);
menu.infraredVision = DebugMenuAddVar("SkyGFX| Advanced", "Infrared vision", &config->infraredVision, nil, 1, 0, 1, ps2pcStr);
menu.dualPassDefault = DebugMenuAddVarBool32("SkyGFX|Advanced", "Dual-pass Default", &config->dualPassDefault, nil);
menu.dualPassBuilding = DebugMenuAddVarBool32("SkyGFX|Advanced", "Dual-pass Buildings", &config->dualPassBuilding, nil);
menu.dualPassVehicle = DebugMenuAddVarBool32("SkyGFX|Advanced", "Dual-pass Vehicles", &config->dualPassVehicle, nil);
menu.dualPassPed = DebugMenuAddVarBool32("SkyGFX|Advanced", "Dual-pass Peds", &config->dualPassPed, nil);
menu.dualPassGrass = DebugMenuAddVarBool32("SkyGFX|Advanced", "Dual-pass Grass", &config->dualPassGrass, nil);
menu.ps2ModulateBuilding = DebugMenuAddVarBool32("SkyGFX|Advanced", "PS2-modulate Buildings", &config->ps2ModulateBuilding, nil);
menu.ps2ModulateGrass = DebugMenuAddVarBool32("SkyGFX|Advanced", "PS2-modulate Grass", &config->ps2ModulateGrass, nil);
menu.infraredVision = DebugMenuAddVar("SkyGFX|Advanced", "Infrared vision", &config->infraredVision, nil, 1, 0, 1, ps2pcStr);
DebugMenuEntrySetWrap(menu.infraredVision, true);
menu.nightVision = DebugMenuAddVar("SkyGFX| Advanced", "Night vision", &config->nightVision, nil, 1, 0, 1, ps2pcStr);
menu.nightVision = DebugMenuAddVar("SkyGFX|Advanced", "Night vision", &config->nightVision, nil, 1, 0, 1, ps2pcStr);
DebugMenuEntrySetWrap(menu.nightVision, true);
menu.grainFilter = DebugMenuAddVar("SkyGFX| Advanced", "Grain filter", &config->grainFilter, resetValues, 1, 0, 1, ps2pcStr);
menu.grainFilter = DebugMenuAddVar("SkyGFX|Advanced", "Grain filter", &config->grainFilter, resetValues, 1, 0, 1, ps2pcStr);
DebugMenuEntrySetWrap(menu.grainFilter, true);

//void privatepatches(void);
Expand Down

0 comments on commit b9e5c4e

Please sign in to comment.