summaryrefslogtreecommitdiffstats
path: root/src/jake2
diff options
context:
space:
mode:
authorRene Stoeckel <[email protected]>2005-02-06 19:01:45 +0000
committerRene Stoeckel <[email protected]>2005-02-06 19:01:45 +0000
commitd6ae0e11a51aac8999e68c320d55cabd7c943c97 (patch)
treef0b696b77c5a66dc10c6ce3368ec89776e0bc857 /src/jake2
parenta838700571c1ab84e59549479bc7e65ffc119395 (diff)
import statement added for monsters.
Diffstat (limited to 'src/jake2')
-rw-r--r--src/jake2/game/GamePWeapon.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/jake2/game/GamePWeapon.java b/src/jake2/game/GamePWeapon.java
index ca183e1..ee1ace5 100644
--- a/src/jake2/game/GamePWeapon.java
+++ b/src/jake2/game/GamePWeapon.java
@@ -19,11 +19,13 @@
*/
// Created on 16.11.2003 by RST.
-// $Id: GamePWeapon.java,v 1.6 2004-09-22 19:22:03 salomo Exp $
+// $Id: GamePWeapon.java,v 1.7 2005-02-06 19:01:45 salomo Exp $
package jake2.game;
import jake2.Defines;
import jake2.Globals;
+import jake2.game.monsters.M_Player;
+import jake2.qcommon.Com;
import jake2.util.Lib;
import jake2.util.Math3D;
@@ -755,6 +757,7 @@ public class GamePWeapon {
if (item.ammo != null && 0 == GameBase.g_select_empty.value
&& 0 == (item.flags & Defines.IT_AMMO)) {
+
ammo_item = GameUtil.FindItem(item.ammo);
ammo_index = GameUtil.ITEM_INDEX(ammo_item);
@@ -1072,6 +1075,7 @@ public class GamePWeapon {
if (ent.client.pers.weapon != null
&& ent.client.pers.weapon.ammo != null)
+
ent.client.ammo_index = GameUtil.ITEM_INDEX(GameUtil
.FindItem(ent.client.pers.weapon.ammo));
else