Game API v1.0.39: Start controller and port addresses with "/"

Before: 1/game.controller.snes.multitap/2 After: /1/game.controller.snes.multitap/2
garbear · Sep 10, 2018 · dab4d5f · dab4d5f
1 parent 38cbaa7
commit dab4d5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
@@ -202,12 +202,12 @@ bool EnableMouse(bool enable, const game_controller* controller);
  * To connect a multitap to the console's first port, the multitap's controller
  * info is set using the port address:
  *
- *     1
+ *     /1
  *
  * To connect a SNES controller to the second port of the multitap, the
  * controller info is next set using the address:
  *
- *     1/game.controller.multitap/2
+ *     /1/game.controller.multitap/2
  *
  * Any attempts to connect a controller to a port on a disconnected multitap
  * will return false.

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
@@ -75,8 +75,8 @@
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID    "kodi.binary.instance.audioencoder"
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "addon-instance/AudioEncoder.h"
 
-#define ADDON_INSTANCE_VERSION_GAME                   "1.0.38"
-#define ADDON_INSTANCE_VERSION_GAME_MIN               "1.0.38"
+#define ADDON_INSTANCE_VERSION_GAME                   "1.0.39"
+#define ADDON_INSTANCE_VERSION_GAME_MIN               "1.0.39"
 #define ADDON_INSTANCE_VERSION_GAME_XML_ID            "kodi.binary.instance.game"
 #define ADDON_INSTANCE_VERSION_GAME_DEPENDS           "kodi_game_dll.h" \
                                                       "kodi_game_types.h" \

diff --git a/xbmc/games/addons/input/GameClientTopology.cpp b/xbmc/games/addons/input/GameClientTopology.cpp
@@ -98,9 +98,9 @@ std::string CGameClientTopology::MakeAddress(const std::string &baseAddress, con
   std::ostringstream address;
 
   if (!baseAddress.empty())
-    address << baseAddress << CONTROLLER_ADDRESS_SEPARATOR;
+    address << baseAddress;
 
-  address << nodeId;
+  address << CONTROLLER_ADDRESS_SEPARATOR << nodeId;
 
   return address.str();
 }