summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/bg_misc.c2
-rw-r--r--src/game/bg_public.h2
-rw-r--r--src/game/g_missile.c10
-rw-r--r--src/game/g_weapon.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 506bf599..f2bc1d54 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -1960,7 +1960,7 @@ weaponAttributes_t bg_weapons[ ] =
0, //int clips;
0, //int maxClips;
qfalse, //int infiniteAmmo;
- 20, //int repeatRate;
+ 40, //int repeatRate;
0, //int reloadTime;
qfalse, //qboolean hasAltMode;
qfalse, //qboolean synced;
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 42e92464..6a0018ed 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -322,7 +322,7 @@ typedef enum {
} holdable_t;
//TA: needed client side to size sprites
-#define FIREBALL_LIFETIME 1000.0f
+#define FIREBALL_LIFETIME 800.0f
typedef enum
{
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index f715bf21..aa4116c8 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -257,8 +257,8 @@ gentity_t *fire_flamer( gentity_t *self, vec3_t start, vec3_t dir )
//random rotation for the flame sprite
bolt->s.generic1 = rand( ) % 360;
bolt->parent = self;
- bolt->damage = 60;
- bolt->splashDamage = 65;
+ bolt->damage = 5;
+ bolt->splashDamage = 5;
bolt->splashRadius = 45;
bolt->methodOfDeath = MOD_FLAMER;
bolt->splashMethodOfDeath = MOD_FLAMER_SPLASH;
@@ -266,11 +266,11 @@ gentity_t *fire_flamer( gentity_t *self, vec3_t start, vec3_t dir )
bolt->target_ent = NULL;
bolt->s.pos.trType = TR_LINEAR;
- bolt->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME; // move a bit on the very first frame
+ bolt->s.pos.trTime = level.time - ( MISSILE_PRESTEP_TIME / 2 ); // move a bit on the very first frame
VectorCopy( start, bolt->s.pos.trBase );
//VectorMA( self->client->ps.velocity, 300, dir, bolt->s.pos.trDelta );
- VectorScale( dir, 200, bolt->s.pos.trDelta );
- SnapVector( bolt->s.pos.trDelta ); // save net bandwidth
+ VectorScale( dir, 300, bolt->s.pos.trDelta );
+ /*SnapVector( bolt->s.pos.trDelta ); // save net bandwidth*/
VectorCopy (start, bolt->r.currentOrigin);
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index f08ae2fe..1d8180dd 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -226,7 +226,7 @@ void flamerFire( gentity_t *ent )
m = fire_flamer( ent, muzzle, forward );
- VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
+ //VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
/*