diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-10 01:27:41 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-10 01:27:41 +0000 |
commit | e308a2a1912aaa0968f551e9284151cbf0a27054 (patch) | |
tree | ee64bed7296fdaf070f681d775514b8327d480ca | |
parent | be2fdb7066f39069d748a89a61f60f3b7b6f902e (diff) | |
download | hercules-e308a2a1912aaa0968f551e9284151cbf0a27054.tar.gz hercules-e308a2a1912aaa0968f551e9284151cbf0a27054.tar.bz2 hercules-e308a2a1912aaa0968f551e9284151cbf0a27054.tar.xz hercules-e308a2a1912aaa0968f551e9284151cbf0a27054.zip |
- Renamed 'RRConfig' folder to 'config'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15052 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | src/map/Makefile.in | 4 | ||||
-rw-r--r-- | src/map/config/Core.h (renamed from src/map/RRConfig/Core.h) | 0 | ||||
-rw-r--r-- | src/map/config/Data/Const.h (renamed from src/map/RRConfig/Data/Const.h) | 0 | ||||
-rw-r--r-- | src/map/config/Renewal.h (renamed from src/map/RRConfig/Renewal.h) | 2 | ||||
-rw-r--r-- | src/map/config/Secure.h (renamed from src/map/RRConfig/Secure.h) | 0 | ||||
-rw-r--r-- | src/map/config/Skills/General.h (renamed from src/map/RRConfig/Skills/General.h) | 0 | ||||
-rw-r--r-- | src/map/config/Skills/Mage_Classes.h (renamed from src/map/RRConfig/Skills/Mage_Classes.h) | 0 | ||||
-rw-r--r-- | src/map/config/Skills/Swordsman_Classes.h (renamed from src/map/RRConfig/Skills/Swordsman_Classes.h) | 0 | ||||
-rw-r--r-- | src/map/map.h | 2 | ||||
-rw-r--r-- | src/map/npc.c | 4 | ||||
-rw-r--r-- | src/map/npc.h | 2 | ||||
-rw-r--r-- | src/map/pc.c | 2 | ||||
-rw-r--r-- | src/map/pc.h | 2 | ||||
-rw-r--r-- | src/map/script.c | 4 | ||||
-rw-r--r-- | vcproj-10/map-server_sql.vcxproj | 14 | ||||
-rw-r--r-- | vcproj-10/map-server_txt.vcxproj | 14 | ||||
-rw-r--r-- | vcproj-9/map-server_sql.vcproj | 14 | ||||
-rw-r--r-- | vcproj-9/map-server_txt.vcproj | 14 |
18 files changed, 39 insertions, 39 deletions
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/config/Core.h index 5073d5262..5073d5262 100644 --- a/src/map/RRConfig/Core.h +++ b/src/map/config/Core.h diff --git a/src/map/RRConfig/Data/Const.h b/src/map/config/Data/Const.h index 31f68fdbc..31f68fdbc 100644 --- a/src/map/RRConfig/Data/Const.h +++ b/src/map/config/Data/Const.h diff --git a/src/map/RRConfig/Renewal.h b/src/map/config/Renewal.h index 9d5ee6cf0..a1ab30427 100644 --- a/src/map/RRConfig/Renewal.h +++ b/src/map/config/Renewal.h @@ -8,7 +8,7 @@ **/ /** - * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/map/RRConfig/Skills folder + * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/map/config/Skills folder **/ /** diff --git a/src/map/RRConfig/Secure.h b/src/map/config/Secure.h index 6f3da3b90..6f3da3b90 100644 --- a/src/map/RRConfig/Secure.h +++ b/src/map/config/Secure.h diff --git a/src/map/RRConfig/Skills/General.h b/src/map/config/Skills/General.h index 7869c0cc9..7869c0cc9 100644 --- a/src/map/RRConfig/Skills/General.h +++ b/src/map/config/Skills/General.h diff --git a/src/map/RRConfig/Skills/Mage_Classes.h b/src/map/config/Skills/Mage_Classes.h index 26cd1d03c..26cd1d03c 100644 --- a/src/map/RRConfig/Skills/Mage_Classes.h +++ b/src/map/config/Skills/Mage_Classes.h diff --git a/src/map/RRConfig/Skills/Swordsman_Classes.h b/src/map/config/Skills/Swordsman_Classes.h index 3792fa5a3..3792fa5a3 100644 --- a/src/map/RRConfig/Skills/Swordsman_Classes.h +++ b/src/map/config/Skills/Swordsman_Classes.h 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 <stdarg.h> 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 ) diff --git a/vcproj-10/map-server_sql.vcxproj b/vcproj-10/map-server_sql.vcxproj index 997854d0f..af05998dc 100644 --- a/vcproj-10/map-server_sql.vcxproj +++ b/vcproj-10/map-server_sql.vcxproj @@ -173,13 +173,13 @@ <ClInclude Include="..\src\map\pc.h" /> <ClInclude Include="..\src\map\pet.h" /> <ClInclude Include="..\src\map\quest.h" /> - <ClInclude Include="..\src\map\RRConfig\Core.h" /> - <ClInclude Include="..\src\map\RRConfig\Renewal.h" /> - <ClInclude Include="..\src\map\RRConfig\Secure.h" /> - <ClInclude Include="..\src\map\RRConfig\Data\Const.h" /> - <ClInclude Include="..\src\map\RRConfig\Skills\General.h" /> - <ClInclude Include="..\src\map\RRConfig\Skills\Mage_Classes.h" /> - <ClInclude Include="..\src\map\RRConfig\Skills\Swordsman_Classes.h" /> + <ClInclude Include="..\src\map\config\Core.h" /> + <ClInclude Include="..\src\map\config\Renewal.h" /> + <ClInclude Include="..\src\map\config\Secure.h" /> + <ClInclude Include="..\src\map\config\Data\Const.h" /> + <ClInclude Include="..\src\map\config\Skills\General.h" /> + <ClInclude Include="..\src\map\config\Skills\Mage_Classes.h" /> + <ClInclude Include="..\src\map\config\Skills\Swordsman_Classes.h" /> <ClInclude Include="..\src\map\script.h" /> <ClInclude Include="..\src\map\searchstore.h" /> <ClInclude Include="..\src\map\skill.h" /> diff --git a/vcproj-10/map-server_txt.vcxproj b/vcproj-10/map-server_txt.vcxproj index a40e6f5e0..8c31ae6d6 100644 --- a/vcproj-10/map-server_txt.vcxproj +++ b/vcproj-10/map-server_txt.vcxproj @@ -205,13 +205,13 @@ <ClInclude Include="..\src\map\pc.h" /> <ClInclude Include="..\src\map\pet.h" /> <ClInclude Include="..\src\map\quest.h" /> - <ClInclude Include="..\src\map\RRConfig\Core.h" /> - <ClInclude Include="..\src\map\RRConfig\Renewal.h" /> - <ClInclude Include="..\src\map\RRConfig\Secure.h" /> - <ClInclude Include="..\src\map\RRConfig\Data\Const.h" /> - <ClInclude Include="..\src\map\RRConfig\Skills\General.h" /> - <ClInclude Include="..\src\map\RRConfig\Skills\Mage_Classes.h" /> - <ClInclude Include="..\src\map\RRConfig\Skills\Swordsman_Classes.h" /> + <ClInclude Include="..\src\map\config\Core.h" /> + <ClInclude Include="..\src\map\config\Renewal.h" /> + <ClInclude Include="..\src\map\config\Secure.h" /> + <ClInclude Include="..\src\map\config\Data\Const.h" /> + <ClInclude Include="..\src\map\config\Skills\General.h" /> + <ClInclude Include="..\src\map\config\Skills\Mage_Classes.h" /> + <ClInclude Include="..\src\map\config\Skills\Swordsman_Classes.h" /> <ClInclude Include="..\src\map\script.h" /> <ClInclude Include="..\src\map\searchstore.h" /> <ClInclude Include="..\src\map\skill.h" /> diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj index 7f4bac76f..d2c8192c2 100644 --- a/vcproj-9/map-server_sql.vcproj +++ b/vcproj-9/map-server_sql.vcproj @@ -584,31 +584,31 @@ > </File> <File - RelativePath="..\src\map\RRConfig\Core.h" + RelativePath="..\src\map\config\Core.h" > </File> <File - RelativePath="..\src\map\RRConfig\Renewal.h" + RelativePath="..\src\map\config\Renewal.h" > </File> <File - RelativePath="..\src\map\RRConfig\Secure.h" + RelativePath="..\src\map\config\Secure.h" > </File> <File - RelativePath="..\src\map\RRConfig\Data\Const.h" + RelativePath="..\src\map\config\Data\Const.h" > </File> <File - RelativePath="..\src\map\RRConfig\Skills\General.h" + RelativePath="..\src\map\config\Skills\General.h" > </File> <File - RelativePath="..\src\map\RRConfig\Skills\Mage_Classes.h" + RelativePath="..\src\map\config\Skills\Mage_Classes.h" > </File> <File - RelativePath="..\src\map\RRConfig\Skills\Swordsman_Classes.h" + RelativePath="..\src\map\config\Skills\Swordsman_Classes.h" > </File> <File diff --git a/vcproj-9/map-server_txt.vcproj b/vcproj-9/map-server_txt.vcproj index d4cc1b13b..6291089a9 100644 --- a/vcproj-9/map-server_txt.vcproj +++ b/vcproj-9/map-server_txt.vcproj @@ -415,31 +415,31 @@ > </File> <File - RelativePath="..\src\map\RRConfig\Core.h" + RelativePath="..\src\map\config\Core.h" > </File> <File - RelativePath="..\src\map\RRConfig\Renewal.h" + RelativePath="..\src\map\config\Renewal.h" > </File> <File - RelativePath="..\src\map\RRConfig\Secure.h" + RelativePath="..\src\map\config\Secure.h" > </File> <File - RelativePath="..\src\map\RRConfig\Data\Const.h" + RelativePath="..\src\map\config\Data\Const.h" > </File> <File - RelativePath="..\src\map\RRConfig\Skills\General.h" + RelativePath="..\src\map\config\Skills\General.h" > </File> <File - RelativePath="..\src\map\RRConfig\Skills\Mage_Classes.h" + RelativePath="..\src\map\config\Skills\Mage_Classes.h" > </File> <File - RelativePath="..\src\map\RRConfig\Skills\Swordsman_Classes.h" + RelativePath="..\src\map\config\Skills\Swordsman_Classes.h" > </File> <File |