From dcde317904fff27c9738ec18a2800a9c9cef2de3 Mon Sep 17 00:00:00 2001 From: Henrique Santiago Date: Mon, 6 Aug 2012 20:43:15 -0300 Subject: [PATCH] Fix dragable and npcto/from and remove margintop from entergame. --- modules/client_entergame/entergame.otui | 1 - src/framework/ui/uiwidgetbasestyle.cpp | 2 +- src/otclient/protocolcodes.cpp | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/client_entergame/entergame.otui b/modules/client_entergame/entergame.otui index 3d5b7487..2d2e0844 100644 --- a/modules/client_entergame/entergame.otui +++ b/modules/client_entergame/entergame.otui @@ -3,7 +3,6 @@ EnterGameWindow < MainWindow EnterGameWindow id: enterGame !text: tr('Enter Game') - margin-top: 100 size: 236 274 @onEnter: EnterGame.doLogin() @onEscape: EnterGame.hide() diff --git a/src/framework/ui/uiwidgetbasestyle.cpp b/src/framework/ui/uiwidgetbasestyle.cpp index 13a53761..ab6de074 100644 --- a/src/framework/ui/uiwidgetbasestyle.cpp +++ b/src/framework/ui/uiwidgetbasestyle.cpp @@ -111,7 +111,7 @@ void UIWidget::parseBaseStyle(const OTMLNodePtr& styleNode) else if(node->tag() == "checked") setChecked(node->value()); else if(node->tag() == "dragable") - setChecked(node->value()); + setDragable(node->value()); else if(node->tag() == "on") setOn(node->value()); else if(node->tag() == "focusable") diff --git a/src/otclient/protocolcodes.cpp b/src/otclient/protocolcodes.cpp index 7214c9bb..ea68c053 100644 --- a/src/otclient/protocolcodes.cpp +++ b/src/otclient/protocolcodes.cpp @@ -36,8 +36,8 @@ void buildMessageModesMap(int version) { messageModesMap[Otc::MessageSay] = 1; messageModesMap[Otc::MessageWhisper] = 2; messageModesMap[Otc::MessageYell] = 3; - messageModesMap[Otc::MessageNpcFrom] = 4; - messageModesMap[Otc::MessageNpcTo] = 5; + messageModesMap[Otc::MessageNpcTo] = 4; + messageModesMap[Otc::MessageNpcFrom] = 5; messageModesMap[Otc::MessagePrivateFrom] = 6; messageModesMap[Otc::MessagePrivateTo] = 6; messageModesMap[Otc::MessageChannelHighlight] = 7; @@ -135,4 +135,4 @@ uint8 translateMessageModeToServer(Otc::MessageMode mode) return Otc::MessageInvalid; } -} \ No newline at end of file +}