From b4b9c229bc97d298ad8880f14a350235b3cc8d99 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 7 Nov 2018 10:01:24 +1100 Subject: [PATCH] Fix copy/paste not working on linux --- src/Entity.c | 2 +- src/NixWindow.c | 2 +- src/PacketHandlers.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Entity.c b/src/Entity.c index 166ddd1e4..c143e83ce 100644 --- a/src/Entity.c +++ b/src/Entity.c @@ -1013,7 +1013,7 @@ static void LocalPlayer_HandleFly(void) { struct LocalPlayer* p = &LocalPlayer_Instance; if (p->Hacks.CanFly && p->Hacks.Enabled) { p->Hacks.Flying = !p->Hacks.Flying; - } else if(!p->_WarnedFly) { + } else if (!p->_WarnedFly) { p->_WarnedFly = true; if (Game_PureClassic) return; Chat_AddRaw("&cFlying is currently disabled"); diff --git a/src/NixWindow.c b/src/NixWindow.c index f27d1cfb0..756cf02a8 100644 --- a/src/NixWindow.c +++ b/src/NixWindow.c @@ -283,7 +283,7 @@ void Window_GetClipboardText(String* value) { } void Window_SetClipboardText(const String* value) { - String_Copy(&clipboard_paste_text, value); + String_Copy(&clipboard_copy_text, value); XSetSelectionOwner(win_display, xa_clipboard, win_handle, 0); } diff --git a/src/PacketHandlers.c b/src/PacketHandlers.c index dc572d83a..be67033fb 100644 --- a/src/PacketHandlers.c +++ b/src/PacketHandlers.c @@ -573,10 +573,10 @@ static void Classic_EntityTeleport(uint8_t* data) { } static void Classic_RelPosAndOrientationUpdate(uint8_t* data) { + struct LocationUpdate update; EntityID id = *data++; Vector3 pos; float rotY, headX; - struct LocationUpdate update; pos.X = (int8_t)(*data++) / 32.0f; pos.Y = (int8_t)(*data++) / 32.0f; @@ -589,9 +589,9 @@ static void Classic_RelPosAndOrientationUpdate(uint8_t* data) { } static void Classic_RelPositionUpdate(uint8_t* data) { + struct LocationUpdate update; EntityID id = *data++; Vector3 pos; - struct LocationUpdate update; pos.X = (int8_t)(*data++) / 32.0f; pos.Y = (int8_t)(*data++) / 32.0f; @@ -602,9 +602,9 @@ static void Classic_RelPositionUpdate(uint8_t* data) { } static void Classic_OrientationUpdate(uint8_t* data) { + struct LocationUpdate update; EntityID id = *data++; float rotY, headX; - struct LocationUpdate update; rotY = Math_Packed2Deg(*data++); headX = Math_Packed2Deg(*data++);