From 69543863009ec5f51d1feb710aa355ceecbaea6f Mon Sep 17 00:00:00 2001 From: brianluau Date: Sun, 22 Apr 2012 15:17:49 +0000 Subject: - Follow-up to r15923: fixed renamed file not being svn-copied (and lacking svn history). - Added svn:eol-style=native property for some recently added text files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15924 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/config/classes/general.h | 48 ++++++------ src/map/config/classes/swordsman.h | 32 ++++---- src/map/config/const.h | 156 ++++++++++++++++++------------------- 3 files changed, 118 insertions(+), 118 deletions(-) (limited to 'src') diff --git a/src/map/config/classes/general.h b/src/map/config/classes/general.h index 279bb033e..a2c9c64c3 100644 --- a/src/map/config/classes/general.h +++ b/src/map/config/classes/general.h @@ -1,24 +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_ +// 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 index 3c8f69043..44ae922d5 100644 --- a/src/map/config/classes/swordsman.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/const.h b/src/map/config/const.h index ae7ecd102..420fe4927 100644 --- a/src/map/config/const.h +++ b/src/map/config/const.h @@ -1,78 +1,78 @@ -// 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 - - -#ifdef __64BIT__ - #define __64BPRTSIZE(y) (intptr)y -#else - #define __64BPRTSIZE(y) y -#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 + + +#ifdef __64BIT__ + #define __64BPRTSIZE(y) (intptr)y +#else + #define __64BPRTSIZE(y) y +#endif +/** + * End of File + **/ +#endif -- cgit v1.2.3-70-g09d2