Compare commits

..

No commits in common. "7531dc88ac189b3c718c9d95bd93d3a9926d4090" and "ea6bf5b5822d6db1bceaa4d79d4e80ad3734113a" have entirely different histories.

7 changed files with 12 additions and 15 deletions

View file

@ -52,11 +52,8 @@ add_executable(MassBuilderSaveTool WIN32
${Assets})
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_compile_definitions(SAVETOOL_DEBUG_BUILD)
add_compile_definitions(MANAGER_DEBUG_BUILD)
endif()
add_compile_definitions(SAVETOOL_VERSION="1.0.0"
SAVETOOL_CODENAME="Agonising Quark"
SUPPORTED_GAME_VERSION="0.7.6")
target_link_options(MassBuilderSaveTool PRIVATE -static -static-libgcc -static-libstdc++)

View file

@ -39,7 +39,7 @@
extern const ImVec2 center_pivot = {0.5f, 0.5f};
#ifdef SAVETOOL_DEBUG_BUILD
#ifdef MANAGER_DEBUG_BUILD
#include <Corrade/Utility/Tweakable.h>
#define tw CORRADE_TWEAKABLE
@ -48,10 +48,10 @@ Utility::Tweakable tweak;
SaveTool::SaveTool(const Arguments& arguments):
Platform::Sdl2Application{arguments,
Configuration{}.setTitle("M.A.S.S. Builder Save Tool " SAVETOOL_VERSION " (\"" SAVETOOL_CODENAME "\")")
Configuration{}.setTitle("M.A.S.S. Builder Save Tool version rewrite-0.0.1")
.setSize({960, 720})}
{
#ifdef SAVETOOL_DEBUG_BUILD
#ifdef MANAGER_DEBUG_BUILD
tweak.enable("", "../../");
#endif
@ -154,7 +154,7 @@ void SaveTool::handleFileAction(efsw::WatchID watch_id,
}
void SaveTool::drawEvent() {
#ifdef SAVETOOL_DEBUG_BUILD
#ifdef MANAGER_DEBUG_BUILD
tweak.update();
#endif
@ -365,7 +365,7 @@ void SaveTool::drawGui() {
drawAbout();
}
#ifdef SAVETOOL_DEBUG_BUILD
#ifdef MANAGER_DEBUG_BUILD
if(_demoWindow) {
ImGui::ShowDemoWindow(&_demoWindow);
}
@ -410,7 +410,7 @@ void SaveTool::drawDisclaimer() {
ImGui::Bullet();
ImGui::SameLine();
ImGui::TextUnformatted("This version of the application was tested on M.A.S.S. Builder early access version " SUPPORTED_GAME_VERSION ". It may or may not work with other versions of the game.");
ImGui::TextUnformatted("This version of the application was tested on M.A.S.S. Builder early access version 0.7.6. It may or may not work with other versions of the game.");
ImGui::PopTextWrapPos();

View file

@ -141,7 +141,7 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
UiState _uiState{UiState::Disclaimer};
bool _aboutPopup{false};
#ifdef SAVETOOL_DEBUG_BUILD
#ifdef MANAGER_DEBUG_BUILD
bool _demoWindow{false};
bool _styleEditor{false};
bool _metricsWindow{false};

View file

@ -306,7 +306,7 @@ void SaveTool::drawResearchInventory() {
ImGui::TableSetColumnIndex(0); \
ImGui::TextUnformatted(name); \
ImGui::TableSetColumnIndex(1); \
ImGui::TextDisabled("Unavailable as of M.A.S.S. Builder version " SUPPORTED_GAME_VERSION);
ImGui::TextDisabled("Unavailable as of M.A.S.S. Builder version 0.7.6");
#define matRow(name, var, getter, setter) \
ImGui::TableNextRow(); \

View file

@ -47,7 +47,7 @@ void SaveTool::drawAbout() {
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(1);
ImGui::TextUnformatted(SDL_GetWindowTitle(window()));
ImGui::Text("%s (<insert codename here>)", SDL_GetWindowTitle(window()));
ImGui::EndTable();
}

View file

@ -89,7 +89,7 @@ void SaveTool::drawMainMenu() {
ImGui::EndMenu();
}
#ifdef SAVETOOL_DEBUG_BUILD
#ifdef MANAGER_DEBUG_BUILD
if(ImGui::BeginMenu("Debug tools")) {
ImGui::MenuItem("ImGui demo window", nullptr, &_demoWindow);
ImGui::MenuItem("ImGui style editor", nullptr, &_styleEditor);

View file

@ -19,7 +19,7 @@
#include <fstream>
int main(int argc, char** argv) {
#ifndef SAVETOOL_DEBUG_BUILD
#ifndef MANAGER_DEBUG_BUILD
std::ofstream output{"out.txt", std::ios::trunc|std::ios::out};
Utility::Debug d{&output};