diff options
| -rw-r--r-- | src/cgame/cg_buildable.c | 2 | ||||
| -rw-r--r-- | src/game/bg_misc.c | 10 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c index 9f91b56b..96fa94ce 100644 --- a/src/cgame/cg_buildable.c +++ b/src/cgame/cg_buildable.c @@ -460,7 +460,7 @@ void CG_Buildable( centity_t *cent ) turretBarrel.hModel = cg_buildables[ es->modelindex ].models[ 1 ]; - CG_PositionRotatedEntityOnTag( &turretBarrel, &ent, ent.hModel, "tag_turret" ); + CG_PositionEntityOnTag( &turretBarrel, &ent, ent.hModel, "tag_turret" ); VectorCopy( cent->lerpOrigin, turretBarrel.lightingOrigin ); AnglesToAxis( es->angles2, flatAxis ); diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 564cdef0..96a46f0e 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -335,20 +335,20 @@ buildableAttributes_t bg_buildableList[ ] = "plasmaturret", //char *buildName; "Plasma Turret", //char *humanName; "team_human_def1", //char *entityName; - { "models/buildables/plasmaturret/pturret_base.md3", "models/buildables/plasmaturret/pturret_top.md3", 0, 0 }, + { "base.md3", "barrel.md3", "top.md3", 0 }, { -24, -24, -11 }, //vec3_t mins; { 24, 24, 11 }, //vec3_t maxs; TR_GRAVITY, //trType_t traj; 0.0, //float bounce; 80, //int buildPoints; - ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages + ( 1 << S2 )|( 1 << S3 ), //int stages 1000, //int health; 50, //int damage; 20, //int splashDamage; 50, //int splashRadius; MOD_HSPAWN, //int meansOfDeath; BIT_HUMANS, //int team; - ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon; + ( 1 << WP_HBUILD2 ), //weapon_t buildWeapon; BANIM_IDLE1, //int idleAnim; 50, //int nextthink; 500, //int turretFireSpeed; @@ -374,14 +374,14 @@ buildableAttributes_t bg_buildableList[ ] = TR_GRAVITY, //trType_t traj; 0.0, //float bounce; 80, //int buildPoints; - ( 1 << S2 )|( 1 << S3 ), //int stages + ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages 1000, //int health; 50, //int damage; 20, //int splashDamage; 50, //int splashRadius; MOD_HSPAWN, //int meansOfDeath; BIT_HUMANS, //int team; - ( 1 << WP_HBUILD2 ), //weapon_t buildWeapon; + ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon; BANIM_IDLE1, //int idleAnim; 50, //int nextthink; 50, //int turretFireSpeed; diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index d0c6a615..a2419069 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -1242,7 +1242,7 @@ void HFM_Think( gentity_t *self ) #define HDEF1_ANGULARSPEED 10 //degrees/think ~= 200deg/sec #define HDEF1_ACCURACYTOLERANCE HDEF1_ANGULARSPEED / 2 //angular difference for turret to fire -#define HDEF1_VERTICALCAP 20 //+/- maximum pitch +#define HDEF1_VERTICALCAP 90 //+/- maximum pitch #define HDEF1_PROJSPEED 2000.0f //speed of projectile (used in prediction) /* |