Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - g_monster.c
diff -s -r q2_305/g_monster.c q2_314/g_monster.c
Left File < - 3.05/g_monster.c
Right File > - 3.14/g_monster.c
Back to Index
14c14
< fire_bullet (self, start, dir, damage, kick, hspread, vspread);
---
> fire_bullet (self, start, dir, damage, kick, hspread, vspread, MOD_UNKNOWN);
24c24
< fire_shotgun (self, start, aimdir, damage, kick, hspread, vspread, count);
---
> fire_shotgun (self, start, aimdir, damage, kick, hspread, vspread, count, MOD_UNKNOWN);
34c34
< fire_blaster (self, start, dir, damage, speed, effect);
---
> fire_blaster (self, start, dir, damage, speed, effect, false);
95a96,97
> if (self->waterlevel)
> return;
216c218
< T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, dmg, 0, DAMAGE_NO_ARMOR);
---
> T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, dmg, 0, DAMAGE_NO_ARMOR, MOD_WATER);
234c236
< T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, dmg, 0, DAMAGE_NO_ARMOR);
---
> T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, dmg, 0, DAMAGE_NO_ARMOR, MOD_WATER);
256c258
< T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, 10*ent->waterlevel, 0, 0);
---
> T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, 10*ent->waterlevel, 0, 0, MOD_LAVA);
264c266
< T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, 4*ent->waterlevel, 0, 0);
---
> T_Damage (ent, world, world, vec3_origin, ent->s.origin, vec3_origin, 4*ent->waterlevel, 0, 0, MOD_SLIME);
270,278c272,283
< if (ent->watertype & CONTENTS_LAVA)
< if (random() <= 0.5)
< gi.sound (ent, CHAN_BODY, gi.soundindex("player/lava1.wav"), 1, ATTN_NORM, 0);
< else
< gi.sound (ent, CHAN_BODY, gi.soundindex("player/lava2.wav"), 1, ATTN_NORM, 0);
< else if (ent->watertype & CONTENTS_SLIME)
< gi.sound (ent, CHAN_BODY, gi.soundindex("player/watr_in.wav"), 1, ATTN_NORM, 0);
< else if (ent->watertype & CONTENTS_WATER)
< gi.sound (ent, CHAN_BODY, gi.soundindex("player/watr_in.wav"), 1, ATTN_NORM, 0);
---
> if (!(ent->svflags & SVF_DEADMONSTER))
> {
> if (ent->watertype & CONTENTS_LAVA)
> if (random() <= 0.5)
> gi.sound (ent, CHAN_BODY, gi.soundindex("player/lava1.wav"), 1, ATTN_NORM, 0);
> else
> gi.sound (ent, CHAN_BODY, gi.soundindex("player/lava2.wav"), 1, ATTN_NORM, 0);
> else if (ent->watertype & CONTENTS_SLIME)
> gi.sound (ent, CHAN_BODY, gi.soundindex("player/watr_in.wav"), 1, ATTN_NORM, 0);
> else if (ent->watertype & CONTENTS_WATER)
> gi.sound (ent, CHAN_BODY, gi.soundindex("player/watr_in.wav"), 1, ATTN_NORM, 0);
> }
512c517
< if (deathmatch->value || nomonsters->value)
---
> if (deathmatch->value)