Remove ; and little fix to MiniWindow
This commit is contained in:
parent
85b52fbdfd
commit
16a3dd2b7e
|
@ -110,12 +110,14 @@ function UIMiniWindow:onSetup()
|
||||||
|
|
||||||
self.miniLoaded = true
|
self.miniLoaded = true
|
||||||
|
|
||||||
|
if self.save then
|
||||||
if oldParent and oldParent:getClassName() == 'UIMiniWindowContainer' then
|
if oldParent and oldParent:getClassName() == 'UIMiniWindowContainer' then
|
||||||
oldParent:order()
|
oldParent:order()
|
||||||
end
|
end
|
||||||
if newParent and newParent:getClassName() == 'UIMiniWindowContainer' and newParent ~= oldParent then
|
if newParent and newParent:getClassName() == 'UIMiniWindowContainer' and newParent ~= oldParent then
|
||||||
newParent:order()
|
newParent:order()
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function UIMiniWindow:onDragEnter(mousePos)
|
function UIMiniWindow:onDragEnter(mousePos)
|
||||||
|
|
|
@ -276,7 +276,7 @@ void Item::serializeItem(const BinaryWriteTreePtr& out)
|
||||||
out->writeU8(ATTR_COUNT);
|
out->writeU8(ATTR_COUNT);
|
||||||
out->writeU8(getCount());
|
out->writeU8(getCount());
|
||||||
|
|
||||||
out->writeU8(ATTR_CHARGES);;
|
out->writeU8(ATTR_CHARGES);
|
||||||
out->writeU16(getCountOrSubType());
|
out->writeU16(getCountOrSubType());
|
||||||
|
|
||||||
Position dest = m_attribs.get<Position>(ATTR_TELE_DEST);
|
Position dest = m_attribs.get<Position>(ATTR_TELE_DEST);
|
||||||
|
|
Loading…
Reference in New Issue