summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/Makefile.in4
-rw-r--r--src/map/config/classes/general.h (renamed from src/map/config/Skills/General.h)49
-rw-r--r--src/map/config/classes/swordsman.h (renamed from src/map/config/Skills/Swordsman_Classes.h)32
-rw-r--r--src/map/config/const.h (renamed from src/map/config/Data/Const.h)144
-rw-r--r--src/map/config/core.h (renamed from src/map/config/Core.h)9
-rw-r--r--src/map/config/renewal.h (renamed from src/map/config/Renewal.h)0
-rw-r--r--src/map/config/secure.h (renamed from src/map/config/Secure.h)0
7 files changed, 119 insertions, 119 deletions
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index 2821b7985..0b5ba023d 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -40,8 +40,8 @@ MAP_H = map.h chrif.h clif.h pc.h status.h npc.h \
intif.h trade.h party.h vending.h guild.h pet.h \
log.h mail.h date.h unit.h homunculus.h mercenary.h quest.h instance.h mapreg.h \
buyingstore.h searchstore.h duel.h pc_groups.h \
- config/Core.h config/Renewal.h config/Secure.h config/Data/Const.h \
- config/Skills/General.h config/Skills/Swordsman_Classes.h
+ config/core.h config/renewal.h config/secure.h config/const.h \
+ config/classes/general.h config/classes/swordsman.h
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
diff --git a/src/map/config/Skills/General.h b/src/map/config/classes/general.h
index 746630845..279bb033e 100644
--- a/src/map/config/Skills/General.h
+++ b/src/map/config/classes/general.h
@@ -1,25 +1,24 @@
-// 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/
- **/
-
-/**
- * Default Magical Reflection Behavior
- * - When reflecting, reflected damage depends on gears caster is wearing, not target
- * - When disabled damage depends on gears target is wearing, not caster.
- * @values 1 (enabled) or 0 (disabled)
- **/
-#define MAGIC_REFLECTION_TYPE 1
-
-/**
- * No settings past this point
- **/
-#include "Mage_Classes.h"
-#include "Swordsman_Classes.h"
-
-#endif // _CONFIG_GENERAL_H_
+// 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/
+ **/
+
+/**
+ * Default Magical Reflection Behavior
+ * - When reflecting, reflected damage depends on gears caster is wearing, not target
+ * - When disabled damage depends on gears target is wearing, not caster.
+ * @values 1 (enabled) or 0 (disabled)
+ **/
+#define MAGIC_REFLECTION_TYPE 1
+
+/**
+ * No settings past this point
+ **/
+#include "swordsman.h"
+
+#endif // _CONFIG_GENERAL_H_
diff --git a/src/map/config/Skills/Swordsman_Classes.h b/src/map/config/classes/swordsman.h
index 44ae922d5..3c8f69043 100644
--- a/src/map/config/Skills/Swordsman_Classes.h
+++ b/src/map/config/classes/swordsman.h
@@ -1,16 +1,16 @@
-// 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
-///
-/// maximum number of runes that a rune knight character can carry at any given time
-/// default: 20
-#define MAX_RUNE 20
-
-#endif // _CONFIG_SKILLS_SWORDS_H_
+// 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
+///
+/// maximum number of runes that a rune knight character can carry at any given time
+/// default: 20
+#define MAX_RUNE 20
+
+#endif // _CONFIG_SKILLS_SWORDS_H_
diff --git a/src/map/config/Data/Const.h b/src/map/config/const.h
index 8b9980252..dc85bda82 100644
--- a/src/map/config/Data/Const.h
+++ b/src/map/config/const.h
@@ -1,72 +1,72 @@
-// 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/
- **/
-
-/**
- * @INFO: This file holds constants that aims at making code smoother and more efficient
- */
-
-/**
- * "Constants"
- **/
-#ifdef RENEWAL_CAST
-
- #ifndef RENEWAL
- #error RENEWAL_CAST requires RENEWAL enabled
- #endif
-
- #define CONST_CASTRATE_SCALE RENEWAL_CAST_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
- **/
-#if SECURE_NPCTIMEOUT_INTERVAL <= 0
- #error SECURE_NPCTIMEOUT_INTERVAL should be at least 1 (1s)
-#endif
-#if SECURE_NPCTIMEOUT < 0
- #error SECURE_NPCTIMEOUT cannot be lower than 0
-#endif
-
-/**
- * Path within the /db folder to (non-)renewal specific db files
- **/
-#ifdef RENEWAL
- #define DBPATH "re/"
-#else
- #define DBPATH "pre-re/"
-#endif
-
-/**
- * DefType
- **/
-#ifdef RENEWAL
- typedef short defType;
- #define DEFTYPE_MIN SHRT_MIN
- #define DEFTYPE_MAX SHRT_MAX
-#else
- typedef signed char defType;
- #define DEFTYPE_MIN CHAR_MIN
- #define DEFTYPE_MAX CHAR_MAX
-#endif
-
-/**
- * End of File
- **/
-#endif
+// 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/
+ **/
+
+/**
+ * @INFO: This file holds constants that aims at making code smoother and more efficient
+ */
+
+/**
+ * "Constants"
+ **/
+#ifdef RENEWAL_CAST
+
+ #ifndef RENEWAL
+ #error RENEWAL_CAST requires RENEWAL enabled
+ #endif
+
+ #define CONST_CASTRATE_SCALE RENEWAL_CAST_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
+ **/
+#if SECURE_NPCTIMEOUT_INTERVAL <= 0
+ #error SECURE_NPCTIMEOUT_INTERVAL should be at least 1 (1s)
+#endif
+#if SECURE_NPCTIMEOUT < 0
+ #error SECURE_NPCTIMEOUT cannot be lower than 0
+#endif
+
+/**
+ * Path within the /db folder to (non-)renewal specific db files
+ **/
+#ifdef RENEWAL
+ #define DBPATH "re/"
+#else
+ #define DBPATH "pre-re/"
+#endif
+
+/**
+ * DefType
+ **/
+#ifdef RENEWAL
+ typedef short defType;
+ #define DEFTYPE_MIN SHRT_MIN
+ #define DEFTYPE_MAX SHRT_MAX
+#else
+ typedef signed char defType;
+ #define DEFTYPE_MIN CHAR_MIN
+ #define DEFTYPE_MAX CHAR_MAX
+#endif
+
+/**
+ * End of File
+ **/
+#endif
diff --git a/src/map/config/Core.h b/src/map/config/core.h
index 95c3ee8ed..4d8e38f95 100644
--- a/src/map/config/Core.h
+++ b/src/map/config/core.h
@@ -28,12 +28,13 @@
/**
* No settings past this point
**/
-#include "./Renewal.h"
-#include "./Secure.h"
-#include "./Skills/General.h"
+#include "./renewal.h"
+#include "./secure.h"
+#include "./classes/general.h"
+
/**
* Constants come last; so they process anything that could've been modified in early includes
**/
-#include "./Data/Const.h"
+#include "./const.h"
#endif // _CONFIG_CORE_H_
diff --git a/src/map/config/Renewal.h b/src/map/config/renewal.h
index 938c8b29a..938c8b29a 100644
--- a/src/map/config/Renewal.h
+++ b/src/map/config/renewal.h
diff --git a/src/map/config/Secure.h b/src/map/config/secure.h
index e2b000440..e2b000440 100644
--- a/src/map/config/Secure.h
+++ b/src/map/config/secure.h
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 20:49:31 +0000