aboutsummaryrefslogtreecommitdiff
path: root/server/editor/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'server/editor/src/main.rs')
-rw-r--r--server/editor/src/main.rs13
1 files changed, 8 insertions, 5 deletions
diff --git a/server/editor/src/main.rs b/server/editor/src/main.rs
index 54d3b065..4cba9e4a 100644
--- a/server/editor/src/main.rs
+++ b/server/editor/src/main.rs
@@ -5,7 +5,10 @@ use clap::Parser;
use futures_util::{SinkExt, StreamExt};
use hurrycurry_client_lib::network::sync::Network;
use hurrycurry_protocol::{
- glam::{ivec2, IVec2, Vec2}, movement::MovementBase, Character, Gamedata, Hand, Message, PacketC, PacketS, PlayerClass, PlayerID, TileIndex, VERSION
+ Character, Gamedata, Hand, Message, PacketC, PacketS, PlayerClass, PlayerID, TileIndex,
+ VERSION,
+ glam::{IVec2, Vec2, ivec2},
+ movement::MovementBase,
};
use log::{debug, info, warn};
use save::{export_state, import_state};
@@ -293,7 +296,7 @@ impl State {
let t = t.strip_prefix("/").unwrap_or(&t);
self.handle_command(
Command::try_parse_from(
- shlex::split(&t)
+ shlex::split(t)
.ok_or(anyhow!("invalid quoting"))?
.into_iter(),
)
@@ -350,10 +353,10 @@ impl State {
}
pub fn save(&mut self, name: &str) -> Result<()> {
- let e = export_state(&self);
+ let e = export_state(self);
File::create(format!("data/maps/{name}.yaml"))?.write_all(e.as_bytes())?;
self.out.push(PacketC::ServerMessage {
- message: Message::Text(format!("Map saved.")),
+ message: Message::Text("Map saved.".to_string()),
error: false,
});
self.mapname = name.to_owned();
@@ -364,7 +367,7 @@ impl State {
self.clear();
import_state(self, &e)?;
self.out.push(PacketC::ServerMessage {
- message: Message::Text(format!("Map loaded.")),
+ message: Message::Text("Map loaded.".to_string()),
error: false,
});
self.mapname = name.to_owned();