diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_misc.c | 2 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 83d7042e..f688d858 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -840,7 +840,7 @@ TA: droid defense item { "team_droid_def1", "sound/items/holdable.wav", - { "models/buildables/defense1/defense1.md3", 0, 0, 0 }, + { "models/buildables/barricade/barricade.md3", 0, 0, 0 }, "icons/teleporter", //icon "Barricade", //pickup 0, diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 586d4765..f7769613 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -325,6 +325,21 @@ void DSpawn_Pain( gentity_t *self, gentity_t *attacker, int damage ) /* ================ +DBarricade_Pain + +pain function for Droid Spawn +================ +*/ +void DBarricade_Pain( gentity_t *self, gentity_t *attacker, int damage ) +{ + if( random() > 0.5f ) + G_setBuildableAnim( self, BANIM_PAIN1 ); + else + G_setBuildableAnim( self, BANIM_PAIN2 ); +} + +/* +================ DBarricade_Die Called when an droid spawn dies @@ -1420,7 +1435,7 @@ gentity_t *G_buildItem( gentity_t *ent, buildable_t buildable, int distance, flo case BA_D_BARRICADE: built->die = DBarricade_Die; built->think = DBarricade_Think; - built->pain = DSpawn_Pain; + built->pain = DBarricade_Pain; break; case BA_D_ACIDTUBE: |