Compare commits
2 Commits
618dad7df1
...
e17764dc88
Author | SHA1 | Date |
---|---|---|
Pcornat | e17764dc88 | |
Pcornat | 340a4516dd |
|
@ -97,6 +97,8 @@ option(SPDLOG_NO_ATOMIC_LEVELS "prevent spdlog from using of std::atomic log lev
|
|||
add_subdirectory(external/spdlog)
|
||||
|
||||
set(JSON_BuildTests OFF CACHE INTERNAL "")
|
||||
option(JSON_ImplicitConversions "Enable implicit conversions." OFF)
|
||||
option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." ON)
|
||||
add_subdirectory(external/json)
|
||||
|
||||
option(CATCH_INSTALL_DOCS "Install documentation alongside library" OFF)
|
||||
|
|
|
@ -41,10 +41,10 @@ namespace character::characteristic {
|
|||
[[nodiscard]] std::uint32_t get_additional() const { return additional; }
|
||||
|
||||
friend void from_json(const json &j, Characteristic &charac) {
|
||||
const_cast<std::uint32_t &>(charac.base) = j.at("base");
|
||||
charac.carac = j.at("carac");
|
||||
charac.materiel = j.at("materiel");
|
||||
charac.additional = j.at("additional");
|
||||
const_cast<std::uint32_t &>(charac.base) = j.at("base").get<std::uint32_t>();
|
||||
charac.carac = j.at("carac").get<std::uint32_t>();
|
||||
charac.materiel = j.at("materiel").get<std::uint32_t>();
|
||||
charac.additional = j.at("additional").get<std::uint32_t>();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
int main() {
|
||||
std::ios::sync_with_stdio(false);
|
||||
spdlog::set_default_logger(spdlog::stdout_color_st("console"));
|
||||
spdlog::set_default_logger(spdlog::stdout_color_st("BillySheet"));
|
||||
|
||||
try {
|
||||
gui::Window window;
|
||||
|
|
Loading…
Reference in New Issue