natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing more boost references

Browse Source
This commit is contained in:
Alister
2021-12-12 23:45:29 +00:00
parent f404a540d7
commit badac07093
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/noggit/texture_set.cpp
View File

@@ -8,10 +8,9 @@
#include <noggit/World.h>
#include <noggit/texture_set.hpp>
#include <ClientFile.hpp>
#include <algorithm> // std::min
#include <array>
#include <boost/format.hpp>
#include <sstream>
TextureSet::TextureSet (MapChunk* chunk, BlizzardArchive::ClientFile* f, size_t base, MapTile* tile
, bool use_big_alphamaps, bool do_not_fix_alpha_map, bool do_not_convert_alphamaps
@@ -111,7 +110,10 @@ void TextureSet::replace_texture (scoped_blp_texture_reference const& texture_to
// prevent texture duplication
if (replacement_texture_level != -1 && replacement_texture_level != texture_to_replace_level)
{
std::string fallback_tex_name = (boost::format("error_%d.blp") % replacement_texture_level).str();
auto sstream = std::stringstream();
sstream << "error_" << replacement_texture_level << ".blp";
std::string fallback_tex_name = sstream.str();
auto fallback = scoped_blp_texture_reference(fallback_tex_name, _context);
textures[replacement_texture_level] = std::move(fallback);

7
src/noggit/ui/tools/NodeEditor/Nodes/Logic/LogicReturnNode.cpp
View File

@@ -78,10 +78,9 @@ NodeValidationState LogicReturnNode::validate()
{
setValidationState(NodeValidationState::Error);
auto message = boost::format("Error: Failed to evaluate input of type <%s> at port %d.")
% _in_ports[i].data_type->type().name.toStdString() % i;
setValidationMessage(message.str().c_str());
auto sstream = std::stringstream();
sstream << "Error: Failed to evaluate input of type <"<< _in_ports[i].data_type->type().name.toStdString() << "> at port " << i << ".";
setValidationMessage(sstream.str().c_str());
return _validation_state;
}
}