diff options
Diffstat (limited to 'src/game/g_cmds.c')
| -rw-r--r-- | src/game/g_cmds.c | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 539bb722..7c5389fc 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -4,27 +4,16 @@ /* * Portions Copyright (C) 2000-2001 Tim Angus * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1, or (at your option) - * any later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the OSML - Open Source Modification License v1.0 as + * described in the file COPYING which is distributed with this source + * code. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* To assertain which portions are licensed under the LGPL and which are - * licensed by Id Software, Inc. please run a diff between the equivalent - * versions of the "Tremulous" modification and the unmodified "Quake3" - * game source code. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - + #include "g_local.h" #include "../../ui/menudef.h" // for the voice chats @@ -2119,11 +2108,11 @@ void Cmd_Build_f( gentity_t *ent ) switch( G_itemFits( ent, buildable, dist, origin ) ) { case IBE_NONE: - G_buildItem( ent, buildable, origin, ent->s.apos.trBase, speed ); - break; - - case IBE_NOCREEP: - G_AddPredictableEvent( ent, EV_MENU, MN_D_NOCREEP ); + case IBE_RPLWARN: + case IBE_RPTWARN: + case IBE_SPWNWARN: + case IBE_NOROOM: + ent->client->ps.stats[ STAT_BUILDABLE ] = buildable; break; case IBE_NOASSERT: @@ -2146,31 +2135,9 @@ void Cmd_Build_f( gentity_t *ent ) G_AddPredictableEvent( ent, EV_MENU, MN_H_REPEATER ); break; - case IBE_NOROOM: - if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) - G_AddPredictableEvent( ent, EV_MENU, MN_H_NOROOM ); - else - G_AddPredictableEvent( ent, EV_MENU, MN_D_NOROOM ); - break; - case IBE_NOPOWER: G_AddPredictableEvent( ent, EV_MENU, MN_H_NOPOWER ); break; - - case IBE_SPWNWARN: - G_AddPredictableEvent( ent, EV_MENU, MN_D_SPWNWARN ); - G_buildItem( ent, buildable, origin, ent->s.apos.trBase, speed ); - break; - - case IBE_RPLWARN: - G_AddPredictableEvent( ent, EV_MENU, MN_H_RPLWARN ); - G_buildItem( ent, buildable, origin, ent->s.apos.trBase, speed ); - break; - - case IBE_RPTWARN: - G_AddPredictableEvent( ent, EV_MENU, MN_H_RPTWARN ); - G_buildItem( ent, buildable, origin, ent->s.apos.trBase, speed ); - break; } } else |