Libconfig Interfaced

Ready for plugin use.
Thanks to Haruna

Signed-off-by: shennetsind <ind@henn.et>

1 files changed, 14 insertions, 14 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index cc2566a6e..f96b70cdb 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -9746,14 +9746,14 @@ void pc_read_skill_tree(void) {
 		{ "Rebellion", JOB_REBELLION },
 	};
 	
-	if (conf_read_file(&skill_tree_conf, config_filename)) {
+	if (libconfig->read_file(&skill_tree_conf, config_filename)) {
 		ShowError("can't read %s\n", config_filename);
 		return;
 	}
 	
 	jnamelen = ARRAYLENGTH(jnames);
 	
-	while( (skt = config_setting_get_elem(skill_tree_conf.root,i++)) ) {
+	while( (skt = libconfig->setting_get_elem(skill_tree_conf.root,i++)) ) {
 		int k, idx;
 		const char *name = config_setting_name(skt);
 		
@@ -9765,12 +9765,12 @@ void pc_read_skill_tree(void) {
 		}
 		
 		
-		if( ( skills = config_setting_get_member(skt,"skills") ) ) {
+		if( ( skills = libconfig->setting_get_member(skt,"skills") ) ) {
 			int c = 0;
 			
 			idx = pc->class2idx(jnames[k].id);
 			
-			while( ( sk = config_setting_get_elem(skills,c++) ) ) {
+			while( ( sk = libconfig->setting_get_elem(skills,c++) ) ) {
 				const char *sk_name = config_setting_name(sk);
 				int skill_id;
 				
@@ -9790,23 +9790,23 @@ void pc_read_skill_tree(void) {
 					
 					if( config_setting_is_group(sk) ) {
 						int max = 0, jlevel = 0;
-						config_setting_lookup_int(sk, "MaxLevel", &max);
-						config_setting_lookup_int(sk, "MinJobLevel", &jlevel);
+						libconfig->setting_lookup_int(sk, "MaxLevel", &max);
+						libconfig->setting_lookup_int(sk, "MinJobLevel", &jlevel);
 						pc->skill_tree[idx][skidx].max = (unsigned char)max;
 						pc->skill_tree[idx][skidx].joblv = (unsigned char)jlevel;
-						rlen = config_setting_length(sk);
+						rlen = libconfig->setting_length(sk);
 						offset += jlevel ? 2 : 1;
 					} else {
-						pc->skill_tree[idx][skidx].max = (unsigned char)config_setting_get_int(sk);
+						pc->skill_tree[idx][skidx].max = (unsigned char)libconfig->setting_get_int(sk);
 						pc->skill_tree[idx][skidx].joblv = 0;
 					}
 					
 					for( h = offset; h < rlen && h < MAX_PC_SKILL_REQUIRE; h++ ) {
-						config_setting_t *rsk = config_setting_get_elem(sk,h);
+						config_setting_t *rsk = libconfig->setting_get_elem(sk,h);
 						if( rsk && ( rskid = skill->name2id(config_setting_name(rsk)) ) ) {
 							pc->skill_tree[idx][skidx].need[h].id  = rskid;
 							pc->skill_tree[idx][skidx].need[h].idx = skill->get_index(rskid);
-							pc->skill_tree[idx][skidx].need[h].lv  = (unsigned char)config_setting_get_int(rsk);
+							pc->skill_tree[idx][skidx].need[h].lv  = (unsigned char)libconfig->setting_get_int(rsk);
 						} else if( rsk ) {
 							ShowWarning("pc_read_skill_tree: unknown requirement '%s' for '%s' in '%s'\n",config_setting_name(rsk),sk_name,name);
 						} else {
@@ -9822,7 +9822,7 @@ void pc_read_skill_tree(void) {
 	}
 	
 	i = 0;
-	while( (skt = config_setting_get_elem(skill_tree_conf.root,i++)) ) {
+	while( (skt = libconfig->setting_get_elem(skill_tree_conf.root,i++)) ) {
 		int k, idx, v = 0;
 		const char *name = config_setting_name(skt);
 		const char *iname;
@@ -9836,8 +9836,8 @@ void pc_read_skill_tree(void) {
 		}
 		idx = pc->class2idx(jnames[k].id);
 
-		if( ( inherit = config_setting_get_member(skt,"inherit") ) ) {
-			while( ( iname = config_setting_get_string_elem(inherit, v++) ) ) {
+		if( ( inherit = libconfig->setting_get_member(skt,"inherit") ) ) {
+			while( ( iname = libconfig->setting_get_string_elem(inherit, v++) ) ) {
 				int b = 0, a, d, f, fidx;
 
 				ARR_FIND(0, jnamelen, b, strcmpi(jnames[b].name,iname) == 0 );
@@ -9869,7 +9869,7 @@ void pc_read_skill_tree(void) {
 		
 	}
 	
-	config_destroy(&skill_tree_conf);
+	libconfig->destroy(&skill_tree_conf);
 
     /* lets update all players skill tree */
     iter = mapit_getallusers();