--- Daodan/src/Daodan_Config.c 2014/04/06 17:06:02 993 +++ Daodan/src/Daodan_Config.c 2014/04/09 00:10:18 995 @@ -1,28 +1,38 @@ #include #include +#include -#include "Daodan_Cheater.h" #include "Daodan_Config.h" #include "Daodan_Patch.h" -#include "Daodan_Utility.h" +#include "Patches/Utility.h" #include "Oni/Oni.h" +#include "_Version.h" #include "Inifile_Reader.h" #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0])) static const char* iniName = "daodan.ini"; +static const char* helpFile = "daodan_help.txt"; + +static const char* defaultSection = "options"; + +static char invalidCurParamaters[1000] = ""; +static char invalidTotalParamaters[3000] = ""; + +void DDrConfig_PrintHelp(); + ConfigSection_t config[] = { { "patches", "Patches", { { "alttab", - "Allows user to switch applications while in Oni (Alt-Tab) and use Windows key, however it may enable the screensaver as well.", + "Allows to Alt-Tab out of Oni and use Windows key. May enable the screensaver as well.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "argb8888", - "Textures using ARGB8888 can be used.", + "Allows using textures with ARGB8888.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, @@ -31,28 +41,18 @@ ConfigSection_t config[] = { C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, - { "bsl", - "Enables d_regen (unfinished) and prevents fly-in portraits from being stretched when playing in widescreen resolutions.", - C_BOOL, - {.intBoolVal = true}, - {.intBoolVal = true} }, - { "cheater", - "Adds new cheat codes (see section below).", - C_BOOL, - {.intBoolVal = true}, - {.intBoolVal = true} }, { "cheatsenabled", "Enables cheats without having to beat the game first.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "cheattable", - "Replaces Oni's cheat table with table that includes new cheats (see section below).", + "Replaces Oni's cheat table with table that includes new cheats including devmode.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "chinese", - "Allow for chinese fonts to be shown.", + "Allow for chinese fonts to be shown if the required DLL is available.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, @@ -66,18 +66,23 @@ ConfigSection_t config[] = { C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, + { "d_regen", + "Enables script command d_regen (query/set regeneration for any character).", + C_BOOL, + {.intBoolVal = true}, + {.intBoolVal = true} }, { "daodandisplayenum", - "Offers more display modes in the Options menu.", + "Offers a more accurate list of available display modes in the Options menu.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "directinput", - "Forces on DirectInput.", + "Enforces the usage of DirectInput on every system. Should be off for Linux/Wine.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "disablecmdline", - "Replaces existing command line parser with Daodan's in order to add new commands. Meant to be used with getcmdline.", + "Disables Oni's existing command line parser as Daodan has its own.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, @@ -86,13 +91,8 @@ ConfigSection_t config[] = { C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, - { "getcmdline", - "Replaces existing command line parser with Daodan's in order to add new commands. Meant to be used with disablecmdline.", - C_BOOL, - {.intBoolVal = true}, - {.intBoolVal = true} }, { "hdscreens_lowres", - "???", + "Allow HD intro/ending screens on game resolutions smaller than 1024x768.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, @@ -102,7 +102,12 @@ ConfigSection_t config[] = { {.intBoolVal = true}, {.intBoolVal = true} }, { "kickguns", - "Unfinished, do not use.", + "EXPERIMENTAL! Unfinished, do not use.", + C_BOOL, + {.intBoolVal = false}, + {.intBoolVal = false} }, + { "killvtune", + "Prevent loading of vtuneapi.dll.", C_BOOL, {.intBoolVal = false}, {.intBoolVal = false} }, @@ -112,12 +117,12 @@ ConfigSection_t config[] = { {.intBoolVal = true}, {.intBoolVal = true} }, { "levelplugins", - "Allows level files to be loaded from the GDF which do not end in \"_Final\".", + "Allows level files to be loaded which do not end in \"_Final\".", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "newweap", - "Picking up a weapon displays a message containing the weapon name and amount of ammo.", + "Standing above a weapon displays a message containing the weapon name and amount of ammo.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, @@ -131,13 +136,8 @@ ConfigSection_t config[] = { C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, - { "particledisablebit", - "Unlocks particle action disabling/enabling bits for all events so that a particle event can occur multiple times.", - C_BOOL, - {.intBoolVal = false}, - {.intBoolVal = false} }, { "pathfinding", - "Multiplies size of pathfinding grid cache by eight in order to prevent crashes in large levels.", + "Size of pathfinding grid cache increased by eight times in order to prevent crashes in large levels.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, @@ -157,17 +157,22 @@ ConfigSection_t config[] = { {.intBoolVal = false}, {.intBoolVal = false} }, { "showtriggervolumes", - "Allows BSL variable \"show_triggervolumes\" to work when set to 1.", + "Allows BSL variable \"show_triggervolumes\" and Ctrl+Shift+X (in devmode) to work.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "throwtest", - "Not recommended for use; experiment with allowing enemies to be thrown over railings.", + "EXPERIMENTAL! Experiment with allowing enemies to be thrown over railings.", C_BOOL, {.intBoolVal = false}, {.intBoolVal = false} }, + { "usedaodanbsl", + "Adds new BSL commands.", + C_BOOL, + {.intBoolVal = true}, + {.intBoolVal = true} }, { "usedaodangl", - "Provides an improved windowed mode (-noswitch); this patch is known to break the hiding of the Windows taskbar in fullscreen mode.", + "Provides an improved windowed mode (-noswitch).", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, @@ -176,6 +181,11 @@ ConfigSection_t config[] = { C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, + { "widescreenportraits", + "Prevents fly-in portraits from being stretched when playing in widescreen resolutions.", + C_BOOL, + {.intBoolVal = true}, + {.intBoolVal = true} }, { "wpfadetime", "Adds working function for existing BSL command wp_fadetime, sets fade time to 4800.", C_BOOL, @@ -185,42 +195,47 @@ ConfigSection_t config[] = { } }, { "options", "Options", { { "border", - "If \"windowhack\" patch is active, make sure game window has border in windowed mode.", + "Add a border if in windowed mode and \"usedaodangl\" patch is active.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, { "debug", - "???", + "Not useful, probably does nothing.", EXT_BOOL, {.intBoolVal = false }, {.extBoolVal = &AKgDebug_DebugMaps } }, { "debugfiles", - "???", + "Not useful, probably does nothing.", EXT_BOOL, {.intBoolVal = false }, {.extBoolVal = &BFgDebugFileEnable } }, { "findsounds", - "???", + "Not useful, extends output of sound_list_broken_links.", EXT_BOOL, {.intBoolVal = false }, {.extBoolVal = &SSgSearchOnDisk } }, { "gamma", - "Enable gamma slider in fullscreen.", + "Enable gamma slider in fullscreen, disable in windowed mode.", C_BOOL, {.intBoolVal = true}, {.intBoolVal = true} }, + { "help", + "Generates this help file.", + C_CMD, + {.intBoolVal = 0}, + {.callback = DDrConfig_PrintHelp} }, { "ignore_private_data", - "???", + "Not useful, probably does nothing.", EXT_BOOL, {.intBoolVal = false }, {.extBoolVal = &opt_ignore_private_data } }, { "sound", - "???", + "Enable sound.", EXT_BOOL, {.intBoolVal = true }, {.extBoolVal = &opt_sound } }, { "switch", - "Always switch screen to resolution on Oni's Options screen, making the game fullscreen; opposite of Oni's built-in argument \"noswitch\".", + "Switch to fullscreen instead of staying in a window.", EXT_BOOL, {.intBoolVal = true}, {.extBoolVal = &M3gResolutionSwitch} }, @@ -229,11 +244,6 @@ ConfigSection_t config[] = { C_BOOL, {.intBoolVal = false}, {.intBoolVal = false} }, - { "usedaodanbsl", - "Adds new BSL commands (see below).", - C_BOOL, - {.intBoolVal = true}, - {.intBoolVal = true} }, { "language", "Localization for hardcoded strings (e.g. \"Savepoints\").", C_STRING, @@ -255,6 +265,8 @@ void DDrConfig_Print() case EXT_BOOL: STARTUPMESSAGE("Option %s.%s = %d (def %d)", config[s].name, co->name, *co->value.extBoolVal, co->defaultValue.intBoolVal); break; + case C_CMD: + break; default: STARTUPMESSAGE("Option %s.%s = %d (def %d)", config[s].name, co->name, co->value.intBoolVal, co->defaultValue.intBoolVal); } @@ -262,6 +274,75 @@ void DDrConfig_Print() } } +void DDrConfig_PrintHelp() +{ + STARTUPMESSAGE("Writing Daodan help file (%s)", helpFile); + + FILE* fp; + remove(helpFile); + fp = fopen(helpFile, "w"); + if (fp) + { + time_t rawtime; + struct tm* timeinfo; + char buffer[80]; + time(&rawtime); + timeinfo = localtime(&rawtime); + strftime(buffer, 80, "%Y-%m-%d %H:%M:%S", timeinfo); + + fprintf(fp, "Daodan help - generated on %s for Daodan v."DAODAN_VERSION_STRING"\n\n", buffer); + fprintf(fp, "List of Daodan configuration parameters:\n"); + for (unsigned int s = 0; s < ARRAY_SIZE(config); s++) { + fprintf(fp, " %s - %s:\n", config[s].name, config[s].description); + for (ConfigOption_t* co = config[s].options; co->name != 0; co++) { + char* name = co->name; + char* desc = co->description; + const char* tName = DDrConfig_GetOptionTypeName(co->type); + int boolV = co->defaultValue.intBoolVal; + char* val; + switch (co->type) { + case C_STRING: + val = co->defaultValue.stringVal; + break; + case EXT_BOOL: + val = (boolV ? "true" : "false"); + break; + case C_BOOL: + val = (boolV ? "true" : "false"); + break; + case C_CMD: + val = ""; + break; + default: + val = malloc(20); + sprintf(val, "%d", boolV); + } + fprintf(fp, " %-22s %6s=%-5s %s\n", name, tName, val, desc); + } + fprintf(fp, "\n"); + } + fprintf(fp, "\nConfiguration parameters can be either set in daodan.ini or passed on command line.\n\n"); + fprintf(fp, "In daodan.ini each section of parameters has its own section in the ini file started by [section name]. Parameters are given within that section by their name only, followed by an equals sign and the desired value. Example:\n"); + fprintf(fp, " [sectionX]\n parameterName = false\n"); + fprintf(fp, "\nTo pass the parameter on the command line:\n"); + fprintf(fp, " Oni.exe -sectionX.parameterName false\n"); + fprintf(fp, "For bool parameters the value can be ommitted so it is regarded as \"true\":\n"); + fprintf(fp, " Oni.exe -sectionX.parameterName\n"); + fprintf(fp, "To disable a bool parameter you can prefix \"no\" to the parameter name like this:\n"); + fprintf(fp, " Oni.exe -sectionX.noparameterName\n"); + fprintf(fp, "If no section is given it is assumed to be \"%s\", e.g.\n", defaultSection); + fprintf(fp, " Oni.exe -%s.parametername\n", defaultSection); + fprintf(fp, "can simply be written as\n"); + fprintf(fp, " Oni.exe -parametername\n"); + + fclose(fp); + } + else + { + STARTUPMESSAGE("Writing Daodan help file failed", 0); + } +} + const char* DDrConfig_GetOptionTypeName(OptionType_t type) { switch (type) { @@ -271,6 +352,8 @@ const char* DDrConfig_GetOptionTypeName( return "Bool"; case C_STRING: return "String"; + case C_CMD: + return "Cmd"; case EXT_BOOL: return "pBool"; default: @@ -321,6 +404,7 @@ ConfigOption_t* DDrConfig_GetOptOfType(c } + void DDrConfig_InitExtBools() { for (unsigned int s = 0; s < ARRAY_SIZE(config); s++) { @@ -334,7 +418,26 @@ void DDrConfig_InitExtBools() -void DDrIniCallback(char* section, char* name, char* value) +void DDrConfig_WriteTemplateIni() +{ + FILE* fp; + STARTUPMESSAGE("%s doesn't exist, creating", iniName); + fp = fopen(iniName, "w"); + if (fp) + { + for (unsigned int s = 0; s < ARRAY_SIZE(config); s++) { + fprintf(fp, "[%s]\n", config[s].name); + } + fclose(fp); + } + else + { + STARTUPMESSAGE("Writing %s template file failed", iniName); + } +} + + +void DDrIniCallback(const char* section, const char* name, const char* value) { static char curSection[20]; char fullOptName[50]; @@ -352,6 +455,7 @@ void DDrIniCallback(char* section, char* if (co) { + char* buf = 0; switch (co->type) { case C_INT: co->value.intBoolVal = strtol(value, NULL, 0); @@ -360,7 +464,12 @@ void DDrIniCallback(char* section, char* co->value.intBoolVal = !_stricmp(value, "true"); break; case C_STRING: - co->value.stringVal = value; + buf = malloc(strlen(value)+1); + strcpy(buf, value); + co->value.stringVal = buf; + break; + case C_CMD: + co->value.callback(); break; case EXT_BOOL: *(co->value.extBoolVal) = !_stricmp(value, "true"); @@ -368,31 +477,71 @@ void DDrIniCallback(char* section, char* default: STARTUPMESSAGE("Config value type unknown: %d", co->type); } + } else { + char buf[50]; + sprintf_s(buf, sizeof(buf), " %s.%s\n", section, name); + if (strlen(buf) + strlen(invalidCurParamaters) < sizeof(invalidCurParamaters) - 1) { + strcpy(invalidCurParamaters + strlen(invalidCurParamaters), buf); + } } } -void DDrConfig_WriteTemplateIni() + +bool DDrConfig_ParseCommandLine(int argc, char* argv[]) { - FILE* fp; - STARTUPMESSAGE("%s doesn't exist, creating", iniName); - fp = fopen(iniName, "w"); - if (fp) + for (int i = 1; i < argc; i ++) { - for (unsigned int s = 0; s < ARRAY_SIZE(config); s++) { - fprintf(fp, "[%s]\n", config[s].name); + if (argv[i][0] == '-') + { + const char* section; + char* optionsep; + char* option; + bool invertedOption; + + if ((optionsep = strchr(argv[i], '.'))) + // Is "section.option" + { + *optionsep = 0; + option = optionsep+1; + section = argv[i]+1; + } + else + // Is just "option" + { + section = defaultSection; + option = argv[i]+1; + } + + invertedOption = (option[0] == 'n' || option[0] == 'N') && (option[1] == 'o' || option[1] == 'O'); + if (invertedOption) + option += 2; + + if (i < (argc - 1) && argv[i+1][0] != '-') + // Has value in next field + { + DDrIniCallback(section, option, argv[++i]); + } + else + // Implicit value + { + DDrIniCallback(section, option, (invertedOption ? "false" : "true")); + } + + if (optionsep) + *optionsep = '.'; + } + else + { + STARTUPMESSAGE("Parse error \"%s\"", argv[i]); + return false; } - fclose(fp); } + return true; } - void DDrConfig(int argc, char* argv[]) { - int i; - char* section; - char* option; - bool falseoption; - + STARTUPMESSAGE("Initializing standard booleans", 0); DDrConfig_InitExtBools(); if (GetFileAttributes(iniName) == INVALID_FILE_ATTRIBUTES) @@ -403,148 +552,31 @@ void DDrConfig(int argc, char* argv[]) STARTUPMESSAGE("Error reading daodan.ini, check your syntax!", 0); STARTUPMESSAGE("Finished parsing", 0); - + if (strlen(invalidCurParamaters) > 0) + { + sprintf_s(invalidTotalParamaters, sizeof(invalidTotalParamaters), "In %s:\n%s\n", iniName, invalidCurParamaters); + invalidCurParamaters[0] = 0; + } STARTUPMESSAGE("Parsing command line...", 0); - for (i = 1; i < argc; i ++) + DDrConfig_ParseCommandLine(argc, argv); + STARTUPMESSAGE("Finished parsing", 0); + + if (strlen(invalidCurParamaters) > 0) { - if (argv[i][0] == '-') - { - section = argv[i] + 1; - if ((option = strchr(argv[i], '.'))) - { - *option = '\0'; - falseoption = (option[1] == 'n' || option[1] == 'N') && (option[2] == 'o' || option[2] == 'O'); - if (i < (argc - 1) && argv[i + 1][0] != '-') - DDrIniCallback(section, option + 1, argv[++i]); - else - DDrIniCallback(section, option + (falseoption ? 3 : 1), (falseoption ? "false" : "true")); - *option = '.'; - } - else - { - falseoption = (section[0] == 'n' || section[0] == 'N') && (section[1] == 'o' || section[1] == 'O'); - if (i < (argc - 1) && argv[i + 1][0] != '-') - DDrIniCallback("options", section, argv[++i]); - else - DDrIniCallback("options", section + (falseoption ? 2 : 0), (falseoption ? "false" : "true")); - } - } - else - { - STARTUPMESSAGE("Parse error \"%s\"", argv[i]); - break; - } + sprintf_s(invalidTotalParamaters, sizeof(invalidTotalParamaters), "%sOn command line:\n%s\n", invalidTotalParamaters, invalidCurParamaters); } - STARTUPMESSAGE("Finished parsing", 0); -} + if (strlen(invalidTotalParamaters) > 0) + { + char msg[3200]; + sprintf_s(msg, sizeof(msg), "Invalid parameters given:\n%sContinue launching Oni?", invalidTotalParamaters); + int res = MessageBox(NULL, msg, "Parameters invalid", MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON1); + if (res == IDNO) { + exit(0); + } + } -/* - case s_language: - else if (!_stricmp(name, "blam")) - DDrPatch__strdup((int*)(OniExe + 0x0010fb73), value); - else if (!_stricmp(name, "damn")) - DDrPatch__strdup((int*)(OniExe + 0x0010fb6e), value); - else if (!_stricmp(name, "savepoint")) - { - char* str = _strdup(value); - DDrPatch_Int32((int*)(OniExe + 0x000fd730), (int)str); - DDrPatch_Int32((int*)(OniExe + 0x000fd738), (int)str); - } - else if (!_stricmp(name, "syndicatewarehouse")) - { - char* str = _strdup(value); - DDrPatch_Int32((int*)(OniExe + 0x000fd71a), (int)str); - DDrPatch_Int32((int*)(OniExe + 0x0010ef75), (int)str); - } - 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); - DDr_CheatTable[11].message_on = str; - DDr_CheatTable[cheat_x].message_on = str; - } - else if (!_stricmp(name, "devmode_off")) - { - 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); -*/ +// DDrConfig_Print(); +}