voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

postmerge fix

Browse source
This commit is contained in:
A-lex-Ra 2023-12-25 20:34:39 +06:00
parent 4d8c8563cc
commit 1dae8c2c31
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/util/platform.cpp
View file

@ -8,22 +8,9 @@
#include "../typedefs.h"
namespace platform {
const std::string SETTINGS_FILE = "settings.toml";
const std::string CONTROLS_FILE = "controls.json";
const std::string DEFAULT_LOCALE = "en_EN";
}
using std::filesystem::path;
path platform::get_settings_file() {
return path(SETTINGS_FILE);
}
path platform::get_controls_file() {
return path(CONTROLS_FILE);
}
/*System locale to engine locale mapping*/
std::string platform::get_locale_by_lang(std::string lang) {
if (lang == "ru") {
@ -35,7 +22,7 @@ std::string platform::get_locale_by_lang(std::string lang) {
#ifdef WIN32
#include <Windows.h>
#include "../util/stringutil.h"
#include "./stringutil.h"
void platform::configure_encoding() {
// set utf-8 encoding to console output