gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix dragable and npcto/from and remove margintop from entergame.

This commit is contained in:
Henrique Santiago 2012-08-06 20:43:15 -03:00
parent bd61a89675
commit dcde317904
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/client_entergame/entergame.otui
View File

@ -3,7 +3,6 @@ EnterGameWindow < MainWindow
EnterGameWindow EnterGameWindow
id: enterGame id: enterGame
!text: tr('Enter Game') !text: tr('Enter Game')
margin-top: 100
size: 236 274 size: 236 274
@onEnter: EnterGame.doLogin() @onEnter: EnterGame.doLogin()
@onEscape: EnterGame.hide() @onEscape: EnterGame.hide()

2
src/framework/ui/uiwidgetbasestyle.cpp
View File

@ -111,7 +111,7 @@ void UIWidget::parseBaseStyle(const OTMLNodePtr& styleNode)
else if(node->tag() == "checked") else if(node->tag() == "checked")
setChecked(node->value<bool>()); setChecked(node->value<bool>());
else if(node->tag() == "dragable") else if(node->tag() == "dragable")
setChecked(node->value<bool>()); setDragable(node->value<bool>());
else if(node->tag() == "on") else if(node->tag() == "on")
setOn(node->value<bool>()); setOn(node->value<bool>());
else if(node->tag() == "focusable") else if(node->tag() == "focusable")

6
src/otclient/protocolcodes.cpp
View File

@ -36,8 +36,8 @@ void buildMessageModesMap(int version) {
messageModesMap[Otc::MessageSay] = 1; messageModesMap[Otc::MessageSay] = 1;
messageModesMap[Otc::MessageWhisper] = 2; messageModesMap[Otc::MessageWhisper] = 2;
messageModesMap[Otc::MessageYell] = 3; messageModesMap[Otc::MessageYell] = 3;
messageModesMap[Otc::MessageNpcFrom] = 4; messageModesMap[Otc::MessageNpcTo] = 4;
messageModesMap[Otc::MessageNpcTo] = 5; messageModesMap[Otc::MessageNpcFrom] = 5;
messageModesMap[Otc::MessagePrivateFrom] = 6; messageModesMap[Otc::MessagePrivateFrom] = 6;
messageModesMap[Otc::MessagePrivateTo] = 6; messageModesMap[Otc::MessagePrivateTo] = 6;
messageModesMap[Otc::MessageChannelHighlight] = 7; messageModesMap[Otc::MessageChannelHighlight] = 7;
@ -135,4 +135,4 @@ uint8 translateMessageModeToServer(Otc::MessageMode mode)
return Otc::MessageInvalid; return Otc::MessageInvalid;
} }
} }