Converted almost everything to use wstring so that it works better with SFML and the unicode/utf8 usage in the system.

This commit is contained in:
Zed A. Shaw 2025-03-28 12:40:46 -04:00
parent 47c6bfd531
commit 72951f308f
17 changed files with 156 additions and 162 deletions

View file

@ -8,6 +8,7 @@
#include "systems.hpp"
#include "events.hpp"
#include "sound.hpp"
#include <fmt/xchar.h>
namespace gui {
using namespace components;
@ -45,7 +46,7 @@ namespace gui {
$combat_ui.init();
$status_ui.init();
$status_ui.log("Welcome to the game!");
$status_ui.log(L"Welcome to the game!");
$boss_fight_ui = $levels.create_bossfight($level.world);
$boss_fight_ui->init();
@ -344,15 +345,15 @@ namespace gui {
auto &damage = std::any_cast<Events::Combat&>(data);
if(damage.enemy_did > 0) {
$status_ui.log(fmt::format("Enemy HIT YOU for {} damage!", damage.enemy_did));
$status_ui.log(fmt::format(L"Enemy HIT YOU for {} damage!", damage.enemy_did));
} else {
$status_ui.log("Enemy MISSED YOU.");
$status_ui.log(L"Enemy MISSED YOU.");
}
if(damage.player_did > 0) {
$status_ui.log(fmt::format("You HIT enemy for {} damage!", damage.player_did));
$status_ui.log(fmt::format(L"You HIT enemy for {} damage!", damage.player_did));
} else {
$status_ui.log("You MISSED the enemy.");
$status_ui.log(L"You MISSED the enemy.");
}
}
break;
@ -366,7 +367,7 @@ namespace gui {
// auto &item = std::any_cast<InventoryItem&>(data);
// $status_ui.log(fmt::format("You picked up a {}.",
// std::string(item.data["name"])));
$status_ui.log("You picked up an item.");
$status_ui.log(L"You picked up an item.");
} break;
case eGUI::ATTACK:
event(Event::ATTACK);
@ -383,11 +384,11 @@ namespace gui {
case eGUI::NOOP: {
if(data.type() == typeid(std::string)) {
auto name = std::any_cast<std::string>(data);
$status_ui.log(fmt::format("NOOP EVENT! {},{} name={}", evt, entity, name));
$status_ui.log(fmt::format(L"NOOP EVENT! {},{}", evt, entity));
}
} break;
default:
$status_ui.log(fmt::format("INVALID EVENT! {},{}", evt, entity));
$status_ui.log(fmt::format(L"INVALID EVENT! {},{}", evt, entity));
}
}
}