1 files changed, 19 insertions, 19 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 865673630..e9a93918b 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3532,9 +3532,9 @@ void run_script_main(struct script_state *st)
 			//Restore previous script if any.
 			script_detach_state(st, true);
 			if (sd->state.reg_dirty&2)
-				intif_saveregistry(sd,2);
+				intif->saveregistry(sd,2);
 			if (sd->state.reg_dirty&1)
-				intif_saveregistry(sd,1);
+				intif->saveregistry(sd,1);
 		}
 		script->free_state(st);
 		st = NULL;
@@ -6252,7 +6252,7 @@ static void buildin_delitem_delete(struct map_session_data* sd, int idx, int* am
 	{
 		if( sd->inventory_data[idx]->type == IT_PETEGG && inv->card[0] == CARD0_PET )
 		{// delete associated pet
-			intif_delete_petdata(MakeDWord(inv->card[1], inv->card[2]));
+			intif->delete_petdata(MakeDWord(inv->card[1], inv->card[2]));
 		}
 		pc->delitem(sd, idx, delamount, 0, 0, LOG_TYPE_SCRIPT);
 	}
@@ -6316,7 +6316,7 @@ static bool buildin_delitem_search(struct map_session_data* sd, struct item* it,
 			{
 				if( sd->inventory_data[i]->type == IT_PETEGG )
 				{
-					if( inv->card[0] == CARD0_PET && CheckForCharServer() )
+					if( inv->card[0] == CARD0_PET && intif->CheckForCharServer() )
 					{// pet which cannot be deleted
 						continue;
 					}
@@ -6346,7 +6346,7 @@ static bool buildin_delitem_search(struct map_session_data* sd, struct item* it,
 				continue;
 			}
 			
-			if( sd->inventory_data[i]->type == IT_PETEGG && inv->card[0] == CARD0_PET && CheckForCharServer() )
+			if( sd->inventory_data[i]->type == IT_PETEGG && inv->card[0] == CARD0_PET && intif->CheckForCharServer() )
 			{// pet which cannot be deleted
 				continue;
 			}
@@ -8311,7 +8311,7 @@ BUILDIN(makepet)
 		pet_id = search_petDB_index(id, PET_EGG);
 	if (pet_id >= 0 && sd) {
 		sd->catch_target_class = pet_db[pet_id].class_;
-		intif_create_pet(
+		intif->create_pet(
 						 sd->status.account_id, sd->status.char_id,
 						 (short)pet_db[pet_id].class_, (short)mob_db(pet_db[pet_id].class_)->lv,
 						 (short)pet_db[pet_id].EggID, 0, (short)pet_db[pet_id].intimate,
@@ -9124,9 +9124,9 @@ BUILDIN(announce)
 	else
 	{
 		if (fontColor)
-			intif_broadcast2(mes, (int)strlen(mes)+1, strtol(fontColor, (char **)NULL, 0), fontType, fontSize, fontAlign, fontY);
+			intif->broadcast2(mes, (int)strlen(mes)+1, strtol(fontColor, (char **)NULL, 0), fontType, fontSize, fontAlign, fontY);
 		else
-			intif_broadcast(mes, (int)strlen(mes)+1, flag&0xf0);
+			intif->broadcast(mes, (int)strlen(mes)+1, flag&0xf0);
 	}
 	return true;
 }
@@ -10017,7 +10017,7 @@ BUILDIN(waitingroom)
 	
 	nd = (struct npc_data *)iMap->id2bl(st->oid);
 	if( nd != NULL )
-		chat_createnpcchat(nd, title, limit, pub, trigger, ev, zeny, minLvl, maxLvl);
+		chat->createnpcchat(nd, title, limit, pub, trigger, ev, zeny, minLvl, maxLvl);
 	
 	return true;
 }
@@ -10034,7 +10034,7 @@ BUILDIN(delwaitingroom)
 	else
 		nd = (struct npc_data *)iMap->id2bl(st->oid);
 	if( nd != NULL )
-		chat_deletenpcchat(nd);
+		chat->deletenpcchat(nd);
 	return true;
 }
 
@@ -10053,7 +10053,7 @@ BUILDIN(waitingroomkickall)
 		nd = (struct npc_data *)iMap->id2bl(st->oid);
 	
 	if( nd != NULL && (cd=(struct chat_data *)iMap->id2bl(nd->chat_id)) != NULL )
-		chat_npckickall(cd);
+		chat->npckickall(cd);
 	return true;
 }
 
@@ -10072,7 +10072,7 @@ BUILDIN(enablewaitingroomevent)
 		nd = (struct npc_data *)iMap->id2bl(st->oid);
 	
 	if( nd != NULL && (cd=(struct chat_data *)iMap->id2bl(nd->chat_id)) != NULL )
-		chat_enableevent(cd);
+		chat->enableevent(cd);
 	return true;
 }
 
@@ -10091,7 +10091,7 @@ BUILDIN(disablewaitingroomevent)
 		nd = (struct npc_data *)iMap->id2bl(st->oid);
 	
 	if( nd != NULL && (cd=(struct chat_data *)iMap->id2bl(nd->chat_id)) != NULL )
-		chat_disableevent(cd);
+		chat->disableevent(cd);
 	return true;
 }
 
@@ -12459,10 +12459,10 @@ BUILDIN(getmercinfo)
 			else
 				script_pushconststr(st,"");
 			break;
-		case 3: script_pushint(st,md ? mercenary_get_faith(md) : 0); break;
-		case 4: script_pushint(st,md ? mercenary_get_calls(md) : 0); break;
+		case 3: script_pushint(st,md ? mercenary->get_faith(md) : 0); break;
+		case 4: script_pushint(st,md ? mercenary->get_calls(md) : 0); break;
 		case 5: script_pushint(st,md ? md->mercenary.kill_count : 0); break;
-		case 6: script_pushint(st,md ? mercenary_get_lifetime(md) : 0); break;
+		case 6: script_pushint(st,md ? mercenary->get_lifetime(md) : 0); break;
 		case 7: script_pushint(st,md ? md->db->lv : 0); break;
 		default:
 			ShowError("buildin_getmercinfo: Invalid type %d (char_id=%d).\n", type, sd->status.char_id);
@@ -15396,11 +15396,11 @@ BUILDIN(mercenary_create)
 	
 	class_ = script_getnum(st,2);
 	
-	if( !merc_class(class_) )
+	if( !mercenary->merc_class(class_) )
 		return true;
 	
 	contract_time = script_getnum(st,3);
-	merc_create(sd, class_, contract_time);
+	mercenary->merc_create(sd, class_, contract_time);
 	return true;
 }
 
@@ -15551,7 +15551,7 @@ BUILDIN(mercenary_set_faith)
 	
 	*calls += value;
 	*calls = cap_value(*calls, 0, INT_MAX);
-	if( mercenary_get_guild(sd->md) == guild )
+	if( mercenary->get_guild(sd->md) == guild )
 		clif->mercenary_updatestatus(sd,SP_MERCFAITH);
 	
 	return true;