guiutil::alert text wrapping + refactor
This commit is contained in:
@@ -11,7 +11,7 @@ namespace fs = std::filesystem;
|
||||
|
||||
WorldConverter::WorldConverter(fs::path folder,
|
||||
const Content* content,
|
||||
const ContentLUT* lut)
|
||||
std::shared_ptr<ContentLUT> lut)
|
||||
: lut(lut), content(content) {
|
||||
DebugSettings settings;
|
||||
wfile = new WorldFiles(folder, settings);
|
||||
@@ -60,7 +60,7 @@ void WorldConverter::convertNext() {
|
||||
Chunk::fromOld(data.get());
|
||||
}
|
||||
if (lut) {
|
||||
Chunk::convert(data.get(), lut);
|
||||
Chunk::convert(data.get(), lut.get());
|
||||
}
|
||||
wfile->put(gx, gz, data.get());
|
||||
}
|
||||
|
||||
@@ -2,19 +2,23 @@
|
||||
#define FILES_WORLD_CONVERTER_H_
|
||||
|
||||
#include <queue>
|
||||
#include <memory>
|
||||
#include <filesystem>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
class Content;
|
||||
class ContentLUT;
|
||||
class WorldFiles;
|
||||
|
||||
class WorldConverter {
|
||||
WorldFiles* wfile;
|
||||
const ContentLUT* const lut;
|
||||
std::shared_ptr<ContentLUT> const lut;
|
||||
const Content* const content;
|
||||
std::queue<std::filesystem::path> regions;
|
||||
std::queue<fs::path> regions;
|
||||
public:
|
||||
WorldConverter(std::filesystem::path folder, const Content* content, const ContentLUT* lut);
|
||||
WorldConverter(fs::path folder, const Content* content,
|
||||
std::shared_ptr<ContentLUT> lut);
|
||||
~WorldConverter();
|
||||
|
||||
bool hasNext() const;
|
||||
|
||||
Reference in New Issue
Block a user