summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDastgir <dastgir@users.noreply.github.com>2015-12-10 17:39:51 +0530
committerDastgir <dastgir@users.noreply.github.com>2015-12-10 17:39:51 +0530
commit1a668f601cdb0d109f1bba617a971df131afb4ce (patch)
tree544167ed05a2702f69b989fa8b8a948ae0bfa448
parent63abf092ab36d39ee4acc67d3c90091cb12b16f1 (diff)
parent70d2214f6816164e56ebd4b6403c9b49258f8d27 (diff)
downloadhercules-1a668f601cdb0d109f1bba617a971df131afb4ce.tar.gz
hercules-1a668f601cdb0d109f1bba617a971df131afb4ce.tar.bz2
hercules-1a668f601cdb0d109f1bba617a971df131afb4ce.tar.xz
hercules-1a668f601cdb0d109f1bba617a971df131afb4ce.zip
Merge pull request #924 from Jedzkie/Pull_03
Rename 'ITEMIDBATTLE_MANUAL100' to 'ITEMID_BATTLE_MANUAL100'.
-rw-r--r--src/map/itemdb.h2
-rw-r--r--src/map/pc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 7b35e1ae1..63e79df90 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -122,7 +122,7 @@ enum item_itemid {
ITEMID_NOBLE_NAMEPLATE = 12705,
ITEMID_DUN_TELE_SCROLL1 = 14527,
ITEMID_BATTLE_MANUAL25 = 14532,
- ITEMIDBATTLE_MANUAL100 = 14533,
+ ITEMID_BATTLE_MANUAL100 = 14533,
ITEMID_BATTLE_MANUAL_X3 = 14545,
ITEMID_DUN_TELE_SCROLL2 = 14581,
ITEMID_WOB_RUNE = 14582,
diff --git a/src/map/pc.c b/src/map/pc.c
index 5ef0075bc..9d774906d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4711,7 +4711,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
case ITEMID_THICK_MANUAL50:
case ITEMID_NOBLE_NAMEPLATE:
case ITEMID_BATTLE_MANUAL25:
- case ITEMIDBATTLE_MANUAL100:
+ case ITEMID_BATTLE_MANUAL100:
case ITEMID_BATTLE_MANUAL_X3:
if( sd->sc.data[SC_CASH_PLUSEXP] )
return 0;