From 758e7e6a9a995ea27f0ec5461a588c2278f45ec4 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 24 Aug 2007 01:15:56 +0000
Subject: - Fixed the hotkey list sending to the client not displaying right
 away. - Corrected the unit_id of NPC_EVILLAND (taken from jA)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11071 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/clif.c  | 2 +-
 src/map/skill.c | 5 ++---
 src/map/skill.h | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/map/clif.c b/src/map/clif.c
index cede06761..9a3e5e7d9 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8046,11 +8046,11 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 		int lv;
 		sd->state.connect_new = 0;
 		clif_skillinfoblock(sd);
+		clif_hotkeys_send(sd);
 		clif_updatestatus(sd,SP_NEXTBASEEXP);
 		clif_updatestatus(sd,SP_NEXTJOBEXP);
 		clif_updatestatus(sd,SP_SKILLPOINT);
 		clif_initialstatus(sd);
-		clif_hotkeys_send(sd);
 
 		if (sd->sc.option&OPTION_FALCON)
 			clif_status_load(&sd->bl, SI_FALCON, 1);
diff --git a/src/map/skill.c b/src/map/skill.c
index 5f6c249ce..f35de5edd 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7262,7 +7262,6 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 			}
 
 		case UNT_SANCTUARY:
-		if (sg->skill_id == PR_SANCTUARY) {
 			if (battle_check_undead(tstatus->race, tstatus->def_ele) || tstatus->race==RC_DEMON)
 			{	//Only damage enemies with offensive Sanctuary. [Skotlex]
 				if(battle_check_target(&src->bl,bl,BCT_ENEMY)>0 &&
@@ -7285,8 +7284,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 			if (sg->val1 <= 0)
 				skill_delunitgroup(NULL,sg, 0);
 			break;
-		}
-			//Evil Land
+
+		case UNT_EVILLAND:
 			if (!battle_check_undead(tstatus->race, tstatus->def_ele) && tstatus->race!=RC_DEMON)
 			{	//Damage enemies
 				if(battle_check_target(&src->bl,bl,BCT_ENEMY)>0)
diff --git a/src/map/skill.h b/src/map/skill.h
index 68b5872f6..c67d65588 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -989,6 +989,11 @@ enum {
 	UNT_GROUNDDRIFT_POISON,
 	UNT_GROUNDDRIFT_WATER,
 	UNT_GROUNDDRIFT_FIRE,
+	//0xc3 ?
+	//0xc4 ?
+	//0xc5 ?
+	//0xc6 ?
+	UNT_EVILLAND = 0xc7,
 };
 
 #endif /* _SKILL_H_ */
-- 
cgit v1.2.3-70-g09d2