7 files changed, 79 insertions, 90 deletions
diff --git a/src/map/config/Core.h b/src/map/config/Core.h
index a5db0f1ff..95c3ee8ed 100644
--- a/src/map/config/Core.h
+++ b/src/map/config/Core.h
@@ -1,5 +1,8 @@
-#ifndef _RRCONFIGS_
-#define _RRCONFIGS_
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_CORE_H_
+#define _CONFIG_CORE_H_
+
 /**
  * rAthena configuration file (http://rathena.org)
  * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
@@ -32,7 +35,5 @@
  * Constants come last; so they process anything that could've been modified in early includes
  **/
 #include "./Data/Const.h"
-/**
- * End of File
- **/
-#endif
+
+#endif // _CONFIG_CORE_H_
diff --git a/src/map/config/Data/Const.h b/src/map/config/Data/Const.h
index 2071a4a8c..8b9980252 100644
--- a/src/map/config/Data/Const.h
+++ b/src/map/config/Data/Const.h
@@ -1,5 +1,8 @@
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
 #ifndef _RRCONFIGS_CONST_
 #define _RRCONFIGS_CONST_
+
 /**
  * rAthena configuration file (http://rathena.org)
  * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
@@ -12,13 +15,13 @@
 /**
  * "Constants"
  **/
-#if RECASTING
+#ifdef RENEWAL_CAST
 
-	#if REMODE == 0
-		#error RECASTING requires REMODE enabled
+	#ifndef RENEWAL
+		#error RENEWAL_CAST requires RENEWAL enabled
 	#endif
 
-	#define CONST_CASTRATE_SCALE RECASTING_VMIN
+	#define CONST_CASTRATE_SCALE RENEWAL_CAST_VMIN
 	/**
 	 * Cast Rate Formula: (DEX x 2)+INT
 	 **/
@@ -31,8 +34,6 @@
 	#define CONST_CASTRATE_CALC (status_get_dex(bl))
 #endif
 
-#define isOFF(def) (def == 0)
-
 /**
  * "Sane Checks" to save you from compiling with cool bugs 
  **/
@@ -46,7 +47,7 @@
 /**
  * Path within the /db folder to (non-)renewal specific db files
  **/
-#if REMODE
+#ifdef RENEWAL
 	#define DBPATH "re/"
 #else
 	#define DBPATH "pre-re/"
@@ -55,7 +56,7 @@
 /**
  * DefType
  **/
-#if REMODE
+#ifdef RENEWAL
 	typedef short defType;
 	#define DEFTYPE_MIN SHRT_MIN
 	#define DEFTYPE_MAX SHRT_MAX
diff --git a/src/map/config/Renewal.h b/src/map/config/Renewal.h
index 81aaea9ad..938c8b29a 100644
--- a/src/map/config/Renewal.h
+++ b/src/map/config/Renewal.h
@@ -1,5 +1,8 @@
-#ifndef _RRCONFIGS_RE_
-#define _RRCONFIGS_RE_
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_RENEWAL_H_
+#define _CONFIG_RENEWAL_H_
+
 /**
  * rAthena configuration file (http://rathena.org)
  * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
@@ -9,51 +12,44 @@
  * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/map/config/Skills folder
  **/
 
-/**
- * Game Server Mode
- * @values: 1 or 0
- *	1 : renewal support, such as renewal-exclusive formulas
- *    -> Note some features may be enabled/disabled at this file despite this setting being ON
- *  0 : renewal support disabled, use original formulas
- **/
-#define REMODE 1
+/// game renewal server mode
+/// (disable by commenting the line)
+///
+/// leave this line to enable renewal specific support such as renewal formulas
+#define RENEWAL
 
-/**
- * Renewal Cast Time
- * @values: 1 (enabled) or 0 (disabled)
- *  1 : Cast Time is decreased by DEX*2+INT, 20% of the cast time is not reduced by stats,
- *  - for example, on a skill whose cast time is 10s, only 8s may be reduced. other 2s are
- *  - part of a "fixed cast time" that is only reduced by special items and skills (such as
- *  - Arch Bishop's Sacrament skill).
- *  0 : the old cast time method, influenced by dex, items and skills.
- **/
-#define RECASTING 1
+/// renewal cast time
+/// (disable by commenting the line)
+///
+/// leave this line to enable renewal casting time algorithms
+/// cast time is decreased by DEX * 2 + INT while 20% of the cast time is not reduced by stats.
+/// example:
+///  on a skill whos cast time is 10s, only 8s may be reduced. the other 2s are part of a
+///  "fixed cast time" which can only be reduced by specialist items and skills
+#define RENEWAL_CAST
 
-/**
- * Renewal Drop Rate Modifier
- * @values: 1 (enabled) or 0 (disabled)
- * - When enabled a modifier based on difference between the player and the monster level is applied,
- * - based on the http://irowiki.org/wiki/Drop_System#Level_Factor table
- **/
-#define RE_DROP_MOD 1
+/// renewal drop rate algorithms
+/// (disable by commenting the line)
+///
+/// leave this line to enable renewal item drop rate algorithms
+/// while enabled a special modified based on the difference between the player and monster level is applied
+/// based on the http://irowiki.org/wiki/Drop_System#Level_Factor table
+#define RENEWAL_DROP
 
-/**
- * Renewal Cast Time : Variable-Free
- * - Value required for no variable cast time with stats.
- * - Formula: (casterDex x 2) + (casterInt)
- * Default: 530
- **/
-#define RECASTING_VMIN 530
+/// renewal cast time variable cast requirement
+///
+/// this is the value required for no variable cast-time with stats.
+/// formula: (DEX * 2) + INT
+/// default: 530
+#define RENEWAL_CAST_VMIN 530
 
-/**
- * Renewal Enchant Deadly Poison Change
- * - In RE EDP no longer increases final damage by 400%.
- * - it increases your weapon atk and your stat atk
- * - it doesn't affect grimtooth
- **/
-#define RE_EDP 1
+/// renewal enchant deadly poison algorithm
+///
+/// leave this line to enable the renewed EDP algorithm
+/// under renewal mode:
+///  - damage is NOT increased by 400%
+///  - it does NOT affect grimtooth
+///  - weapon and status ATK are increased
+#define RENEWAL_EDP
 
-/**
- * End of File
- **/
-#endif
+#endif // _CONFIG_RENEWAL_H_
diff --git a/src/map/config/Secure.h b/src/map/config/Secure.h
index 1cf945083..e2b000440 100644
--- a/src/map/config/Secure.h
+++ b/src/map/config/Secure.h
@@ -1,5 +1,8 @@
-#ifndef _RRCONFIGS_SECURE_
-#define _RRCONFIGS_SECURE_
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_SECURE_H_
+#define _CONFIG_SECURE_H_
+
 /**
  * rAthena configuration file (http://rathena.org)
  * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
@@ -27,8 +30,4 @@
  **/
 #define SECURE_NPCTIMEOUT_INTERVAL 1
 
-
-/**
- * End of File
- **/
-#endif
+#endif // _CONFIG_SECURE_H_
diff --git a/src/map/config/Skills/General.h b/src/map/config/Skills/General.h
index d06b7842d..746630845 100644
--- a/src/map/config/Skills/General.h
+++ b/src/map/config/Skills/General.h
@@ -1,5 +1,8 @@
-#ifndef _RRCONFIGS_SKILLS_GENERAL_
-#define _RRCONFIGS_SKILLS_GENERAL_
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_GENERAL_H_
+#define _CONFIG_GENERAL_H_
+
 /**
  * rAthena configuration file (http://rathena.org)
  * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
@@ -18,4 +21,5 @@
  **/
 #include "Mage_Classes.h"
 #include "Swordsman_Classes.h"
-#endif
+
+#endif // _CONFIG_GENERAL_H_
diff --git a/src/map/config/Skills/Mage_Classes.h b/src/map/config/Skills/Mage_Classes.h
deleted file mode 100644
index 65d7f88e8..000000000
--- a/src/map/config/Skills/Mage_Classes.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _RRCONFIGS_SKILLS_MAGE_
-#define _RRCONFIGS_SKILLS_MAGE_
-/**
- * rAthena configuration file (http://rathena.org)
- * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
- **/
-
-/**
- * No settings past this point
- **/
-#endif
diff --git a/src/map/config/Skills/Swordsman_Classes.h b/src/map/config/Skills/Swordsman_Classes.h
index 91edb7167..44ae922d5 100644
--- a/src/map/config/Skills/Swordsman_Classes.h
+++ b/src/map/config/Skills/Swordsman_Classes.h
@@ -1,17 +1,16 @@
-#ifndef _RRCONFIGS_SKILLS_SWORDS_
-#define _RRCONFIGS_SKILLS_SWORDS_
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_SKILLS_SWORDS_H_
+#define _CONFIG_SKILLS_SWORDS_H_
 /**
  * rAthena configuration file (http://rathena.org)
  * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
  **/
 
-/**
- * (Rune Knight) the maximum rune items a character may have of the same type
- * Default: 20
- **/
+/// rune knight
+///
+/// maximum number of runes that a rune knight character can carry at any given time
+/// default: 20
 #define MAX_RUNE 20
 
-/**
- * No settings past this point
- **/
-#endif
+#endif // _CONFIG_SKILLS_SWORDS_H_