Compare commits

..

No commits in common. "22c9627b84623a8c7bedef808ada4d8d4106f6a3" and "d0716d624281b35365040e3b65faa3ac24945286" have entirely different histories.

5 changed files with 25 additions and 70 deletions

View file

@ -145,7 +145,6 @@ SaveTool::SaveTool(const Arguments& arguments):
SaveTool::~SaveTool() { SaveTool::~SaveTool() {
SDL_RemoveTimer(_gameCheckTimerId); SDL_RemoveTimer(_gameCheckTimerId);
_conf.setValue("cheat_mode", _cheatMode);
_conf.setValue("unsafe_mode", _unsafeMode); _conf.setValue("unsafe_mode", _unsafeMode);
_conf.setValue("startup_update_check", _checkUpdatesOnStartup); _conf.setValue("startup_update_check", _checkUpdatesOnStartup);
_conf.save(); _conf.save();
@ -358,13 +357,6 @@ void SaveTool::updateCheckEvent(SDL_Event& event) {
} }
void SaveTool::initialiseConfiguration() { void SaveTool::initialiseConfiguration() {
if(_conf.hasValue("cheat_mode")) {
_cheatMode = _conf.value<bool>("cheat_mode");
}
else {
_conf.setValue("cheat_mode", _cheatMode);
}
if(_conf.hasValue("unsafe_mode")) { if(_conf.hasValue("unsafe_mode")) {
_unsafeMode = _conf.value<bool>("unsafe_mode"); _unsafeMode = _conf.value<bool>("unsafe_mode");
} }

View file

@ -204,6 +204,4 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
std::string _latestVersion; std::string _latestVersion;
std::string _releaseLink; std::string _releaseLink;
std::string _downloadLink; std::string _downloadLink;
bool _cheatMode{false};
}; };

View file

@ -231,10 +231,6 @@ void SaveTool::drawGeneralInfo() {
} }
} }
if(!_cheatMode) {
return;
}
ImGui::SameLine(); ImGui::SameLine();
static Int credits; static Int credits;
@ -305,8 +301,7 @@ void SaveTool::drawResearchInventory() {
ImGui::TextUnformatted((name)); \ ImGui::TextUnformatted((name)); \
ImGui::TableSetColumnIndex(1); \ ImGui::TableSetColumnIndex(1); \
if(_currentProfile->getter() != -1) { \ if(_currentProfile->getter() != -1) { \
ImGui::Text("%i", _currentProfile->getter()); \ drawUnsafeText("%i", _currentProfile->getter()); \
if(_cheatMode) { \
ImGui::TableSetColumnIndex(2); \ ImGui::TableSetColumnIndex(2); \
ImGui::PushID(#setter); \ ImGui::PushID(#setter); \
static Int var = _currentProfile->getter(); \ static Int var = _currentProfile->getter(); \
@ -322,7 +317,6 @@ void SaveTool::drawResearchInventory() {
} \ } \
ImGui::PopID(); \ ImGui::PopID(); \
} \ } \
} \
else { \ else { \
ImGui::TextDisabled("Not found in the save file"); \ ImGui::TextDisabled("Not found in the save file"); \
} }

View file

@ -55,15 +55,8 @@ void SaveTool::drawMainMenu() {
ImGui::Separator(); ImGui::Separator();
if(ImGui::BeginMenu(ICON_FA_COG " Settings")) { if(ImGui::BeginMenu(ICON_FA_COG " Settings")) {
ImGui::Checkbox("Cheat mode", &_cheatMode);
ImGui::SameLine();
ImGui::AlignTextToFramePadding();
drawHelpMarker("This gives access to save edition features that can be considered cheats.",
Float(windowSize().x()) * 0.4f);
ImGui::Checkbox("Unsafe mode", &_unsafeMode); ImGui::Checkbox("Unsafe mode", &_unsafeMode);
ImGui::SameLine(); ImGui::SameLine();
ImGui::AlignTextToFramePadding();
drawHelpMarker("This allows changing the state of save files in the game's save folder even when the game is running.", drawHelpMarker("This allows changing the state of save files in the game's save folder even when the game is running.",
Float(windowSize().x()) * 0.4f); Float(windowSize().x()) * 0.4f);

View file

@ -18,25 +18,7 @@
#include <fstream> #include <fstream>
#include <errhandlingapi.h>
#include <synchapi.h>
#include <winerror.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
void* mutex_handle = CreateMutexW(nullptr, 0, L"MassBuilderSaveTool");
if(!mutex_handle) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error initialising the app",
"There was an error initialising the mutex.",nullptr);
return EXIT_FAILURE;
}
if(GetLastError() == ERROR_ALREADY_EXISTS) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error initialising the app",
"There can be only one running instance of the application.",nullptr);
return EXIT_FAILURE;
}
#ifndef SAVETOOL_DEBUG_BUILD #ifndef SAVETOOL_DEBUG_BUILD
std::ofstream output{"SaveToolLog.txt", std::ios::trunc|std::ios::out}; std::ofstream output{"SaveToolLog.txt", std::ios::trunc|std::ios::out};
@ -46,9 +28,5 @@ int main(int argc, char** argv) {
#endif #endif
SaveTool app({argc, argv}); SaveTool app({argc, argv});
Int result = app.exec(); return app.exec();
ReleaseMutex(mutex_handle);
return result;
} }