From e308a2a1912aaa0968f551e9284151cbf0a27054 Mon Sep 17 00:00:00 2001 From: brianluau Date: Sat, 10 Dec 2011 01:27:41 +0000 Subject: - Renamed 'RRConfig' folder to 'config'. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15052 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/Makefile.in | 4 +-- src/map/RRConfig/Core.h | 28 --------------- src/map/RRConfig/Data/Const.h | 33 ------------------ src/map/RRConfig/Renewal.h | 53 ----------------------------- src/map/RRConfig/Secure.h | 36 -------------------- src/map/RRConfig/Skills/General.h | 23 ------------- src/map/RRConfig/Skills/Mage_Classes.h | 19 ----------- src/map/RRConfig/Skills/Swordsman_Classes.h | 19 ----------- src/map/config/Core.h | 28 +++++++++++++++ src/map/config/Data/Const.h | 33 ++++++++++++++++++ src/map/config/Renewal.h | 53 +++++++++++++++++++++++++++++ src/map/config/Secure.h | 36 ++++++++++++++++++++ src/map/config/Skills/General.h | 23 +++++++++++++ src/map/config/Skills/Mage_Classes.h | 19 +++++++++++ src/map/config/Skills/Swordsman_Classes.h | 19 +++++++++++ src/map/map.h | 2 +- src/map/npc.c | 4 +-- src/map/npc.h | 2 +- src/map/pc.c | 2 +- src/map/pc.h | 2 +- src/map/script.c | 4 +-- 21 files changed, 221 insertions(+), 221 deletions(-) delete mode 100644 src/map/RRConfig/Core.h delete mode 100644 src/map/RRConfig/Data/Const.h delete mode 100644 src/map/RRConfig/Renewal.h delete mode 100644 src/map/RRConfig/Secure.h delete mode 100644 src/map/RRConfig/Skills/General.h delete mode 100644 src/map/RRConfig/Skills/Mage_Classes.h delete mode 100644 src/map/RRConfig/Skills/Swordsman_Classes.h create mode 100644 src/map/config/Core.h create mode 100644 src/map/config/Data/Const.h create mode 100644 src/map/config/Renewal.h create mode 100644 src/map/config/Secure.h create mode 100644 src/map/config/Skills/General.h create mode 100644 src/map/config/Skills/Mage_Classes.h create mode 100644 src/map/config/Skills/Swordsman_Classes.h (limited to 'src/map') diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 60fc49f7c..492300c3d 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -35,8 +35,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 \ - RRConfig/Core.h RRConfig/Renewal.h RRConfig/Secure.h RRConfig/Data/Const.h \ - RRConfig/Skills/General.h RRConfig/Skills/Mage_Classes.h RRConfig/Skills/Swordsman_Classes.h + config/Core.h config/Renewal.h config/Secure.h config/Data/Const.h \ + config/Skills/General.h config/Skills/Mage_Classes.h config/Skills/Swordsman_Classes.h HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) diff --git a/src/map/RRConfig/Core.h b/src/map/RRConfig/Core.h deleted file mode 100644 index 5073d5262..000000000 --- a/src/map/RRConfig/Core.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _RRCONFIGS_ -#define _RRCONFIGS_ -/** - * Ragnarok Resources Configuration File (http://ro-resources.net) - * The following settings are applied upon compiling the program, - * therefore any settings you disable will not even be added to the program - * making these settings the most performance-effiecient possible - **/ - -/** - * @INFO: RREmu Settings Core - * - For detailed guidance on these check http://trac.ro-resources.net/wiki/CoreConfiguration - **/ - -/** - * 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" -/** - * End of File - **/ -#endif diff --git a/src/map/RRConfig/Data/Const.h b/src/map/RRConfig/Data/Const.h deleted file mode 100644 index 31f68fdbc..000000000 --- a/src/map/RRConfig/Data/Const.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef _RRCONFIGS_CONST_ -#define _RRCONFIGS_CONST_ -/** - * Ragnarok Resources Configuration File (http://ro-resources.net) - * The following settings are applied upon compiling the program, - * therefore any settings you disable will not even be added to the program - * making these settings the most performance-effiecient possible - **/ - -/** - * @INFO: This file holds constants that aims at making code smoother and more efficient - */ - -/** - * "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) ) - -/** - * "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 - -/** - * End of File - **/ -#endif diff --git a/src/map/RRConfig/Renewal.h b/src/map/RRConfig/Renewal.h deleted file mode 100644 index 9d5ee6cf0..000000000 --- a/src/map/RRConfig/Renewal.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _RRCONFIGS_RE_ -#define _RRCONFIGS_RE_ -/** - * Ragnarok Resources Configuration File (http://ro-resources.net) - * The following settings are applied upon compiling the program, - * therefore any settings you disable will not even be added to the program - * making these settings the most performance-effiecient possible - **/ - -/** - * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/map/RRConfig/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 RRMODE 1 - -/** - * 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 : Variable-Free - * - Value required for no variable cast time with stats. - * - Formula: (casterDex x 2) + (casterInt) - * Default: 530 - **/ -#define RECASTING_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 - -/** - * End of File - **/ -#endif diff --git a/src/map/RRConfig/Secure.h b/src/map/RRConfig/Secure.h deleted file mode 100644 index 6f3da3b90..000000000 --- a/src/map/RRConfig/Secure.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _RRCONFIGS_SECURE_ -#define _RRCONFIGS_SECURE_ -/** - * Ragnarok Resources Configuration File (http://ro-resources.net) - * The following settings are applied upon compiling the program, - * therefore any settings you disable will not even be added to the program - * making these settings the most performance-effiecient possible - **/ - -/** - * @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 - - -/** - * End of File - **/ -#endif diff --git a/src/map/RRConfig/Skills/General.h b/src/map/RRConfig/Skills/General.h deleted file mode 100644 index 7869c0cc9..000000000 --- a/src/map/RRConfig/Skills/General.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _RRCONFIGS_SKILLS_GENERAL_ -#define _RRCONFIGS_SKILLS_GENERAL_ -/** - * Ragnarok Resources Configuration File (http://ro-resources.net) - * The following settings are applied upon compiling the program, - * therefore any settings you disable will not even be added to the program - * making these settings the most performance-effiecient possible - **/ - -/** - * 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 RR_MAGIC_REFLECTION 1 - -/** - * No settings past this point - **/ -#include "Mage_Classes.h" -#include "Swordsman_Classes.h" -#endif diff --git a/src/map/RRConfig/Skills/Mage_Classes.h b/src/map/RRConfig/Skills/Mage_Classes.h deleted file mode 100644 index 26cd1d03c..000000000 --- a/src/map/RRConfig/Skills/Mage_Classes.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _RRCONFIGS_SKILLS_MAGE_ -#define _RRCONFIGS_SKILLS_MAGE_ -/** - * Ragnarok Resources Configuration File (http://ro-resources.net) - * The following settings are applied upon compiling the program, - * therefore any settings you disable will not even be added to the program - * making these settings the most performance-effiecient possible - **/ - -/** - * (Wizard/HW/Warlock) enable Fire Ivy skill? (1 OR 0) - * Default: 0 (disabled) - **/ -#define FIREIVY_ON 0 - -/** - * No settings past this point - **/ -#endif diff --git a/src/map/RRConfig/Skills/Swordsman_Classes.h b/src/map/RRConfig/Skills/Swordsman_Classes.h deleted file mode 100644 index 3792fa5a3..000000000 --- a/src/map/RRConfig/Skills/Swordsman_Classes.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _RRCONFIGS_SKILLS_SWORDS_ -#define _RRCONFIGS_SKILLS_SWORDS_ -/** - * Ragnarok Resources Configuration File (http://ro-resources.net) - * The following settings are applied upon compiling the program, - * therefore any settings you disable will not even be added to the program - * making these settings the most performance-effiecient possible - **/ - -/** - * (Rune Knight) the maximum rune items a character may have of the same type - * Default: 20 - **/ -#define MAX_RUNE 20 - -/** - * No settings past this point - **/ -#endif diff --git a/src/map/config/Core.h b/src/map/config/Core.h new file mode 100644 index 000000000..5073d5262 --- /dev/null +++ b/src/map/config/Core.h @@ -0,0 +1,28 @@ +#ifndef _RRCONFIGS_ +#define _RRCONFIGS_ +/** + * Ragnarok Resources Configuration File (http://ro-resources.net) + * The following settings are applied upon compiling the program, + * therefore any settings you disable will not even be added to the program + * making these settings the most performance-effiecient possible + **/ + +/** + * @INFO: RREmu Settings Core + * - For detailed guidance on these check http://trac.ro-resources.net/wiki/CoreConfiguration + **/ + +/** + * 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" +/** + * End of File + **/ +#endif diff --git a/src/map/config/Data/Const.h b/src/map/config/Data/Const.h new file mode 100644 index 000000000..31f68fdbc --- /dev/null +++ b/src/map/config/Data/Const.h @@ -0,0 +1,33 @@ +#ifndef _RRCONFIGS_CONST_ +#define _RRCONFIGS_CONST_ +/** + * Ragnarok Resources Configuration File (http://ro-resources.net) + * The following settings are applied upon compiling the program, + * therefore any settings you disable will not even be added to the program + * making these settings the most performance-effiecient possible + **/ + +/** + * @INFO: This file holds constants that aims at making code smoother and more efficient + */ + +/** + * "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) ) + +/** + * "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 + +/** + * End of File + **/ +#endif diff --git a/src/map/config/Renewal.h b/src/map/config/Renewal.h new file mode 100644 index 000000000..a1ab30427 --- /dev/null +++ b/src/map/config/Renewal.h @@ -0,0 +1,53 @@ +#ifndef _RRCONFIGS_RE_ +#define _RRCONFIGS_RE_ +/** + * Ragnarok Resources Configuration File (http://ro-resources.net) + * The following settings are applied upon compiling the program, + * therefore any settings you disable will not even be added to the program + * making these settings the most performance-effiecient possible + **/ + +/** + * @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 RRMODE 1 + +/** + * 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 : Variable-Free + * - Value required for no variable cast time with stats. + * - Formula: (casterDex x 2) + (casterInt) + * Default: 530 + **/ +#define RECASTING_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 + +/** + * End of File + **/ +#endif diff --git a/src/map/config/Secure.h b/src/map/config/Secure.h new file mode 100644 index 000000000..6f3da3b90 --- /dev/null +++ b/src/map/config/Secure.h @@ -0,0 +1,36 @@ +#ifndef _RRCONFIGS_SECURE_ +#define _RRCONFIGS_SECURE_ +/** + * Ragnarok Resources Configuration File (http://ro-resources.net) + * The following settings are applied upon compiling the program, + * therefore any settings you disable will not even be added to the program + * making these settings the most performance-effiecient possible + **/ + +/** + * @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 + + +/** + * End of File + **/ +#endif diff --git a/src/map/config/Skills/General.h b/src/map/config/Skills/General.h new file mode 100644 index 000000000..7869c0cc9 --- /dev/null +++ b/src/map/config/Skills/General.h @@ -0,0 +1,23 @@ +#ifndef _RRCONFIGS_SKILLS_GENERAL_ +#define _RRCONFIGS_SKILLS_GENERAL_ +/** + * Ragnarok Resources Configuration File (http://ro-resources.net) + * The following settings are applied upon compiling the program, + * therefore any settings you disable will not even be added to the program + * making these settings the most performance-effiecient possible + **/ + +/** + * 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 RR_MAGIC_REFLECTION 1 + +/** + * No settings past this point + **/ +#include "Mage_Classes.h" +#include "Swordsman_Classes.h" +#endif diff --git a/src/map/config/Skills/Mage_Classes.h b/src/map/config/Skills/Mage_Classes.h new file mode 100644 index 000000000..26cd1d03c --- /dev/null +++ b/src/map/config/Skills/Mage_Classes.h @@ -0,0 +1,19 @@ +#ifndef _RRCONFIGS_SKILLS_MAGE_ +#define _RRCONFIGS_SKILLS_MAGE_ +/** + * Ragnarok Resources Configuration File (http://ro-resources.net) + * The following settings are applied upon compiling the program, + * therefore any settings you disable will not even be added to the program + * making these settings the most performance-effiecient possible + **/ + +/** + * (Wizard/HW/Warlock) enable Fire Ivy skill? (1 OR 0) + * Default: 0 (disabled) + **/ +#define FIREIVY_ON 0 + +/** + * No settings past this point + **/ +#endif diff --git a/src/map/config/Skills/Swordsman_Classes.h b/src/map/config/Skills/Swordsman_Classes.h new file mode 100644 index 000000000..3792fa5a3 --- /dev/null +++ b/src/map/config/Skills/Swordsman_Classes.h @@ -0,0 +1,19 @@ +#ifndef _RRCONFIGS_SKILLS_SWORDS_ +#define _RRCONFIGS_SKILLS_SWORDS_ +/** + * Ragnarok Resources Configuration File (http://ro-resources.net) + * The following settings are applied upon compiling the program, + * therefore any settings you disable will not even be added to the program + * making these settings the most performance-effiecient possible + **/ + +/** + * (Rune Knight) the maximum rune items a character may have of the same type + * Default: 20 + **/ +#define MAX_RUNE 20 + +/** + * No settings past this point + **/ +#endif diff --git a/src/map/map.h b/src/map/map.h index 18f5f3928..51678d590 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -13,7 +13,7 @@ /** * [ro-resources.net] **/ -#include "./RRConfig/Core.h" +#include "./config/Core.h" #include diff --git a/src/map/npc.c b/src/map/npc.c index 7c60e462f..880626344 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -200,7 +200,7 @@ struct npc_data* npc_name2id(const char* name) return (struct npc_data *) strdb_get(npcname_db, name); } /** - * For the Secure NPC Timeout option (check RRConfig/Secure.h) [RR] + * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT /** @@ -1141,7 +1141,7 @@ int npc_scriptcont(struct map_session_data* sd, int id) } } /** - * For the Secure NPC Timeout option (check RRConfig/Secure.h) [RR] + * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT /** diff --git a/src/map/npc.h b/src/map/npc.h index 8f8d7eca9..ac411697e 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -158,7 +158,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po extern struct npc_data* fake_nd; /** - * For the Secure NPC Timeout option (check RRConfig/Secure.h) [RR] + * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data); diff --git a/src/map/pc.c b/src/map/pc.c index 6a6c24398..21588a12d 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -830,7 +830,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim sd->npc_timer_id = INVALID_TIMER; sd->pvp_timer = INVALID_TIMER; /** - * For the Secure NPC Timeout option (check RRConfig/Secure.h) [RR] + * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT /** diff --git a/src/map/pc.h b/src/map/pc.h index 51588c842..16c31e69c 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -431,7 +431,7 @@ struct map_session_data { unsigned short user_font; /** - * For the Secure NPC Timeout option (check RRConfig/Secure.h) [RR] + * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT /** diff --git a/src/map/script.c b/src/map/script.c index a132f1111..2ffcad83c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3369,7 +3369,7 @@ static void script_detach_state(struct script_state* st, bool dequeue_event) sd->st = st->bk_st; sd->npc_id = st->bk_npcid; /** - * For the Secure NPC Timeout option (check RRConfig/Secure.h) [RR] + * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT /** @@ -3422,7 +3422,7 @@ static void script_attach_state(struct script_state* st) sd->st = st; sd->npc_id = st->oid; /** - * For the Secure NPC Timeout option (check RRConfig/Secure.h) [RR] + * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT if( sd->npc_idle_timer == INVALID_TIMER ) -- cgit v1.2.3-60-g2f50