From 50c20aa28ff58d8e7125d2728c086fe7cbfc6258 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Fri, 16 Feb 2024 19:47:54 +0100 Subject: [PATCH] Don't send empty chat messages(which currently crashes) and display the correct name in the change name gui. --- src/gui/windows/change_name.zig | 2 +- src/gui/windows/chat.zig | 6 ++++-- src/settings.zig | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/windows/change_name.zig b/src/gui/windows/change_name.zig index a150f8a0..b697673f 100644 --- a/src/gui/windows/change_name.zig +++ b/src/gui/windows/change_name.zig @@ -43,7 +43,7 @@ pub fn onOpen() void { list.add(Label.init(.{0, 0}, width, "\\**italic*\\* \\*\\***bold**\\*\\* \\__underlined_\\_ \\_\\___strike-through__\\_\\_", .center)); list.add(Label.init(.{0, 0}, width, "Even colors are possible, using the hexadecimal color code:", .center)); list.add(Label.init(.{0, 0}, width, "\\##ff0000ff#ffffff00#ffffff00#ff0000red#ffffff \\##ff0000ff#00770077#ffffff00#ff7700orange#ffffff \\##ffffff00#00ff00ff#ffffff00#00ff00green#ffffff \\##ffffff00#ffffff00#0000ffff#0000ffblue", .center)); - textComponent = TextInput.init(.{0, 0}, width, 32, "quanturmdoelvloper", .{.callback = &apply}); + textComponent = TextInput.init(.{0, 0}, width, 32, settings.playerName, .{.callback = &apply}); list.add(textComponent); list.add(Button.initText(.{0, 0}, 100, "Apply", .{.callback = &apply})); list.finish(.center); diff --git a/src/gui/windows/chat.zig b/src/gui/windows/chat.zig index b61c75ca..950b4d70 100644 --- a/src/gui/windows/chat.zig +++ b/src/gui/windows/chat.zig @@ -125,6 +125,8 @@ pub fn addMessage(message: []const u8) void { } pub fn sendMessage(_: usize) void { - main.network.Protocols.chat.send(main.game.world.?.conn, input.currentString.items); - input.clear(); + if(input.currentString.items.len != 0) { + main.network.Protocols.chat.send(main.game.world.?.conn, input.currentString.items); + input.clear(); + } } \ No newline at end of file diff --git a/src/settings.zig b/src/settings.zig index d0a81d68..9307ca2c 100644 --- a/src/settings.zig +++ b/src/settings.zig @@ -28,7 +28,7 @@ pub var bloom: bool = true; pub var vsync: bool = true; -pub var playerName: []const u8 = ""; +pub var playerName: []const u8 = "quanturmdoelvloper"; pub var lastUsedIPAddress: []const u8 = "127.0.0.1";