From c61ca3727be3a366a593248a862f37063937fda2 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 23 Oct 2006 13:57:54 +0000
Subject: - Removed NJ_TOBIDOUGU adding damage to W_HUUMA weapons which somehow
 got readded. - When nonplayers use Cloaking, it will be forced to level 10
 since mobs shouldn't have movement/attack restrictions while walking cloaked.
 - Should fix a warning in int_homun.c

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9043 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/battle.c | 4 ----
 src/map/mob.c    | 3 ++-
 src/map/script.c | 4 ++--
 src/map/status.c | 2 ++
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/map')

diff --git a/src/map/battle.c b/src/map/battle.c
index 95a4ac49f..0469fea0f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -649,10 +649,6 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
 			if((skill = pc_checkskill(sd,AS_KATAR)) > 0)
 				damage += (skill * 3);
 			break;
-		case W_HUUMA:
-			if((skill = pc_checkskill(sd,NJ_TOBIDOUGU)) >0)
-				damage += (skill * 3);
-			break;
 	}
 
 	return damage;
diff --git a/src/map/mob.c b/src/map/mob.c
index e8d2a5b81..6f73433c7 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2132,7 +2132,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 
 	if(md->nd)
 		mob_script_callback(md, src, CALLBACK_DEAD);
-	else if(md->npc_event[0]){
+	else
+	if(md->npc_event[0]){
 		md->status.hp = 0; //So that npc_event invoked functions KNOW that I am dead.
 		if(src) 
 		switch (src->type) {
diff --git a/src/map/script.c b/src/map/script.c
index eef5cac23..50c665086 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4574,7 +4574,8 @@ int buildin_jobchange(struct script_state *st)
 	if( st->end>st->start+3 )
 		upper=conv_num(st,& (st->stack->stack_data[st->start+3]));
 
-	if ((job >= 0 && job < MAX_PC_CLASS)){
+	if ((job >= 0 && job < MAX_PC_CLASS))
+	{
 		pc_jobchange(script_rid2sd(st),job, upper);
 		if(use_irc && irc_announce_jobchange_flag)
 			irc_announce_jobchange(script_rid2sd(st));
@@ -7140,7 +7141,6 @@ int buildin_initnpctimer(struct script_state *st)
 	else
 		nd=(struct npc_data *)map_id2bl(st->oid);
 
-	//nd->u.scr.rid = st->rid; //NO, use npcattachtimer if you want a player-attached timer! [Skotlex]
 	npc_settimerevent_tick(nd,0);
 	npc_timerevent_start(nd, st->rid);
 	return 0;
diff --git a/src/map/status.c b/src/map/status.c
index 97c3cc6e3..bc30ada23 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5043,6 +5043,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			if (map_flag_gvg(bl->m)) val4 *= 5;
 			break;
 		case SC_CLOAKING:
+			if (!sd) //Monsters should be able to walk no penalties. [Skotlex]
+				val1 = 10;
 			val2 = tick>0?tick:60000; //SP consumption rate.
 			val3 = 0;
 			if (sd && (sd->class_&MAPID_UPPERMASK) == MAPID_ASSASSIN &&
-- 
cgit v1.2.3-70-g09d2