Merge branch 'main' into main
This commit is contained in:
@@ -704,6 +704,9 @@ class GameWindow(ui.ScriptWindow):
|
|||||||
def OpenQuestWindow(self, skin, idx):
|
def OpenQuestWindow(self, skin, idx):
|
||||||
self.interface.OpenQuestWindow(skin, idx)
|
self.interface.OpenQuestWindow(skin, idx)
|
||||||
|
|
||||||
|
def BINARY_ClearQuest(self, index):
|
||||||
|
self.interface.BINARY_ClearQuest(index)
|
||||||
|
|
||||||
def AskGuildName(self):
|
def AskGuildName(self):
|
||||||
|
|
||||||
guildNameBoard = uiCommon.InputDialog()
|
guildNameBoard = uiCommon.InputDialog()
|
||||||
|
|||||||
@@ -108,6 +108,8 @@ class BeltInventoryWindow(ui.ScriptWindow):
|
|||||||
|
|
||||||
ui.ScriptWindow.__init__(self)
|
ui.ScriptWindow.__init__(self)
|
||||||
|
|
||||||
|
self.AddFlag("float")
|
||||||
|
|
||||||
self.isLoaded = 0
|
self.isLoaded = 0
|
||||||
self.wndInventory = wndInventory
|
self.wndInventory = wndInventory
|
||||||
|
|
||||||
@@ -1106,6 +1108,9 @@ class InventoryWindow(ui.ScriptWindow):
|
|||||||
if None != self.tooltipItem:
|
if None != self.tooltipItem:
|
||||||
self.tooltipItem.SetTop()
|
self.tooltipItem.SetTop()
|
||||||
|
|
||||||
|
if self.wndBelt:
|
||||||
|
self.wndBelt.SetTop()
|
||||||
|
|
||||||
def OnPressEscapeKey(self):
|
def OnPressEscapeKey(self):
|
||||||
self.Close()
|
self.Close()
|
||||||
return True
|
return True
|
||||||
|
|||||||
Reference in New Issue
Block a user