Fixing minor bugs in texts, encoding, UI
This commit is contained in:
1 parent
79413e7319
commit
d4365728fe
87 files changed
+883
-404
No files matched your search
@@ -1,4 +1,4 @@
|
||||
#include "LocationEditor.h"
|
||||
#include "LocationEditor.h"
|
||||
#include "Location.h"
|
||||
#include "Character.h"
|
||||
#include "utils/Utils.h"
|
||||
@@ -415,6 +415,7 @@ namespace ZL
|
||||
}
|
||||
|
||||
const std::string filename = baseName + ".json";
|
||||
/*
|
||||
std::ofstream out(filename);
|
||||
if (out.is_open()) {
|
||||
out << j.dump(4);
|
||||
@@ -422,7 +423,8 @@ namespace ZL
|
||||
<< " interactive object(s) to " << filename << "\n";
|
||||
} else {
|
||||
std::cerr << "[IO_EDITOR] Failed to open " << filename << " for writing\n";
|
||||
}
|
||||
}*/
|
||||
saveJsonToFile(j, filename);
|
||||
}
|
||||
|
||||
void LocationEditor::saveAll()
|
||||
@@ -522,14 +524,15 @@ namespace ZL
|
||||
}
|
||||
|
||||
const std::string filename = baseName + ".json";
|
||||
std::ofstream out(filename);
|
||||
/*std::ofstream out(filename);
|
||||
if (out.is_open()) {
|
||||
out << j.dump(4);
|
||||
std::cout << "[GAME_EDITOR] Saved " << editorPlacedObjects.size()
|
||||
<< " object(s) to " << filename << "\n";
|
||||
} else {
|
||||
std::cerr << "[GAME_EDITOR] Failed to open " << filename << " for writing\n";
|
||||
}
|
||||
}*/
|
||||
saveJsonToFile(j, filename);
|
||||
}
|
||||
|
||||
} // namespace ZL
|
||||
Reference in new issue
Block a user