Applied #189

* There was a bug in OTML saving hotkeys per player because of the way they are storing children and not a straight value. Perhaps you want to look at it ed.
Note: Your hotkeys will reset in this revision.

modules/game_hotkeys/hotkeys_manager.lua

@@ -84,13 +84,16 @@ function terminate()
 end
 
 function load()
-  local hotkeySettings = g_settings.getNode('HotkeysManager')
+  local hotkeySettings = g_settings.getNode('HotkeysManager') or {}
+  if hotkeySettings then
+    local playerHotkeySettings = hotkeySettings[g_game.getLocalPlayer():getName()]
 
-  local hasCombos = false
+    local hasCombos = false
-  if hotkeySettings ~= nil then
+    if playerHotkeySettings ~= nil then
-    for i, v in pairs(hotkeySettings) do
+      for k, setting in pairs(playerHotkeySettings) do
-      addKeyCombo(nil, v.keyCombo, v)
+        addKeyCombo(nil, setting.keyCombo, setting)
-      hasCombos = true
+        hasCombos = true
+      end
     end
   end
 
@@ -99,18 +102,25 @@ function load()
     for i=1,12 do
       addKeyCombo(nil, 'F' .. i)
     end
+    for i=1,4 do
+      addKeyCombo(nil, 'Shift+F' .. i)
+    end
   end
 end
 
 function save()
-  local hotkeySettings = {}
+  local char = g_game.getLocalPlayer():getName()
+  local hotkeySettings = g_settings.getNode('HotkeysManager') or {}
+  hotkeySettings[char] = {}
   for i=1, currentHotkeysList:getChildCount() do
     local child = currentHotkeysList:getChildByIndex(i)
-    table.insert(hotkeySettings, {keyCombo = child.keyCombo,
+    table.insert(hotkeySettings[char], {
-                                  autoSend = child.autoSend,
+      keyCombo = child.keyCombo,
-                                  itemId = child.itemId,
+      autoSend = child.autoSend,
-                                  useType = child.useType,
+      itemId = child.itemId,
-                                  value = child.value})
+      useType = child.useType,
+      value = child.value
+    })
   end
 
   g_settings.setNode('HotkeysManager', hotkeySettings)

src/framework/otml/otmlemitter.cpp

@@ -38,7 +38,7 @@ std::string OTMLEmitter::emitNode(const OTMLNodePtr& node, int currentDepth)
             ss << node->tag();
 
             // add ':' to if the node is unique or has value
-            if(node->hasValue() || node->isUnique() || node->isNull())
+            if(node->hasValue() || node->isUnique() || node->isNull() || node->hasChildren())
                 ss << ":";
         } else
             ss << "-";