- Now gvg_dungeon mapflag will activate the other mapflags which are required: pvp, pvp_nocalcrank and pvp_noparty/pvp_noguild (they are forced to off if gvg_dungeon is on and viceversa)

- Cleaned the pvp ranking code so that it takes effect even if pvp_nocalcrank is active WHEN the map is a gvg_dungeon one.
- Cleaned up a bit the pvp ranking timer code.
- Now homuncs and their masters are the only ones who can use support skills on the homunc.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9360 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 2 deletions

diff --git a/src/map/status.c b/src/map/status.c
index 3b36944c1..6c97a70b3 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1102,10 +1102,11 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
 			return 1;

 		return 0;

 	case BL_HOM: 

-		//Can't use support skills on homun

+		//Can't use support skills on homun (only master/self can)

 		//Placed here instead of battle_check_target because support skill

 		//invocations don't call that function.

-		if (skill_num && skill_get_inf(skill_num)&INF_SUPPORT_SKILL)

+		if (skill_num && skill_get_inf(skill_num)&INF_SUPPORT_SKILL &&

+			battle_get_master(target) != src)

 			return 0;

 	default:

 		//Check for chase-walk/hiding/cloaking opponents.