summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-28 03:23:19 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-28 03:23:19 +0000
commit0fcebf1d6be27d213aecbf3af841db25779e9057 (patch)
treeedb8e3473d68fa8701ffbbc8b94eecff018e863b
parentae67454d6c5d87cbe25d86eb6134158a65f59672 (diff)
downloadhercules-0fcebf1d6be27d213aecbf3af841db25779e9057.tar.gz
hercules-0fcebf1d6be27d213aecbf3af841db25779e9057.tar.bz2
hercules-0fcebf1d6be27d213aecbf3af841db25779e9057.tar.xz
hercules-0fcebf1d6be27d213aecbf3af841db25779e9057.zip
Renamed the last RR_ prefix'd setting, thanks to brianl/wolfed
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15807 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/config/Skills/General.h2
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/config/Skills/General.h b/src/map/config/Skills/General.h
index 61e03b9c0..d06b7842d 100644
--- a/src/map/config/Skills/General.h
+++ b/src/map/config/Skills/General.h
@@ -11,7 +11,7 @@
* - When disabled damage depends on gears target is wearing, not caster.
* @values 1 (enabled) or 0 (disabled)
**/
-#define RR_MAGIC_REFLECTION 1
+#define MAGIC_REFLECTION_TYPE 1
/**
* No settings past this point
diff --git a/src/map/skill.c b/src/map/skill.c
index b3830f9b7..6ce93344e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2131,7 +2131,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
/**
* Official Magic Reflection Behavior : damage reflected depends on gears caster wears, not target
**/
- #if RR_MAGIC_REFLECTION
+ #if MAGIC_REFLECTION_TYPE
if( dmg.dmg_lv != ATK_MISS )//Wiz SL cancelled and consumed fragment
dmg = battle_calc_attack(BF_MAGIC,bl,bl,skillid,skilllv,flag&0xFFF);
#endif