5 files changed, 31 insertions, 39 deletions
diff --git a/src/config/classes/general.h b/src/config/classes/general.h
index 147fddb55..b3da4a475 100644
--- a/src/config/classes/general.h
+++ b/src/config/classes/general.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_GENERAL_H_
-#define _CONFIG_GENERAL_H_
+#ifndef CONFIG_GENERAL_H
+#define CONFIG_GENERAL_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -31,4 +31,4 @@
  * No settings past this point
  **/
 
-#endif // _CONFIG_GENERAL_H_
+#endif // CONFIG_GENERAL_H
diff --git a/src/config/const.h b/src/config/const.h
index 6557cb987..2b5b180c4 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -2,8 +2,8 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef _CONFIG_CONSTANTS_H_
-#define _CONFIG_CONSTANTS_H_
+#ifndef CONFIG_CONSTANTS_H
+#define CONFIG_CONSTANTS_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -15,7 +15,7 @@
  */
 
 /**
- * "Sane Checks" to save you from compiling with cool bugs 
+ * "Sane Checks" to save you from compiling with cool bugs
  **/
 #if SECURE_NPCTIMEOUT_INTERVAL <= 0
 	#error SECURE_NPCTIMEOUT_INTERVAL should be at least 1 (1s)
@@ -52,13 +52,6 @@
 	#define DEFTYPE_MAX CHAR_MAX
 #endif
 
-/* pointer size fix which fixes several gcc warnings */
-#ifdef __64BIT__
-	#define __64BPTRSIZE(y) ((intptr)(y))
-#else
-	#define __64BPTRSIZE(y) (y)
-#endif
-
 /* ATCMD_FUNC(mobinfo) HIT and FLEE calculations */
 #ifdef RENEWAL
 	#define MOB_FLEE(mobdata) ( (mobdata)->lv + (mobdata)->status.agi + 100 )
@@ -94,14 +87,6 @@
 	#define RE_LVL_TMDMOD()
 #endif
 
-/* Feb 1st 2012 */
-#if PACKETVER >= 20120201
-	#define NEW_CARTS
-	#define MAX_CARTS 9
-#else
-	#define MAX_CARTS 5
-#endif
-
 // Renewal variable cast time reduction
 #ifdef RENEWAL_CAST
 	#define VARCAST_REDUCTION(val) do { \
@@ -118,4 +103,4 @@
 /**
  * End of File
  **/
-#endif /* _CONFIG_CONSTANTS_H_ */
+#endif /* CONFIG_CONSTANTS_H */
diff --git a/src/config/core.h b/src/config/core.h
index edd5c2b2a..ac59563b5 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_CORE_H_
-#define _CONFIG_CORE_H_
+#ifndef CONFIG_CORE_H
+#define CONFIG_CORE_H
 
 /// Max number of items on @autolootid list
 #define AUTOLOOTITEM_SIZE 10
@@ -27,7 +27,7 @@
 /// CONSOLE_INPUT allows you to type commands into the server's console,
 /// Disabling it saves one thread.
 #define CONSOLE_INPUT
-/// Maximum number of caracters 'CONSOLE_INPUT' will support per line.
+/// Maximum number of characters 'CONSOLE_INPUT' will support per line.
 #define MAX_CONSOLE_INPUT 150
 
 /// Uncomment to disable Hercules' anonymous stat report
@@ -43,7 +43,7 @@
 /// By default, all range checks in Aegis are of Square shapes, so a weapon range
 /// - of 10 allows you to attack from anywhere within a 21x21 area.
 /// Enabling this changes such checks to circular checks, which is more realistic,
-/// - but is not the official behaviour.
+/// - but is not the official behavior.
 //#define CIRCULAR_AREA
 
 //This is the distance at which @autoloot works,
@@ -57,10 +57,6 @@
 /// When uncommented the cap takes place after modifiers.
 //#define HMAP_ZONE_DAMAGE_CAP_TYPE
 
-/// Uncomment to enable Non Stackable items unique ID
-/// By enabling it, the system will create an unique id for each new non stackable item created
-//#define NSI_UNIQUE_ID
-
 /// Comment to disable Guild/Party Bound item system
 #define GP_BOUND_ITEMS
 
@@ -83,4 +79,4 @@
  **/
 #include "./const.h"
 
-#endif // _CONFIG_CORE_H_
+#endif // CONFIG_CORE_H
diff --git a/src/config/renewal.h b/src/config/renewal.h
index 36615d63b..939ad9b73 100644
--- a/src/config/renewal.h
+++ b/src/config/renewal.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_RENEWAL_H_
-#define _CONFIG_RENEWAL_H_
+#ifndef CONFIG_RENEWAL_H
+#define CONFIG_RENEWAL_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -13,8 +13,18 @@
  * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/config/classes folder
  **/
 
+/**
+ * Renewal full toggle switch.
+ *
+ * Uncomment this line to disable all of the below settings at once.
+ * Note: in UNIX builds, this can be easily done without touching this
+ * line, by passing --disable-renewal to the configure script:
+ * ./configure --disable-renewal
+ */
 //#define DISABLE_RENEWAL
-#ifndef DISABLE_RENEWAL
+
+
+#ifndef DISABLE_RENEWAL // Do not change this line
 
 /// game renewal server mode
 /// (disable by commenting the line)
@@ -74,5 +84,6 @@
 #define RENEWAL_ASPD
 
 #endif // DISABLE_RENEWAL
+#undef DISABLE_RENEWAL
 
-#endif // _CONFIG_RENEWAL_H_
+#endif // CONFIG_RENEWAL_H
diff --git a/src/config/secure.h b/src/config/secure.h
index e5e3662d1..418d24751 100644
--- a/src/config/secure.h
+++ b/src/config/secure.h
@@ -1,8 +1,8 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
-#ifndef _CONFIG_SECURE_H_
-#define _CONFIG_SECURE_H_
+#ifndef CONFIG_SECURE_H
+#define CONFIG_SECURE_H
 
 /**
  * Hercules configuration file (http://hercules.ws)
@@ -49,7 +49,7 @@
 
 /**
  * Uncomment to disable
- * while enabled, movement of invisible (cloaking, hide, etca [not chase walk]) units is not informed to nearby foes,
+ * while enabled, movement of invisible (cloaking, hide, etc [not chase walk]) units is not informed to nearby foes,
  * rendering any client-side cheat, that would otherwise make these units visible, to not function.
  * - "Why is this a setting?" because theres a cost, while enabled if a hidden character uses a skill with cast time,
  * - for example "cloaking -> walk a bit -> soul break another player" the character display will be momentarily abrupted
@@ -58,4 +58,4 @@
  **/
 #define ANTI_MAYAP_CHEAT
 
-#endif // _CONFIG_SECURE_H_
+#endif // CONFIG_SECURE_H