diff options
| -rw-r--r-- | src/cgame/cg_weapons.c | 26 | ||||
| -rw-r--r-- | src/game/g_active.c | 2 | ||||
| -rw-r--r-- | src/game/tremulous.h | 12 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index cdd77d47..fbb79c08 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -1116,20 +1116,20 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent flash.renderfx = parent->renderfx; flash.hModel = weapon->flashModel; - if( !flash.hModel ) - return; - - angles[ YAW ] = 0; - angles[ PITCH ] = 0; - angles[ ROLL ] = crandom( ) * 10; - AnglesToAxis( angles, flash.axis ); + if( flash.hModel ) + { + angles[ YAW ] = 0; + angles[ PITCH ] = 0; + angles[ ROLL ] = crandom( ) * 10; + AnglesToAxis( angles, flash.axis ); - if( noGunModel ) - CG_PositionRotatedEntityOnTag( &flash, parent, parent->hModel, "tag_weapon" ); - else - CG_PositionRotatedEntityOnTag( &flash, &gun, weapon->weaponModel, "tag_flash" ); - - trap_R_AddRefEntityToScene( &flash ); + if( noGunModel ) + CG_PositionRotatedEntityOnTag( &flash, parent, parent->hModel, "tag_weapon" ); + else + CG_PositionRotatedEntityOnTag( &flash, &gun, weapon->weaponModel, "tag_flash" ); + + trap_R_AddRefEntityToScene( &flash ); + } if( ps || cg.renderingThirdPerson || cent->currentState.number != cg.predictedPlayerState.clientNum ) diff --git a/src/game/g_active.c b/src/game/g_active.c index 90136f11..91f45e52 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1123,7 +1123,7 @@ void ClientThink_real( gentity_t *ent ) client->ps.stats[ STAT_STATE ] &= ~SS_HOVELING; //hovel is empty - G_setBuildableAnim( hovel, BANIM_ATTACK1, qfalse ); + G_setBuildableAnim( hovel, BANIM_ATTACK2, qfalse ); hovel->active = qfalse; } else diff --git a/src/game/tremulous.h b/src/game/tremulous.h index acfc4608..55fdb4ae 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -43,7 +43,7 @@ #define HYDRA_CLAW_DMG ADM(40) #define HYDRA_CLAW_RANGE 96.0f -#define HYDRA_CLAW_REPEAT 500 +#define HYDRA_CLAW_REPEAT 600 #define HYDRA_CLAW_U_REPEAT 500 #define HYDRA_GRAB_RANGE 64.0f #define HYDRA_GRAB_TIME 1000 @@ -54,17 +54,17 @@ #define CHIMERA_CLAW_DMG ADM(50) #define CHIMERA_CLAW_RANGE 96.0f -#define CHIMERA_CLAW_REPEAT 400 -#define CHIMERA_CLAW_U_REPEAT 300 +#define CHIMERA_CLAW_REPEAT 500 +#define CHIMERA_CLAW_U_REPEAT 400 #define CHIMERA_AREAZAP_DMG ADM(75) #define CHIMERA_AREAZAP_RANGE 200.0f #define CHIMERA_AREAZAP_REPEAT 1500 #define CHIMERA_WALLJUMP_MAXSPEED 1000.0f -#define DRAGOON_CLAW_DMG ADM(75) +#define DRAGOON_CLAW_DMG ADM(100) #define DRAGOON_CLAW_RANGE 96.0f -#define DRAGOON_CLAW_REPEAT 750 -#define DRAGOON_CLAW_U_REPEAT 500 +#define DRAGOON_CLAW_REPEAT 700 +#define DRAGOON_CLAW_U_REPEAT 600 #define DRAGOON_POUNCE_DMG ADM(200) #define DRAGOON_POUNCE_RANGE 96.0f #define DRAGOON_POUNCE_SPEED 700 |