diff options
Diffstat (limited to 'src/defaults.cpp')
| -rw-r--r-- | src/defaults.cpp | 487 |
1 files changed, 243 insertions, 244 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 1ddad88d4..2c7d12772 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -61,278 +61,277 @@ VariableData* createData(bool defData) return new BoolData(defData); } -#define AddDEF(defaultsData, key, value) \ - defaultsData->insert(std::pair<std::string, VariableData*> \ - (key, createData(value))); - +#define AddDEF(key, value) \ + configData->insert(std::pair<std::string, VariableData*> \ + (key, createData(value))); DefaultsData* getConfigDefaults() { DefaultsData* configData = new DefaultsData; // Init main config defaults - AddDEF(configData, "OverlayDetail", 2); - AddDEF(configData, "speechBubbleAlpha", 1.0f); - AddDEF(configData, "MostUsedServerName0", "server.themanaworld.org"); - AddDEF(configData, "visiblenames", true); - AddDEF(configData, "speech", static_cast<int>(Being::TEXT_OVERHEAD)); - AddDEF(configData, "showgender", true); - AddDEF(configData, "showlevel", false); - AddDEF(configData, "showMonstersTakedDamage", true); - AddDEF(configData, "highlightAttackRange", false); - AddDEF(configData, "highlightMapPortals", true); - AddDEF(configData, "highlightMonsterAttackRange", false); - AddDEF(configData, "chatMaxCharLimit", 300); - AddDEF(configData, "lowTraffic", true); - AddDEF(configData, "invertMoveDirection", 0); - AddDEF(configData, "crazyMoveType", 1); - AddDEF(configData, "attackWeaponType", 1); - AddDEF(configData, "quickDropCounter", 1); - AddDEF(configData, "pickUpType", 3); - AddDEF(configData, "magicAttackType", 0); - AddDEF(configData, "attackType", 1); - AddDEF(configData, "followMode", 0); - AddDEF(configData, "imitationMode", 0); - AddDEF(configData, "syncPlayerMove", false); - AddDEF(configData, "drawPath", false); - AddDEF(configData, "moveToTargetType", 6); - AddDEF(configData, "crazyMoveProgram", "mumrsonmdmlon"); - AddDEF(configData, "disableGameModifiers", false); - AddDEF(configData, "targetDeadPlayers", false); - AddDEF(configData, "afkMessage", "I am away from keyboard"); - AddDEF(configData, "particleMaxCount", 3000); - AddDEF(configData, "particleFastPhysics", 1); - AddDEF(configData, "particleEmitterSkip", 1); - AddDEF(configData, "particleeffects", true); - AddDEF(configData, "logToStandardOut", false); - AddDEF(configData, "opengl", 0); - AddDEF(configData, "screenwidth", defaultScreenWidth); - AddDEF(configData, "screenheight", defaultScreenHeight); - AddDEF(configData, "screen", false); - AddDEF(configData, "hwaccel", false); - AddDEF(configData, "sound", false); - AddDEF(configData, "sfxVolume", 100); - AddDEF(configData, "musicVolume", 60); - AddDEF(configData, "remember", false); - AddDEF(configData, "username", ""); - AddDEF(configData, "lastCharacter", ""); - AddDEF(configData, "fpslimit", 60); - AddDEF(configData, "altfpslimit", 5); - AddDEF(configData, "updatehost", ""); - AddDEF(configData, "screenshotDirectory", ""); - AddDEF(configData, "useScreenshotDirectorySuffix", true); - AddDEF(configData, "screenshotDirectorySuffix", ""); - AddDEF(configData, "EnableSync", false); - AddDEF(configData, "joystickEnabled", false); - AddDEF(configData, "upTolerance", 100); - AddDEF(configData, "downTolerance", 100); - AddDEF(configData, "leftTolerance", 100); - AddDEF(configData, "rightTolerance", 100); - AddDEF(configData, "logNpcInGui", true); - AddDEF(configData, "download-music", false); - AddDEF(configData, "guialpha", 0.8f); - AddDEF(configData, "ChatLogLength", 0); - AddDEF(configData, "enableChatLog", true); - AddDEF(configData, "whispertab", true); - AddDEF(configData, "customcursor", true); - AddDEF(configData, "showownname", true); - AddDEF(configData, "showpickupparticle", true); - AddDEF(configData, "showpickupchat", true); - AddDEF(configData, "fontSize", 11); - AddDEF(configData, "ReturnToggles", false); - AddDEF(configData, "ScrollLaziness", 16); - AddDEF(configData, "ScrollRadius", 0); - AddDEF(configData, "ScrollCenterOffsetX", 0); - AddDEF(configData, "ScrollCenterOffsetY", 0); - AddDEF(configData, "onlineServerList", ""); - AddDEF(configData, "theme", ""); - AddDEF(configData, "enableMumble", false); - AddDEF(configData, "playBattleSound", true); - AddDEF(configData, "playGuiSound", true); - AddDEF(configData, "playMusic", true); - AddDEF(configData, "packetcounters", true); - AddDEF(configData, "safemode", false); - AddDEF(configData, "font", "fonts/dejavusans.ttf"); - AddDEF(configData, "boldFont", "fonts/dejavusans-bold.ttf"); - AddDEF(configData, "particleFont", "fonts/dejavusans.ttf"); - AddDEF(configData, "helpFont", "fonts/dejavusansmono.ttf"); - AddDEF(configData, "secureFont", "fonts/dejavusansmono.ttf"); - AddDEF(configData, "japanFont", "fonts/mplus-1p-regular.ttf"); - AddDEF(configData, "npcFont", "fonts/dejavusans.ttf"); - AddDEF(configData, "showBackground", true); - AddDEF(configData, "enableTradeTab", true); - AddDEF(configData, "logToChat", false); - AddDEF(configData, "cyclePlayers", true); - AddDEF(configData, "cycleMonsters", true); - AddDEF(configData, "cycleNPC", true); - AddDEF(configData, "floorItemsHighlight", true); - AddDEF(configData, "enableBotCheker", true); - AddDEF(configData, "removeColors", true); - AddDEF(configData, "showMagicInDebug", true); - AddDEF(configData, "allowCommandsInChatTabs", true); - AddDEF(configData, "serverMsgInDebug", true); - AddDEF(configData, "hideShopMessages", true); - AddDEF(configData, "showChatHistory", true); - AddDEF(configData, "showChatColorsList", true); - AddDEF(configData, "chatMaxLinesLimit", 40); - AddDEF(configData, "chatColor", 0); - AddDEF(configData, "hideShield", true); - AddDEF(configData, "showJob", true); - AddDEF(configData, "updateOnlineList", true); - AddDEF(configData, "targetOnlyReachable", true); - AddDEF(configData, "errorsInDebug", true); - AddDEF(configData, "tradebot", true); - AddDEF(configData, "debugLog", false); - AddDEF(configData, "drawHotKeys", true); - AddDEF(configData, "serverAttack", true); - AddDEF(configData, "autofixPos", false); - AddDEF(configData, "alphaCache", true); - AddDEF(configData, "attackMoving", true); - AddDEF(configData, "attackNext", false); - AddDEF(configData, "quickStats", true); - AddDEF(configData, "warpParticle", false); - AddDEF(configData, "autoShop", false); - AddDEF(configData, "enableBattleTab", false); - AddDEF(configData, "showBattleEvents", false); - AddDEF(configData, "showMobHP", true); - AddDEF(configData, "showOwnHP", true); - AddDEF(configData, "usePersistentIP", false); - AddDEF(configData, "showJobExp", true); - AddDEF(configData, "showBeingPopup", true); - AddDEF(configData, "showExtMinimaps", false); - AddDEF(configData, "hideChatInput", true); - AddDEF(configData, "enableAttackFilter", true); - AddDEF(configData, "enablePickupFilter", true); - AddDEF(configData, "securetrades", true); - AddDEF(configData, "unsecureChars", "IO0@#$"); - AddDEF(configData, "currentTip", 0); - AddDEF(configData, "showDidYouKnow", true); - AddDEF(configData, "useLocalTime", false); - AddDEF(configData, "enableAdvert", true); - AddDEF(configData, "enableMapReduce", true); - AddDEF(configData, "showPlayersStatus", true); - AddDEF(configData, "beingopacity", false); - AddDEF(configData, "adjustPerfomance", true); - AddDEF(configData, "enableAlphaFix", false); - AddDEF(configData, "disableAdvBeingCaching", false); - AddDEF(configData, "disableBeingCaching", false); - AddDEF(configData, "enableReorderSprites", true); - AddDEF(configData, "showip", false); - AddDEF(configData, "seflMouseHeal", true); - AddDEF(configData, "enableLazyScrolling", true); - AddDEF(configData, "extMouseTargeting", true); - AddDEF(configData, "showMVP", false); - AddDEF(configData, "pvpAttackType", 0); - AddDEF(configData, "lang", ""); - AddDEF(configData, "selectedJoystick", 0); - AddDEF(configData, "useInactiveJoystick", false); - AddDEF(configData, "testInfo", ""); - AddDEF(configData, "enableresize", true); - AddDEF(configData, "noframe", false); - AddDEF(configData, "groupFriends", true); - AddDEF(configData, "grabinput", false); - AddDEF(configData, "usefbo", false); - AddDEF(configData, "gamma", 1); - AddDEF(configData, "vsync", 0); - AddDEF(configData, "enableBuggyServers", true); - AddDEF(configData, "soundwhisper", "newmessage"); - AddDEF(configData, "soundhighlight", "reminder"); - AddDEF(configData, "soundglobal", "email"); - AddDEF(configData, "sounderror", "error"); - AddDEF(configData, "soundtrade", "start"); - AddDEF(configData, "soundinfo", "notify"); - AddDEF(configData, "soundrequest", "attention"); - AddDEF(configData, "soundguild", "newmessage"); - AddDEF(configData, "autohideButtons", true); - AddDEF(configData, "autohideChat", false); - AddDEF(configData, "downloadProxy", ""); - AddDEF(configData, "downloadProxyType", 0); - AddDEF(configData, "blur", true); + AddDEF("OverlayDetail", 2); + AddDEF("speechBubbleAlpha", 1.0f); + AddDEF("MostUsedServerName0", "server.themanaworld.org"); + AddDEF("visiblenames", true); + AddDEF("speech", static_cast<int>(Being::TEXT_OVERHEAD)); + AddDEF("showgender", true); + AddDEF("showlevel", false); + AddDEF("showMonstersTakedDamage", true); + AddDEF("highlightAttackRange", false); + AddDEF("highlightMapPortals", true); + AddDEF("highlightMonsterAttackRange", false); + AddDEF("chatMaxCharLimit", 300); + AddDEF("lowTraffic", true); + AddDEF("invertMoveDirection", 0); + AddDEF("crazyMoveType", 1); + AddDEF("attackWeaponType", 1); + AddDEF("quickDropCounter", 1); + AddDEF("pickUpType", 3); + AddDEF("magicAttackType", 0); + AddDEF("attackType", 1); + AddDEF("followMode", 0); + AddDEF("imitationMode", 0); + AddDEF("syncPlayerMove", false); + AddDEF("drawPath", false); + AddDEF("moveToTargetType", 6); + AddDEF("crazyMoveProgram", "mumrsonmdmlon"); + AddDEF("disableGameModifiers", false); + AddDEF("targetDeadPlayers", false); + AddDEF("afkMessage", "I am away from keyboard"); + AddDEF("particleMaxCount", 3000); + AddDEF("particleFastPhysics", 1); + AddDEF("particleEmitterSkip", 1); + AddDEF("particleeffects", true); + AddDEF("logToStandardOut", false); + AddDEF("opengl", 0); + AddDEF("screenwidth", defaultScreenWidth); + AddDEF("screenheight", defaultScreenHeight); + AddDEF("screen", false); + AddDEF("hwaccel", false); + AddDEF("sound", false); + AddDEF("sfxVolume", 100); + AddDEF("musicVolume", 60); + AddDEF("remember", false); + AddDEF("username", ""); + AddDEF("lastCharacter", ""); + AddDEF("fpslimit", 60); + AddDEF("altfpslimit", 5); + AddDEF("updatehost", ""); + AddDEF("screenshotDirectory", ""); + AddDEF("useScreenshotDirectorySuffix", true); + AddDEF("screenshotDirectorySuffix", ""); + AddDEF("EnableSync", false); + AddDEF("joystickEnabled", false); + AddDEF("upTolerance", 100); + AddDEF("downTolerance", 100); + AddDEF("leftTolerance", 100); + AddDEF("rightTolerance", 100); + AddDEF("logNpcInGui", true); + AddDEF("download-music", false); + AddDEF("guialpha", 0.8f); + AddDEF("ChatLogLength", 0); + AddDEF("enableChatLog", true); + AddDEF("whispertab", true); + AddDEF("customcursor", true); + AddDEF("showownname", true); + AddDEF("showpickupparticle", true); + AddDEF("showpickupchat", true); + AddDEF("fontSize", 11); + AddDEF("ReturnToggles", false); + AddDEF("ScrollLaziness", 16); + AddDEF("ScrollRadius", 0); + AddDEF("ScrollCenterOffsetX", 0); + AddDEF("ScrollCenterOffsetY", 0); + AddDEF("onlineServerList", ""); + AddDEF("theme", ""); + AddDEF("enableMumble", false); + AddDEF("playBattleSound", true); + AddDEF("playGuiSound", true); + AddDEF("playMusic", true); + AddDEF("packetcounters", true); + AddDEF("safemode", false); + AddDEF("font", "fonts/dejavusans.ttf"); + AddDEF("boldFont", "fonts/dejavusans-bold.ttf"); + AddDEF("particleFont", "fonts/dejavusans.ttf"); + AddDEF("helpFont", "fonts/dejavusansmono.ttf"); + AddDEF("secureFont", "fonts/dejavusansmono.ttf"); + AddDEF("japanFont", "fonts/mplus-1p-regular.ttf"); + AddDEF("npcFont", "fonts/dejavusans.ttf"); + AddDEF("showBackground", true); + AddDEF("enableTradeTab", true); + AddDEF("logToChat", false); + AddDEF("cyclePlayers", true); + AddDEF("cycleMonsters", true); + AddDEF("cycleNPC", true); + AddDEF("floorItemsHighlight", true); + AddDEF("enableBotCheker", true); + AddDEF("removeColors", true); + AddDEF("showMagicInDebug", true); + AddDEF("allowCommandsInChatTabs", true); + AddDEF("serverMsgInDebug", true); + AddDEF("hideShopMessages", true); + AddDEF("showChatHistory", true); + AddDEF("showChatColorsList", true); + AddDEF("chatMaxLinesLimit", 40); + AddDEF("chatColor", 0); + AddDEF("hideShield", true); + AddDEF("showJob", true); + AddDEF("updateOnlineList", true); + AddDEF("targetOnlyReachable", true); + AddDEF("errorsInDebug", true); + AddDEF("tradebot", true); + AddDEF("debugLog", false); + AddDEF("drawHotKeys", true); + AddDEF("serverAttack", true); + AddDEF("autofixPos", false); + AddDEF("alphaCache", true); + AddDEF("attackMoving", true); + AddDEF("attackNext", false); + AddDEF("quickStats", true); + AddDEF("warpParticle", false); + AddDEF("autoShop", false); + AddDEF("enableBattleTab", false); + AddDEF("showBattleEvents", false); + AddDEF("showMobHP", true); + AddDEF("showOwnHP", true); + AddDEF("usePersistentIP", false); + AddDEF("showJobExp", true); + AddDEF("showBeingPopup", true); + AddDEF("showExtMinimaps", false); + AddDEF("hideChatInput", true); + AddDEF("enableAttackFilter", true); + AddDEF("enablePickupFilter", true); + AddDEF("securetrades", true); + AddDEF("unsecureChars", "IO0@#$"); + AddDEF("currentTip", 0); + AddDEF("showDidYouKnow", true); + AddDEF("useLocalTime", false); + AddDEF("enableAdvert", true); + AddDEF("enableMapReduce", true); + AddDEF("showPlayersStatus", true); + AddDEF("beingopacity", false); + AddDEF("adjustPerfomance", true); + AddDEF("enableAlphaFix", false); + AddDEF("disableAdvBeingCaching", false); + AddDEF("disableBeingCaching", false); + AddDEF("enableReorderSprites", true); + AddDEF("showip", false); + AddDEF("seflMouseHeal", true); + AddDEF("enableLazyScrolling", true); + AddDEF("extMouseTargeting", true); + AddDEF("showMVP", false); + AddDEF("pvpAttackType", 0); + AddDEF("lang", ""); + AddDEF("selectedJoystick", 0); + AddDEF("useInactiveJoystick", false); + AddDEF("testInfo", ""); + AddDEF("enableresize", true); + AddDEF("noframe", false); + AddDEF("groupFriends", true); + AddDEF("grabinput", false); + AddDEF("usefbo", false); + AddDEF("gamma", 1); + AddDEF("vsync", 0); + AddDEF("enableBuggyServers", true); + AddDEF("soundwhisper", "newmessage"); + AddDEF("soundhighlight", "reminder"); + AddDEF("soundglobal", "email"); + AddDEF("sounderror", "error"); + AddDEF("soundtrade", "start"); + AddDEF("soundinfo", "notify"); + AddDEF("soundrequest", "attention"); + AddDEF("soundguild", "newmessage"); + AddDEF("autohideButtons", true); + AddDEF("autohideChat", false); + AddDEF("downloadProxy", ""); + AddDEF("downloadProxyType", 0); + AddDEF("blur", true); #if defined(WIN32) || defined(__APPLE__) - AddDEF(configData, "centerwindow", true); + AddDEF("centerwindow", true); #endif - AddDEF(configData, "audioFrequency", 22010); - AddDEF(configData, "audioChannels", 2); - AddDEF(configData, "repeateDelay", SDL_DEFAULT_REPEAT_DELAY); - AddDEF(configData, "repeateInterval", SDL_DEFAULT_REPEAT_INTERVAL); - AddDEF(configData, "compresstextures", false); - AddDEF(configData, "rectangulartextures", true); - AddDEF(configData, "networksleep", 0); - AddDEF(configData, "newtextures", true); - AddDEF(configData, "videodetected", false); - AddDEF(configData, "hideErased", false); - AddDEF(configData, "enableDelayedAnimations", true); - AddDEF(configData, "enableCompoundSpriteDelay", true); - AddDEF(configData, "npcfontSize", 13); + AddDEF("audioFrequency", 22010); + AddDEF("audioChannels", 2); + AddDEF("repeateDelay", SDL_DEFAULT_REPEAT_DELAY); + AddDEF("repeateInterval", SDL_DEFAULT_REPEAT_INTERVAL); + AddDEF("compresstextures", false); + AddDEF("rectangulartextures", true); + AddDEF("networksleep", 0); + AddDEF("newtextures", true); + AddDEF("videodetected", false); + AddDEF("hideErased", false); + AddDEF("enableDelayedAnimations", true); + AddDEF("enableCompoundSpriteDelay", true); + AddDEF("npcfontSize", 13); return configData; } DefaultsData* getBrandingDefaults() { - DefaultsData* brandingData = new DefaultsData; + DefaultsData* configData = new DefaultsData; // Init config defaults - AddDEF(brandingData, "wallpapersPath", ""); - AddDEF(brandingData, "wallpapersFile", ""); - AddDEF(brandingData, "appName", "ManaPlus"); - AddDEF(brandingData, "appIcon", "icons/manaplus"); - AddDEF(brandingData, "loginMusic", "Magick - Real.ogg"); - AddDEF(brandingData, "defaultServer", ""); - AddDEF(brandingData, "defaultPort", DEFAULT_PORT); - AddDEF(brandingData, "defaultServerType", "tmwathena"); - AddDEF(brandingData, "onlineServerList", + AddDEF("wallpapersPath", ""); + AddDEF("wallpapersFile", ""); + AddDEF("appName", "ManaPlus"); + AddDEF("appIcon", "icons/manaplus"); + AddDEF("loginMusic", "Magick - Real.ogg"); + AddDEF("defaultServer", ""); + AddDEF("defaultPort", DEFAULT_PORT); + AddDEF("defaultServerType", "tmwathena"); + AddDEF("onlineServerList", "http://manaplus.evolonline.org/serverlist.xml"); - AddDEF(brandingData, "onlineServerFile", "serverlistplus.xml"); - AddDEF(brandingData, "appShort", "mana"); - AddDEF(brandingData, "defaultUpdateHost", ""); - AddDEF(brandingData, "helpPath", ""); -// AddDEF(brandingData, "onlineServerList", ""); - AddDEF(brandingData, "theme", ""); - AddDEF(brandingData, "font", "fonts/dejavusans.ttf"); - AddDEF(brandingData, "boldFont", "fonts/dejavusans-bold.ttf"); - AddDEF(brandingData, "particleFont", "fonts/dejavusans.ttf"); - AddDEF(brandingData, "helpFont", "fonts/dejavusansmono.ttf"); - AddDEF(brandingData, "secureFont", "fonts/dejavusansmono.ttf"); - AddDEF(brandingData, "japanFont", "fonts/mplus-1p-regular.ttf"); + AddDEF("onlineServerFile", "serverlistplus.xml"); + AddDEF("appShort", "mana"); + AddDEF("defaultUpdateHost", ""); + AddDEF("helpPath", ""); +// AddDEF("onlineServerList", ""); + AddDEF("theme", ""); + AddDEF("font", "fonts/dejavusans.ttf"); + AddDEF("boldFont", "fonts/dejavusans-bold.ttf"); + AddDEF("particleFont", "fonts/dejavusans.ttf"); + AddDEF("helpFont", "fonts/dejavusansmono.ttf"); + AddDEF("secureFont", "fonts/dejavusansmono.ttf"); + AddDEF("japanFont", "fonts/mplus-1p-regular.ttf"); - AddDEF(brandingData, "guiPath", "graphics/gui/"); - AddDEF(brandingData, "guiThemePath", "themes/"); - AddDEF(brandingData, "fontsPath", "fonts/"); + AddDEF("guiPath", "graphics/gui/"); + AddDEF("guiThemePath", "themes/"); + AddDEF("fontsPath", "fonts/"); - AddDEF(brandingData, "systemsounds", "sfx/system/"); + AddDEF("systemsounds", "sfx/system/"); - AddDEF(brandingData, "wallpaperFile", ""); - AddDEF(brandingData, "dataPath", ""); - return brandingData; + AddDEF("wallpaperFile", ""); + AddDEF("dataPath", ""); + return configData; } DefaultsData* getPathsDefaults() { - DefaultsData *pathsData = new DefaultsData; + DefaultsData* configData = new DefaultsData; // Init paths.xml defaults - AddDEF(pathsData, "itemIcons", "graphics/items/"); - AddDEF(pathsData, "unknownItemFile", "unknown-item.png"); - AddDEF(pathsData, "sprites", "graphics/sprites/"); - AddDEF(pathsData, "spriteErrorFile", "error.xml"); - AddDEF(pathsData, "guiIcons", "graphics/guiicons/"); + AddDEF("itemIcons", "graphics/items/"); + AddDEF("unknownItemFile", "unknown-item.png"); + AddDEF("sprites", "graphics/sprites/"); + AddDEF("spriteErrorFile", "error.xml"); + AddDEF("guiIcons", "graphics/guiicons/"); - AddDEF(pathsData, "particles", "graphics/particles/"); - AddDEF(pathsData, "levelUpEffectFile", "levelup.particle.xml"); - AddDEF(pathsData, "portalEffectFile", "warparea.particle.xml"); - AddDEF(pathsData, "hitEffectId", 26); - AddDEF(pathsData, "criticalHitEffectId", 28); + AddDEF("particles", "graphics/particles/"); + AddDEF("levelUpEffectFile", "levelup.particle.xml"); + AddDEF("portalEffectFile", "warparea.particle.xml"); + AddDEF("hitEffectId", 26); + AddDEF("criticalHitEffectId", 28); - AddDEF(pathsData, "minimaps", "graphics/minimaps/"); - AddDEF(pathsData, "maps", "maps/"); + AddDEF("minimaps", "graphics/minimaps/"); + AddDEF("maps", "maps/"); - AddDEF(pathsData, "sfx", "sfx/"); - AddDEF(pathsData, "attackSfxFile", "fist-swish.ogg"); - AddDEF(pathsData, "music", "music/"); + AddDEF("sfx", "sfx/"); + AddDEF("attackSfxFile", "fist-swish.ogg"); + AddDEF("music", "music/"); - AddDEF(pathsData, "wallpapers", "graphics/images/"); - AddDEF(pathsData, "wallpaperFile", "login_wallpaper.png"); + AddDEF("wallpapers", "graphics/images/"); + AddDEF("wallpaperFile", "login_wallpaper.png"); - AddDEF(pathsData, "help", "help/"); + AddDEF("help", "help/"); - return pathsData; + return configData; } #undef AddDEF |