immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved settings out of CMainDialog into a separate class 

Also fixed some problems with resolution list selection after starting game
master
krzys-h 2015-08-04 12:45:52 +02:00
parent ea7bfdefda
commit 4b271cee2d
11 changed files with 527 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -80,13 +80,13 @@ set(BASE_SOURCES
app/system.cpp app/system.cpp
app/${SYSTEM_CPP_MODULE} app/${SYSTEM_CPP_MODULE}
app/system_other.cpp app/system_other.cpp
common/config_file.cpp
common/event.cpp common/event.cpp
common/image.cpp common/image.cpp
common/key.cpp common/key.cpp
common/logger.cpp common/logger.cpp
common/misc.cpp common/misc.cpp
common/pathman.cpp common/pathman.cpp
common/config_file.cpp
common/regex_utils.cpp common/regex_utils.cpp
common/resources/inputstream.cpp common/resources/inputstream.cpp
common/resources/inputstreambuffer.cpp common/resources/inputstreambuffer.cpp
@ -96,6 +96,7 @@ set(BASE_SOURCES
common/resources/sdl_file_wrapper.cpp common/resources/sdl_file_wrapper.cpp
common/resources/sndfile_wrapper.cpp common/resources/sndfile_wrapper.cpp
common/restext.cpp common/restext.cpp
common/settings.cpp
common/stringutils.cpp common/stringutils.cpp
graphics/core/color.cpp graphics/core/color.cpp
graphics/core/framebuffer.cpp graphics/core/framebuffer.cpp

351
src/common/settings.cpp Normal file
View File

@ -0,0 +1,351 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2015, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsiteс.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://gnu.org/licenses
*/
#include "common/settings.h"
#include "app/app.h"
#include "app/input.h"
#include "common/config_file.h"
#include "graphics/engine/camera.h"
#include "graphics/engine/engine.h"
#include "object/robotmain.h"
template<> CSettings* CSingleton<CSettings>::m_instance = nullptr;
CSettings::CSettings()
{
m_tooltips = true;
m_interfaceGlint = true;
m_interfaceRain = true;
m_soluce4 = true;
m_movies = true;
m_niceReset = true;
m_himselfDamage = true;
}
void CSettings::SaveResolutionSettings(const Gfx::DeviceConfig& config)
{
// NOTE: These settings are loaded in CApplication
std::ostringstream ss;
ss << config.size.x << "x" << config.size.y;
GetConfigFile().SetStringProperty("Setup", "Resolution", ss.str());
GetConfigFile().SetIntProperty("Setup", "Fullscreen", config.fullScreen);
GetConfigFile().Save();
}
void CSettings::SaveSettings()
{
CApplication* app = CApplication::GetInstancePointer();
CRobotMain* main = CRobotMain::GetInstancePointer();
Gfx::CEngine* engine = Gfx::CEngine::GetInstancePointer();
Gfx::CCamera* camera = main->GetCamera();
CSoundInterface* sound = app->GetSound();
GetConfigFile().SetIntProperty("Setup", "TotoMode", engine->GetTotoMode());
GetConfigFile().SetIntProperty("Setup", "Tooltips", m_tooltips);
GetConfigFile().SetIntProperty("Setup", "InterfaceGlint", m_interfaceGlint);
GetConfigFile().SetIntProperty("Setup", "InterfaceRain", m_interfaceRain);
GetConfigFile().SetIntProperty("Setup", "Soluce4", m_soluce4);
GetConfigFile().SetIntProperty("Setup", "Movies", m_movies);
GetConfigFile().SetIntProperty("Setup", "NiceReset", m_niceReset);
GetConfigFile().SetIntProperty("Setup", "HimselfDamage", m_himselfDamage);
GetConfigFile().SetIntProperty("Setup", "CameraScroll", camera->GetCameraScroll());
GetConfigFile().SetIntProperty("Setup", "CameraInvertX", camera->GetCameraInvertX());
GetConfigFile().SetIntProperty("Setup", "CameraInvertY", camera->GetCameraInvertY());
GetConfigFile().SetIntProperty("Setup", "InterfaceEffect", camera->GetEffect());
GetConfigFile().SetIntProperty("Setup", "Blood", camera->GetBlood());
GetConfigFile().SetIntProperty("Setup", "Autosave", main->GetAutosave());
GetConfigFile().SetIntProperty("Setup", "AutosaveInterval", main->GetAutosaveInterval());
GetConfigFile().SetIntProperty("Setup", "AutosaveSlots", main->GetAutosaveSlots());
GetConfigFile().SetIntProperty("Setup", "GroundShadow", engine->GetShadow());
GetConfigFile().SetIntProperty("Setup", "GroundSpot", engine->GetGroundSpot());
GetConfigFile().SetIntProperty("Setup", "ObjectDirty", engine->GetDirty());
GetConfigFile().SetIntProperty("Setup", "FogMode", engine->GetFog());
GetConfigFile().SetIntProperty("Setup", "LensMode", engine->GetLensMode());
GetConfigFile().SetIntProperty("Setup", "SkyMode", engine->GetSkyMode());
GetConfigFile().SetIntProperty("Setup", "PlanetMode", engine->GetPlanetMode());
GetConfigFile().SetIntProperty("Setup", "LightMode", engine->GetLightMode());
GetConfigFile().SetIntProperty("Setup", "UseJoystick", app->GetJoystickEnabled() ? app->GetJoystick().index : -1);
GetConfigFile().SetFloatProperty("Setup", "ParticleDensity", engine->GetParticleDensity());
GetConfigFile().SetFloatProperty("Setup", "ClippingDistance", engine->GetClippingDistance());
GetConfigFile().SetFloatProperty("Setup", "ObjectDetail", engine->GetObjectDetail());
GetConfigFile().SetFloatProperty("Setup", "GadgetQuantity", engine->GetGadgetQuantity());
GetConfigFile().SetIntProperty("Setup", "AudioVolume", sound->GetAudioVolume());
GetConfigFile().SetIntProperty("Setup", "MusicVolume", sound->GetMusicVolume());
GetConfigFile().SetIntProperty("Setup", "EditIndentMode", engine->GetEditIndentMode());
GetConfigFile().SetIntProperty("Setup", "EditIndentValue", engine->GetEditIndentValue());
GetConfigFile().SetIntProperty("Setup", "SystemMouse", app->GetMouseMode() == MOUSE_SYSTEM);
GetConfigFile().SetIntProperty("Setup", "MipmapLevel", engine->GetTextureMipmapLevel());
GetConfigFile().SetIntProperty("Setup", "Anisotropy", engine->GetTextureAnisotropyLevel());
GetConfigFile().SetFloatProperty("Setup", "ShadowColor", engine->GetShadowColor());
GetConfigFile().SetFloatProperty("Setup", "ShadowRange", engine->GetShadowRange());
GetConfigFile().SetIntProperty("Setup", "MSAA", engine->GetMultiSample());
GetConfigFile().SetIntProperty("Setup", "FilterMode", engine->GetTextureFilterMode());
GetConfigFile().SetIntProperty("Setup", "ShadowMapping", engine->GetShadowMapping());
GetConfigFile().SetIntProperty("Setup", "ShadowMappingQuality", engine->GetShadowMappingQuality());
GetConfigFile().SetIntProperty("Setup", "ShadowMappingResolution", engine->GetShadowMappingOffscreen() ? engine->GetShadowMappingOffscreenResolution() : 0);
CInput::GetInstancePointer()->SaveKeyBindings();
GetConfigFile().Save();
}
void CSettings::LoadSettings()
{
CApplication* app = CApplication::GetInstancePointer();
CRobotMain* main = CRobotMain::GetInstancePointer();
Gfx::CEngine* engine = Gfx::CEngine::GetInstancePointer();
Gfx::CCamera* camera = main->GetCamera();
CSoundInterface* sound = app->GetSound();
float fValue;
int iValue;
std::string key;
if (GetConfigFile().GetIntProperty("Setup", "TotoMode", iValue))
engine->SetTotoMode(iValue);
if (GetConfigFile().GetIntProperty("Setup", "Tooltips", iValue))
m_tooltips = iValue;
if (GetConfigFile().GetIntProperty("Setup", "InterfaceGlint", iValue))
m_interfaceGlint = iValue;
if (GetConfigFile().GetIntProperty("Setup", "InterfaceRain", iValue))
m_interfaceRain = iValue;
if (GetConfigFile().GetIntProperty("Setup", "Soluce4", iValue))
m_soluce4 = iValue;
if (GetConfigFile().GetIntProperty("Setup", "Movies", iValue))
m_movies = iValue;
if (GetConfigFile().GetIntProperty("Setup", "NiceReset", iValue))
m_niceReset = iValue;
if (GetConfigFile().GetIntProperty("Setup", "HimselfDamage", iValue))
m_himselfDamage = iValue;
if (GetConfigFile().GetIntProperty("Setup", "CameraScroll", iValue))
camera->SetCameraScroll(iValue);
if (GetConfigFile().GetIntProperty("Setup", "CameraInvertX", iValue))
camera->SetCameraInvertX(iValue);
if (GetConfigFile().GetIntProperty("Setup", "CameraInvertY", iValue))
camera->SetCameraInvertY(iValue);
if (GetConfigFile().GetIntProperty("Setup", "InterfaceEffect", iValue))
camera->SetEffect(iValue);
if (GetConfigFile().GetIntProperty("Setup", "Blood", iValue))
camera->SetBlood(iValue);
if (GetConfigFile().GetIntProperty("Setup", "Autosave", iValue))
main->SetAutosave(iValue);
if (GetConfigFile().GetIntProperty("Setup", "AutosaveInterval", iValue))
main->SetAutosaveInterval(iValue);
if (GetConfigFile().GetIntProperty("Setup", "AutosaveSlots", iValue))
main->SetAutosaveSlots(iValue);
if (GetConfigFile().GetIntProperty("Setup", "GroundShadow", iValue))
engine->SetShadow(iValue);
if (GetConfigFile().GetIntProperty("Setup", "GroundSpot", iValue))
engine->SetGroundSpot(iValue);
if (GetConfigFile().GetIntProperty("Setup", "ObjectDirty", iValue))
engine->SetDirty(iValue);
if (GetConfigFile().GetIntProperty("Setup", "FogMode", iValue))
{
engine->SetFog(iValue);
camera->SetOverBaseColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f)); // TODO: color ok?
}
if (GetConfigFile().GetIntProperty("Setup", "LensMode", iValue))
engine->SetLensMode(iValue);
if (GetConfigFile().GetIntProperty("Setup", "SkyMode", iValue))
engine->SetSkyMode(iValue);
if (GetConfigFile().GetIntProperty("Setup", "PlanetMode", iValue))
engine->SetPlanetMode(iValue);
if (GetConfigFile().GetIntProperty("Setup", "LightMode", iValue))
engine->SetLightMode(iValue);
if (GetConfigFile().GetIntProperty("Setup", "UseJoystick", iValue))
{
if(iValue >= 0)
{
auto joysticks = app->GetJoystickList();
for(const auto& joystick : joysticks)
{
if (joystick.index == iValue)
{
app->ChangeJoystick(joystick);
app->SetJoystickEnabled(true);
}
}
}
else
{
app->SetJoystickEnabled(false);
}
}
if (GetConfigFile().GetFloatProperty("Setup", "ParticleDensity", fValue))
engine->SetParticleDensity(fValue);
if (GetConfigFile().GetFloatProperty("Setup", "ClippingDistance", fValue))
engine->SetClippingDistance(fValue);
if (GetConfigFile().GetFloatProperty("Setup", "ObjectDetail", fValue))
engine->SetObjectDetail(fValue);
if (GetConfigFile().GetFloatProperty("Setup", "GadgetQuantity", fValue))
engine->SetGadgetQuantity(fValue);
if (GetConfigFile().GetIntProperty("Setup", "AudioVolume", iValue))
sound->SetAudioVolume(iValue);
if (GetConfigFile().GetIntProperty("Setup", "MusicVolume", iValue))
sound->SetMusicVolume(iValue);
if (GetConfigFile().GetIntProperty("Setup", "EditIndentMode", iValue))
engine->SetEditIndentMode(iValue);
if (GetConfigFile().GetIntProperty("Setup", "EditIndentValue", iValue))
engine->SetEditIndentValue(iValue);
if (GetConfigFile().GetIntProperty("Setup", "SystemMouse", iValue))
app->SetMouseMode(iValue ? MOUSE_SYSTEM : MOUSE_ENGINE);
if (GetConfigFile().GetIntProperty("Setup", "MipmapLevel", iValue))
engine->SetTextureMipmapLevel(iValue);
if (GetConfigFile().GetIntProperty("Setup", "Anisotropy", iValue))
engine->SetTextureAnisotropyLevel(iValue);
if (GetConfigFile().GetFloatProperty("Setup", "ShadowColor", fValue))
engine->SetShadowColor(fValue);
if (GetConfigFile().GetFloatProperty("Setup", "ShadowRange", fValue))
engine->SetShadowRange(fValue);
if (GetConfigFile().GetIntProperty("Setup", "MSAA", iValue))
engine->SetMultiSample(iValue);
if (GetConfigFile().GetIntProperty("Setup", "FilterMode", iValue))
engine->SetTextureFilterMode(static_cast<Gfx::TexFilter>(iValue));
if (GetConfigFile().GetIntProperty("Setup", "ShadowMapping", iValue))
engine->SetShadowMapping(iValue);
if (GetConfigFile().GetIntProperty("Setup", "ShadowMappingQuality", iValue))
engine->SetShadowMappingQuality(iValue);
if (GetConfigFile().GetIntProperty("Setup", "ShadowMappingResolution", iValue))
{
if(iValue == 0)
{
engine->SetShadowMappingOffscreen(false);
}
else
{
engine->SetShadowMappingOffscreen(true);
engine->SetShadowMappingOffscreenResolution(iValue);
}
}
CInput::GetInstancePointer()->LoadKeyBindings();
}
void CSettings::SetTooltips(bool tooltips)
{
m_tooltips = tooltips;
}
bool CSettings::GetTooltips()
{
return m_tooltips;
}
void CSettings::SetInterfaceGlint(bool interfaceGlint)
{
m_interfaceGlint = interfaceGlint;
}
bool CSettings::GetInterfaceGlint()
{
return m_interfaceGlint;
}
void CSettings::SetInterfaceRain(bool interfaceRain)
{
m_interfaceRain = interfaceRain;
}
bool CSettings::GetInterfaceRain()
{
return m_interfaceRain;
}
void CSettings::SetSoluce4(bool soluce4)
{
m_soluce4 = soluce4;
}
bool CSettings::GetSoluce4()
{
return m_soluce4;
}
void CSettings::SetMovies(bool movies)
{
m_movies = movies;
}
bool CSettings::GetMovies()
{
return m_movies;
}
void CSettings::SetNiceReset(bool niceReset)
{
m_niceReset = niceReset;
}
bool CSettings::GetNiceReset()
{
return m_niceReset;
}
void CSettings::SetHimselfDamage(bool himselfDamage)
{
m_himselfDamage = himselfDamage;
}
bool CSettings::GetHimselfDamage()
{
return m_himselfDamage;
}

65
src/common/settings.h Normal file
View File

@ -0,0 +1,65 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2015, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsiteс.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://gnu.org/licenses
*/
#pragma once
#include "common/singleton.h"
namespace Gfx
{
struct DeviceConfig;
}
class CSettings : public CSingleton<CSettings>
{
public:
CSettings();
void SaveResolutionSettings(const Gfx::DeviceConfig& config);
void SaveSettings();
void LoadSettings();
void SetTooltips(bool tooltips);
bool GetTooltips();
void SetInterfaceGlint(bool interfaceGlint);
bool GetInterfaceGlint();
void SetInterfaceRain(bool interfaceRain);
bool GetInterfaceRain();
void SetSoluce4(bool soluce4);
bool GetSoluce4();
void SetMovies(bool movies);
bool GetMovies();
void SetNiceReset(bool niceReset);
bool GetNiceReset();
void SetHimselfDamage(bool himselfDamage);
bool GetHimselfDamage();
protected:
bool m_tooltips;
bool m_interfaceGlint;
bool m_interfaceRain;
bool m_soluce4;
bool m_movies;
bool m_niceReset;
bool m_himselfDamage;
};

21
src/graphics/engine/camera.cpp
View File

@ -167,6 +167,11 @@ void CCamera::SetEffect(bool enable)
m_effect = enable; m_effect = enable;
} }
bool CCamera::GetEffect()
{
return m_effect;
}
void CCamera::SetBlood(bool enable) void CCamera::SetBlood(bool enable)
{ {
m_blood = enable; m_blood = enable;
@ -182,16 +187,31 @@ void CCamera::SetCameraScroll(bool scroll)
m_cameraScroll = scroll; m_cameraScroll = scroll;
} }
bool CCamera::GetCameraScroll()
{
return m_cameraScroll;
}
void CCamera::SetCameraInvertX(bool invert) void CCamera::SetCameraInvertX(bool invert)
{ {
m_cameraInvertX = invert; m_cameraInvertX = invert;
} }
bool CCamera::GetCameraInvertX()
{
return m_cameraInvertX;
}
void CCamera::SetCameraInvertY(bool invert) void CCamera::SetCameraInvertY(bool invert)
{ {
m_cameraInvertY = invert; m_cameraInvertY = invert;
} }
bool CCamera::GetCameraInvertY()
{
return m_cameraInvertY;
}
float CCamera::GetMotorTurn() float CCamera::GetMotorTurn()
{ {
if (m_type == CAM_TYPE_BACK) if (m_type == CAM_TYPE_BACK)
@ -1684,4 +1704,3 @@ Math::Vector CCamera::ExcludeObject(Math::Vector eye, Math::Vector lookat,
} }

5
src/graphics/engine/camera.h
View File

@ -203,11 +203,15 @@ public:
void SetScriptLookat(Math::Vector lookat); void SetScriptLookat(Math::Vector lookat);
void SetEffect(bool enable); void SetEffect(bool enable);
bool GetEffect();
void SetBlood(bool enable); void SetBlood(bool enable);
bool GetBlood(); bool GetBlood();
void SetCameraScroll(bool scroll); void SetCameraScroll(bool scroll);
bool GetCameraScroll();
void SetCameraInvertX(bool invert); void SetCameraInvertX(bool invert);
bool GetCameraInvertX();
void SetCameraInvertY(bool invert); void SetCameraInvertY(bool invert);
bool GetCameraInvertY();
//! Returns an additional force to turn //! Returns an additional force to turn
float GetMotorTurn(); float GetMotorTurn();
@ -400,4 +404,3 @@ protected:
} // namespace Gfx } // namespace Gfx

2
src/object/motion/motiontoto.cpp
View File

@ -779,7 +779,7 @@ bool CMotionToto::EventFrame(const Event &event)
m_particle->CreateParticle(pos, speed, dim, type, 0.5f+Math::Rand()*0.5f, 0.0f, 1.0f, Gfx::SH_INTERFACE); m_particle->CreateParticle(pos, speed, dim, type, 0.5f+Math::Rand()*0.5f, 0.0f, 1.0f, Gfx::SH_INTERFACE);
} }
//? if ( m_bDisplayInfo && m_main->GetGlint() ) //? if ( m_bDisplayInfo && m_main->GetInterfaceGlint() )
if ( false ) if ( false )
{ {
pos.x = (Math::Rand()-0.5f)*1.4f; pos.x = (Math::Rand()-0.5f)*1.4f;

28
src/object/robotmain.cpp
View File

@ -32,6 +32,7 @@
#include "common/make_unique.h" #include "common/make_unique.h"
#include "common/misc.h" #include "common/misc.h"
#include "common/restext.h" #include "common/restext.h"
#include "common/settings.h"
#include "common/stringutils.h" #include "common/stringutils.h"
#include "common/resources/inputstream.h" #include "common/resources/inputstream.h"
@ -273,6 +274,7 @@ void CRobotMain::Create()
m_planet = m_engine->GetPlanet(); m_planet = m_engine->GetPlanet();
m_pause = CPauseManager::GetInstancePointer(); m_pause = CPauseManager::GetInstancePointer();
m_input = CInput::GetInstancePointer(); m_input = CInput::GetInstancePointer();
m_settings = new CSettings();
m_interface = new Ui::CInterface(); m_interface = new Ui::CInterface();
m_terrain = new Gfx::CTerrain(); m_terrain = new Gfx::CTerrain();
@ -334,6 +336,9 @@ void CRobotMain::Create()
//! Destructor of robot application //! Destructor of robot application
CRobotMain::~CRobotMain() CRobotMain::~CRobotMain()
{ {
delete m_settings;
m_settings = nullptr;
delete m_displayText; delete m_displayText;
m_displayText = nullptr; m_displayText = nullptr;
@ -406,7 +411,8 @@ void CRobotMain::ResetAfterDeviceChanged()
//! Creates the file colobot.ini at the first time //! Creates the file colobot.ini at the first time
void CRobotMain::CreateConfigFile() void CRobotMain::CreateConfigFile()
{ {
m_dialog->SetupMemorize(); m_settings->SaveSettings();
m_settings->SaveResolutionSettings(m_app->GetVideoConfig());
GetConfigFile().SetFloatProperty("Edit", "FontSize", m_fontSize); GetConfigFile().SetFloatProperty("Edit", "FontSize", m_fontSize);
GetConfigFile().SetFloatProperty("Edit", "WindowPosX", m_windowPos.x); GetConfigFile().SetFloatProperty("Edit", "WindowPosX", m_windowPos.x);
@ -423,7 +429,7 @@ void CRobotMain::CreateConfigFile()
void CRobotMain::LoadConfigFile() void CRobotMain::LoadConfigFile()
{ {
m_dialog->SetupRecall(); m_settings->LoadSettings();
} }
//! Changes phase //! Changes phase
@ -2241,7 +2247,7 @@ void CRobotMain::HiliteObject(Math::Point pos)
CObject* obj = m_short->DetectShort(pos); CObject* obj = m_short->DetectShort(pos);
std::string interfaceTooltipName; std::string interfaceTooltipName;
if (m_dialog->GetTooltip() && m_interface->GetTooltip(pos, interfaceTooltipName)) if (m_settings->GetTooltips() && m_interface->GetTooltip(pos, interfaceTooltipName))
{ {
m_tooltipPos = pos; m_tooltipPos = pos;
m_tooltipName = interfaceTooltipName; m_tooltipName = interfaceTooltipName;
@ -2270,7 +2276,7 @@ void CRobotMain::HiliteObject(Math::Point pos)
if (obj != nullptr) if (obj != nullptr)
{ {
std::string objectTooltipName; std::string objectTooltipName;
if (m_dialog->GetTooltip() && obj->GetTooltipName(objectTooltipName)) if (m_settings->GetTooltips() && obj->GetTooltipName(objectTooltipName))
{ {
m_tooltipPos = pos; m_tooltipPos = pos;
m_tooltipName = objectTooltipName; m_tooltipName = objectTooltipName;
@ -3649,7 +3655,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
if (i != -1) if (i != -1)
{ {
if (i != PARAM_FIXSCENE && if (i != PARAM_FIXSCENE &&
!m_dialog->GetMovies()) i = 0; !m_settings->GetMovies()) i = 0;
automat->Start(i); // starts the film automat->Start(i); // starts the film
} }
} }
@ -5686,29 +5692,29 @@ char* CRobotMain::GetScriptFile()
} }
bool CRobotMain::GetGlint() bool CRobotMain::GetInterfaceGlint()
{ {
return m_dialog->GetGlint(); return m_settings->GetInterfaceGlint();
} }
bool CRobotMain::GetSoluce4() bool CRobotMain::GetSoluce4()
{ {
return m_dialog->GetSoluce4(); return m_settings->GetSoluce4();
} }
bool CRobotMain::GetMovies() bool CRobotMain::GetMovies()
{ {
return m_dialog->GetMovies(); return m_settings->GetMovies();
} }
bool CRobotMain::GetNiceReset() bool CRobotMain::GetNiceReset()
{ {
return m_dialog->GetNiceReset(); return m_settings->GetNiceReset();
} }
bool CRobotMain::GetHimselfDamage() bool CRobotMain::GetHimselfDamage()
{ {
return m_dialog->GetHimselfDamage(); return m_settings->GetHimselfDamage();
} }
bool CRobotMain::GetShowSoluce() bool CRobotMain::GetShowSoluce()

4
src/object/robotmain.h
View File

@ -80,6 +80,7 @@ class CObjectManager;
class CSceneEndCondition; class CSceneEndCondition;
class CAudioChangeCondition; class CAudioChangeCondition;
class CPlayerProfile; class CPlayerProfile;
class CSettings;
namespace Gfx namespace Gfx
{ {
@ -241,7 +242,7 @@ public:
char* GetScriptFile(); char* GetScriptFile();
bool GetTrainerPilot(); bool GetTrainerPilot();
bool GetFixScene(); bool GetFixScene();
bool GetGlint(); bool GetInterfaceGlint();
bool GetSoluce4(); bool GetSoluce4();
bool GetMovies(); bool GetMovies();
bool GetNiceReset(); bool GetNiceReset();
@ -450,6 +451,7 @@ protected:
CSoundInterface* m_sound; CSoundInterface* m_sound;
CPauseManager* m_pause; CPauseManager* m_pause;
CInput* m_input; CInput* m_input;
CSettings* m_settings;
//! Progress of loaded player //! Progress of loaded player
std::unique_ptr<CPlayerProfile> m_playerProfile; std::unique_ptr<CPlayerProfile> m_playerProfile;

2
src/ui/control.cpp
View File

@ -415,7 +415,7 @@ void CControl::GlintFrame(const Event &event)
(m_state & STATE_ENABLE ) == 0 || (m_state & STATE_ENABLE ) == 0 ||
(m_state & STATE_VISIBLE) == 0 ) return; (m_state & STATE_VISIBLE) == 0 ) return;
if ( !m_main->GetGlint() ) return; if ( !m_main->GetInterfaceGlint() ) return;
m_glintProgress += event.rTime; m_glintProgress += event.rTime;

527
src/ui/maindialog.cpp
View File

@ -33,6 +33,7 @@
#include "common/make_unique.h" #include "common/make_unique.h"
#include "common/misc.h" #include "common/misc.h"
#include "common/restext.h" #include "common/restext.h"
#include "common/settings.h"
#include "common/stringutils.h" #include "common/stringutils.h"
#include "common/resources/inputstream.h" #include "common/resources/inputstream.h"
@ -137,8 +138,6 @@ CMainDialog::CMainDialog()
m_accessMission= true; m_accessMission= true;
m_accessUser = true; m_accessUser = true;
m_bDeleteGamer = true;
for(int i = 0; i < static_cast<int>(LevelCategory::Max); i++) for(int i = 0; i < static_cast<int>(LevelCategory::Max); i++)
{ {
m_chap[static_cast<LevelCategory>(i)] = 0; m_chap[static_cast<LevelCategory>(i)] = 0;
@ -149,20 +148,6 @@ CMainDialog::CMainDialog()
m_listCategory = m_category; m_listCategory = m_category;
m_maxList = 0; m_maxList = 0;
m_bTooltip = true;
m_bGlint = true;
m_bRain = true;
m_bSoluce4 = true;
m_bMovies = true;
m_bNiceReset = true;
m_bHimselfDamage = true;
m_bCameraScroll = true;
m_bCameraInvertX = false;
m_bCameraInvertY = false;
m_bEffect = true;
m_bBlood = true;
m_bAutosave = true;
m_shotDelay = 0; m_shotDelay = 0;
m_glintMouse = Math::Point(0.0f, 0.0f); m_glintMouse = Math::Point(0.0f, 0.0f);
@ -190,7 +175,18 @@ void CMainDialog::Create()
m_engine = Gfx::CEngine::GetInstancePointer(); m_engine = Gfx::CEngine::GetInstancePointer();
m_particle = m_engine->GetParticle(); m_particle = m_engine->GetParticle();
m_pause = CPauseManager::GetInstancePointer(); m_pause = CPauseManager::GetInstancePointer();
m_settings = CSettings::GetInstancePointer();
std::vector<Math::IntPoint> modes;
m_app->GetVideoResolutionList(modes, true, true);
for (auto it = modes.begin(); it != modes.end(); ++it)
{
if (it->x == m_app->GetVideoConfig().size.x && it->y == m_app->GetVideoConfig().size.y)
{
m_setupSelMode = it - modes.begin();
break;
}
}
m_setupFull = m_app->GetVideoConfig().fullScreen; m_setupFull = m_app->GetVideoConfig().fullScreen;
} }
@ -442,15 +438,12 @@ void CMainDialog::ChangePhase(Phase phase)
pli = pw->CreateList(pos, ddim, 0, EVENT_INTERFACE_NLIST); pli = pw->CreateList(pos, ddim, 0, EVENT_INTERFACE_NLIST);
pli->SetState(STATE_SHADOW); pli->SetState(STATE_SHADOW);
if ( m_bDeleteGamer )
{
pos.x = 200.0f/640.0f; pos.x = 200.0f/640.0f;
pos.y = 100.0f/480.0f; pos.y = 100.0f/480.0f;
ddim.x = 160.0f/640.0f; ddim.x = 160.0f/640.0f;
ddim.y = 32.0f/480.0f; ddim.y = 32.0f/480.0f;
pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_NDELETE); pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_NDELETE);
pb->SetState(STATE_SHADOW); pb->SetState(STATE_SHADOW);
}
pos.x = 380.0f/640.0f; pos.x = 380.0f/640.0f;
pos.y = 100.0f/480.0f; pos.y = 100.0f/480.0f;
@ -2344,7 +2337,7 @@ bool CMainDialog::EventProcess(const Event &event)
event.type == EVENT_INTERFACE_BACK || event.type == EVENT_INTERFACE_BACK ||
(event.type == EVENT_KEY_DOWN && event.key.key == KEY(ESCAPE)) ) (event.type == EVENT_KEY_DOWN && event.key.key == KEY(ESCAPE)) )
{ {
SetupMemorize(); m_settings->SaveSettings();
m_engine->ApplyChange(); m_engine->ApplyChange();
m_main->ChangePhase(PHASE_MAIN_MENU); m_main->ChangePhase(PHASE_MAIN_MENU);
return false; return false;
@ -2390,7 +2383,7 @@ bool CMainDialog::EventProcess(const Event &event)
event.type == EVENT_INTERFACE_BACK || event.type == EVENT_INTERFACE_BACK ||
(event.type == EVENT_KEY_DOWN && event.key.key == KEY(ESCAPE)) ) (event.type == EVENT_KEY_DOWN && event.key.key == KEY(ESCAPE)) )
{ {
SetupMemorize(); m_settings->SaveSettings();
m_engine->ApplyChange(); m_engine->ApplyChange();
m_interface->DeleteControl(EVENT_WINDOW5); m_interface->DeleteControl(EVENT_WINDOW5);
ChangePhase(PHASE_SIMUL); ChangePhase(PHASE_SIMUL);
@ -2575,19 +2568,19 @@ bool CMainDialog::EventProcess(const Event &event)
break; break;
case EVENT_INTERFACE_TOOLTIP: case EVENT_INTERFACE_TOOLTIP:
m_bTooltip = !m_bTooltip; m_settings->SetTooltips(!m_settings->GetTooltips());
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_GLINT: case EVENT_INTERFACE_GLINT:
m_bGlint = !m_bGlint; m_settings->SetInterfaceGlint(!m_settings->GetInterfaceGlint());
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_RAIN: case EVENT_INTERFACE_RAIN:
m_bRain = !m_bRain; m_settings->SetInterfaceRain(!m_settings->GetInterfaceRain());
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
@ -2622,67 +2615,61 @@ bool CMainDialog::EventProcess(const Event &event)
break; break;
case EVENT_INTERFACE_SOLUCE4: case EVENT_INTERFACE_SOLUCE4:
m_bSoluce4 = !m_bSoluce4; m_settings->SetSoluce4(!m_settings->GetSoluce4());
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_MOVIES: case EVENT_INTERFACE_MOVIES:
m_bMovies = !m_bMovies; m_settings->SetMovies(!m_settings->GetMovies());
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_NICERST: case EVENT_INTERFACE_NICERST:
m_bNiceReset = !m_bNiceReset; m_settings->SetNiceReset(!m_settings->GetNiceReset());
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_HIMSELF: case EVENT_INTERFACE_HIMSELF:
m_bHimselfDamage = !m_bHimselfDamage; m_settings->SetHimselfDamage(!m_settings->GetHimselfDamage());
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_SCROLL: case EVENT_INTERFACE_SCROLL:
m_bCameraScroll = !m_bCameraScroll; m_camera->SetCameraScroll(!m_camera->GetCameraScroll());
m_camera->SetCameraScroll(m_bCameraScroll);
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_INVERTX: case EVENT_INTERFACE_INVERTX:
m_bCameraInvertX = !m_bCameraInvertX; m_camera->SetCameraInvertX(!m_camera->GetCameraInvertX());
m_camera->SetCameraInvertX(m_bCameraInvertX);
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_INVERTY: case EVENT_INTERFACE_INVERTY:
m_bCameraInvertY = !m_bCameraInvertY; m_camera->SetCameraInvertY(!m_camera->GetCameraInvertY());
m_camera->SetCameraInvertY(m_bCameraInvertY);
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_EFFECT: case EVENT_INTERFACE_EFFECT:
m_bEffect = !m_bEffect; m_camera->SetEffect(!m_camera->GetEffect());
m_camera->SetEffect(m_bEffect);
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_BLOOD: case EVENT_INTERFACE_BLOOD:
m_bBlood = !m_bBlood; m_camera->SetBlood(!m_camera->GetBlood());
m_camera->SetBlood(m_bBlood);
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
case EVENT_INTERFACE_AUTOSAVE_ENABLE: case EVENT_INTERFACE_AUTOSAVE_ENABLE:
m_bAutosave = !m_bAutosave; m_main->SetAutosave(!m_main->GetAutosave());
m_main->SetAutosave(m_bAutosave);
ChangeSetupButtons(); ChangeSetupButtons();
UpdateSetupButtons(); UpdateSetupButtons();
break; break;
@ -3156,7 +3143,7 @@ void CMainDialog::FrameParticle(float rTime)
279.0f, 18.0f, 279.0f, 18.0f,
}; };
if ( m_bDialog || !m_bRain ) return; if ( m_bDialog || !m_settings->GetInterfaceRain() ) return;
if ( m_phase == PHASE_MAIN_MENU ) if ( m_phase == PHASE_MAIN_MENU )
{ {
@ -3364,7 +3351,7 @@ void CMainDialog::NiceParticle(Math::Point mouse, bool bPress)
Math::Vector pos, speed; Math::Vector pos, speed;
Math::Point dim; Math::Point dim;
if ( !m_bRain ) return; if ( !m_settings->GetInterfaceRain() ) return;
if ( (m_phase == PHASE_SIMUL || if ( (m_phase == PHASE_SIMUL ||
m_phase == PHASE_WIN || m_phase == PHASE_WIN ||
m_phase == PHASE_LOST ) && m_phase == PHASE_LOST ) &&
@ -4345,7 +4332,7 @@ void CMainDialog::UpdateSceneResume(int chap, int rank)
numTry = m_main->GetPlayerProfile()->GetLevelTryCount(m_category, chap, rank); numTry = m_main->GetPlayerProfile()->GetLevelTryCount(m_category, chap, rank);
bPassed = m_main->GetPlayerProfile()->GetLevelPassed(m_category, chap, rank); bPassed = m_main->GetPlayerProfile()->GetLevelPassed(m_category, chap, rank);
bVisible = ( numTry > 2 || bPassed || m_main->GetShowSoluce() ); bVisible = ( numTry > 2 || bPassed || m_main->GetShowSoluce() );
if ( !GetSoluce4() ) bVisible = false; if ( !m_settings->GetSoluce4() ) bVisible = false;
pc->SetState(STATE_VISIBLE, bVisible); pc->SetState(STATE_VISIBLE, bVisible);
if ( !bVisible ) if ( !bVisible )
{ {
@ -4429,19 +4416,20 @@ void CMainDialog::ChangeDisplay()
bFull = pc->TestState(STATE_CHECK); bFull = pc->TestState(STATE_CHECK);
m_setupFull = bFull; m_setupFull = bFull;
SetupMemorize();
#if !PLATFORM_LINUX
// Windows causes problems, so we'll restart the game
// Mac OS was not tested so let's restart just to be sure
m_app->Restart();
#else
std::vector<Math::IntPoint> modes; std::vector<Math::IntPoint> modes;
m_app->GetVideoResolutionList(modes, true, true); m_app->GetVideoResolutionList(modes, true, true);
Gfx::DeviceConfig config = m_app->GetVideoConfig(); Gfx::DeviceConfig config = m_app->GetVideoConfig();
config.size = modes[m_setupSelMode]; config.size = modes[m_setupSelMode];
config.fullScreen = bFull; config.fullScreen = bFull;
m_settings->SaveResolutionSettings(config);
#if !PLATFORM_LINUX
// Windows causes problems, so we'll restart the game
// Mac OS was not tested so let's restart just to be sure
m_app->Restart();
#else
m_app->ChangeVideoConfig(config); m_app->ChangeVideoConfig(config);
#endif #endif
} }
@ -4505,19 +4493,19 @@ void CMainDialog::UpdateSetupButtons()
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_TOOLTIP)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_TOOLTIP));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bTooltip); pc->SetState(STATE_CHECK, m_settings->GetTooltips());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_GLINT)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_GLINT));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bGlint); pc->SetState(STATE_CHECK, m_settings->GetInterfaceGlint());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_RAIN)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_RAIN));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bRain); pc->SetState(STATE_CHECK, m_settings->GetInterfaceRain());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_MOUSE)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_MOUSE));
@ -4541,67 +4529,67 @@ void CMainDialog::UpdateSetupButtons()
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SOLUCE4)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SOLUCE4));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bSoluce4); pc->SetState(STATE_CHECK, m_settings->GetSoluce4());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_MOVIES)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_MOVIES));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bMovies); pc->SetState(STATE_CHECK, m_settings->GetMovies());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_NICERST)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_NICERST));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bNiceReset); pc->SetState(STATE_CHECK, m_settings->GetNiceReset());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_HIMSELF)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_HIMSELF));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bHimselfDamage); pc->SetState(STATE_CHECK, m_settings->GetHimselfDamage());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SCROLL)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SCROLL));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bCameraScroll); pc->SetState(STATE_CHECK, m_camera->GetCameraScroll());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_INVERTX)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_INVERTX));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bCameraInvertX); pc->SetState(STATE_CHECK, m_camera->GetCameraInvertX());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_INVERTY)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_INVERTY));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bCameraInvertY); pc->SetState(STATE_CHECK, m_camera->GetCameraInvertY());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_EFFECT)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_EFFECT));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bEffect); pc->SetState(STATE_CHECK, m_camera->GetEffect());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_BLOOD)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_BLOOD));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bBlood); pc->SetState(STATE_CHECK, m_camera->GetBlood());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_AUTOSAVE_ENABLE)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_AUTOSAVE_ENABLE));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_CHECK, m_bAutosave); pc->SetState(STATE_CHECK, m_main->GetAutosave());
} }
ps = static_cast<CSlider*>(pw->SearchControl(EVENT_INTERFACE_AUTOSAVE_INTERVAL)); ps = static_cast<CSlider*>(pw->SearchControl(EVENT_INTERFACE_AUTOSAVE_INTERVAL));
if ( ps != 0 ) if ( ps != 0 )
{ {
ps->SetState(STATE_ENABLE, m_bAutosave); ps->SetState(STATE_ENABLE, m_main->GetAutosave());
ps->SetVisibleValue(m_main->GetAutosaveInterval()); ps->SetVisibleValue(m_main->GetAutosaveInterval());
} }
@ -4609,7 +4597,7 @@ void CMainDialog::UpdateSetupButtons()
ps = static_cast<CSlider*>(pw->SearchControl(EVENT_INTERFACE_AUTOSAVE_SLOTS)); ps = static_cast<CSlider*>(pw->SearchControl(EVENT_INTERFACE_AUTOSAVE_SLOTS));
if ( ps != 0 ) if ( ps != 0 )
{ {
ps->SetState(STATE_ENABLE, m_bAutosave); ps->SetState(STATE_ENABLE, m_main->GetAutosave());
ps->SetVisibleValue(m_main->GetAutosaveSlots()); ps->SetVisibleValue(m_main->GetAutosaveSlots());
} }
@ -4881,370 +4869,6 @@ void CMainDialog::ChangeSetupButtons()
} }
// Memorizes all the settings.
void CMainDialog::SetupMemorize()
{
GetConfigFile().SetIntProperty("Setup", "Tooltips", m_bTooltip);
GetConfigFile().SetIntProperty("Setup", "InterfaceGlint", m_bGlint);
GetConfigFile().SetIntProperty("Setup", "InterfaceRain", m_bRain);
GetConfigFile().SetIntProperty("Setup", "Soluce4", m_bSoluce4);
GetConfigFile().SetIntProperty("Setup", "Movies", m_bMovies);
GetConfigFile().SetIntProperty("Setup", "NiceReset", m_bNiceReset);
GetConfigFile().SetIntProperty("Setup", "HimselfDamage", m_bHimselfDamage);
GetConfigFile().SetIntProperty("Setup", "CameraScroll", m_bCameraScroll);
GetConfigFile().SetIntProperty("Setup", "CameraInvertX", m_bCameraInvertX);
GetConfigFile().SetIntProperty("Setup", "CameraInvertY", m_bCameraInvertY);
GetConfigFile().SetIntProperty("Setup", "InterfaceEffect", m_bEffect);
GetConfigFile().SetIntProperty("Setup", "Blood", m_bBlood);
GetConfigFile().SetIntProperty("Setup", "Autosave", m_bAutosave);
GetConfigFile().SetIntProperty("Setup", "AutosaveInterval", m_main->GetAutosaveInterval());
GetConfigFile().SetIntProperty("Setup", "AutosaveSlots", m_main->GetAutosaveSlots());
GetConfigFile().SetIntProperty("Setup", "GroundShadow", m_engine->GetShadow());
GetConfigFile().SetIntProperty("Setup", "GroundSpot", m_engine->GetGroundSpot());
GetConfigFile().SetIntProperty("Setup", "ObjectDirty", m_engine->GetDirty());
GetConfigFile().SetIntProperty("Setup", "FogMode", m_engine->GetFog());
GetConfigFile().SetIntProperty("Setup", "LensMode", m_engine->GetLensMode());
GetConfigFile().SetIntProperty("Setup", "SkyMode", m_engine->GetSkyMode());
GetConfigFile().SetIntProperty("Setup", "PlanetMode", m_engine->GetPlanetMode());
GetConfigFile().SetIntProperty("Setup", "LightMode", m_engine->GetLightMode());
GetConfigFile().SetIntProperty("Setup", "UseJoystick", m_app->GetJoystickEnabled() ? m_app->GetJoystick().index : -1);
GetConfigFile().SetFloatProperty("Setup", "ParticleDensity", m_engine->GetParticleDensity());
GetConfigFile().SetFloatProperty("Setup", "ClippingDistance", m_engine->GetClippingDistance());
GetConfigFile().SetFloatProperty("Setup", "ObjectDetail", m_engine->GetObjectDetail());
GetConfigFile().SetFloatProperty("Setup", "GadgetQuantity", m_engine->GetGadgetQuantity());
GetConfigFile().SetIntProperty("Setup", "TotoMode", m_engine->GetTotoMode());
GetConfigFile().SetIntProperty("Setup", "AudioVolume", m_sound->GetAudioVolume());
GetConfigFile().SetIntProperty("Setup", "MusicVolume", m_sound->GetMusicVolume());
GetConfigFile().SetIntProperty("Setup", "EditIndentMode", m_engine->GetEditIndentMode());
GetConfigFile().SetIntProperty("Setup", "EditIndentValue", m_engine->GetEditIndentValue());
GetConfigFile().SetIntProperty("Setup", "SystemMouse", m_app->GetMouseMode() == MOUSE_SYSTEM);
GetConfigFile().SetIntProperty("Setup", "MipmapLevel", m_engine->GetTextureMipmapLevel());
GetConfigFile().SetIntProperty("Setup", "Anisotropy", m_engine->GetTextureAnisotropyLevel());
GetConfigFile().SetFloatProperty("Setup", "ShadowColor", m_engine->GetShadowColor());
GetConfigFile().SetFloatProperty("Setup", "ShadowRange", m_engine->GetShadowRange());
GetConfigFile().SetIntProperty("Setup", "MSAA", m_engine->GetMultiSample());
GetConfigFile().SetIntProperty("Setup", "FilterMode", m_engine->GetTextureFilterMode());
GetConfigFile().SetIntProperty("Setup", "ShadowMapping", m_engine->GetShadowMapping());
GetConfigFile().SetIntProperty("Setup", "ShadowMappingQuality", m_engine->GetShadowMappingQuality());
GetConfigFile().SetIntProperty("Setup", "ShadowMappingResolution", m_engine->GetShadowMappingOffscreen() ? m_engine->GetShadowMappingOffscreenResolution() : 0);
/* screen setup */
GetConfigFile().SetIntProperty("Setup", "Fullscreen", m_setupFull ? 1 : 0);
CList *pl;
CWindow *pw;
pw = static_cast<CWindow *>(m_interface->SearchControl(EVENT_WINDOW5));
if ( pw != 0 )
{
pl = static_cast<CList *>(pw->SearchControl(EVENT_LIST2));
if ( pl != 0 )
{
std::vector<Math::IntPoint> modes;
m_app->GetVideoResolutionList(modes, true, true);
std::ostringstream ss;
ss << modes[m_setupSelMode].x << "x" << modes[m_setupSelMode].y;
GetConfigFile().SetStringProperty("Setup", "Resolution", ss.str());
}
}
CInput::GetInstancePointer()->SaveKeyBindings();
GetConfigFile().SetIntProperty("Setup", "DeleteGamer", m_bDeleteGamer);
GetConfigFile().Save();
}
// Remember all the settings.
void CMainDialog::SetupRecall()
{
float fValue;
int iValue;
std::string key;
if ( GetConfigFile().GetIntProperty("Setup", "TotoMode", iValue) )
{
m_engine->SetTotoMode(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "Tooltips", iValue) )
{
m_bTooltip = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "InterfaceGlint", iValue) )
{
m_bGlint = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "InterfaceRain", iValue) )
{
m_bRain = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "SystemMouse", iValue) )
{
m_app->SetMouseMode(iValue ? MOUSE_SYSTEM : MOUSE_ENGINE);
}
if ( GetConfigFile().GetIntProperty("Setup", "Soluce4", iValue) )
{
m_bSoluce4 = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "Movies", iValue) )
{
m_bMovies = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "NiceReset", iValue) )
{
m_bNiceReset = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "HimselfDamage", iValue) )
{
m_bHimselfDamage = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "CameraScroll", iValue) )
{
m_bCameraScroll = iValue;
m_camera->SetCameraScroll(m_bCameraScroll);
}
if ( GetConfigFile().GetIntProperty("Setup", "CameraInvertX", iValue) )
{
m_bCameraInvertX = iValue;
m_camera->SetCameraInvertX(m_bCameraInvertX);
}
if ( GetConfigFile().GetIntProperty("Setup", "CameraInvertY", iValue) )
{
m_bCameraInvertY = iValue;
m_camera->SetCameraInvertY(m_bCameraInvertY);
}
if ( GetConfigFile().GetIntProperty("Setup", "InterfaceEffect", iValue) )
{
m_bEffect = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "Blood", iValue) )
{
m_bBlood = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "Autosave", iValue) )
{
m_bAutosave = iValue;
}
if ( GetConfigFile().GetIntProperty("Setup", "AutosaveInterval", iValue) )
{
m_main->SetAutosaveInterval(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "AutosaveSlots", iValue) )
{
m_main->SetAutosaveSlots(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "GroundShadow", iValue) )
{
m_engine->SetShadow(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "GroundSpot", iValue) )
{
m_engine->SetGroundSpot(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "ObjectDirty", iValue) )
{
m_engine->SetDirty(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "FogMode", iValue) )
{
m_engine->SetFog(iValue);
m_camera->SetOverBaseColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f)); // TODO: color ok?
}
if ( GetConfigFile().GetIntProperty("Setup", "LensMode", iValue) )
{
m_engine->SetLensMode(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "SkyMode", iValue) )
{
m_engine->SetSkyMode(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "PlanetMode", iValue) )
{
m_engine->SetPlanetMode(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "LightMode", iValue) )
{
m_engine->SetLightMode(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "UseJoystick", iValue) )
{
if(iValue >= 0)
{
auto joysticks = m_app->GetJoystickList();
for(const auto& joystick : joysticks)
{
if (joystick.index == iValue)
{
m_app->ChangeJoystick(joystick);
m_app->SetJoystickEnabled(true);
}
}
}
else
{
m_app->SetJoystickEnabled(false);
}
}
if ( GetConfigFile().GetFloatProperty("Setup", "ParticleDensity", fValue) )
{
m_engine->SetParticleDensity(fValue);
}
if ( GetConfigFile().GetFloatProperty("Setup", "ClippingDistance", fValue) )
{
m_engine->SetClippingDistance(fValue);
}
if ( GetConfigFile().GetFloatProperty("Setup", "ObjectDetail", fValue) )
{
m_engine->SetObjectDetail(fValue);
}
if ( GetConfigFile().GetFloatProperty("Setup", "GadgetQuantity", fValue) )
{
m_engine->SetGadgetQuantity(fValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "AudioVolume", iValue) )
{
m_sound->SetAudioVolume(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "MusicVolume", iValue) )
{
m_sound->SetMusicVolume(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "EditIndentMode", iValue) )
{
m_engine->SetEditIndentMode(iValue);
}
if ( GetConfigFile().GetIntProperty("Setup", "EditIndentValue", iValue) )
{
m_engine->SetEditIndentValue(iValue);
}
CInput::GetInstancePointer()->LoadKeyBindings();
if ( GetConfigFile().GetIntProperty("Setup", "DeleteGamer", iValue) )
{
m_bDeleteGamer = iValue;
}
if ( GetConfigFile().GetStringProperty("Setup", "Resolution", key) )
{
std::istringstream resolution(key);
std::string ws, hs;
std::getline(resolution, ws, 'x');
std::getline(resolution, hs, 'x');
int w = 800, h = 600;
if (!ws.empty() && !hs.empty())
{
w = atoi(ws.c_str());
h = atoi(hs.c_str());
}
std::vector<Math::IntPoint> modes;
m_app->GetVideoResolutionList(modes, true, true);
for (auto it = modes.begin(); it != modes.end(); ++it)
{
if (it->x == w && it->y == h)
{
m_setupSelMode = it - modes.begin();
break;
}
}
}
if ( GetConfigFile().GetIntProperty("Setup", "Fullscreen", iValue) )
{
m_setupFull = (iValue == 1);
}
if ( GetConfigFile().GetIntProperty("Setup", "MipmapLevel", iValue))
{
m_engine->SetTextureMipmapLevel(iValue);
}
if (GetConfigFile().GetIntProperty("Setup", "Anisotropy", iValue))
{
m_engine->SetTextureAnisotropyLevel(iValue);
}
if (GetConfigFile().GetIntProperty("Setup", "ShadowMapping", iValue))
{
m_engine->SetShadowMapping(iValue);
}
if (GetConfigFile().GetIntProperty("Setup", "ShadowMappingQuality", iValue))
{
m_engine->SetShadowMappingQuality(iValue);
}
if (GetConfigFile().GetIntProperty("Setup", "ShadowMappingResolution", iValue))
{
if(iValue == 0)
{
m_engine->SetShadowMappingOffscreen(false);
}
else
{
m_engine->SetShadowMappingOffscreen(true);
m_engine->SetShadowMappingOffscreenResolution(iValue);
}
}
if (GetConfigFile().GetFloatProperty("Setup", "ShadowColor", fValue))
{
m_engine->SetShadowColor(fValue);
}
if (GetConfigFile().GetFloatProperty("Setup", "ShadowRange", fValue))
{
m_engine->SetShadowRange(fValue);
}
if (GetConfigFile().GetIntProperty("Setup", "MSAA", iValue))
{
m_engine->SetMultiSample(iValue);
}
if (GetConfigFile().GetIntProperty("Setup", "FilterMode", iValue))
{
m_engine->SetTextureFilterMode(static_cast<Gfx::TexFilter>(iValue));
}
}
// Changes the general level of quality. // Changes the general level of quality.
void CMainDialog::ChangeSetupQuality(int quality) void CMainDialog::ChangeSetupQuality(int quality)
@ -5660,7 +5284,7 @@ void CMainDialog::FrameDialog(float rTime)
} }
} }
if ( !m_bGlint ) return; if ( !m_settings->GetInterfaceGlint() ) return;
m_dialogParti += rTime; m_dialogParti += rTime;
if ( m_dialogParti < m_engine->ParticleAdapt(0.05f) ) return; if ( m_dialogParti < m_engine->ParticleAdapt(0.05f) ) return;
@ -5789,13 +5413,6 @@ void CMainDialog::StopSuspend()
} }
// Whether to use tooltips.
bool CMainDialog::GetTooltip()
{
return m_bTooltip;
}
// Specifies whether a dialog is displayed. // Specifies whether a dialog is displayed.
bool CMainDialog::IsDialog() bool CMainDialog::IsDialog()
@ -5811,42 +5428,6 @@ bool CMainDialog::GetSceneSoluce()
return m_bSceneSoluce; return m_bSceneSoluce;
} }
// Indicates if there are reflections on the buttons.
bool CMainDialog::GetGlint()
{
return m_bGlint;
}
// Whether to show 4:solutions.
bool CMainDialog::GetSoluce4()
{
return m_bSoluce4;
}
// Whether to show the cinematics.
bool CMainDialog::GetMovies()
{
return m_bMovies;
}
// Whether to make an animation on reset.
bool CMainDialog::GetNiceReset()
{
return m_bNiceReset;
}
// Indicates whether the fire causes damage to its own units.
bool CMainDialog::GetHimselfDamage()
{
return m_bHimselfDamage;
}
bool CMainDialog::GetGamerOnlyHead() bool CMainDialog::GetGamerOnlyHead()
{ {
return (m_phase == PHASE_APPERANCE && m_apperanceTab == 0); return (m_phase == PHASE_APPERANCE && m_apperanceTab == 0);

28
src/ui/maindialog.h
View File

@ -31,6 +31,7 @@
class CEventQueue; class CEventQueue;
class CSettings;
class CSoundInterface; class CSoundInterface;
namespace Gfx namespace Gfx
@ -61,13 +62,6 @@ public:
bool GetSceneSoluce(); bool GetSceneSoluce();
bool GetTooltip();
bool GetGlint();
bool GetSoluce4();
bool GetMovies();
bool GetNiceReset();
bool GetHimselfDamage();
void StartAbort(); void StartAbort();
void StartDeleteObject(); void StartDeleteObject();
void StartDeleteGame(char *gamer); void StartDeleteGame(char *gamer);
@ -80,9 +74,6 @@ public:
void StartSuspend(); void StartSuspend();
void StopSuspend(); void StopSuspend();
void SetupMemorize();
void SetupRecall();
void UpdateChapterPassed(); void UpdateChapterPassed();
bool NextMission(); bool NextMission();
@ -142,6 +133,7 @@ protected:
Gfx::CCamera* m_camera; Gfx::CCamera* m_camera;
CSoundInterface* m_sound; CSoundInterface* m_sound;
CPauseManager* m_pause; CPauseManager* m_pause;
CSettings* m_settings;
Phase m_phase; // copy of CRobotMain Phase m_phase; // copy of CRobotMain
Phase m_phaseSetup; // tab selected Phase m_phaseSetup; // tab selected
@ -158,10 +150,10 @@ protected:
int m_accessChap; int m_accessChap;
bool m_bSceneSoluce; // shows the solution bool m_bSceneSoluce; // shows the solution
bool m_bSimulSetup; // adjustment during the game bool m_bSimulSetup; // adjustment during the game
bool m_accessEnable; bool m_accessEnable;
bool m_accessMission; bool m_accessMission;
bool m_accessUser; bool m_accessUser;
bool m_bDeleteGamer;
std::vector<std::string> m_customLevelList; std::vector<std::string> m_customLevelList;
@ -171,20 +163,6 @@ protected:
int m_setupSelMode; int m_setupSelMode;
bool m_setupFull; bool m_setupFull;
bool m_bTooltip; // tooltips to be displayed?
bool m_bGlint; // reflections on buttons?
bool m_bRain; // rain in the interface?
bool m_bSoluce4; // solutions in program 4?
bool m_bMovies; // cinematics?
bool m_bNiceReset; // for reset animation
bool m_bHimselfDamage; // for shots
bool m_bCameraScroll; // for CCamera
bool m_bCameraInvertX; // for CCamera
bool m_bCameraInvertY; // for CCamera
bool m_bEffect; // for CCamera
bool m_bBlood; // for CCamera
bool m_bAutosave;
Math::Point m_glintMouse; Math::Point m_glintMouse;
float m_glintTime; float m_glintTime;