This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 5274acd624c3a5ad60592cee2ebc869b10a96fda
Merge: 3ef2f97 2770ee8
Author: Piotr Dziwinski <piot...@gmail.com>
Date: Tue Oct 7 22:15:40 2014 +0200
Merge with dev
CMakeLists.txt | 74 +++---
INSTALL.md | 2 +-
po/de.po | 27 ++-
src/CBot/CBotToken.cpp | 2 +-
src/CBot/ClassFILE.cpp | 426 ----------------------------------
src/CMakeLists.txt | 357 ++++++++++++++--------------
src/app/app.cpp | 29 +--
src/common/iman.cpp | 4 +-
src/common/profile.cpp | 39 ++--
src/common/profile.h | 124 +++++-----
src/common/singleton.h | 5 +-
src/graphics/core/device.h | 40 +---
src/graphics/engine/engine.cpp | 84 +++----
src/graphics/opengl/gldevice.cpp | 211 +----------------
src/graphics/opengl/gldevice.h | 112 ++++-----
src/object/brain.cpp | 173 ++++----------
src/object/brain.h | 3 +-
src/object/robotmain.cpp | 257 +++-----------------
src/object/robotmain.h | 1 -
src/sound/oalsound/alsound.cpp | 14 +-
src/ui/edit.cpp | 25 +-
src/ui/interface.cpp | 7 +-
src/ui/list.cpp | 6 +-
src/ui/maindialog.cpp | 148 ++++++------
src/ui/window.cpp | 53 ++---
test/unit/CMakeLists.txt | 257 ++++----------------
test/unit/common/CMakeLists.txt | 21 --
test/unit/common/image_test.cpp | 57 -----
test/unit/common/profile_test.cpp | 19 +-
test/unit/graphics/core/device_mock.h | 17 --
test/unit/ui/CMakeLists.txt | 45 ----
test/unit/ui/edit_test.cpp | 90 -------
test/unit/ui/mocks/text_mock.h | 35 ---
test/unit/ui/stubs/app_stub.cpp | 42 ----
test/unit/ui/stubs/engine_stub.cpp | 104 ---------
test/unit/ui/stubs/particle_stub.cpp | 205 ----------------
test/unit/ui/stubs/restext_stub.cpp | 12 -
test/unit/ui/stubs/robotmain_stub.cpp | 25 --
38 files changed, 669 insertions(+), 2483 deletions(-)
diff --cc src/CMakeLists.txt
index 0440c5f,fbbaa37..869f0cb
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -59,189 -59,197 +59,208 @@@ if(PLATFORM_WINDOWS
endif()
# Source files
- set(SOURCES
- app/app.cpp
- app/main.cpp
- app/pausemanager.cpp
- app/system.cpp
- app/${SYSTEM_CPP_MODULE}
- app/system_other.cpp
- common/event.cpp
- common/image.cpp
- common/iman.cpp
- common/logger.cpp
- common/misc.cpp
- common/profile.cpp
- common/restext.cpp
- common/stringutils.cpp
- common/resources/resourcemanager.cpp
- common/resources/inputstreambuffer.cpp
- common/resources/outputstreambuffer.cpp
- common/resources/inputstream.cpp
- common/resources/outputstream.cpp
- common/resources/sndfile.cpp
- graphics/core/color.cpp
- graphics/engine/camera.cpp
- graphics/engine/cloud.cpp
- graphics/engine/engine.cpp
- graphics/engine/lightman.cpp
- graphics/engine/lightning.cpp
- graphics/engine/modelfile.cpp
- graphics/engine/modelmanager.cpp
- graphics/engine/particle.cpp
- graphics/engine/planet.cpp
- graphics/engine/pyro.cpp
- graphics/engine/terrain.cpp
- graphics/engine/text.cpp
- graphics/engine/water.cpp
- graphics/opengl/gldevice.cpp
- object/auto/auto.cpp
- object/auto/autobase.cpp
- object/auto/autoconvert.cpp
- object/auto/autoderrick.cpp
- object/auto/autodestroyer.cpp
- object/auto/autoegg.cpp
- object/auto/autoenergy.cpp
- object/auto/autofactory.cpp
- object/auto/autoflag.cpp
- object/auto/autohuston.cpp
- object/auto/autoinfo.cpp
- object/auto/autojostle.cpp
- object/auto/autokid.cpp
- object/auto/autolabo.cpp
- object/auto/automush.cpp
- object/auto/autonest.cpp
- object/auto/autonuclear.cpp
- object/auto/autopara.cpp
- object/auto/autoportico.cpp
- object/auto/autoradar.cpp
- object/auto/autorepair.cpp
- object/auto/autoresearch.cpp
- object/auto/autoroot.cpp
- object/auto/autosafe.cpp
- object/auto/autostation.cpp
- object/auto/autotower.cpp
- object/brain.cpp
- object/level/parser.cpp
- object/level/parserline.cpp
- object/level/parserparam.cpp
- object/level/parserexceptions.cpp
- object/mainmovie.cpp
- object/motion/motion.cpp
- object/motion/motionant.cpp
- object/motion/motionbee.cpp
- object/motion/motiondummy.cpp
- object/motion/motionhuman.cpp
- object/motion/motionmother.cpp
- object/motion/motionspider.cpp
- object/motion/motiontoto.cpp
- object/motion/motionvehicle.cpp
- object/motion/motionworm.cpp
- object/object.cpp
- object/robotmain.cpp
- object/objman.cpp
- object/task/task.cpp
- object/task/taskadvance.cpp
- object/task/taskbuild.cpp
- object/task/taskfire.cpp
- object/task/taskfireant.cpp
- object/task/taskflag.cpp
- object/task/taskgoto.cpp
- object/task/taskgungoal.cpp
- object/task/taskinfo.cpp
- object/task/taskmanager.cpp
- object/task/taskmanip.cpp
- object/task/taskpen.cpp
- object/task/taskrecover.cpp
- object/task/taskreset.cpp
- object/task/tasksearch.cpp
- object/task/taskshield.cpp
- object/task/taskspiderexplo.cpp
- object/task/tasktake.cpp
- object/task/taskterraform.cpp
- object/task/taskturn.cpp
- object/task/taskwait.cpp
- physics/physics.cpp
- script/cbottoken.cpp
- script/cmdtoken.cpp
- script/script.cpp
- sound/sound.cpp
- ui/button.cpp
- ui/check.cpp
- ui/color.cpp
- ui/compass.cpp
- ui/control.cpp
- ui/displayinfo.cpp
- ui/displaytext.cpp
- ui/edit.cpp
- ui/editvalue.cpp
- ui/gauge.cpp
- ui/group.cpp
- ui/image.cpp
- ui/interface.cpp
- ui/key.cpp
- ui/label.cpp
- ui/list.cpp
- ui/maindialog.cpp
- ui/mainmap.cpp
- ui/mainshort.cpp
- ui/map.cpp
- ui/scroll.cpp
- ui/shortcut.cpp
- ui/slider.cpp
- ui/studio.cpp
- ui/target.cpp
- ui/window.cpp
- ${OPENAL_SRC}
- ${RES_FILES}
+ set(BASE_SOURCES
+ app/app.cpp
- app/gamedata.cpp
+ app/pausemanager.cpp
+ app/system.cpp
+ app/${SYSTEM_CPP_MODULE}
+ app/system_other.cpp
+ common/event.cpp
+ common/image.cpp
+ common/iman.cpp
+ common/logger.cpp
+ common/misc.cpp
+ common/profile.cpp
+ common/restext.cpp
+ common/stringutils.cpp
++ common/resources/resourcemanager.cpp
++ common/resources/inputstreambuffer.cpp
++ common/resources/outputstreambuffer.cpp
++ common/resources/inputstream.cpp
++ common/resources/outputstream.cpp
++ common/resources/sndfile.cpp
+ graphics/core/color.cpp
+ graphics/engine/camera.cpp
+ graphics/engine/cloud.cpp
+ graphics/engine/engine.cpp
+ graphics/engine/lightman.cpp
+ graphics/engine/lightning.cpp
+ graphics/engine/modelfile.cpp
+ graphics/engine/modelmanager.cpp
+ graphics/engine/particle.cpp
+ graphics/engine/planet.cpp
+ graphics/engine/pyro.cpp
+ graphics/engine/terrain.cpp
+ graphics/engine/text.cpp
+ graphics/engine/water.cpp
+ graphics/opengl/gldevice.cpp
+ object/auto/auto.cpp
+ object/auto/autobase.cpp
+ object/auto/autoconvert.cpp
+ object/auto/autoderrick.cpp
+ object/auto/autodestroyer.cpp
+ object/auto/autoegg.cpp
+ object/auto/autoenergy.cpp
+ object/auto/autofactory.cpp
+ object/auto/autoflag.cpp
+ object/auto/autohuston.cpp
+ object/auto/autoinfo.cpp
+ object/auto/autojostle.cpp
+ object/auto/autokid.cpp
+ object/auto/autolabo.cpp
+ object/auto/automush.cpp
+ object/auto/autonest.cpp
+ object/auto/autonuclear.cpp
+ object/auto/autopara.cpp
+ object/auto/autoportico.cpp
+ object/auto/autoradar.cpp
+ object/auto/autorepair.cpp
+ object/auto/autoresearch.cpp
+ object/auto/autoroot.cpp
+ object/auto/autosafe.cpp
+ object/auto/autostation.cpp
+ object/auto/autotower.cpp
+ object/brain.cpp
++ object/level/parser.cpp
++ object/level/parserline.cpp
++ object/level/parserparam.cpp
++ object/level/parserexceptions.cpp
+ object/mainmovie.cpp
+ object/motion/motion.cpp
+ object/motion/motionant.cpp
+ object/motion/motionbee.cpp
+ object/motion/motiondummy.cpp
+ object/motion/motionhuman.cpp
+ object/motion/motionmother.cpp
+ object/motion/motionspider.cpp
+ object/motion/motiontoto.cpp
+ object/motion/motionvehicle.cpp
+ object/motion/motionworm.cpp
+ object/object.cpp
+ object/robotmain.cpp
+ object/objman.cpp
+ object/task/task.cpp
+ object/task/taskadvance.cpp
+ object/task/taskbuild.cpp
+ object/task/taskfire.cpp
+ object/task/taskfireant.cpp
+ object/task/taskflag.cpp
+ object/task/taskgoto.cpp
+ object/task/taskgungoal.cpp
+ object/task/taskinfo.cpp
+ object/task/taskmanager.cpp
+ object/task/taskmanip.cpp
+ object/task/taskpen.cpp
+ object/task/taskrecover.cpp
+ object/task/taskreset.cpp
+ object/task/tasksearch.cpp
+ object/task/taskshield.cpp
+ object/task/taskspiderexplo.cpp
+ object/task/tasktake.cpp
+ object/task/taskterraform.cpp
+ object/task/taskturn.cpp
+ object/task/taskwait.cpp
+ physics/physics.cpp
+ script/cbottoken.cpp
+ script/cmdtoken.cpp
+ script/script.cpp
+ sound/sound.cpp
+ ui/button.cpp
+ ui/check.cpp
+ ui/color.cpp
+ ui/compass.cpp
+ ui/control.cpp
+ ui/displayinfo.cpp
+ ui/displaytext.cpp
+ ui/edit.cpp
+ ui/editvalue.cpp
+ ui/gauge.cpp
+ ui/group.cpp
+ ui/image.cpp
+ ui/interface.cpp
+ ui/key.cpp
+ ui/label.cpp
+ ui/list.cpp
+ ui/maindialog.cpp
+ ui/mainmap.cpp
+ ui/mainshort.cpp
+ ui/map.cpp
+ ui/scroll.cpp
+ ui/shortcut.cpp
+ ui/slider.cpp
+ ui/studio.cpp
+ ui/target.cpp
+ ui/window.cpp
+ ${OPENAL_SRC}
+ ${RES_FILES}
+ )
+
+ set(MAIN_SOURCES
+ app/main.cpp
)
+ # Libraries
set(LIBS
- CBot
- clipboard
- localename
- ${SDL_LIBRARY}
- ${SDLIMAGE_LIBRARY}
- ${SDLTTF_LIBRARY}
- ${OPENGL_LIBRARY}
- ${PNG_LIBRARIES}
- ${GLEW_LIBRARY}
- ${Boost_LIBRARIES}
- ${LIBSNDFILE_LIBRARY}
- ${OPTIONAL_LIBS}
- ${PLATFORM_LIBS}
+ CBot
+ clipboard
+ localename
+ ${SDL_LIBRARY}
+ ${SDLIMAGE_LIBRARY}
+ ${SDLTTF_LIBRARY}
+ ${OPENGL_LIBRARY}
+ ${PNG_LIBRARIES}
+ ${GLEW_LIBRARY}
+ ${Boost_LIBRARIES}
+ ${LIBSNDFILE_LIBRARY}
+ ${OPTIONAL_LIBS}
+ ${PLATFORM_LIBS}
+${PHYSFS_LIBRARY}
)
- # Local
- include_directories(
- .
- ..
- ${CMAKE_CURRENT_BINARY_DIR}
+ set(COLOBOT_LIBS ${LIBS} PARENT_SCOPE)
+
+
+ # Includes
+ set(LOCAL_INCLUDES
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+ ${CMAKE_CURRENT_BINARY_DIR}
)
- # System
- include_directories(
- SYSTEM
- ${SDL_INCLUDE_DIR}
- ${SDLIMAGE_INCLUDE_DIR}
- ${SDLTTF_INCLUDE_DIR}
- ${PNG_INCLUDE_DIRS}
- ${GLEW_INCLUDE_PATH}
- ${Boost_INCLUDE_DIRS}
- ${LIBSNDFILE_INCLUDE_DIR}
- ${LOCALENAME_INCLUDE_DIR}
- ${OPTIONAL_INCLUDE_DIRS}
- ${CLIPBOARD_INCLUDE_DIR}
+ set(SYSTEM_INCLUDES
+ ${SDL_INCLUDE_DIR}
+ ${SDLIMAGE_INCLUDE_DIR}
+ ${SDLTTF_INCLUDE_DIR}
+ ${PNG_INCLUDE_DIRS}
+ ${GLEW_INCLUDE_PATH}
+ ${Boost_INCLUDE_DIRS}
+ ${LIBSNDFILE_INCLUDE_DIR}
+ ${LOCALENAME_INCLUDE_DIR}
+ ${OPTIONAL_INCLUDE_DIRS}
+ ${CLIPBOARD_INCLUDE_DIR}
+${PHYSFS_INCLUDE_PATH}
)
- link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot)
+ set(COLOBOT_LOCAL_INCLUDES ${LOCAL_INCLUDES} PARENT_SCOPE)
+ set(COLOBOT_SYSTEM_INCLUDES ${SYSTEM_INCLUDES} PARENT_SCOPE)
+
+ include_directories(${LOCAL_INCLUDES})
+ include_directories(SYSTEM ${SYSTEM_INCLUDES})
+
+
+ # Link directories
+ link_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/CBot
+ )
+
+
+ # Targets
- add_executable(colobot ${SOURCES})
+ add_library(colobotbase STATIC ${BASE_SOURCES})
- target_link_libraries(colobot ${LIBS})
+ add_executable(colobot ${MAIN_SOURCES})
+ target_link_libraries(colobot colobotbase ${LIBS})
install(TARGETS colobot RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR})
if(NOT CBOT_STATIC)
diff --cc src/app/app.cpp
index b07c3e8,42ebd39..fad7a32
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@@ -404,24 -407,11 +404,24 @@@ bool CApplication::Create(
m_exitCode = 1;
return false;
}
-
- m_gameData->SetDataDir(std::string(m_dataPath));
- m_gameData->Init();
+
+ boost::filesystem::create_directories(m_savePath);
+ boost::filesystem::create_directories(m_savePath+"/mods");
+
+ LoadModsFromDir(m_dataPath+"/mods");
+ LoadModsFromDir(m_savePath+"/mods");
+
+ CResourceManager::AddLocation(m_dataPath, false);
+ CResourceManager::SetSaveLocation(m_savePath);
+ CResourceManager::AddLocation(m_savePath, true);
+
- if (!GetProfile().InitCurrentDirectory())
++ if (!GetProfile().Init())
+ {
+ GetLogger()->Warn("Config not found. Default values will be used!\n");
+ defaultValues = true;
+ }
- if (GetProfile().GetLocalProfileString("Language", "Lang", path)) {
+ if (GetProfile().GetStringProperty("Language", "Lang", path)) {
Language language;
if (ParseLanguage(path, language)) {
m_language = language;
diff --cc src/common/profile.cpp
index 9947769,79d7152..5ecb804
--- a/src/common/profile.cpp
+++ b/src/common/profile.cpp
@@@ -17,12 -17,10 +17,12 @@@
#include "common/profile.h"
- #include "common/logger.h"
+#include "common/resources/inputstream.h"
+#include "common/resources/outputstream.h"
-
#include "app/system.h"
+ #include "common/logger.h"
+
#include <utility>
#include <cstring>
#include <boost/property_tree/ini_parser.hpp>
@@@ -41,11 -40,20 +42,15 @@@ CProfile::CProfile(
CProfile::~CProfile()
{
- SaveCurrentDirectory();
+ Save();
}
+ void CProfile::SetUseCurrentDirectory(bool useCurrentDirectory)
+ {
+ m_useCurrentDirectory = useCurrentDirectory;
+ }
- bool CProfile::InitCurrentDirectory()
-std::string CProfile::GetIniFileLocation()
-{
- return m_useCurrentDirectory ? "colobot.ini" :
GetSystemUtils()->GetProfileFileLocation();
-}
-
+ bool CProfile::Init()
{
try
{
diff --cc src/ui/maindialog.cpp
index b886691,1b0facb..4a8b0fe
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@@ -5074,38 -5164,40 +5074,38 @@@ void CMainDialog::ChangeSetupButtons(
void CMainDialog::SetupMemorize()
{
- GetProfile().SetLocalProfileString("Directory", "savegame",
m_savegameDir);
- GetProfile().SetLocalProfileString("Directory", "public", m_publicDir);
- GetProfile().SetLocalProfileString("Directory", "files", m_filesDir);
- GetProfile().SetLocalProfileInt("Setup", "Tooltips", m_bTooltip);
- GetProfile().SetLocalProfileInt("Setup", "InterfaceGlint", m_bGlint);
- GetProfile().SetLocalProfileInt("Setup", "InterfaceGlint", m_bRain);
- GetProfile().SetLocalProfileInt("Setup", "Soluce4", m_bSoluce4);
- GetProfile().SetLocalProfileInt("Setup", "Movies", m_bMovies);
- GetProfile().SetLocalProfileInt("Setup", "NiceReset", m_bNiceReset);
- GetProfile().SetLocalProfileInt("Setup", "HimselfDamage",
m_bHimselfDamage);
- GetProfile().SetLocalProfileInt("Setup", "CameraScroll", m_bCameraScroll);
- GetProfile().SetLocalProfileInt("Setup", "CameraInvertX",
m_bCameraInvertX);
- GetProfile().SetLocalProfileInt("Setup", "CameraInvertY",
m_bCameraInvertY);
- GetProfile().SetLocalProfileInt("Setup", "InterfaceEffect", m_bEffect);
- GetProfile().SetLocalProfileInt("Setup", "GroundShadow",
m_engine->GetShadow());
- GetProfile().SetLocalProfileInt("Setup", "GroundSpot",
m_engine->GetGroundSpot());
- GetProfile().SetLocalProfileInt("Setup", "ObjectDirty",
m_engine->GetDirty());
- GetProfile().SetLocalProfileInt("Setup", "FogMode", m_engine->GetFog());
- GetProfile().SetLocalProfileInt("Setup", "LensMode",
m_engine->GetLensMode());
- GetProfile().SetLocalProfileInt("Setup", "SkyMode",
m_engine->GetSkyMode());
- GetProfile().SetLocalProfileInt("Setup", "PlanetMode",
m_engine->GetPlanetMode());
- GetProfile().SetLocalProfileInt("Setup", "LightMode",
m_engine->GetLightMode());
- GetProfile().SetLocalProfileFloat("Setup", "ParticleDensity",
m_engine->GetParticleDensity());
- GetProfile().SetLocalProfileFloat("Setup", "ClippingDistance",
m_engine->GetClippingDistance());
- GetProfile().SetLocalProfileFloat("Setup", "ObjectDetail",
m_engine->GetObjectDetail());
- GetProfile().SetLocalProfileFloat("Setup", "GadgetQuantity",
m_engine->GetGadgetQuantity());
- GetProfile().SetLocalProfileInt("Setup", "TextureQuality",
m_engine->GetTextureQuality());
- GetProfile().SetLocalProfileInt("Setup", "TotoMode",
m_engine->GetTotoMode());
- GetProfile().SetLocalProfileInt("Setup", "AudioVolume",
m_sound->GetAudioVolume());
- GetProfile().SetLocalProfileInt("Setup", "MusicVolume",
m_sound->GetMusicVolume());
- GetProfile().SetLocalProfileInt("Setup", "EditIndentMode",
m_engine->GetEditIndentMode());
- GetProfile().SetLocalProfileInt("Setup", "EditIndentValue",
m_engine->GetEditIndentValue());
- GetProfile().SetStringProperty("Directory", "scene", m_sceneDir);
+ GetProfile().SetStringProperty("Directory", "savegame", m_savegameDir);
+ GetProfile().SetStringProperty("Directory", "public", m_publicDir);
- GetProfile().SetStringProperty("Directory", "user", m_userDir);
+ GetProfile().SetStringProperty("Directory", "files", m_filesDir);
+ GetProfile().SetIntProperty("Setup", "Tooltips", m_bTooltip);
+ GetProfile().SetIntProperty("Setup", "InterfaceGlint", m_bGlint);
+ GetProfile().SetIntProperty("Setup", "InterfaceGlint", m_bRain);
+ GetProfile().SetIntProperty("Setup", "Soluce4", m_bSoluce4);
+ GetProfile().SetIntProperty("Setup", "Movies", m_bMovies);
+ GetProfile().SetIntProperty("Setup", "NiceReset", m_bNiceReset);
+ GetProfile().SetIntProperty("Setup", "HimselfDamage", m_bHimselfDamage);
+ GetProfile().SetIntProperty("Setup", "CameraScroll", m_bCameraScroll);
+ GetProfile().SetIntProperty("Setup", "CameraInvertX", m_bCameraInvertX);
+ GetProfile().SetIntProperty("Setup", "CameraInvertY", m_bCameraInvertY);
+ GetProfile().SetIntProperty("Setup", "InterfaceEffect", m_bEffect);
+ GetProfile().SetIntProperty("Setup", "GroundShadow",
m_engine->GetShadow());
+ GetProfile().SetIntProperty("Setup", "GroundSpot",
m_engine->GetGroundSpot());
+ GetProfile().SetIntProperty("Setup", "ObjectDirty", m_engine->GetDirty());
+ GetProfile().SetIntProperty("Setup", "FogMode", m_engine->GetFog());
+ GetProfile().SetIntProperty("Setup", "LensMode", m_engine->GetLensMode());
+ GetProfile().SetIntProperty("Setup", "SkyMode", m_engine->GetSkyMode());
+ GetProfile().SetIntProperty("Setup", "PlanetMode",
m_engine->GetPlanetMode());
+ GetProfile().SetIntProperty("Setup", "LightMode",
m_engine->GetLightMode());
+ GetProfile().SetFloatProperty("Setup", "ParticleDensity",
m_engine->GetParticleDensity());
+ GetProfile().SetFloatProperty("Setup", "ClippingDistance",
m_engine->GetClippingDistance());
+ GetProfile().SetFloatProperty("Setup", "ObjectDetail",
m_engine->GetObjectDetail());
+ GetProfile().SetFloatProperty("Setup", "GadgetQuantity",
m_engine->GetGadgetQuantity());
+ GetProfile().SetIntProperty("Setup", "TextureQuality",
m_engine->GetTextureQuality());
+ GetProfile().SetIntProperty("Setup", "TotoMode", m_engine->GetTotoMode());
+ GetProfile().SetIntProperty("Setup", "AudioVolume",
m_sound->GetAudioVolume());
+ GetProfile().SetIntProperty("Setup", "MusicVolume",
m_sound->GetMusicVolume());
+ GetProfile().SetIntProperty("Setup", "EditIndentMode",
m_engine->GetEditIndentMode());
+ GetProfile().SetIntProperty("Setup", "EditIndentValue",
m_engine->GetEditIndentValue());
/* screen setup */
if (m_setupFull)
@@@ -5151,7 -5243,12 +5151,7 @@@ void CMainDialog::SetupRecall(
int iValue;
std::string key;
- if ( GetProfile().GetLocalProfileString("Directory", "savegame", key) )
- if ( GetProfile().GetStringProperty("Directory", "scene", key) )
- {
- m_sceneDir = key;
- }
-
+ if ( GetProfile().GetStringProperty("Directory", "savegame", key) )
{
m_savegameDir = key;
}
@@@ -5161,7 -5258,12 +5161,7 @@@
m_publicDir = key;
}
- if ( GetProfile().GetLocalProfileString("Directory", "files", key) )
- if ( GetProfile().GetStringProperty("Directory", "user", key) )
- {
- m_userDir = key;
- }
-
+ if ( GetProfile().GetStringProperty("Directory", "files", key) )
{
m_filesDir = key;
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
