Changeset 72:4c8944b21814

Timestamp:

11/22/07 01:40:00 (3 years ago)

Author:

mdoison

Branch:

madcat

convert_revision:

svn:7c786126-522e-0410-a822-d6d8feae56ca/branches/madcat@94

Message:

• Apply ff_cvar.patch (tjw 1.2)
• Apply builder_prevent_explosion.patch (tjw 1.2)
• Remove 008.pierref.deco_exploding_sd.patch (deprecated by builder_prevent_explosion.patch)

Location:

src/game

Files:

• g_cmds.c (modified) (2 diffs)
• g_main.c (modified) (1 diff)

src/game/g_cmds.c

@@ -1875 +1875 @@
           ( ent->client->ps.weapon <= WP_HBUILD ) ) )
     {
+      // Always let the builder prevent the explosion 
+      if( traceEnt->health <= 0 )
+      {
+        G_FreeEntity( traceEnt );
+        return;
+      }
+
       // Cancel deconstruction
       if( g_markDeconstruct.integer && traceEnt->deconstruct )
@@ -1954 +1961 @@
         }
       }
-      else 
-      {
-         // We *can* deconstrute building on fire :)
-          G_LogPrintf( "Decon: %i %i 0: %s ^3deconstructed^7 %s\n",
-            ent->client->ps.clientNum,
-            traceEnt->s.modelindex,
-            ent->client->pers.netname, 
-            BG_FindNameForBuildable( traceEnt->s.modelindex ) );
-
-          if( !deconstruct )
-            G_Damage( traceEnt, ent, ent, forward, tr.endpos, 10000, 0, MOD_SUICIDE );
-          else
-            G_FreeEntity( traceEnt );
-
-          // cheat or fast build -> no build timer
-          if( !g_cheats.integer && !g_fastBuild.integer )
-            ent->client->ps.stats[ STAT_MISC ] +=
-              BG_FindBuildDelayForWeapon( ent->s.weapon ) >> 2;
-      }
     }
   }

src/game/g_main.c

@@ -191 +191 @@
   { &g_synchronousClients, "g_synchronousClients", "0", CVAR_SYSTEMINFO, 0, qfalse  },
 
-  { &g_friendlyFire, "g_friendlyFire", "1", CVAR_ARCHIVE, 0, qtrue  },
+  { &g_friendlyFire, "g_friendlyFire", "1", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qtrue  },
   { &g_friendlyFireAliens, "g_friendlyFireAliens", "1", CVAR_ARCHIVE, 0, qtrue  },
   { &g_friendlyFireHumans, "g_friendlyFireHumans", "1", CVAR_ARCHIVE, 0, qtrue  },