Bladeren bron

- Renamed 'RRConfig' folder to 'config'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15052 54d463be-8e91-2dee-dedb-b68131a5f0ec
brianluau 13 jaren geleden
bovenliggende
commit
27f53c1386

+ 2 - 2
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)

+ 0 - 0
src/map/RRConfig/Core.h → src/map/config/Core.h


+ 0 - 0
src/map/RRConfig/Data/Const.h → src/map/config/Data/Const.h


+ 1 - 1
src/map/RRConfig/Renewal.h → 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
  **/
 
 /**

+ 0 - 0
src/map/RRConfig/Secure.h → src/map/config/Secure.h


+ 0 - 0
src/map/RRConfig/Skills/General.h → src/map/config/Skills/General.h


+ 0 - 0
src/map/RRConfig/Skills/Mage_Classes.h → src/map/config/Skills/Mage_Classes.h


+ 0 - 0
src/map/RRConfig/Skills/Swordsman_Classes.h → src/map/config/Skills/Swordsman_Classes.h


+ 1 - 1
src/map/map.h

@@ -13,7 +13,7 @@
 /**
  * [ro-resources.net]
  **/
-#include "./RRConfig/Core.h"
+#include "./config/Core.h"
 
 #include <stdarg.h>
 

+ 2 - 2
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
 	/**

+ 1 - 1
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);

+ 1 - 1
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
 	/**

+ 1 - 1
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
 	/**

+ 2 - 2
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 )

+ 7 - 7
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" />

+ 7 - 7
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" />

+ 7 - 7
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

+ 7 - 7
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