Menu
▾
▴
[Jake2-commits] jake2/src/jake2/game/monsters M_Infantry.java,1.2,1.3 M_Brain.java,1.2,1.3 M_Insane.java,1.2,1.3 M_Gunner.java,1.2,1.3 M_Parasite.java,1.2,1.3 M_Boss32.java,1.2,1.3 M_Float.java,1.2,1.3 M_Gladiator.java,1.2,1.3 M_Berserk.java,1.2,1.3 M_Supertank.java,1.2,1.3 M_Boss2.java,1.2,1.3 M_Tank.java,1.2,1.3 M_Soldier.java,1.2,1.3 M_Flipper.java,1.2,1.3 M_Chick.java,1.2,1.3 M_Boss31.java,1.2,1.3 M_Mutant.java,1.2,1.3 M_Flyer.java,1.2,1.3 M_Hover.java,1.2,1.3 M_Medic.java,1.2,1.3 M_Actor.java,1.2,1.3
Update of /cvsroot/jake2/jake2/src/jake2/game/monsters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13343/src/jake2/game/monsters Modified Files: M_Infantry.java M_Brain.java M_Insane.java M_Gunner.java M_Parasite.java M_Boss32.java M_Float.java M_Gladiator.java M_Berserk.java M_Supertank.java M_Boss2.java M_Tank.java M_Soldier.java M_Flipper.java M_Chick.java M_Boss31.java M_Mutant.java M_Flyer.java M_Hover.java M_Medic.java M_Actor.java Log Message: sorted the methods according to their original locations in the c files. Index: M_Infantry.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Infantry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Infantry.java 6 Feb 2005 18:48:14 -0000 1.2 --- M_Infantry.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- import jake2.Defines; import jake2.client.M; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntDodgeAdapter; *************** *** 30,34 **** import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; - import jake2.game.Fire; import jake2.game.GameAI; import jake2.game.GameBase; --- 31,34 ---- *************** *** 844,854 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 844,854 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; *************** *** 994,998 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 0); ! if (Fire.fire_hit(self, aim, (5 + (Lib.rand() % 5)), 50)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_punch_hit, 1, Defines.ATTN_NORM, 0); --- 994,998 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 0); ! if (GameWeapon.fire_hit(self, aim, (5 + (Lib.rand() % 5)), 50)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_punch_hit, 1, Defines.ATTN_NORM, 0); Index: M_Insane.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Insane.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Insane.java 6 Feb 2005 18:48:14 -0000 1.2 --- M_Insane.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntPainAdapter; *************** *** 809,819 **** Defines.ATTN_IDLE, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 810,820 ---- Defines.ATTN_IDLE, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Soldier.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Soldier.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Soldier.java 6 Feb 2005 18:48:15 -0000 1.2 --- M_Soldier.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntDodgeAdapter; *************** *** 1041,1050 **** Defines.ATTN_NORM, 0); for (n = 0; n < 3; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowGib(self, "models/objects/gibs/chest/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 1042,1051 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 3; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowGib(self, "models/objects/gibs/chest/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Parasite.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Parasite.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Parasite.java 6 Feb 2005 18:48:16 -0000 1.2 --- M_Parasite.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; *************** *** 626,630 **** Math3D.VectorSubtract(start, end, dir); ! GameUtil.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin, Globals.vec3_origin, damage, 0, Defines.DAMAGE_NO_KNOCKBACK, Defines.MOD_UNKNOWN); --- 627,631 ---- Math3D.VectorSubtract(start, end, dir); ! GameCombat.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin, Globals.vec3_origin, damage, 0, Defines.DAMAGE_NO_KNOCKBACK, Defines.MOD_UNKNOWN); *************** *** 749,759 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 750,760 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Boss31.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss31.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Boss31.java 6 Feb 2005 18:48:16 -0000 1.2 --- M_Boss31.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 1080,1084 **** new mframe_t(GameAI.ai_move, 0, null), new mframe_t(GameAI.ai_move, 0, M_Boss32.MakronToss), ! new mframe_t(GameAI.ai_move, 0, GameAI.BossExplode) // 50 }; --- 1080,1084 ---- new mframe_t(GameAI.ai_move, 0, null), new mframe_t(GameAI.ai_move, 0, M_Boss32.MakronToss), ! new mframe_t(GameAI.ai_move, 0, M_Supertank.BossExplode) // 50 }; Index: M_Float.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Float.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Float.java 6 Feb 2005 18:48:17 -0000 1.2 --- M_Float.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 25,33 **** import jake2.Defines; import jake2.Globals; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; - import jake2.game.Fire; import jake2.game.GameAI; import jake2.game.GameBase; --- 25,33 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; import jake2.game.GameAI; import jake2.game.GameBase; *************** *** 801,805 **** GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_attack3, 1, Defines.ATTN_NORM, 0); ! Fire.fire_hit(self, aim, 5 + Lib.rand() % 6, -50); return true; } --- 801,805 ---- GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_attack3, 1, Defines.ATTN_NORM, 0); ! GameWeapon.fire_hit(self, aim, 5 + Lib.rand() % 6, -50); return true; } *************** *** 868,872 **** GameBase.gi.multicast(origin, Defines.MULTICAST_PVS); ! GameUtil.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin, Globals.vec3_origin, 5 + Lib.rand() % 6, -10, Defines.DAMAGE_ENERGY, Defines.MOD_UNKNOWN); --- 868,872 ---- GameBase.gi.multicast(origin, Defines.MULTICAST_PVS); ! GameCombat.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin, Globals.vec3_origin, 5 + Lib.rand() % 6, -10, Defines.DAMAGE_ENERGY, Defines.MOD_UNKNOWN); *************** *** 1161,1165 **** GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_death1, 1, Defines.ATTN_NORM, 0); ! GameAI.BecomeExplosion1(self); } --- 1161,1165 ---- GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_death1, 1, Defines.ATTN_NORM, 0); ! GameMisc.BecomeExplosion1(self); } Index: M_Medic.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Medic.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Medic.java 6 Feb 2005 18:48:32 -0000 1.2 --- M_Medic.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,42 **** import jake2.Defines; ! import jake2.game.EdictIterator; ! import jake2.game.EntDieAdapter; ! import jake2.game.EntDodgeAdapter; ! import jake2.game.EntInteractAdapter; ! import jake2.game.EntPainAdapter; ! import jake2.game.EntThinkAdapter; ! import jake2.game.GameAI; ! import jake2.game.GameBase; ! import jake2.game.GameSpawn; ! import jake2.game.GameUtil; ! import jake2.game.Monster; ! import jake2.game.edict_t; ! import jake2.game.mframe_t; ! import jake2.game.mmove_t; ! import jake2.game.trace_t; import jake2.util.Lib; import jake2.util.Math3D; --- 24,28 ---- import jake2.Defines; ! import jake2.game.*; import jake2.util.Lib; import jake2.util.Math3D; *************** *** 939,949 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 925,935 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Berserk.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Berserk.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Berserk.java 6 Feb 2005 18:48:32 -0000 1.2 --- M_Berserk.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 20,38 **** // Created on 11.11.2003 by RST // $Id$ package jake2.game.monsters; import jake2.Defines; ! import jake2.game.EntDieAdapter; ! import jake2.game.EntInteractAdapter; ! import jake2.game.EntPainAdapter; ! import jake2.game.EntThinkAdapter; ! import jake2.game.Fire; ! import jake2.game.GameAI; ! import jake2.game.GameBase; ! import jake2.game.GameUtil; ! import jake2.game.edict_t; ! import jake2.game.mframe_t; ! import jake2.game.mmove_t; import jake2.util.Lib; import jake2.util.Math3D; --- 20,30 ---- // Created on 11.11.2003 by RST + // $Id$ + package jake2.game.monsters; import jake2.Defines; ! import jake2.game.*; import jake2.util.Lib; import jake2.util.Math3D; *************** *** 686,690 **** float[] aim = { Defines.MELEE_DISTANCE, 0f, -24f }; ! Fire.fire_hit(self, aim, (15 + (Lib.rand() % 6)), 400); // Faster attack -- upwards and backwards --- 678,682 ---- float[] aim = { Defines.MELEE_DISTANCE, 0f, -24f }; ! GameWeapon.fire_hit(self, aim, (15 + (Lib.rand() % 6)), 400); // Faster attack -- upwards and backwards *************** *** 719,723 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], -4); ! Fire.fire_hit(self, aim, (5 + (Lib.rand() % 6)), 400); // Slower // attack --- 711,715 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], -4); ! GameWeapon.fire_hit(self, aim, (5 + (Lib.rand() % 6)), 400); // Slower // attack *************** *** 909,919 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 901,911 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Actor.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Actor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Actor.java 6 Feb 2005 18:48:32 -0000 1.2 --- M_Actor.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntPainAdapter; *************** *** 1298,1308 **** // 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 1299,1309 ---- // 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Tank.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Tank.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Tank.java 6 Feb 2005 18:48:15 -0000 1.2 --- M_Tank.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; *************** *** 1413,1426 **** Defines.ATTN_NORM, 0); for (n = 0; n < 1 /* 4 */; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2", damage, Defines.GIB_METALLIC); ! GameAI.ThrowGib(self, "models/objects/gibs/chest/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/gear/tris.md2", damage, Defines.GIB_METALLIC); self.deadflag = Defines.DEAD_DEAD; --- 1414,1427 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 1 /* 4 */; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2", damage, Defines.GIB_METALLIC); ! GameMisc.ThrowGib(self, "models/objects/gibs/chest/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/gear/tris.md2", damage, Defines.GIB_METALLIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Boss32.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss32.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Boss32.java 6 Feb 2005 18:48:16 -0000 1.2 --- M_Boss32.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; *************** *** 1696,1707 **** Defines.ATTN_NORM, 0); for (n = 0; n < 1 /* 4 */; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2", damage, Defines.GIB_METALLIC); ! GameAI.ThrowHead(self, "models/objects/gibs/gear/tris.md2", damage, Defines.GIB_METALLIC); self.deadflag = Defines.DEAD_DEAD; --- 1697,1708 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 1 /* 4 */; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2", damage, Defines.GIB_METALLIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/gear/tris.md2", damage, Defines.GIB_METALLIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Flyer.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Flyer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Flyer.java 6 Feb 2005 18:48:17 -0000 1.2 --- M_Flyer.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,32 **** import jake2.Defines; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; - import jake2.game.Fire; import jake2.game.GameAI; import jake2.game.GameBase; --- 24,32 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; import jake2.game.GameAI; import jake2.game.GameBase; *************** *** 757,761 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 0); ! Fire.fire_hit(self, aim, 5, 0); GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_slash, 1, Defines.ATTN_NORM, 0); --- 757,761 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 0); ! GameWeapon.fire_hit(self, aim, 5, 0); GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_slash, 1, Defines.ATTN_NORM, 0); *************** *** 769,773 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 0); ! Fire.fire_hit(self, aim, 5, 0); GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_slash, 1, Defines.ATTN_NORM, 0); --- 769,773 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 0); ! GameWeapon.fire_hit(self, aim, 5, 0); GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_slash, 1, Defines.ATTN_NORM, 0); *************** *** 906,910 **** GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_die, 1, Defines.ATTN_NORM, 0); ! GameAI.BecomeExplosion1(self); } }; --- 906,910 ---- GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_die, 1, Defines.ATTN_NORM, 0); ! GameMisc.BecomeExplosion1(self); } }; Index: M_Supertank.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Supertank.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Supertank.java 6 Feb 2005 18:48:32 -0000 1.2 --- M_Supertank.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntPainAdapter; *************** *** 942,946 **** new mframe_t(GameAI.ai_move, 0, null), new mframe_t(GameAI.ai_move, 0, null), ! new mframe_t(GameAI.ai_move, 0, GameAI.BossExplode) }; static mmove_t supertank_move_death = new mmove_t(FRAME_death_1, --- 943,947 ---- new mframe_t(GameAI.ai_move, 0, null), new mframe_t(GameAI.ai_move, 0, null), ! new mframe_t(GameAI.ai_move, 0, M_Supertank.BossExplode) }; static mmove_t supertank_move_death = new mmove_t(FRAME_death_1, *************** *** 1197,1263 **** }; ! void BossExplode(edict_t self) { ! float[] org = { 0, 0, 0 }; ! int n; ! ! self.think = GameAI.BossExplode; ! Math3D.VectorCopy(self.s.origin, org); ! org[2] += 24 + (Lib.rand() & 15); ! switch (self.count++) { ! case 0: ! org[0] -= 24; ! org[1] -= 24; ! break; ! case 1: ! org[0] += 24; ! org[1] += 24; ! break; ! case 2: ! org[0] += 24; ! org[1] -= 24; ! break; ! case 3: ! org[0] -= 24; ! org[1] += 24; ! break; ! case 4: ! org[0] -= 48; ! org[1] -= 48; ! break; ! case 5: ! org[0] += 48; ! org[1] += 48; ! break; ! case 6: ! org[0] -= 48; ! org[1] += 48; ! break; ! case 7: ! org[0] += 48; ! org[1] -= 48; ! break; ! case 8: ! self.s.sound = 0; ! for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", ! 500, Defines.GIB_ORGANIC); ! for (n = 0; n < 8; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2", ! 500, Defines.GIB_METALLIC); ! GameAI.ThrowGib(self, "models/objects/gibs/chest/tris.md2", 500, ! Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/gear/tris.md2", 500, ! Defines.GIB_METALLIC); ! self.deadflag = Defines.DEAD_DEAD; ! return; } ! ! GameBase.gi.WriteByte(Defines.svc_temp_entity); ! GameBase.gi.WriteByte(Defines.TE_EXPLOSION1); ! GameBase.gi.WritePosition(org); ! GameBase.gi.multicast(self.s.origin, Defines.MULTICAST_PVS); ! ! self.nextthink = GameBase.level.time + 0.1f; ! } } \ No newline at end of file --- 1198,1270 ---- }; ! /** Common Boss explode animation. */ ! ! public static EntThinkAdapter BossExplode = new EntThinkAdapter() { ! public boolean think(edict_t self) { ! float[] org = { 0, 0, 0 }; ! ! int n; ! ! self.think = BossExplode; ! Math3D.VectorCopy(self.s.origin, org); ! org[2] += 24 + (Lib.rand() & 15); ! switch (self.count++) { ! case 0: ! org[0] -= 24; ! org[1] -= 24; ! break; ! case 1: ! org[0] += 24; ! org[1] += 24; ! break; ! case 2: ! org[0] += 24; ! org[1] -= 24; ! break; ! case 3: ! org[0] -= 24; ! org[1] += 24; ! break; ! case 4: ! org[0] -= 48; ! org[1] -= 48; ! break; ! case 5: ! org[0] += 48; ! org[1] += 48; ! break; ! case 6: ! org[0] -= 48; ! org[1] += 48; ! break; ! case 7: ! org[0] += 48; ! org[1] -= 48; ! break; ! case 8: ! self.s.sound = 0; ! for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", 500, ! Defines.GIB_ORGANIC); ! for (n = 0; n < 8; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2", ! 500, Defines.GIB_METALLIC); ! GameMisc.ThrowGib(self, "models/objects/gibs/chest/tris.md2", 500, ! Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/gear/tris.md2", 500, ! Defines.GIB_METALLIC); ! self.deadflag = Defines.DEAD_DEAD; ! return true; ! } ! ! GameBase.gi.WriteByte(Defines.svc_temp_entity); ! GameBase.gi.WriteByte(Defines.TE_EXPLOSION1); ! GameBase.gi.WritePosition(org); ! GameBase.gi.multicast(self.s.origin, Defines.MULTICAST_PVS); ! ! self.nextthink = GameBase.level.time + 0.1f; ! return true; } ! }; } \ No newline at end of file Index: M_Gunner.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Gunner.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Gunner.java 6 Feb 2005 18:48:15 -0000 1.2 --- M_Gunner.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntDodgeAdapter; *************** *** 788,798 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 789,799 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Boss2.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss2.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Boss2.java 6 Feb 2005 18:48:32 -0000 1.2 --- M_Boss2.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 1014,1018 **** new mframe_t(GameAI.ai_move, 0, null), new mframe_t(GameAI.ai_move, 0, null), ! new mframe_t(GameAI.ai_move, 0, GameAI.BossExplode) }; /* --- 1014,1018 ---- new mframe_t(GameAI.ai_move, 0, null), new mframe_t(GameAI.ai_move, 0, null), ! new mframe_t(GameAI.ai_move, 0, M_Supertank.BossExplode) }; /* Index: M_Chick.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Chick.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Chick.java 6 Feb 2005 18:48:17 -0000 1.2 --- M_Chick.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 20,40 **** // Created on 13.11.2003 by RST. // $Id$ package jake2.game.monsters; import jake2.Defines; ! import jake2.game.EntDieAdapter; ! import jake2.game.EntDodgeAdapter; ! import jake2.game.EntInteractAdapter; ! import jake2.game.EntPainAdapter; ! import jake2.game.EntThinkAdapter; ! import jake2.game.Fire; ! import jake2.game.GameAI; ! import jake2.game.GameBase; ! import jake2.game.GameUtil; ! import jake2.game.Monster; ! import jake2.game.edict_t; ! import jake2.game.mframe_t; ! import jake2.game.mmove_t; import jake2.util.Lib; import jake2.util.Math3D; --- 20,30 ---- // Created on 13.11.2003 by RST. + // $Id$ + package jake2.game.monsters; import jake2.Defines; ! import jake2.game.*; import jake2.util.Lib; import jake2.util.Math3D; *************** *** 970,980 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 960,970 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; *************** *** 1068,1072 **** GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee_swing, 1, Defines.ATTN_NORM, 0); ! Fire.fire_hit(self, aim, (10 + (Lib.rand() % 6)), 100); return true; } --- 1058,1062 ---- GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee_swing, 1, Defines.ATTN_NORM, 0); ! GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 6)), 100); return true; } Index: M_Hover.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Hover.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Hover.java 6 Feb 2005 18:48:17 -0000 1.2 --- M_Hover.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; *************** *** 585,589 **** return true; } ! GameAI.BecomeExplosion1(self); return true; } --- 586,590 ---- return true; } ! GameMisc.BecomeExplosion1(self); return true; } *************** *** 615,625 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 616,626 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Flipper.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Flipper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Flipper.java 6 Feb 2005 18:48:17 -0000 1.2 --- M_Flipper.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,32 **** import jake2.Defines; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; - import jake2.game.Fire; import jake2.game.GameAI; import jake2.game.GameBase; --- 24,32 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; import jake2.game.GameAI; import jake2.game.GameBase; *************** *** 533,537 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 0); ! Fire.fire_hit(self, aim, 5, 0); return true; } --- 533,537 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 0); ! GameWeapon.fire_hit(self, aim, 5, 0); return true; } *************** *** 702,712 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 702,712 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Gladiator.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Gladiator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Gladiator.java 6 Feb 2005 18:48:18 -0000 1.2 --- M_Gladiator.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 24,32 **** import jake2.Defines; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; - import jake2.game.Fire; import jake2.game.GameAI; import jake2.game.GameBase; --- 24,32 ---- import jake2.Defines; + import jake2.game.*; import jake2.game.EntDieAdapter; import jake2.game.EntInteractAdapter; import jake2.game.EntPainAdapter; import jake2.game.EntThinkAdapter; import jake2.game.GameAI; import jake2.game.GameBase; *************** *** 360,364 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], -4); ! if (Fire.fire_hit(self, aim, (20 + (Lib.rand() % 5)), 300)) GameBase.gi.sound(self, Defines.CHAN_AUTO, sound_cleaver_hit, 1, Defines.ATTN_NORM, 0); --- 360,364 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], -4); ! if (GameWeapon.fire_hit(self, aim, (20 + (Lib.rand() % 5)), 300)) GameBase.gi.sound(self, Defines.CHAN_AUTO, sound_cleaver_hit, 1, Defines.ATTN_NORM, 0); *************** *** 571,581 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 571,581 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Mutant.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Mutant.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Mutant.java 6 Feb 2005 18:48:17 -0000 1.2 --- M_Mutant.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 25,42 **** import jake2.Defines; import jake2.client.M; ! import jake2.game.EntDieAdapter; ! import jake2.game.EntInteractAdapter; ! import jake2.game.EntPainAdapter; ! import jake2.game.EntThinkAdapter; ! import jake2.game.EntTouchAdapter; ! import jake2.game.Fire; ! import jake2.game.GameAI; ! import jake2.game.GameBase; ! import jake2.game.GameUtil; ! import jake2.game.cplane_t; ! import jake2.game.csurface_t; ! import jake2.game.edict_t; ! import jake2.game.mframe_t; ! import jake2.game.mmove_t; import jake2.util.Lib; import jake2.util.Math3D; --- 25,29 ---- import jake2.Defines; import jake2.client.M; ! import jake2.game.*; import jake2.util.Lib; import jake2.util.Math3D; *************** *** 613,617 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 8); ! if (Fire.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hit, 1, Defines.ATTN_NORM, 0); --- 600,604 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 8); ! if (GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hit, 1, Defines.ATTN_NORM, 0); *************** *** 628,632 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 8); ! if (Fire.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hit2, 1, Defines.ATTN_NORM, 0); --- 615,619 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 8); ! if (GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hit2, 1, Defines.ATTN_NORM, 0); *************** *** 693,697 **** Math3D.VectorMA(self.s.origin, self.maxs[0], normal, point); damage = (int) (40 + 10 * Lib.random()); ! GameUtil.T_Damage(other, self, self, self.velocity, point, normal, damage, damage, 0, Defines.MOD_UNKNOWN); } --- 680,684 ---- Math3D.VectorMA(self.s.origin, self.maxs[0], normal, point); damage = (int) (40 + 10 * Lib.random()); ! GameCombat.T_Damage(other, self, self, self.velocity, point, normal, damage, damage, 0, Defines.MOD_UNKNOWN); } *************** *** 958,968 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 945,955 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; Index: M_Brain.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Brain.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** M_Brain.java 6 Feb 2005 18:48:14 -0000 1.2 --- M_Brain.java 16 Nov 2005 22:24:52 -0000 1.3 *************** *** 20,39 **** // Created on 13.11.2003 by RST. // $Id$ package jake2.game.monsters; import jake2.Defines; ! import jake2.game.EntDieAdapter; ! import jake2.game.EntDodgeAdapter; ! import jake2.game.EntInteractAdapter; ! import jake2.game.EntPainAdapter; ! import jake2.game.EntThinkAdapter; ! import jake2.game.Fire; ! import jake2.game.GameAI; ! import jake2.game.GameBase; ! import jake2.game.GameUtil; ! import jake2.game.edict_t; ! import jake2.game.mframe_t; ! import jake2.game.mmove_t; import jake2.util.Lib; import jake2.util.Math3D; --- 20,30 ---- // Created on 13.11.2003 by RST. + // $Id$ + package jake2.game.monsters; import jake2.Defines; ! import jake2.game.*; import jake2.util.Lib; import jake2.util.Math3D; *************** *** 799,803 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 8); ! if (Fire.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee3, 1, Defines.ATTN_NORM, 0); --- 790,794 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 8); ! if (GameWeapon.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee3, 1, Defines.ATTN_NORM, 0); *************** *** 820,824 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 8); ! if (Fire.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee3, 1, Defines.ATTN_NORM, 0); --- 811,815 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 8); ! if (GameWeapon.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40)) GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee3, 1, Defines.ATTN_NORM, 0); *************** *** 844,848 **** Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 8); ! if (Fire.fire_hit(self, aim, (10 + (Lib.rand() % 5)), -600) && GameBase.skill.value > 0) self.spawnflags |= 65536; --- 835,839 ---- Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 8); ! if (GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 5)), -600) && GameBase.skill.value > 0) self.spawnflags |= 65536; *************** *** 1070,1080 **** Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; --- 1061,1071 ---- Defines.ATTN_NORM, 0); for (n = 0; n < 2; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, Defines.GIB_ORGANIC); for (n = 0; n < 4; n++) ! GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, Defines.GIB_ORGANIC); ! GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2", damage, Defines.GIB_ORGANIC); self.deadflag = Defines.DEAD_DEAD; |
