matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add hidden settings for not including/loading pressure in saves, closes #524

Browse Source 
If I ever redo the options menu, there will be an actual checkbox for these
This commit is contained in:
jacob1 2018-03-06 21:01:49 -05:00
parent 68efe49a5b
commit 5eb0d1bd27
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/game/GameController.cpp
View File

@ -329,6 +329,10 @@ std::string GameController::GetSignText(int signID)
void GameController::PlaceSave(ui::Point position, bool includePressure) void GameController::PlaceSave(ui::Point position, bool includePressure)
{ {
bool incPressure = Client::Ref().GetPrefBool("Simulation.LoadPressure", true);
if (!incPressure)
includePressure = !includePressure;
GameSave *placeSave = gameModel->GetPlaceSave(); GameSave *placeSave = gameModel->GetPlaceSave();
if (placeSave) if (placeSave)
{ {
@ -571,8 +575,11 @@ void GameController::ToolClick(int toolSelection, ui::Point point)
std::string GameController::StampRegion(ui::Point point1, ui::Point point2, bool includePressure) std::string GameController::StampRegion(ui::Point point1, ui::Point point2, bool includePressure)
{ {
GameSave * newSave; bool incPressure = Client::Ref().GetPrefBool("Simulation.IncludePressure", true);
newSave = gameModel->GetSimulation()->Save(point1.X, point1.Y, point2.X, point2.Y, includePressure); if (!incPressure)
includePressure = !includePressure;
GameSave * newSave = gameModel->GetSimulation()->Save(point1.X, point1.Y, point2.X, point2.Y, includePressure);
if(newSave) if(newSave)
{ {
newSave->paused = gameModel->GetPaused(); newSave->paused = gameModel->GetPaused();
@ -590,8 +597,11 @@ std::string GameController::StampRegion(ui::Point point1, ui::Point point2, bool
void GameController::CopyRegion(ui::Point point1, ui::Point point2, bool includePressure) void GameController::CopyRegion(ui::Point point1, ui::Point point2, bool includePressure)
{ {
GameSave * newSave; bool incPressure = Client::Ref().GetPrefBool("Simulation.IncludePressure", true);
newSave = gameModel->GetSimulation()->Save(point1.X, point1.Y, point2.X, point2.Y, includePressure); if (!incPressure)
includePressure = !includePressure;
GameSave * newSave = gameModel->GetSimulation()->Save(point1.X, point1.Y, point2.X, point2.Y, includePressure);
if(newSave) if(newSave)
{ {
Json::Value clipboardInfo; Json::Value clipboardInfo;