jaildesigner-jailgames/jaildoctors_dilemma
1
0
Fork 2
Code Issues Pull Requests Projects Releases 24 Wiki Activity

fix: bug que feia que en el editor, al canviar d'habitació el renderInfo tornara a eixir

Browse Source
This commit is contained in:
Sergio
2026-04-02 19:55:28 +02:00
parent cccb2359cf
commit cea5492abc
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/game/editor/map_editor.cpp
View File

@@ -122,7 +122,7 @@ void MapEditor::toggleMiniMap() {
mini_map_ = std::make_unique<MiniMap>(parseColor(settings_.minimap_bg), parseColor(settings_.minimap_conn));
mini_map_->on_navigate = [this](const std::string& room_name) {
mini_map_visible_ = false;
// Navegar a la room (usa changeRoomWithEditor vía GameControl)
reenter_ = true;
if (GameControl::exit_editor) { GameControl::exit_editor(); }
if (GameControl::change_room && GameControl::change_room(room_name)) {
if (GameControl::enter_editor) { GameControl::enter_editor(); }
@@ -175,14 +175,19 @@ void MapEditor::enter(std::shared_ptr<Room> room, std::shared_ptr<Player> player
yaml_backup_ = yaml_; // Copia profunda para revert
}
// Guardar estado de invencibilidad y forzarla
invincible_before_editor_ = Options::cheats.invincible;
if (!reenter_) {
// Solo guardar estado previo en el primer enter (no en re-enter tras cambio de room)
invincible_before_editor_ = Options::cheats.invincible;
render_info_before_editor_ = RenderInfo::get()->isActive();
}
reenter_ = false;
// Forzar invencibilidad
Options::cheats.invincible = Options::Cheat::State::ENABLED;
player_->setColor();
// Guardar estado de render_info y aplicar el setting del editor
render_info_before_editor_ = RenderInfo::get()->isActive();
if (settings_.show_render_info != render_info_before_editor_) {
// Aplicar el setting de render_info del editor
if (settings_.show_render_info != RenderInfo::get()->isActive()) {
RenderInfo::get()->toggle();
}
@@ -209,13 +214,14 @@ void MapEditor::exit() {
active_ = false;
// Restaurar invencibilidad
Options::cheats.invincible = invincible_before_editor_;
player_->setColor();
if (!reenter_) {
// Solo restaurar en el exit final (no en cambio de room)
Options::cheats.invincible = invincible_before_editor_;
player_->setColor();
// Restaurar render_info
if (RenderInfo::get()->isActive() != render_info_before_editor_) {
RenderInfo::get()->toggle();
if (RenderInfo::get()->isActive() != render_info_before_editor_) {
RenderInfo::get()->toggle();
}
}
// Restaurar prompt de la consola y limpiar estado