summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_buildable.c4
-rw-r--r--src/game/g_combat.c36
2 files changed, 26 insertions, 14 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index c10df521..a0cc8c02 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -382,7 +382,7 @@ void ASpawn_Melt( gentity_t *self )
{
//FIXME: this line crashes the QVM (but not binary when MOD is set to MOD_[H/D]SPAWN
G_SelectiveRadiusDamage( self->s.pos.trBase, self->parent, self->splashDamage,
- self->splashRadius, self, MOD_SHOTGUN, PTE_ALIENS );
+ self->splashRadius, self, MOD_ASPAWN, PTE_ALIENS );
//start creep recession
if( !( self->s.eFlags & EF_DEAD ) )
@@ -555,7 +555,7 @@ void AOvermind_Think( gentity_t *self )
{
self->timestamp = level.time;
G_SelectiveRadiusDamage( self->s.pos.trBase, self, self->splashDamage,
- self->splashRadius, self, MOD_SHOTGUN, PTE_ALIENS );
+ self->splashRadius, self, MOD_OVERMIND, PTE_ALIENS );
G_setBuildableAnim( self, BANIM_ATTACK1, qfalse );
}
}
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 579cec2f..8c82dd2e 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -113,19 +113,15 @@ char *modNames[ ] =
{
"MOD_UNKNOWN",
"MOD_SHOTGUN",
- "MOD_GAUNTLET",
+ "MOD_BLASTER",
+ "MOD_PAINSAW",
"MOD_MACHINEGUN",
"MOD_CHAINGUN",
- "MOD_GRENADE",
- "MOD_GRENADE_SPLASH",
- "MOD_ROCKET",
- "MOD_ROCKET_SPLASH",
+ "MOD_PRIFLE",
+ "MOD_LCANNON",
+ "MOD_LCANNON_SPLASH",
"MOD_FLAMER",
"MOD_FLAMER_SPLASH",
- "MOD_RAILGUN",
- "MOD_LIGHTNING",
- "MOD_BFG",
- "MOD_BFG_SPLASH",
"MOD_WATER",
"MOD_SLIME",
"MOD_LAVA",
@@ -135,10 +131,26 @@ char *modNames[ ] =
"MOD_SUICIDE",
"MOD_TARGET_LASER",
"MOD_TRIGGER_HURT",
- "MOD_GRAPPLE",
- "MOD_VENOM",
+
+ "MOD_ABUILDER_CLAW",
+ "MOD_SOLDIER_BITE",
+ "MOD_HYDRA_CLAW",
+ "MOD_HYDRA_PCLOUD",
+ "MOD_DRAGOON_CLAW",
+ "MOD_DRAGOON_POUNCE",
+ "MOD_CHIMERA_CLAW",
+ "MOD_CHIMERA_ZAP",
+ "MOD_BMOFO_CLAW",
+ "MOD_BMOFO_CHARGE",
+
+ "MOD_SLOWBLOB",
+ "MOD_POISON",
+
"MOD_HSPAWN",
- "MOD_DSPAWN"
+ "MOD_TESLAGEN",
+ "MOD_ASPAWN",
+ "MOD_ATUBE",
+ "MOD_OVERMIND"
};
/*