summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMikko Tiusanen <ams@daug.net>2014-11-22 22:43:01 +0200
committerMikko Tiusanen <ams@daug.net>2014-11-22 22:43:01 +0200
commit7110bced025e3453c70ec5cd6405a8d194c748bf (patch)
tree39886d5ede20daf8915e63c79c392f3a6c4308cf /src
parentb7f1c60eba246d8d87dfb1e3eaf69e4bcb1645ee (diff)
parent07a69adf645f56a050075d61d54380665bd8dd1f (diff)
Merge branch 'master' of github.com:mtiusane/new-edge
Diffstat (limited to 'src')
-rw-r--r--src/game/g_missile.c2
-rw-r--r--src/game/tremulous.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index 959067e..f9096ef 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -989,7 +989,7 @@ gentity_t *fire_rocket( gentity_t *self, vec3_t start, vec3_t dir )
bolt->r.ownerNum = self->s.number;
bolt->parent = self;
bolt->damage = ROCKETL_DAMAGE;
- bolt->splashDamage = ROCKETL_DAMAGE / 2;
+ bolt->splashDamage = ROCKETL_DAMAGE;
bolt->splashRadius = ROCKETL_RADIUS;
bolt->methodOfDeath = MOD_ROCKETL;
bolt->splashMethodOfDeath = MOD_ROCKETL_SPLASH;
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index b2932da..e7512d5 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -539,9 +539,9 @@ TREMULOUS EDGE MOD SRC FILE
#define FLAMER_SECONDARY_REPEAT 200
#define ROCKETL_PRICE 700
-#define ROCKETL_AMMO 6
-#define ROCKETL_CLIPS 4
-#define ROCKETL_RELOAD 2000
+#define ROCKETL_AMMO 24
+#define ROCKETL_CLIPS 0
+#define ROCKETL_RELOAD 0
#define ROCKETL_REPEAT 1000
#define ROCKETL_K_SCALE 1.0f
#define ROCKETL_DAMAGE HDM(88)