summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 00:52:58 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 00:52:58 +0000
commitafe5db9b8300ed02e0a57c75b28d5c02baed58da (patch)
treebbc28932116583b4a2933e98684438ad131abe8f
parenta81940bc5c77a27767748c910b2a8efc5961af0d (diff)
downloadhercules-afe5db9b8300ed02e0a57c75b28d5c02baed58da.tar.gz
hercules-afe5db9b8300ed02e0a57c75b28d5c02baed58da.tar.bz2
hercules-afe5db9b8300ed02e0a57c75b28d5c02baed58da.tar.xz
hercules-afe5db9b8300ed02e0a57c75b28d5c02baed58da.zip
Minor defines cleanup; moved AUTOLOOTITEM_SIZE from pc.h to Core.h
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15552 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/config/Core.h5
-rw-r--r--src/map/config/Data/Const.h16
-rw-r--r--src/map/pc.h3
3 files changed, 19 insertions, 5 deletions
diff --git a/src/map/config/Core.h b/src/map/config/Core.h
index d8d651903..cbd7c0aa3 100644
--- a/src/map/config/Core.h
+++ b/src/map/config/Core.h
@@ -11,6 +11,11 @@
**/
#define MAX_REFINE 20
+/**
+ * Max number of items on @autolootid list
+ **/
+#define AUTOLOOTITEM_SIZE 10
+
//Uncomment to enable the Cell Stack Limit mod.
//It's only config is the battle_config cell_stack_limit.
//Only chars affected are those defined in BL_CHAR (mobs and players currently)
diff --git a/src/map/config/Data/Const.h b/src/map/config/Data/Const.h
index 8ebc7f91d..f8da4c90b 100644
--- a/src/map/config/Data/Const.h
+++ b/src/map/config/Data/Const.h
@@ -12,8 +12,20 @@
/**
* "Constants"
**/
-#define CONST_CASTRATE_SCALE ( RECASTING ? RECASTING_VMIN : battle_config.castrate_dex_scale )
-#define CONST_CASTRATE_CALC ( RECASTING ? ((status_get_dex(bl)*2)+status_get_int(bl)) : status_get_dex(bl) )
+#if RECASTING
+ #define CONST_CASTRATE_SCALE RECASTING_VMIN
+ /**
+ * Cast Rate Formula: (DEX x 2)+INT
+ **/
+ #define CONST_CASTRATE_CALC ((status_get_dex(bl)*2)+status_get_int(bl))
+#else
+ #define CONST_CASTRATE_SCALE battle_config.castrate_dex_scale
+ /**
+ * Cast Rate Formula: (DEX)
+ **/
+ #define CONST_CASTRATE_CALC (status_get_dex(bl))
+#endif
+
/**
* "Sane Checks" to save you from compiling with cool bugs
diff --git a/src/map/pc.h b/src/map/pc.h
index af26ce8d2..c0863bb1d 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -25,9 +25,6 @@
//For Warlock
#define MAX_SPELLBOOK 10
-//Max number of items on @autolootid list
-#define AUTOLOOTITEM_SIZE 10
-
struct weapon_data {
int atkmods[3];
// all the variables except atkmods get zero'ed in each call of status_calc_pc