summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_cmds.c4
-rw-r--r--src/game/tremulous.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index fb59950..8822d1e 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1309,8 +1309,11 @@ static void Cmd_SayArea_f( gentity_t *ent )
VectorSubtract( ent->s.origin, range, mins );
num = trap_EntitiesInBox( mins, maxs, entityList, MAX_GENTITIES );
+
for( i = 0; i < num; i++ )
{
+ // FIXME: the commented out bit causes segfaults
+/*
if (g_clients[entityList[i]].pers.connected != CON_DISCONNECTED && g_clients[entityList[i]].pers.control != 0)
{
if (g_clients[entityList[i]].pers.control < 0)
@@ -1318,6 +1321,7 @@ static void Cmd_SayArea_f( gentity_t *ent )
if (G_SayTo(ent, &g_entities[g_clients[entityList[i]].pers.control - 1], SAY_TEAM, color, name, msg, prefix))
continue;
}
+*/
G_SayTo( ent, &g_entities[ entityList[ i ] ], SAY_TEAM, color, name, msg, prefix );
}
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index ce969f6..f46aea6 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -236,8 +236,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BARRICADE_BP 10
#define BARRICADE_BT 20000
-#define BARRICADE_HEALTH ABHM(200)
-#define BARRICADE_REGEN 14
+#define BARRICADE_HEALTH ABHM(250)
+#define BARRICADE_REGEN 16
#define BARRICADE_SPLASHDAMAGE 50
#define BARRICADE_SPLASHRADIUS 50
#define BARRICADE_CREEPSIZE 120