[Key] Small fix for multiplayer mode.

If the 'config/keys.lua' file didn't exist custom keys were empty.
Unarelith · Jul 8, 2020 · e3dc327 · e3dc327
1 parent 4ac67ee
commit e3dc327
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/docs/lua-api-key.md b/docs/lua-api-key.md
@@ -36,7 +36,7 @@ Example:
 default_key = "E"
 ```
 
-Names are defined [here](https://github.com/Unarelith/GameKit/blob/master/source/core/input/KeyboardUtils.cpp).
+Names are defined [here](https://wiki.libsdl.org/SDL_Keycode).
 
 ### `name`
 

diff --git a/source/common/world/Key.hpp b/source/common/world/Key.hpp
@@ -44,7 +44,13 @@ class Key : public gk::ISerializable {
 			: m_id(id), m_stringID(stringID), m_name(name) {}
 
 		void serialize(sf::Packet &packet) const override { packet << m_id << m_stringID << m_name << m_defaultKey; }
-		void deserialize(sf::Packet &packet) override { packet >> m_id >> m_stringID >> m_name >> m_defaultKey; }
+		void deserialize(sf::Packet &packet) override {
+			packet >> m_id >> m_stringID >> m_name >> m_defaultKey;
+
+			// Needed for multiplayer mode
+			if (m_keycode == SDLK_UNKNOWN)
+				m_keycode = SDL_GetKeyFromName(m_defaultKey.c_str());
+		}
 
 		u16 id() const { return m_id; }
 
@@ -59,6 +65,7 @@ class Key : public gk::ISerializable {
 		void setDefaultKey(const std::string &defaultKey) {
 			m_defaultKey = defaultKey;
 
+			// Needed for singleplayer mode
 			if (m_keycode == SDLK_UNKNOWN)
 				m_keycode = SDL_GetKeyFromName(m_defaultKey.c_str());
 		}