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

fix issue in move window, allow 861 protocols, update todo, remove wrong code from spinbox

This commit is contained in:
Eduardo Bart 2012-01-28 16:33:12 -02:00
parent e8767d3971
commit d3a403eb93
4 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -22,9 +22,6 @@ fix use with
move windows move windows
let windows open while playing let windows open while playing
fix auto repeats in lineedit fix auto repeats in lineedit
trade
battlelist
offer window
==================================================== ====================================================
Low priority TODO Low priority TODO
@ -43,6 +40,8 @@ use hardware buffer
use indices use indices
fix opacity and cached framebuffers conflict fix opacity and cached framebuffers conflict
map rendering could be optimized to infinite zoom out using quadtree voxels
== Lua == Lua
make possible to bind non LuaObject derived classes on lua engine (for usage with Point,Rect,Color,Size) make possible to bind non LuaObject derived classes on lua engine (for usage with Point,Rect,Color,Size)
review usage of x,y/width,height in lua instead of point/size review usage of x,y/width,height in lua instead of point/size
@ -76,6 +75,7 @@ terminal/console scrolling
auto walk auto walk
hotkeys window hotkeys window
trade window trade window
shop window
battle list battle list
implement left panel with dragging windows implement left panel with dragging windows
clean sprites cache periodically clean sprites cache periodically

8
modules/core_widgets/uispinbox.lua
View File

@ -52,14 +52,6 @@ function UISpinBox:onMouseWheel(mousePos, direction)
return true return true
end end
function UISpinBox:onStyleApply(styleName, styleNode)
if styleNode.options then
for k,option in pairs(styleNode.options) do
self:addOption(option)
end
end
end
function UISpinBox:onTextChange(text) function UISpinBox:onTextChange(text)
local number = tonumber(text) local number = tonumber(text)
if not number or number > self.m_maximum or number < self.m_minimum then if not number or number > self.m_maximum or number < self.m_minimum then

8
modules/game/movewindow.otui
View File

@ -1,21 +1,21 @@
MainWindow MainWindow
text: Move Item text: Move Item
size: 196 112 size: 196 112
@onEscape: self:getParent():destroy() @onEscape: self:destroy()
Label Label
text: Amount: text: Amount:
width: 64 width: 64
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
margin-top: 2 margin-top: 2
SpinBox SpinBox
id: spinbox id: spinbox
anchors.left: prev.right anchors.left: prev.right
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
HorizontalSeparator HorizontalSeparator
id: separator id: separator
anchors.left: parent.left anchors.left: parent.left

30
src/otclient/net/protocolcodes.h
View File

@ -25,7 +25,7 @@
#include <otclient/global.h> #include <otclient/global.h>
#if PROTOCOL != 860 && PROTOCOL != 862 #if PROTOCOL < 860 || PROTOCOL > 862
#error "the supplied protocol version is not supported" #error "the supplied protocol version is not supported"
#endif #endif
@ -49,7 +49,7 @@ namespace Proto {
#if PROTOCOL==860 #if PROTOCOL==860
const int NumViolationReasons = 20; const int NumViolationReasons = 20;
#elif PROTOCOL==862 #elif PROTOCOL==861 || PROTOCOL==862
const int NumViolationReasons = 19; const int NumViolationReasons = 19;
#endif #endif
@ -221,7 +221,7 @@ namespace Proto {
}; };
enum SpeakTypes { enum SpeakTypes {
#if PROTOCOL==862 #if PROTOCOL==861 || PROTOCOL==862
SpeakSay = 1, SpeakSay = 1,
SpeakWhisper, SpeakWhisper,
SpeakYell, SpeakYell,
@ -265,18 +265,7 @@ namespace Proto {
}; };
enum MessageTypes { enum MessageTypes {
#if PROTOCOL==860 #if PROTOCOL==862 || PROTOCOL==861
MessageConsoleRed = 18,
MessageConsoleOrange,
MessageConsoleOrange2,
MessageWarning,
MessageEventAdvance,
MessageEventDefault,
MessageStatusDefault,
MessageInfoDescription ,
MessageStatusSmall,
MessageConsoleBlue
#elif PROTOCOL==862
MessageConsoleOrange = 13, MessageConsoleOrange = 13,
MessageConsoleOrange2, MessageConsoleOrange2,
MessageWarning, MessageWarning,
@ -287,6 +276,17 @@ namespace Proto {
MessageStatusSmall, MessageStatusSmall,
MessageConsoleBlue, MessageConsoleBlue,
MessageConsoleRed MessageConsoleRed
#elif PROTOCOL==860
MessageConsoleRed = 18,
MessageConsoleOrange,
MessageConsoleOrange2,
MessageWarning,
MessageEventAdvance,
MessageEventDefault,
MessageStatusDefault,
MessageInfoDescription ,
MessageStatusSmall,
MessageConsoleBlue
#endif #endif
}; };