[ClientWorld|ServerWorld] Increased world size. [Player] Sprint added.

Unarelith · Jan 20, 2019 · 3105fe9 · 3105fe9
1 parent 0b88b1b
commit 3105fe9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@
 - Movement: <kbd>W</kbd><kbd>A</kbd><kbd>S</kbd><kbd>D</kbd>
 - Inventory: <kbd>E</kbd>
 - Jump: <kbd>Space</kbd>
+- Sprint: <kbd>Left Ctrl</kbd>
 - Jetpack: <kbd>X</kbd>
 - Exit: <kbd>Escape</kbd>
 

diff --git a/client/include/world/ClientWorld.hpp b/client/include/world/ClientWorld.hpp
@@ -39,9 +39,9 @@ class ClientWorld : public gk::IDrawable {
 		void draw(gk::RenderTarget &target, gk::RenderStates states) const override;
 
 		// FIXME: Duplicated with those in ServerWorld
-		const s32 m_width = 32;
+		const s32 m_width = 64;
 		const s32 m_height = 4;
-		const s32 m_depth = 32;
+		const s32 m_depth = 64;
 
 		std::vector<std::unique_ptr<ClientChunk>> m_chunks;
 

diff --git a/client/source/world/Player.cpp b/client/source/world/Player.cpp
@@ -92,6 +92,11 @@ void Player::processInputs() {
 	if (gk::GamePad::isKeyPressed(GameKey::Right) && gk::GamePad::isKeyPressed(GameKey::Up))   move(45.0f);
 	if (gk::GamePad::isKeyPressed(GameKey::Left)  && gk::GamePad::isKeyPressed(GameKey::Down)) move(-135.0f);
 	if (gk::GamePad::isKeyPressed(GameKey::Right) && gk::GamePad::isKeyPressed(GameKey::Down)) move(135.0f);
+
+	if (gk::GamePad::isKeyPressed(GameKey::Sprint)) {
+		m_velocity.x *= 1.5;
+		m_velocity.z *= 1.5;
+	}
 }
 
 void Player::updatePosition(const ClientWorld &world) {

diff --git a/common/include/core/input/GameKey.hpp b/common/include/core/input/GameKey.hpp
@@ -24,6 +24,7 @@ namespace GameKey {
 		Jump,
 		Fly,
 		Sneak,
+		Sprint,
 
 		Dig,
 		Use,

diff --git a/common/source/core/input/KeyboardHandler.cpp b/common/source/core/input/KeyboardHandler.cpp
@@ -43,6 +43,7 @@ KeyboardHandler::KeyboardHandler() {
 	addKey(GameKey::Jump,      "Jump");
 	addKey(GameKey::Fly,       "Fly");
 	addKey(GameKey::Sneak,     "Sneak");
+	addKey(GameKey::Sprint,    "Sprint");
 
 	addKey(GameKey::Dig,       "Dig");
 	addKey(GameKey::Use,       "Use");

diff --git a/resources/config/keys.xml b/resources/config/keys.xml
@@ -8,6 +8,7 @@
 	<Jump      key="Space"/>
 	<Fly       key="X"/>
 	<Sneak     key="Left Shift"/>
+	<Sprint    key="Left Ctrl"/>
 
 	<Dig       key="L"/>
 	<Use       key="M"/>

diff --git a/server/include/world/ServerWorld.hpp b/server/include/world/ServerWorld.hpp
@@ -39,9 +39,9 @@ class ServerWorld {
 
 	private:
 		// FIXME: Duplicated with those in ClientWorld
-		const s32 m_width = 32;
+		const s32 m_width = 64;
 		const s32 m_height = 4;
-		const s32 m_depth = 32;
+		const s32 m_depth = 64;
 
 		std::vector<std::unique_ptr<ServerChunk>> m_chunks;
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ namespace GameKey { @@
     		Jump,
     		Fly,
     		Sneak,
+    		Sprint,
     		Dig,
     		Use,
@@ Expand Down @@