Permalink
Browse files

Merge pull request #17 from wtfbbqhax/trivial-fixes

Trivial fixes
  • Loading branch information...
timangus committed Jun 16, 2016
2 parents d58d4ef + 053785b commit c862a5340c8de44dcc7abaff170c20c04f9340e8
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/game/g_buildable.c
  2. +1 −1 src/game/g_cmds.c
View
@@ -100,7 +100,7 @@ gentity_t *G_CheckSpawnPoint( int spawnNum, const vec3_t origin,
if( tr.entityNum != ENTITYNUM_NONE )
return &g_entities[ tr.entityNum ];
trap_Trace( &tr, localOrigin, cmins, cmaxs, localOrigin, -1, MASK_PLAYERSOLID );
trap_Trace( &tr, localOrigin, cmins, cmaxs, localOrigin, ENTITYNUM_NONE, MASK_PLAYERSOLID );
if( tr.entityNum != ENTITYNUM_NONE )
return &g_entities[ tr.entityNum ];
View
@@ -2311,7 +2311,7 @@ void Cmd_Sell_f( gentity_t *ent )
//if we have this weapon selected, force a new selection
if( weapon == selected )
G_ForceWeaponChange( ent, WP_NONE );
G_ForceWeaponChange( ent, WP_BLASTER );
}
else if( upgrade != UP_NONE )
{

0 comments on commit c862a53

Please sign in to comment.