From 7d50f79a9c5c5de524b4e532d3ce1b2fd0745857 Mon Sep 17 00:00:00 2001 From: epoque11 Date: Mon, 9 Apr 2012 23:21:18 +0000 Subject: - Follow-up to r15837, fixed compiler error due to missing header file - Cleaned upper-case file naming which goes against coding standards git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15838 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/Makefile.in | 4 +- src/map/config/Core.h | 39 ----------------- src/map/config/Data/Const.h | 72 ------------------------------- src/map/config/Renewal.h | 55 ----------------------- src/map/config/Secure.h | 33 -------------- src/map/config/Skills/General.h | 25 ----------- src/map/config/Skills/Swordsman_Classes.h | 16 ------- src/map/config/classes/general.h | 24 +++++++++++ src/map/config/classes/swordsman.h | 16 +++++++ src/map/config/const.h | 72 +++++++++++++++++++++++++++++++ src/map/config/core.h | 40 +++++++++++++++++ src/map/config/renewal.h | 55 +++++++++++++++++++++++ src/map/config/secure.h | 33 ++++++++++++++ 13 files changed, 242 insertions(+), 242 deletions(-) delete mode 100644 src/map/config/Core.h delete mode 100644 src/map/config/Data/Const.h delete mode 100644 src/map/config/Renewal.h delete mode 100644 src/map/config/Secure.h delete mode 100644 src/map/config/Skills/General.h delete mode 100644 src/map/config/Skills/Swordsman_Classes.h create mode 100644 src/map/config/classes/general.h create mode 100644 src/map/config/classes/swordsman.h create mode 100644 src/map/config/const.h create mode 100644 src/map/config/core.h create mode 100644 src/map/config/renewal.h create mode 100644 src/map/config/secure.h (limited to 'src/map') 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/Core.h b/src/map/config/Core.h deleted file mode 100644 index 95c3ee8ed..000000000 --- a/src/map/config/Core.h +++ /dev/null @@ -1,39 +0,0 @@ -// 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/ - **/ - -/** - * 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) -//#define CELL_NOSTACK - -//Uncomment to enable circular area checks. -//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. -//#define CIRCULAR_AREA - -/** - * No settings past this point - **/ -#include "./Renewal.h" -#include "./Secure.h" -#include "./Skills/General.h" -/** - * Constants come last; so they process anything that could've been modified in early includes - **/ -#include "./Data/Const.h" - -#endif // _CONFIG_CORE_H_ diff --git a/src/map/config/Data/Const.h b/src/map/config/Data/Const.h deleted file mode 100644 index 8b9980252..000000000 --- a/src/map/config/Data/Const.h +++ /dev/null @@ -1,72 +0,0 @@ -// 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/Renewal.h b/src/map/config/Renewal.h deleted file mode 100644 index 938c8b29a..000000000 --- a/src/map/config/Renewal.h +++ /dev/null @@ -1,55 +0,0 @@ -// 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/ - **/ - -/** - * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/map/config/Skills folder - **/ - -/// 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 -/// (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 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 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 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 - -#endif // _CONFIG_RENEWAL_H_ diff --git a/src/map/config/Secure.h b/src/map/config/Secure.h deleted file mode 100644 index e2b000440..000000000 --- a/src/map/config/Secure.h +++ /dev/null @@ -1,33 +0,0 @@ -// 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/ - **/ - -/** - * @INFO: This file holds optional security settings - **/ - -/** - * Optional NPC Dialog Timer - * When enabled all npcs dialog will 'timeout' if user is on idle for longer than the amount of seconds allowed - * - On 'timeout' the npc dialog window changes it's next/menu to a 'close' button - * @values - * - ? : Desired idle time in seconds (e.g. 10) - * - 0 : Disabled - **/ -#define SECURE_NPCTIMEOUT 0 - -/** - * (Secure) Optional NPC Dialog Timer - * @requirement : SECURE_NPCTIMEOUT must be enabled - * Minimum Interval Between timeout checks in seconds - * Default: 1s - **/ -#define SECURE_NPCTIMEOUT_INTERVAL 1 - -#endif // _CONFIG_SECURE_H_ diff --git a/src/map/config/Skills/General.h b/src/map/config/Skills/General.h deleted file mode 100644 index 746630845..000000000 --- a/src/map/config/Skills/General.h +++ /dev/null @@ -1,25 +0,0 @@ -// 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_ diff --git a/src/map/config/Skills/Swordsman_Classes.h b/src/map/config/Skills/Swordsman_Classes.h deleted file mode 100644 index 44ae922d5..000000000 --- a/src/map/config/Skills/Swordsman_Classes.h +++ /dev/null @@ -1,16 +0,0 @@ -// 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/classes/general.h b/src/map/config/classes/general.h new file mode 100644 index 000000000..279bb033e --- /dev/null +++ b/src/map/config/classes/general.h @@ -0,0 +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 "swordsman.h" + +#endif // _CONFIG_GENERAL_H_ diff --git a/src/map/config/classes/swordsman.h b/src/map/config/classes/swordsman.h new file mode 100644 index 000000000..3c8f69043 --- /dev/null +++ b/src/map/config/classes/swordsman.h @@ -0,0 +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_ diff --git a/src/map/config/const.h b/src/map/config/const.h new file mode 100644 index 000000000..dc85bda82 --- /dev/null +++ b/src/map/config/const.h @@ -0,0 +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 diff --git a/src/map/config/core.h b/src/map/config/core.h new file mode 100644 index 000000000..4d8e38f95 --- /dev/null +++ b/src/map/config/core.h @@ -0,0 +1,40 @@ +// 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/ + **/ + +/** + * 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) +//#define CELL_NOSTACK + +//Uncomment to enable circular area checks. +//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. +//#define CIRCULAR_AREA + +/** + * No settings past this point + **/ +#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 "./const.h" + +#endif // _CONFIG_CORE_H_ diff --git a/src/map/config/renewal.h b/src/map/config/renewal.h new file mode 100644 index 000000000..938c8b29a --- /dev/null +++ b/src/map/config/renewal.h @@ -0,0 +1,55 @@ +// 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/ + **/ + +/** + * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/map/config/Skills folder + **/ + +/// 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 +/// (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 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 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 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 + +#endif // _CONFIG_RENEWAL_H_ diff --git a/src/map/config/secure.h b/src/map/config/secure.h new file mode 100644 index 000000000..e2b000440 --- /dev/null +++ b/src/map/config/secure.h @@ -0,0 +1,33 @@ +// 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/ + **/ + +/** + * @INFO: This file holds optional security settings + **/ + +/** + * Optional NPC Dialog Timer + * When enabled all npcs dialog will 'timeout' if user is on idle for longer than the amount of seconds allowed + * - On 'timeout' the npc dialog window changes it's next/menu to a 'close' button + * @values + * - ? : Desired idle time in seconds (e.g. 10) + * - 0 : Disabled + **/ +#define SECURE_NPCTIMEOUT 0 + +/** + * (Secure) Optional NPC Dialog Timer + * @requirement : SECURE_NPCTIMEOUT must be enabled + * Minimum Interval Between timeout checks in seconds + * Default: 1s + **/ +#define SECURE_NPCTIMEOUT_INTERVAL 1 + +#endif // _CONFIG_SECURE_H_ -- cgit v1.2.3-70-g09d2