built->takedamage now set to qtrue. Added Reactor and Repeater

3 files changed, 76 insertions, 1 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 1f9f5187..77265f7e 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -809,7 +809,7 @@ TA: human defense item
   {
     "team_human_mcu",
     "sound/items/holdable.wav",
-    { "models/bitems/adef1.md3", 0, 0, 0 },
+    { "models/powerups/ammo/plasmaam.md3", 0, 0, 0 },
     "icons/teleporter", //icon
     "Human MCU",      //pickup
     0,
@@ -819,6 +819,38 @@ TA: human defense item
     ""                  //sounds
   },
   
+/*QUAKED team_human_reactor (0 0 1) (-16 -16 -16) (16 16 16)
+TA: human power item
+*/
+  {
+    "team_human_reactor",
+    "sound/items/holdable.wav",
+    { "models/powerups/ammo/bfgam.md3", 0, 0, 0 },
+    "icons/teleporter", //icon
+    "Human Reactor",      //pickup
+    0,
+    IT_BUILDABLE,
+    BA_H_REACTOR,
+    "",                 //precache
+    ""                  //sounds
+  },
+  
+/*QUAKED team_human_repeater (0 0 1) (-16 -16 -16) (16 16 16)
+TA: human power item
+*/
+  {
+    "team_human_repeater",
+    "sound/items/holdable.wav",
+    { "models/powerups/ammo/railgunam.md3", 0, 0, 0 },
+    "icons/teleporter", //icon
+    "Human Repeater",      //pickup
+    0,
+    IT_BUILDABLE,
+    BA_H_REPEATER,
+    "",                 //precache
+    ""                  //sounds
+  },
+  
 /*QUAKED upgrade_torch (0 0 1) (-16 -16 -16) (16 16 16)
 */
   {
@@ -972,6 +1004,38 @@ buildableAttributes_t bg_buildableList[ ] =
     EV_NONE,
     -1,
     qfalse
+  },
+  {
+    BA_H_REACTOR,
+    "reactor",
+    "team_human_reactor",
+    { -15, -15, -15 },
+    { 15, 15, 15 },
+    1000,
+    50,
+    50,
+    150,
+    MOD_HSPAWN,
+    BIT_HUMANS,
+    EV_NONE,
+    -1,
+    qfalse
+  },
+  {
+    BA_H_REPEATER,
+    "repeater",
+    "team_human_repeater",
+    { -15, -15, -15 },
+    { 15, 15, 15 },
+    1000,
+    50,
+    50,
+    150,
+    MOD_HSPAWN,
+    BIT_HUMANS,
+    EV_NONE,
+    -1,
+    qfalse
   }
 };
 
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 3a701611..67dc864b 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -374,6 +374,8 @@ typedef enum {
   BA_H_SPAWN,
   BA_H_DEF1,
   BA_H_MCU,
+  BA_H_REACTOR,
+  BA_H_REPEATER,
 
   BA_NUM_BUILDABLES
 } buildable_t;
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 4294fb01..8b5c0b82 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -566,7 +566,16 @@ gentity_t *Build_Item( gentity_t *ent, buildable_t buildable, int distance ) {
     built->die = HSpawn_Die;
     built->use = HMCU_Activate;
   }
+  else if( buildable == BA_H_REACTOR )
+  {
+    built->die = HSpawn_Die;
+  }
+  else if( buildable == BA_H_REPEATER )
+  {
+    built->die = HSpawn_Die;
+  }
 
+  built->takedamage = qtrue;
   built->s.number = built - g_entities;
   built->r.contents = CONTENTS_BODY;
   built->clipmask = MASK_PLAYERSOLID;