From a6b192a2c754be508ed7425b9080552d83a35843 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 25 Nov 2020 13:12:39 +0100
Subject: [PATCH] Update doc file for building the source tree, as that's now
 changed.

---
 doc/building              | 17 +++++++++++++++++
 nuclide                   |  2 ++
 src/server/valve/player.c |  3 +++
 3 files changed, 22 insertions(+)

diff --git a/doc/building b/doc/building
index d85402b2..7ec99272 100644
--- a/doc/building
+++ b/doc/building
@@ -1,3 +1,20 @@
+Building the engine and toolchain:
+The build_engine.sh will do that for you. It will still ask you to have at least
+a certain amount of dependencies installed (such as the GCC, make and the X/SDL
+headers for your operating system.
+
+Building the editor:
+Handled by build_editor.sh, this will require the GCC9. It currently does not
+build on GCC10.
+GTK2, Pango, GTKGLEXT and MiniZip are one of a few other main dependencies.
+
+Building the game-logic:
+Once build_engine.sh has been executed, you can now build the source tree with
+build_game.sh. It'll use the fteqcc binary that's in the ./bin/ directory.
+
+Old, manual build instructions:
+================================================================================
+
 1. Building all of the game-logic
 
 To build the game-logic for all games, issue 'make' inside the src/
diff --git a/nuclide b/nuclide
index 7b0df0aa..65d2446c 100755
--- a/nuclide
+++ b/nuclide
@@ -3,6 +3,8 @@ set -e
 SCRPATH="$( cd "$( dirname $(readlink -nf $0) )" && pwd )"
 PATH="$SCRPATH"/bin:"$PATH"
 
+cd "$SCRPATH"
+
 if [ -f "$SCRPATH"/bin/fteqw ]; then
 	fteqw -manifest valve.fmf $*
 else
diff --git a/src/server/valve/player.c b/src/server/valve/player.c
index 81c7afc4..adc34f72 100644
--- a/src/server/valve/player.c
+++ b/src/server/valve/player.c
@@ -45,8 +45,11 @@ void Player_UseDown(void)
 
 	makevectors(self.v_angle);
 	vecSrc = self.origin + self.view_ofs;
+
+	self.hitcontentsmaski = CONTENTBITS_POINTSOLID;
 	traceline(vecSrc, vecSrc + (v_forward * 64), MOVE_NORMAL, self);
 
+
 	if (trace_ent.PlayerUse) {
 		self.flags &= ~FL_USE_RELEASED;