diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
| commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
| tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /src/defaults.cpp | |
| parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
| parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
| download | plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip | |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'src/defaults.cpp')
| -rw-r--r-- | src/defaults.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 8c0b84ae2..1bce806ff 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -225,6 +225,8 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "selectedJoystick", 0); AddDEF(configData, "useInactiveJoystick", false); AddDEF(configData, "testInfo", ""); + AddDEF(configData, "enableresize", true); + AddDEF(configData, "noframe", false); return configData; } @@ -234,8 +236,8 @@ DefaultsData* getBrandingDefaults() // Init config defaults AddDEF(brandingData, "wallpapersPath", ""); AddDEF(brandingData, "wallpapersFile", ""); - AddDEF(brandingData, "appName", "Mana"); - AddDEF(brandingData, "appIcon", "icons/mana.png"); + AddDEF(brandingData, "appName", "ManaPlus"); + AddDEF(brandingData, "appIcon", "icons/manaplus"); AddDEF(brandingData, "loginMusic", "Magick - Real.ogg"); AddDEF(brandingData, "defaultServer", ""); AddDEF(brandingData, "defaultPort", DEFAULT_PORT); |