From 1e0dfc4570f1657e005c2fd71e75cd2ae9538747 Mon Sep 17 00:00:00 2001 From: DJMrTV Date: Wed, 30 Aug 2023 22:21:42 +0200 Subject: [PATCH] Fixed typo and moved Config initialization to Configs.cpp --- Tools/MapTools/src/Rail.cpp | 2 +- src/Config/Configs.cpp | 5 +++++ src/main.cpp | 16 ++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Tools/MapTools/src/Rail.cpp b/Tools/MapTools/src/Rail.cpp index ab1a084..6a0812b 100644 --- a/Tools/MapTools/src/Rail.cpp +++ b/Tools/MapTools/src/Rail.cpp @@ -2,7 +2,7 @@ -Rail::Rail(const YAML::Node &ObjNode) : Element(ObjNode, {"RailPoints","m_railType","IsClosed","IsLadder","Priority"}) { +Rail::Rail(const YAML::Node &ObjNode) : Element(ObjNode, {"RailPoints","RailType","IsClosed","IsLadder","Priority"}) { YAML::Node railPointsNode = ObjNode["RailPoints"]; for (auto rlpoint: railPointsNode) { diff --git a/src/Config/Configs.cpp b/src/Config/Configs.cpp index 96dd7bb..a1c7000 100644 --- a/src/Config/Configs.cpp +++ b/src/Config/Configs.cpp @@ -3,6 +3,11 @@ // #include"Configs.h" #include +#include + +VGINIT_ACTION(LoadConfigs){ + Configs::g_loadConfigs("Gambit"); +} namespace Configs { static std::vector loadStringListConfig(boost::filesystem::path path) { diff --git a/src/main.cpp b/src/main.cpp index 18c499a..8d23bbd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,19 +1,15 @@ #include #include"imgui.h" -#include "virintox/gcore/gui/FileSelectDialog.h" -#include "InstanceVars.h" -#include "Map.h" -#include "MainViewport.h" -#include "Config/Configs.h" -#include +#include"virintox/gcore/gui/FileSelectDialog.h" +#include"InstanceVars.h" +#include"Map.h" +#include"MainViewport.h" +#include"Config/Configs.h" +#include #include VMIRRORASSEMBLYSELFREGISTER(SpoonEdit, VMIRRORVERSION(0,1,0,0),VMirror::AssemblyType::Executable) -VGINIT_ACTION(LoadConfigs){ - Configs::g_loadConfigs("Gambit"); -} - VGINIT_ACTION(AddMapSelector){ Graphics::window->addWidget(new Graphics::FileSelectDialog("Select/Save Map", {".yaml"},[&](boost::filesystem::path path){ selectedElem = nullptr;