Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempts to fix #208 #209

Merged
merged 1 commit into from
Feb 25, 2023
Merged

Attempts to fix #208 #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/world_interaction/dialog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use bevy_egui::egui::TextStyle::{Body, Button};
use bevy_egui::{egui, EguiContext, EguiPlugin};
use leafwing_input_manager::prelude::ActionState;
use serde::{Deserialize, Serialize};
use std::path::Path;
use unicode_segmentation::UnicodeSegmentation;

mod resources;
Expand Down Expand Up @@ -47,7 +48,11 @@ fn set_current_dialog(
mut actions_frozen: ResMut<ActionsFrozen>,
) -> Result<()> {
for dialog_event in dialog_events.iter() {
let path = format!("dialogs/{}.dlg.ron", dialog_event.dialog.0);
let path = Path::new("dialogs")
.join(&dialog_event.dialog.0)
.with_extension("dlg.ron")
.to_string_lossy()
.to_string();
let dialog_handle = match dialog_handles.dialogs.get(&path) {
Some(handle) => handle,
None => {
Expand Down