License change to OSML

31 files changed, 289 insertions, 589 deletions

diff --git a/src/game/bg_lib.c b/src/game/bg_lib.c
index 6466108a..7041aa39 100644
--- a/src/game/bg_lib.c
+++ b/src/game/bg_lib.c
@@ -8,25 +8,14 @@
 /*
  *  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 "q_shared.h"
diff --git a/src/game/bg_lib.h b/src/game/bg_lib.h
index 99efe089..55fc25a0 100644
--- a/src/game/bg_lib.h
+++ b/src/game/bg_lib.h
@@ -6,25 +6,14 @@
 /*
  *  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.
  */
                     
 typedef int size_t;
diff --git a/src/game/bg_local.h b/src/game/bg_local.h
index 43ac67fd..790a38df 100644
--- a/src/game/bg_local.h
+++ b/src/game/bg_local.h
@@ -5,25 +5,14 @@
 /*
  *  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.
  */
 
 #define MIN_WALK_NORMAL 0.7f   // can't walk on very steep slopes
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 03472b08..43aa0359 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -5,25 +5,14 @@
 /*
  *  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 "q_shared.h"
@@ -3003,7 +2992,7 @@ weaponAttributes_t bg_weapons[ ] =
     0,                    //int       quan;
     0,                    //int       clips;
     0,                    //int       maxClips;
-    qfalse,               //qboolean  hasAltMode;
+    qtrue,                //qboolean  hasAltMode;
     qfalse                //qboolean  synced;
   },
   {
@@ -3015,7 +3004,7 @@ weaponAttributes_t bg_weapons[ ] =
     0,                    //int       quan;
     0,                    //int       clips;
     0,                    //int       maxClips;
-    qfalse,               //qboolean  hasAltMode;
+    qtrue,                //qboolean  hasAltMode;
     qfalse                //qboolean  synced;
   },
   {
@@ -3027,7 +3016,7 @@ weaponAttributes_t bg_weapons[ ] =
     0,                    //int       quan;
     0,                    //int       clips;
     0,                    //int       maxClips;
-    qfalse,               //qboolean  hasAltMode;
+    qtrue,                //qboolean  hasAltMode;
     qfalse                //qboolean  synced;
   },
   {
@@ -3039,7 +3028,7 @@ weaponAttributes_t bg_weapons[ ] =
     0,                    //int       quan;
     0,                    //int       clips;
     0,                    //int       maxClips;
-    qfalse,               //qboolean  hasAltMode;
+    qtrue,                //qboolean  hasAltMode;
     qfalse                //qboolean  synced;
   },
   {
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index fe307307..865d046e 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -6,25 +6,14 @@
 /*
  *  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 "q_shared.h"
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 2aa4e737..d1653cba 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -5,25 +5,14 @@
 /*
  *  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.
  */
                   
 // because games can change separately from the main system version, we need a
@@ -254,8 +243,7 @@ typedef enum {
 #define SS_BLOBLOCKED           128
 #define SS_POISONED             256
 
-#define SB_VALID_TOGGLEBIT      8192
-#define SB_ACTIVE_TOGGLEBIT     16384
+#define SB_VALID_TOGGLEBIT      16384
 
 // player_state->persistant[] indexes
 // these fields are the only part of player_state that isn't
diff --git a/src/game/bg_slidemove.c b/src/game/bg_slidemove.c
index 972dea00..9f8ce37d 100644
--- a/src/game/bg_slidemove.c
+++ b/src/game/bg_slidemove.c
@@ -5,25 +5,14 @@
 /*
  *  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 "q_shared.h"
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 3bff151b..e4ae4d6a 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                  
 #include "g_local.h"
 
 /*
@@ -501,6 +490,28 @@ void ClientTimerActions( gentity_t *ent, int msec )
       if( client->ps.stats[ STAT_MISC ] > MAX_POUNCE_SPEED )
         client->ps.stats[ STAT_MISC ] = MAX_POUNCE_SPEED;
     }
+
+    switch( client->ps.weapon )
+    {
+      case WP_DBUILD:
+      case WP_DBUILD2:
+      case WP_HBUILD:
+      case WP_HBUILD2:
+        if( ( client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) > BA_NONE )
+        {
+          int     dist = BG_FindBuildDistForClass( ent->client->ps.stats[ STAT_PCLASS ] );
+          vec3_t  dummy;
+          
+          if( G_itemFits( ent, client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT, dist, dummy ) == IBE_NONE )
+            client->ps.stats[ STAT_BUILDABLE ] |= SB_VALID_TOGGLEBIT;
+          else
+            client->ps.stats[ STAT_BUILDABLE ] &= ~SB_VALID_TOGGLEBIT;
+        }
+        break;
+        
+      default:
+        break;
+    }
   }
 
   while( client->time1000 >= 1000 )
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index cec65380..6cd83ff3 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -1,27 +1,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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                  
 #include "g_local.h"
 
 /*
@@ -1491,8 +1480,7 @@ Checks to see if an item fits in a specific area
 */
 itemBuildError_t G_itemFits( gentity_t *ent, buildable_t buildable, int distance, vec3_t origin )
 {
-  vec3_t            forward;
-  vec3_t            angles;
+  vec3_t            forward, angles;
   vec3_t            player_origin, entity_origin, target_origin;
   vec3_t            mins, maxs;
   vec3_t            temp_v;
@@ -1532,25 +1520,6 @@ itemBuildError_t G_itemFits( gentity_t *ent, buildable_t buildable, int distance
   if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_DROIDS )
   {
     //droid criteria
-    //check there is creep near by for building on
-/*    if( BG_FindCreepTestForBuildable( buildable ) )
-    {
-      for ( i = 1, tempent = g_entities + i; i < level.num_entities; i++, tempent++ )
-      {
-        if( !tempent->classname || tempent->s.eType != ET_BUILDABLE )
-          continue;
-
-        if( tempent->s.modelindex == BA_D_SPAWN || tempent->s.modelindex == BA_D_HIVEMIND )
-        {
-          VectorSubtract( entity_origin, tempent->s.origin, temp_v );
-          if( VectorLength( temp_v ) <= ( CREEP_BASESIZE * 3 ) )
-            break;
-        }
-      }
-
-      if( i >= level.num_entities )
-        reason = IBE_NOCREEP;
-    }*/
     
     //look for a hivemind
     for ( i = 1, tempent = g_entities + i; i < level.num_entities; i++, tempent++ )
@@ -1835,3 +1804,77 @@ gentity_t *G_buildItem( gentity_t *builder, buildable_t buildable, vec3_t origin
 
   return built;
 }
+
+/*
+=================
+G_ValidateBuild
+=================
+*/
+void G_ValidateBuild( gentity_t *ent, buildable_t buildable )
+{
+  weapon_t      weapon;
+  float         dist, speed, maxspeed;
+  vec3_t        origin;
+
+  speed = 0.0f; //temp hack
+  
+  maxspeed = BG_FindLaunchSpeedForClass( ent->client->ps.stats[ STAT_PCLASS ] );
+
+  if( speed > maxspeed )
+    speed = maxspeed;
+  
+  dist = BG_FindBuildDistForClass( ent->client->ps.stats[ STAT_PCLASS ] );
+    
+  switch( G_itemFits( ent, buildable, dist, origin ) )
+  {
+    case IBE_NONE:
+      G_buildItem( ent, buildable, origin, ent->s.apos.trBase, speed );
+      break;
+
+    case IBE_NOASSERT:
+      G_AddPredictableEvent( ent, EV_MENU, MN_D_NOASSERT );
+      break;
+
+    case IBE_NOHIVEMIND:
+      G_AddPredictableEvent( ent, EV_MENU, MN_D_NOHVMND );
+      break;
+
+    case IBE_HIVEMIND:
+      G_AddPredictableEvent( ent, EV_MENU, MN_D_HIVEMIND );
+      break;
+
+    case IBE_REACTOR:
+      G_AddPredictableEvent( ent, EV_MENU, MN_H_REACTOR );
+      break;
+
+    case IBE_REPEATER:
+      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;
+  }
+}
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 48e3842a..d662f415 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1,29 +1,19 @@
 // Copyright (C) 1999-2000 Id Software, Inc.
 //
+
 /*
  *  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"
 
 // g_client.c -- client functions that don't happen every frame
@@ -1521,6 +1511,8 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn )
 
   ent->client->ps.stats[ STAT_PCLASS ] = ent->client->pers.pclass;
   ent->client->ps.stats[ STAT_PTEAM ] = ent->client->pers.pteam;
+  
+  ent->client->ps.stats[ STAT_BUILDABLE ] = BA_NONE;
 
   // health will count down towards max_health
   ent->health = client->ps.stats[STAT_HEALTH] = client->ps.stats[STAT_MAX_HEALTH]; //* 1.25;
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
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index fb4e073e..232d1ee1 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -5,27 +5,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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                  
 #include "g_local.h"
 
 damageRegion_t  g_damageRegions[ PCL_NUM_CLASSES ][ MAX_LOCDAMAGE_REGIONS ];
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 2522a176..40419f0e 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -5,25 +5,14 @@
 /*
  *  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 "q_shared.h"
@@ -537,7 +526,6 @@ typedef enum
   IBE_NONE,
   
   IBE_NOROOM,
-  IBE_NOCREEP,
   IBE_NOHIVEMIND,
   IBE_HIVEMIND,
   IBE_NOASSERT,
@@ -553,6 +541,7 @@ typedef enum
 
 itemBuildError_t  G_itemFits( gentity_t *ent, buildable_t buildable, int distance, vec3_t origin );
 gentity_t         *G_buildItem( gentity_t *builder, buildable_t buildable, vec3_t origin, vec3_t angles, float speed );
+void              G_ValidateBuild( gentity_t *ent, buildable_t buildable );
 void              G_setBuildableAnim( gentity_t *ent, buildableAnimNumber_t anim, qboolean force );
 void              G_setIdleBuildableAnim( gentity_t *ent, buildableAnimNumber_t anim );
 
diff --git a/src/game/g_main.c b/src/game/g_main.c
index e89139ae..377eabf9 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -4,25 +4,14 @@
 /*
  *  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"
diff --git a/src/game/g_misc.c b/src/game/g_misc.c
index b6711afd..29583b64 100644
--- a/src/game/g_misc.c
+++ b/src/game/g_misc.c
@@ -5,27 +5,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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                  
 #include "g_local.h"
 
 
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index 24c70390..c92edc17 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.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"
 
 #define	MISSILE_PRESTEP_TIME	50
diff --git a/src/game/g_mover.c b/src/game/g_mover.c
index bbc03db6..098e4050 100644
--- a/src/game/g_mover.c
+++ b/src/game/g_mover.c
@@ -4,25 +4,14 @@
 /*
  *  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"
diff --git a/src/game/g_public.h b/src/game/g_public.h
index 28456f3b..eb6440ed 100644
--- a/src/game/g_public.h
+++ b/src/game/g_public.h
@@ -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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 // g_public.h -- game module information visible to server
 
 #define GAME_API_VERSION  8
diff --git a/src/game/g_session.c b/src/game/g_session.c
index 7695c96e..e53a2bf5 100644
--- a/src/game/g_session.c
+++ b/src/game/g_session.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "g_local.h"
 
 
diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c
index f3afeb12..653f06de 100644
--- a/src/game/g_spawn.c
+++ b/src/game/g_spawn.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "g_local.h"
 
 qboolean  G_SpawnString( const char *key, const char *defaultString, char **out ) {
diff --git a/src/game/g_svcmds.c b/src/game/g_svcmds.c
index 21eafeed..b2fa3c4c 100644
--- a/src/game/g_svcmds.c
+++ b/src/game/g_svcmds.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 // this file holds commands that can be executed by the server console, but not remote clients
 
 #include "g_local.h"
diff --git a/src/game/g_syscalls.c b/src/game/g_syscalls.c
index 00b9477d..8bbe8ab6 100644
--- a/src/game/g_syscalls.c
+++ b/src/game/g_syscalls.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "g_local.h"
 
 // this file is only included when building a dll
diff --git a/src/game/g_target.c b/src/game/g_target.c
index 08168329..f3daba36 100644
--- a/src/game/g_target.c
+++ b/src/game/g_target.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "g_local.h"
 
 //==========================================================
diff --git a/src/game/g_team.c b/src/game/g_team.c
index 528e82a4..56819ef7 100644
--- a/src/game/g_team.c
+++ b/src/game/g_team.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "g_local.h"
 
 typedef struct teamgame_s {
diff --git a/src/game/g_trigger.c b/src/game/g_trigger.c
index 33d40309..99f0d8a9 100644
--- a/src/game/g_trigger.c
+++ b/src/game/g_trigger.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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "g_local.h"
 
 
diff --git a/src/game/g_utils.c b/src/game/g_utils.c
index 8c013a1a..4259f0ea 100644
--- a/src/game/g_utils.c
+++ b/src/game/g_utils.c
@@ -5,27 +5,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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "g_local.h"
 
 typedef struct {
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index d4599572..3d639fd6 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -6,25 +6,14 @@
 /*
  *  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"
@@ -628,47 +617,32 @@ BUILD GUN
 */
 
 
-///////build weapons
-/*
-===============
-Weapon_Dbuild_Fire
-===============
-*/
-void Weapon_Dbuild_Fire( gentity_t *ent )
-{
-  G_AddPredictableEvent( ent, EV_MENU, MN_D_BUILD );
-}
-
 /*
 ===============
-Weapon_Dbuild2_Fire
+Weapon_Cancel_Build
 ===============
 */
-void Weapon_Dbuild2_Fire( gentity_t *ent )
+void Weapon_Cancel_Build( gentity_t *ent )
 {
-  G_AddPredictableEvent( ent, EV_MENU, MN_D_BUILD );
+  ent->client->ps.stats[ STAT_BUILDABLE ] = BA_NONE;
 }
 
 /*
 ===============
-Weapon_Hbuild_Fire
+Weapon_Build_Fire
 ===============
 */
-void Weapon_Hbuild_Fire( gentity_t *ent )
+void Weapon_Build_Fire( gentity_t *ent, dynMenu_t menu )
 {
-  G_AddPredictableEvent( ent, EV_MENU, MN_H_BUILD );
+  if( ( ent->client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) > BA_NONE )
+  {
+    ent->client->ps.stats[ STAT_BUILDABLE ] = BA_NONE;
+    G_ValidateBuild( ent, ent->client->ps.stats[ STAT_BUILDABLE ] );
+  }
+  else
+    G_AddPredictableEvent( ent, EV_MENU, menu );
 }
 
-/*
-===============
-Weapon_Hbuild2_Fire
-===============
-*/
-void Weapon_Hbuild2_Fire( gentity_t *ent )
-{
-  G_AddPredictableEvent( ent, EV_MENU, MN_H_BUILD );
-}
-///////build weapons
 
 /*
 ======================================================================
@@ -1100,16 +1074,16 @@ void FireWeapon2( gentity_t *ent )
     case WP_POUNCE:
       break;
     case WP_DBUILD:
-      Weapon_Dbuild_Fire( ent );
+      Weapon_Cancel_Build( ent );
       break;
     case WP_DBUILD2:
-      Weapon_Dbuild2_Fire( ent );
+      Weapon_Cancel_Build( ent );
       break;
     case WP_HBUILD:
-      Weapon_Hbuild_Fire( ent );
+      Weapon_Cancel_Build( ent );
       break;
     case WP_HBUILD2:
-      Weapon_Hbuild2_Fire( ent );
+      Weapon_Cancel_Build( ent );
       break;
     default:
   // FIXME    G_Error( "Bad ent->s.weapon" );
@@ -1194,16 +1168,16 @@ void FireWeapon( gentity_t *ent )
       Weapon_Claw_Fire( ent );
       break;
     case WP_DBUILD:
-      Weapon_Dbuild_Fire( ent );
+      Weapon_Build_Fire( ent, MN_D_BUILD );
       break;
     case WP_DBUILD2:
-      Weapon_Dbuild2_Fire( ent );
+      Weapon_Build_Fire( ent, MN_D_BUILD );
       break;
     case WP_HBUILD:
-      Weapon_Hbuild_Fire( ent );
+      Weapon_Build_Fire( ent, MN_H_BUILD );
       break;
     case WP_HBUILD2:
-      Weapon_Hbuild2_Fire( ent );
+      Weapon_Build_Fire( ent, MN_H_BUILD );
       break;
     default:
   // FIXME    G_Error( "Bad ent->s.weapon" );
diff --git a/src/game/q_math.c b/src/game/q_math.c
index ce671f1f..dd1a532d 100644
--- a/src/game/q_math.c
+++ b/src/game/q_math.c
@@ -5,27 +5,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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "q_shared.h"
 
 
diff --git a/src/game/q_shared.c b/src/game/q_shared.c
index 91784e93..4bf77a8d 100644
--- a/src/game/q_shared.c
+++ b/src/game/q_shared.c
@@ -5,27 +5,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.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*  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.
- */
-                    
 #include "q_shared.h"
 
 float Com_Clamp( float min, float max, float value ) {
diff --git a/src/game/q_shared.h b/src/game/q_shared.h
index 9e82c79d..5b74cc67 100644
--- a/src/game/q_shared.h
+++ b/src/game/q_shared.h
@@ -4,25 +4,14 @@
 /*
  *  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.
  */
 
 #ifndef __Q_SHARED_H
diff --git a/src/game/surfaceflags.h b/src/game/surfaceflags.h
index a1454800..455a1054 100644
--- a/src/game/surfaceflags.h
+++ b/src/game/surfaceflags.h
@@ -5,25 +5,14 @@
 /*
  *  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.
  */
 
 // contents flags are seperate bits