cancel block line build when unable to place blocks

also prioritize secondary action over primary
siecvi · Jan 13, 2025 · dd6e938 · dd6e938
1 parent 05a0749
commit dd6e938
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Sources/Client/Client_Update.cpp b/Sources/Client/Client_Update.cpp
@@ -481,6 +481,8 @@ namespace spades {
 			if (!CanLocalPlayerUseTool()) {
 				winp.primary = false;
 				winp.secondary = false;
+
+				player.SetBlockCursorDragging(false);
 			}
 
 			// disable weapon while reloading (except shotgun)

diff --git a/Sources/Client/Player.cpp b/Sources/Client/Player.cpp
@@ -164,8 +164,8 @@ namespace spades {
 					newInput.secondary = false;
 				}
 
-				if (newInput.primary)
-					newInput.secondary = false;
+				if (newInput.secondary)
+					newInput.primary = false;
 				if (newInput.secondary != weapInput.secondary) {
 					if (newInput.secondary) {
 						if (blockCursorActive) {

diff --git a/Sources/Client/Player.h b/Sources/Client/Player.h
@@ -171,6 +171,7 @@ namespace spades {
 			void PlayerJump();
 			bool IsBlockCursorActive() { return blockCursorActive; }
 			bool IsBlockCursorDragging() { return blockCursorDragging; }
+			void SetBlockCursorDragging(bool value) { blockCursorDragging = value; }
 			IntVector3 GetBlockCursorPos() { return blockCursorPos; }
 			IntVector3 GetBlockCursorDragPos() { return blockCursorDragPos; }
 			bool IsReadyToUseTool();