Fix a few issues with the barricade.

Unvanquished · May 31, 2015 · 0a3ad89 · 0a3ad89
1 parent 424a3fb
commit 0a3ad89
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/main/scripts/barricade.shader b/main/scripts/barricade.shader
@@ -1,12 +1,13 @@
-body //FIXME
+models/buildables/barricade/body
 {
 	qer_editorimage models/buildables/barricade/body_d
 	diffuseMap  models/buildables/barricade/body_d
 	bumpMap     models/buildables/barricade/body_n
 	specularMap models/buildables/barricade/body_s
+	glowMap     models/buildables/barricade/body_g
 }
 
-tentacles //FIXME
+models/buildables/barricade/tentacles
 {
 	qer_editorimage models/buildables/barricade/tentacles_d
 	diffuseMap  models/buildables/barricade/tentacles_d

diff --git a/main/sound/buildables/barricade/sound.cfg b/main/sound/buildables/barricade/sound.cfg
@@ -1,11 +1,11 @@
 0 0 //idle1.wav
 0 0 //idle2.wav
-0 0 //powerdown.wav
+1 0 //powerdown.wav
 0 0 //idle_unpowered.wav
 1 0 //construct1.wav
-0 0 //construct2.wav
-1 0 //attack1.wav
-1 0 //attack2.wav
+1 0 //construct2.wav (BANIM_POWERUP)
+0 0 //attack1.wav
+0 0 //attack2.wav
 0 0 //spawn1.wav
 0 0 //spawn2.wav
 1 0 //pain1.wav

diff --git a/src/gamelogic/cgame/cg_buildable.cpp b/src/gamelogic/cgame/cg_buildable.cpp
@@ -124,7 +124,7 @@ static const struct { shorthand_t shorthand; int flags; } anims[ BA_NUM_BUILDABL
 {{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0}}, // NONE
 {{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0},{XX,0}}, // A_SPAWN
 {{XX,0},{I1,1},{XX,0},{XX,0},{XX,0},{C1,0},{XX,0},{A1,0},{XX,0},{XX,0},{XX,0},{P1,0},{P2,0},{DE,0},{XX,0},{DD,0},{XX,0}}, // A_OVERMIND
-{{XX,0},{I1,0},{XX,0},{BS,0},{IS,0},{C1,0},{BU,0},{XX,0},{XX,0},{XX,0},{XX,0},{P1,0},{PS,0},{DE,0},{dS,0},{DD,0},{DS,0}}, // A_BARRICADE
+{{XX,0},{I1,1},{XX,0},{BS,0},{IS,1},{C1,0},{BU,0},{XX,0},{XX,0},{XX,0},{XX,0},{P1,0},{PS,0},{DE,0},{dS,0},{DD,0},{DS,0}}, // A_BARRICADE
 {{XX,0},{I1,1},{XX,0},{XX,0},{XX,0},{C1,0},{XX,0},{A1,0},{XX,0},{XX,0},{XX,0},{P1,0},{XX,0},{DE,0},{DE,0},{DD,0},{XX,0}}, // A_ACIDTUBE
 {{XX,0},{I1,1},{XX,0},{XX,0},{XX,0},{C1,0},{XX,0},{A1,0},{XX,0},{XX,0},{XX,0},{P1,0},{XX,0},{DE,0},{DE,0},{DD,0},{XX,0}}, // A_TRAPPER
 {{XX,0},{I1,1},{XX,0},{XX,0},{XX,0},{C1,0},{XX,0},{A1,0},{XX,0},{XX,0},{XX,0},{P1,0},{XX,0},{DE,0},{DE,0},{DD,0},{XX,0}}, // A_BOOSTER