cleanup
This commit is contained in:
parent
86cd3b049e
commit
600f9d5e3e
|
@ -115,8 +115,7 @@ pub enum ChatEvent {
|
|||
SpawnMessage(String, hud::LogLevel, String),
|
||||
SpawnChoice(String, usize, ChatPos, bool),
|
||||
RunScript(String),
|
||||
Sleep(f64),
|
||||
//Script(String, String, String),
|
||||
SleepSeconds(f64),
|
||||
}
|
||||
|
||||
// This is the only place where any YAML interaction should be happening.
|
||||
|
@ -462,7 +461,7 @@ impl ChatDB {
|
|||
match (key, value) {
|
||||
(Some(TOKEN_SLEEP), Value::Number(time)) => {
|
||||
if let Some(time_f64) = time.as_f64() {
|
||||
event.send(ChatEvent::Sleep(time_f64));
|
||||
event.send(ChatEvent::SleepSeconds(time_f64));
|
||||
}
|
||||
}
|
||||
(Some(TOKEN_GOTO), Value::String(label)) => {
|
||||
|
@ -651,7 +650,7 @@ pub fn handle_chat_events(
|
|||
ChatEvent::RunScript(script) => {
|
||||
ew_chatscript.send(ChatScriptEvent(script.clone()));
|
||||
}
|
||||
ChatEvent::Sleep(sleep_duration) => {
|
||||
ChatEvent::SleepSeconds(sleep_duration) => {
|
||||
chat.timer = now + sleep_duration;
|
||||
}
|
||||
}
|
||||
|
@ -663,7 +662,6 @@ fn handle_reply_keys(
|
|||
settings: ResMut<var::Settings>,
|
||||
q_choices: Query<&Choice>,
|
||||
mut q_chats: Query<&mut Chat>,
|
||||
//mut evwriter_sendmsg: EventWriter<SendMessageEvent>,
|
||||
mut evwriter_sfx: EventWriter<audio::PlaySfxEvent>,
|
||||
time: Res<Time>,
|
||||
) {
|
||||
|
|
Loading…
Reference in a new issue