* Remove B_REMOVED_TOGGLEBIT, use ps->misc per player instead

* Fix last spawn and uniqueness tests for marked deconstruction
* Fix buildable collision tests for non-marked deconstruction
* New g_markDeconstruct settings to guard against abuse
  + 0 off
  + 1 on, no replacements allowed
  + 2 on, replacements allowed of same type
  + 3 on, any replacements allowed
* Unlink then relink all buildables when doing build tests
* Fixes to tutorial text for marked deconstruction
* Remove unused "weaponswitch" client command

1 files changed, 15 insertions, 0 deletions

diff --git a/src/game/g_active.c b/src/game/g_active.c
index ce60daff..17f66352 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -513,6 +513,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
   gclient_t *client;
   usercmd_t *ucmd;
   int       aForward, aRight;
+  int       i;
 
   ucmd = &ent->client->pers.cmd;
 
@@ -675,6 +676,20 @@ void ClientTimerActions( gentity_t *ent, int msec )
             client->ps.stats[ STAT_BUILDABLE ] |= SB_VALID_TOGGLEBIT;
           else
             client->ps.stats[ STAT_BUILDABLE ] &= ~SB_VALID_TOGGLEBIT;
+
+          // Let the client know which buildables will be removed by building
+          for( i = 0; i < MAX_MISC; i++ )
+          {
+            if( i < level.numBuildablesForRemoval )
+              client->ps.misc[ i ] = level.markedBuildables[ i ]->s.number;
+            else
+              client->ps.misc[ i ] = 0;
+          }
+        }
+        else
+        {
+          for( i = 0; i < MAX_MISC; i++ )
+            client->ps.misc[ i ] = 0;
         }
 
         //update build timer