From 93c52deb53c4a163e69aeed5fb2af4dba66842c2 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 29 Jul 2006 03:32:43 +0000
Subject: - Added A_* constants to identify ammo types. - Added Ishizu's code
 to check ammo type on attack. No more using Grenade rounds with Guns.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7959 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/battle.c | 40 +++++++++++++++++++++++++++++++++++++---
 src/map/pc.h     |  9 +++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

(limited to 'src/map')

diff --git a/src/map/battle.c b/src/map/battle.c
index 14d2f6b0e..707cb139b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2854,9 +2854,43 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
 	if (sd)
 	{
 		sd->state.arrow_atk = (sd->status.weapon == W_BOW || (sd->status.weapon >= W_REVOLVER && sd->status.weapon <= W_GRENADE));
-		if (sd->state.arrow_atk && sd->equip_index[10]<0) {
-			clif_arrow_fail(sd,0);
-			return 0;
+		if (sd->state.arrow_atk)
+		{	//Recycled damage variable to store index.
+			damage = sd->equip_index[EQI_AMMO];
+			if (damage<0) {
+				clif_arrow_fail(sd,0);
+				return 0;
+			}
+			//Ammo check by Ishizu-chan
+			if (sd->inventory_data[damage])
+			switch (sd->status.weapon) {
+			case W_BOW:
+				if (sd->inventory_data[damage]->look != A_ARROW) {
+					clif_arrow_fail(sd,0);
+					return 0;
+				}
+			break;
+			case W_REVOLVER:
+			case W_RIFLE:
+			case W_GATLING:
+				if (sd->inventory_data[damage]->look != A_BULLET) {
+					clif_arrow_fail(sd,0);
+					return 0;
+				}
+			break;
+			case W_SHOTGUN:
+				if (sd->inventory_data[damage]->look != A_SHELL) {
+					clif_arrow_fail(sd,0);
+					return 0;
+				}
+			break;
+			case W_GRENADE:
+				if (sd->inventory_data[damage]->look != A_GRENADE) {
+					clif_arrow_fail(sd,0);
+					return 0;
+				}
+			break;
+			}
 		}
 	}
 
diff --git a/src/map/pc.h b/src/map/pc.h
index 056aeb401..a8435508b 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -40,6 +40,15 @@ enum {
 	MAX_WEAPON_TYPE
 } weapon_type;
 
+enum {
+	A_ARROW = 1,
+	A_DAGGER,    //2
+	A_BULLET,   //3
+	A_SHELL,    //4
+	A_GRENADE,  //5
+	A_SHURIKEN, //6
+	A_KUNAI     //7
+} ammo_type;
 //Equip position constants
 enum {
 	EQP_HEAD_LOW = 0x0001, 
-- 
cgit v1.2.3-70-g09d2