diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:25:47 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:58 +0000 |
| commit | c2772cce6c591f4b043da4526764298d88cce9a9 (patch) | |
| tree | 63f862614dd96a30c18e56b824950046ee94f752 | |
| parent | 64755fae9f8aa7b4992227b045a93749ce87b56b (diff) | |
Server logs look weird with MOD_SUICIDE listed as method of death for buildable deconstruction. Added two new MODs, MOD_DECONSTRUCT and MOD_NOCREEP for more descriptive reasons.
| -rw-r--r-- | src/game/bg_public.h | 2 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 6 | ||||
| -rw-r--r-- | src/game/g_combat.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h index f78218ac..68af42cc 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -866,6 +866,8 @@ typedef enum MOD_TELEFRAG, MOD_FALLING, MOD_SUICIDE, + MOD_DECONSTRUCT, + MOD_NOCREEP, MOD_TARGET_LASER, MOD_TRIGGER_HURT, diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 911884b0..1a532ca1 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -638,9 +638,9 @@ void AGeneric_CreepCheck( gentity_t *self ) { if( spawn && self->killedBy != ENTITYNUM_NONE ) G_Damage( self, NULL, g_entities + self->killedBy, NULL, NULL, - self->health, 0, MOD_SUICIDE ); + self->health, 0, MOD_NOCREEP ); else - G_Damage( self, NULL, NULL, NULL, NULL, self->health, 0, MOD_SUICIDE ); + G_Damage( self, NULL, NULL, NULL, NULL, self->health, 0, MOD_NOCREEP ); return; } G_CreepSlow( self ); @@ -2782,7 +2782,7 @@ void G_FreeMarkedBuildables( gentity_t *deconner ) { ent = level.markedBuildables[ i ]; - G_Damage( ent, NULL, deconner, NULL, NULL, ent->health, 0, MOD_SUICIDE ); + G_Damage( ent, NULL, deconner, NULL, NULL, ent->health, 0, MOD_DECONSTRUCT ); G_FreeEntity( ent ); } } diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 20864852..74b8b141 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -95,6 +95,8 @@ char *modNames[ ] = "MOD_TELEFRAG", "MOD_FALLING", "MOD_SUICIDE", + "MOD_DECONSTRUCT", + "MOD_NOCREEP", "MOD_TARGET_LASER", "MOD_TRIGGER_HURT", |