* 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, 4 insertions, 4 deletions

diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 9d015e8b..cfc7cc1f 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -42,8 +42,8 @@ void G_ForceWeaponChange( gentity_t *ent, weapon_t weapon )
   {
     ent->client->ps.pm_flags |= PMF_WEAPON_SWITCH;
 
-    if( weapon == WP_NONE 
-      || !BG_InventoryContainsWeapon( weapon, ent->client->ps.stats ))
+    if( weapon == WP_NONE ||
+        !BG_InventoryContainsWeapon( weapon, ent->client->ps.stats ))
     {
       //switch to the first non blaster weapon
       for( i = WP_NONE + 1; i < WP_NUM_WEAPONS; i++ )
@@ -64,8 +64,8 @@ void G_ForceWeaponChange( gentity_t *ent, weapon_t weapon )
     }
     else
       ent->client->ps.persistant[ PERS_NEWWEAPON ] = weapon;
-   
-    // force this here to prevent flamer effect from continuing 
+
+    // force this here to prevent flamer effect from continuing
     ent->client->ps.generic1 = WPM_NOTFIRING;
 
     ent->client->ps.weapon = ent->client->ps.persistant[ PERS_NEWWEAPON ];