diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-09 03:53:41 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-09 03:53:41 +0000 |
commit | bf7d71465ddd0cdf88c94fb4ff71dde33474b5a7 (patch) | |
tree | 460a445a059af68633160c2de23f8a21eb7c94e1 /src/map | |
parent | 9b18469c6c904003bc2c31dff333538ba59577cc (diff) | |
download | hercules-bf7d71465ddd0cdf88c94fb4ff71dde33474b5a7.tar.gz hercules-bf7d71465ddd0cdf88c94fb4ff71dde33474b5a7.tar.bz2 hercules-bf7d71465ddd0cdf88c94fb4ff71dde33474b5a7.tar.xz hercules-bf7d71465ddd0cdf88c94fb4ff71dde33474b5a7.zip |
- Set svn:eol-style=native for some recently added text files (follow up to r15009).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15044 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/RRConfig/Core.h | 56 | ||||
-rw-r--r-- | src/map/RRConfig/Data/Const.h | 66 | ||||
-rw-r--r-- | src/map/RRConfig/Renewal.h | 106 | ||||
-rw-r--r-- | src/map/RRConfig/Secure.h | 72 | ||||
-rw-r--r-- | src/map/RRConfig/Skills/General.h | 46 | ||||
-rw-r--r-- | src/map/RRConfig/Skills/Mage_Classes.h | 38 | ||||
-rw-r--r-- | src/map/RRConfig/Skills/Swordsman_Classes.h | 38 |
7 files changed, 211 insertions, 211 deletions
diff --git a/src/map/RRConfig/Core.h b/src/map/RRConfig/Core.h index 9cb161a3f..5073d5262 100644 --- a/src/map/RRConfig/Core.h +++ b/src/map/RRConfig/Core.h @@ -1,28 +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
+#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 index d52c69034..31f68fdbc 100644 --- a/src/map/RRConfig/Data/Const.h +++ b/src/map/RRConfig/Data/Const.h @@ -1,33 +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
+#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 index 1888d3bc4..9d5ee6cf0 100644 --- a/src/map/RRConfig/Renewal.h +++ b/src/map/RRConfig/Renewal.h @@ -1,53 +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/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
+#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 index 44eea2668..6f3da3b90 100644 --- a/src/map/RRConfig/Secure.h +++ b/src/map/RRConfig/Secure.h @@ -1,36 +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
+#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 index 5944d6844..7869c0cc9 100644 --- a/src/map/RRConfig/Skills/General.h +++ b/src/map/RRConfig/Skills/General.h @@ -1,23 +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
+#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 index cf0777787..26cd1d03c 100644 --- a/src/map/RRConfig/Skills/Mage_Classes.h +++ b/src/map/RRConfig/Skills/Mage_Classes.h @@ -1,19 +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
+#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 index 4dddeec54..3792fa5a3 100644 --- a/src/map/RRConfig/Skills/Swordsman_Classes.h +++ b/src/map/RRConfig/Skills/Swordsman_Classes.h @@ -1,19 +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
+#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 |