From c6c63e8125ae1ffb0f19ce7836ac720f76159d2e Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Wed, 14 Nov 2007 13:24:21 +0000 Subject: * (bug 3417) Fix getting stuck while evolving in some situations (thebenmachine@googlemail.com) --- src/game/g_cmds.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 4a9f1cd7..6364c8bb 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1522,17 +1522,17 @@ static qboolean G_RoomForClassChange( gentity_t *ent, pClass_t class, //compute a place up in the air to start the real trace VectorCopy( newOrigin, temp ); temp[ 2 ] += nudgeHeight; - trap_Trace( &tr, newOrigin, toMins, toMaxs, temp, ent->s.number, MASK_SHOT ); + trap_Trace( &tr, newOrigin, toMins, toMaxs, temp, ent->s.number, MASK_PLAYERSOLID ); //trace down to the ground so that we can evolve on slopes VectorCopy( newOrigin, temp ); temp[ 2 ] += ( nudgeHeight * tr.fraction ); - trap_Trace( &tr, temp, toMins, toMaxs, newOrigin, ent->s.number, MASK_SHOT ); + trap_Trace( &tr, temp, toMins, toMaxs, newOrigin, ent->s.number, MASK_PLAYERSOLID ); VectorCopy( tr.endpos, newOrigin ); //make REALLY sure trap_Trace( &tr, newOrigin, toMins, toMaxs, newOrigin, - ent->s.number, MASK_SHOT ); + ent->s.number, MASK_PLAYERSOLID ); //check there is room to evolve if( !tr.startsolid && tr.fraction == 1.0f ) -- cgit