merge revgraphics

modules/game/game.lua

@@ -21,12 +21,12 @@ local function onUseWithMouseRelease(self, mousePosition, mouseButton)
   if mouseButton == MouseLeftButton then
     local clickedWidget = Game.gameUi:recursiveGetChildByPos(mousePosition)
     if clickedWidget then
-      if clickedWidget.getTile then
+      if clickedWidget:getClassName() == 'UIMap' then
         local tile = clickedWidget:getTile(mousePosition)
         if tile then
           Game.useWith(Game.selectedThing, tile:getTopMultiUseThing())
         end
-      elseif clickedWidget.getItem then
+      elseif clickedWidget:getClassName() == 'UIItem' and not clickedWidget:isVirtual() then
         Game.useWith(Game.selectedThing, clickedWidget:getItem())
       end
     end

modules/game/map.lua

@@ -15,7 +15,7 @@ function UIMap:onDragLeave(widget, mousePos)
   if not self.parsed then
     self.currentDragThing = nil
   end
-  
+
   restoreCursor()
   return true
 end
@@ -25,21 +25,21 @@ function UIMap:onDrop(widget, mousePos)
 
   local tile = self:getTile(mousePos)
   if not tile then return false end
-  
-  local data = widget.currentDragThing:getData()
+
+  local count = widget.currentDragThing:getCount()
   if widget.currentDragThing:isStackable() and data > 1 then
     widget.parsed = true
     local moveWindow = displayUI('/game/movewindow.otui')
     local spinbox = moveWindow:getChildById('spinbox')
-    spinbox:setMaximum(data)
+    spinbox:setMaximum(count)
     spinbox:setMinimum(1)
-    spinbox:setCurrentIndex(data)
-    
+    spinbox:setCurrentIndex(count)
+
     local okButton = moveWindow:getChildById('buttonOk')
-    okButton.onClick = function() Game.move(widget.currentDragThing, tile:getPos(), spinbox:getCurrentIndex()) okButton:getParent():destroy() widget.currentDragThing = nil end
+    okButton.onClick = function() Game.move(widget.currentDragThing, tile:getPosition(), spinbox:getCurrentIndex()) okButton:getParent():destroy() widget.currentDragThing = nil end
     moveWindow.onEnter = okButton.onClick
   else
-    Game.move(widget.currentDragThing, tile:getPos(), 1)
+    Game.move(widget.currentDragThing, tile:getPosition(), 1)
   end
 
   return true

modules/game/thing.lua

@@ -1,11 +1,11 @@
 
 function Thing:isInsideContainer()
-  local pos = self:getPos()
+  local pos = self:getPosition()
   return (pos and pos.x == 65535 and pos.y >= 64)
 end
 
 function Thing:getContainerId()
-  local pos = self:getPos()
+  local pos = self:getPosition()
   if not pos then return 0 end
   return pos.y - 64
 end