summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/g_cmds.c4
-rw-r--r--src/game/tremulous.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 532de22b..c03187ae 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1157,7 +1157,7 @@ void Cmd_Destroy_f( gentity_t *ent, qboolean deconstruct )
{
if( ent->client->ps.stats[ STAT_MISC ] > 0 )
{
- G_AddPredictableEvent( ent, EV_BUILD_DELAY, 0 );
+ G_AddEvent( ent, EV_BUILD_DELAY, 0 );
return;
}
@@ -1466,7 +1466,7 @@ void Cmd_Buy_f( gentity_t *ent )
//if the buyer previously had no items at all, force a new selection
if( numItems == 0 )
- G_AddPredictableEvent( ent, EV_NEXT_WEAPON, 0 );
+ G_AddEvent( ent, EV_NEXT_WEAPON, 0 );
//retrigger the armoury menu
ent->client->retriggerArmouryMenu = level.framenum + RAM_FRAMES;
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index ed7fef4f..dc381441 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -271,7 +271,7 @@
*
*/
-#define HUMAN_WDMG_MODIFIER 2.0f
+#define HUMAN_WDMG_MODIFIER 1.5f
#define HDM(d) ((int)((float)d*HUMAN_WDMG_MODIFIER))
#define RIFLE_CLIPSIZE 30
@@ -289,7 +289,7 @@
#define CHAINGUN_SPREAD 1200
#define CHAINGUN_DMG HDM(14)
-#define FLAMER_GAS 400
+#define FLAMER_GAS 40
#define FLAMER_REPEAT 300
#define FLAMER_PRICE 300
#define FLAMER_DMG HDM(30)
@@ -419,7 +419,7 @@
#define TESLAGEN_HEALTH HBHM(200)
#define TESLAGEN_SPLASHDAMAGE 50
#define TESLAGEN_SPLASHRADIUS 100
-#define TESLAGEN_REPEAT 1500
+#define TESLAGEN_REPEAT 500
#define TESLAGEN_RANGE 1500
#define DC_BP 80