Browse Source

Minor defines cleanup; moved AUTOLOOTITEM_SIZE from pc.h to Core.h

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15552 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 years ago
parent
commit
624a7e267d
3 changed files with 19 additions and 5 deletions
  1. 5 0
      src/map/config/Core.h
  2. 14 2
      src/map/config/Data/Const.h
  3. 0 3
      src/map/pc.h

+ 5 - 0
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)

+ 14 - 2
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 

+ 0 - 3
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