Browse Source

Fix dat loading issue with 10.00 & minor outfit window fix.

BenDol 6 years ago
parent
commit
16f6a0019c

+ 2
- 1
modules/game_combatcontrols/combatcontrols.lua View File

@@ -15,7 +15,8 @@ fightModeRadioGroup = nil
15 15
 pvpModeRadioGroup = nil
16 16
 
17 17
 function init()
18
-  combatControlsButton = modules.client_topmenu.addRightGameToggleButton('combatControlsButton', tr('Combat Controls'), '/images/topbuttons/combatcontrols', toggle)
18
+  combatControlsButton = modules.client_topmenu.addRightGameToggleButton('combatControlsButton', 
19
+    tr('Combat Controls'), '/images/topbuttons/combatcontrols', toggle)
19 20
   combatControlsButton:setOn(true)
20 21
   combatControlsWindow = g_ui.loadUI('combatcontrols', modules.game_interface.getRightPanel())
21 22
   combatControlsWindow:disableResize()

+ 0
- 5
modules/game_market/ui/general/marketbuttons.otui View File

@@ -4,14 +4,9 @@ MarketButtonBox < ButtonBoxRounded
4 4
   size: 106 22
5 5
   text-offset: 0 2
6 6
   text-align: center
7
-  image-clip: 0 0 20 20
8 7
   image-border: 2
9 8
 
10
-  $hover !disabled:
11
-    image-clip: 0 20 20 20
12
-
13 9
   $checked:
14
-    image-clip: 0 40 20 20
15 10
     color: white
16 11
 
17 12
   $disabled:

+ 9
- 11
modules/game_outfit/outfit.lua View File

@@ -25,13 +25,17 @@ mountCreature = nil
25 25
 currentMount = 1
26 26
 
27 27
 function init()
28
-  connect(g_game, { onOpenOutfitWindow = create,
29
-                    onGameEnd = destroy })
28
+  connect(g_game, {
29
+    onOpenOutfitWindow = create,
30
+    onGameEnd = destroy
31
+  })
30 32
 end
31 33
 
32 34
 function terminate()
33
-  disconnect(g_game, { onOpenOutfitWindow = create,
34
-                       onGameEnd = destroy })
35
+  disconnect(g_game, {
36
+    onOpenOutfitWindow = create,
37
+    onGameEnd = destroy
38
+  })
35 39
   destroy()
36 40
 end
37 41
 
@@ -300,17 +304,11 @@ function updateOutfit()
300 304
     addon.widget:setChecked(false)
301 305
     addon.widget:setEnabled(false)
302 306
   end
307
+  outfit.addons = 0
303 308
 
304 309
   if availableAddons > 0 then
305 310
     for _, i in pairs(ADDON_SETS[availableAddons]) do
306 311
       addons[i].widget:setEnabled(true)
307
-    end
308
-  end
309
-
310
-  outfit.addons = 0
311
-  for i = 1, #prevAddons do
312
-    local addon = prevAddons[i]
313
-    if addon and addons[i].widget:isEnabled() then
314 312
       addons[i].widget:setChecked(true)
315 313
     end
316 314
   end

+ 2
- 2
src/client/thingtype.cpp View File

@@ -58,7 +58,7 @@ void ThingType::serialize(const FileStreamPtr& fin)
58 58
                 attr = ThingAttrWritable;
59 59
             else if(attr >= ThingAttrWritable)
60 60
                 attr += 1;
61
-        } else if(g_game.getClientVersion() >= 1010) {
61
+        } else if(g_game.getClientVersion() >= 1000) {
62 62
             if(attr == ThingAttrNoMoveAnimation)
63 63
                 attr = 16;
64 64
             else if(attr >= ThingAttrPickupable)
@@ -153,7 +153,7 @@ void ThingType::unserialize(uint16 clientId, ThingCategory category, const FileS
153 153
             break;
154 154
         }
155 155
 
156
-        if(g_game.getClientVersion() >= 1010) {
156
+        if(g_game.getClientVersion() >= 1000) {
157 157
             /* In 10.10+ all attributes from 16 and up were
158 158
              * incremented by 1 to make space for 16 as
159 159
              * "No Movement Animation" flag.

Loading…
Cancel
Save