Skip to content

Commit

Permalink
updating resources;
Browse files Browse the repository at this point in the history
  • Loading branch information
zethon committed Jun 26, 2024
1 parent 1997b5b commit 64c7a23
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 10 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ endif(SHARED_SFML)
# initialize conan libs
include(CMake/conan.cmake)
conan_cmake_run(REQUIRES
boost/1.77.0
boost/1.84.0
ogg/1.3.5
sfml/2.5.1
spdlog/1.9.2
nlohmann_json/3.10.5
sfml/2.6.1
spdlog/1.14.1
nlohmann_json/3.11.3
lua/5.4.3
zlib/1.2.12
zlib/1.3.1
BASIC_SETUP CMAKE_TARGETS
GENERATORS cmake_find_package cmake_paths
BUILD missing
Expand Down
4 changes: 3 additions & 1 deletion src/Item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ void from_json(const nl::json& j, ItemCallbacks& cbs)
{
if (j.contains("onSelect"))
{
j["onSelect"].get_to(cbs.onSelect);
std::string s;
j["onSelect"].get_to(s);
cbs.onSelect = s;
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/ItemFactory.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include <fstream>

#include <boost/filesystem.hpp>

#include <lua.hpp>
Expand Down
1 change: 1 addition & 0 deletions src/ResourceManager.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <fstream>
#include <fmt/core.h>

#include "ResourceManager.h"
Expand Down
5 changes: 4 additions & 1 deletion src/Scenes/HackerTerminal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ std::string getHackerText()

boost::posix_time::ptime tl = boost::posix_time::second_clock::local_time();
output << "$> scp ~/* root@166.89.64.107:/subject_t/backups/"
<< fmt::format("{:04}-{:02}-{:02}", tl.date().year(), tl.date().month(), tl.date().day())
<< fmt::format("{:04}-{:02}-{:02}",
static_cast<std::uint16_t>(tl.date().year()),
static_cast<std::uint16_t>(tl.date().month()),
static_cast<std::uint16_t>(tl.date().day()))
<< std::endl
<< std::endl;

Expand Down
6 changes: 3 additions & 3 deletions src/Settings.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Ash Crypto
// Copyright (c) 2017-2020, Adalid Claure <aclaure@gmail.com>

#include <iostream>
#include <fstream>
#include <iomanip>

#include <boost/filesystem.hpp>
Expand Down Expand Up @@ -88,9 +88,9 @@ void Settings::save(std::string_view filename)

_currentFile = filename;

boost::filesystem::ofstream out;
std::ofstream out;
out.open(filename.data(),
boost::filesystem::ofstream::out | boost::filesystem::ofstream::trunc);
std::ofstream::out | std::ofstream::trunc);

out << std::setw(4) << _settings;
out.close();
Expand Down
2 changes: 2 additions & 0 deletions src/VehicleFactory.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include <fstream>

#include <boost/filesystem.hpp>
#include <boost/spirit/home/x3.hpp>

Expand Down

0 comments on commit 64c7a23

Please sign in to comment.