summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Levin <risujin@fastmail.fm>2009-10-03 11:25:14 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:14:58 +0000
commitc442eb684d0a4584fcc1aad76433bd601a0412a4 (patch)
tree9bfe87b85618030317f88742680cbd90b084aa7e /src
parent5189226d1e8df1e56240d51a32d0db82924320d7 (diff)
Goodbye wall-walking on entities, we hardly knew ye. On a related note, if you'd like to try it uncomment ALIEN_WALLWALK_ENTITIES in tremulous.h.
Diffstat (limited to 'src')
-rw-r--r--src/game/bg_pmove.c7
-rw-r--r--src/game/tremulous.h3
2 files changed, 9 insertions, 1 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index ed39a1a3..51e1415c 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -1911,7 +1911,12 @@ static void PM_GroundClimbTrace( void )
}
//if we hit something
- if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) )
+ if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) )
+#ifdef ALIEN_WALLWALK_ENTITIES
+ )
+#else
+ && !( trace.entityNum != ENTITYNUM_WORLD && i != 4 ) )
+#endif
{
if( i == 2 || i == 3 )
{
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 9dfd7b9a..77275db8 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -358,6 +358,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define ALIEN_CREDITS_PER_FRAG 400
#define ALIEN_TK_SUICIDE_PENALTY 350
+// Uncomment to allow Aliens to wallwalk on any entity (buildables, players, etc)
+//#define ALIEN_WALLWALK_ENTITIES
+
/*
* HUMAN weapons
*