aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2/game/monsters/M_Infantry.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/jake2/game/monsters/M_Infantry.java')
-rw-r--r--src/jake2/game/monsters/M_Infantry.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jake2/game/monsters/M_Infantry.java b/src/jake2/game/monsters/M_Infantry.java
index c0493eb..d4d3bdd 100644
--- a/src/jake2/game/monsters/M_Infantry.java
+++ b/src/jake2/game/monsters/M_Infantry.java
@@ -19,17 +19,17 @@
*/
// Created on 13.11.2003 by RST.
-// $Id: M_Infantry.java,v 1.2 2005-02-06 18:48:14 salomo Exp $
+// $Id: M_Infantry.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
package jake2.game.monsters;
import jake2.Defines;
import jake2.client.M;
+import jake2.game.*;
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;
@@ -843,13 +843,13 @@ public class M_Infantry {
.soundindex("misc/udeath.wav"), 1,
Defines.ATTN_NORM, 0);
for (n = 0; n < 2; n++)
- GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+ GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
damage, Defines.GIB_ORGANIC);
for (n = 0; n < 4; n++)
- GameAI.ThrowGib(self,
+ GameMisc.ThrowGib(self,
"models/objects/gibs/sm_meat/tris.md2", damage,
Defines.GIB_ORGANIC);
- GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+ GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
damage, Defines.GIB_ORGANIC);
self.deadflag = Defines.DEAD_DEAD;
return;
@@ -993,7 +993,7 @@ public class M_Infantry {
float[] aim = { 0, 0, 0 };
Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 0);
- if (Fire.fire_hit(self, aim, (5 + (Lib.rand() % 5)), 50))
+ 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);
return true;