From 27f31dae1ad1c79ba083a4393c38c68daf474827 Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 26 May 2006 10:18:06 +0000
Subject: git-svn-id:
 https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6773
 54d463be-8e91-2dee-dedb-b68131a5f0ec

---
 src/map/battle.c |  3 +++
 src/map/script.c | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/map/battle.c b/src/map/battle.c
index bde86cbe5..8e5bba3ff 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3353,6 +3353,9 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 		case BL_MOB:
 		{
 			TBL_MOB *md = (TBL_MOB*)t_bl;
+			if(md->state.killer)
+				if(md->master_id != s_bl->id)
+					state |= BCT_ENEMY; // If he can attack you, you can attack him.
 			if (!agit_flag && md->guardian_data && md->guardian_data->guild_id)
 				return 0; //Disable guardians/emperiums owned by Guilds on non-woe times.
 			if (md->special_state.ai == 2)
diff --git a/src/map/script.c b/src/map/script.c
index 5cd2819d2..d4f607765 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -760,17 +760,17 @@ struct {
 	// <--- [zBuffer] List of player cont commands
 	// [zBuffer] List of mob control commands --->
 	{buildin_spawnmob,"spawnmob","*"},
-	{buildin_removemob,"removemob","*"},
-	{buildin_mobwalk,"mobwalk","*"},
-	{buildin_mobrandomwalk,"mobrandomwalk","*"},
-	{buildin_getmobdata,"getmobdata","*"},
-	{buildin_setmobdata,"setmobdata","*"},
-	{buildin_mobattack,"mobattack","*"},
-	{buildin_mobstop,"mobstop","*"},
-	{buildin_mobassist,"mobassist","*"},
-	{buildin_mobtalk,"mobtalk","*"},
-	{buildin_mobemote,"mobemote","*"},
-	{buildin_mobattach,"mobattach","*"},
+	{buildin_removemob,"removemob","i"},
+	{buildin_mobwalk,"mobwalk","i*"},
+	{buildin_mobrandomwalk,"mobrandomwalk","ii"},
+	{buildin_getmobdata,"getmobdata","i*"},
+	{buildin_setmobdata,"setmobdata","iii"},
+	{buildin_mobattack,"mobattack","i*"},
+	{buildin_mobstop,"mobstop","i"},
+	{buildin_mobassist,"mobassist","i*"},
+	{buildin_mobtalk,"mobtalk","is"},
+	{buildin_mobemote,"mobemote","ii"},
+	{buildin_mobattach,"mobattach","i*"},
 // <--- [zBuffer] List of mob control commands
 {buildin_sleep,"sleep","i"},
 	{buildin_sleep2,"sleep2","i"},
@@ -10630,7 +10630,7 @@ int buildin_setmobdata(struct script_state *st){
 				md->state.killer = value2>0?1:0;
 				break;
 			default:
-				ShowError("buildin_setmobdata: argument id is not identified.");
+				ShowError("buildin_setmobdata: argument value2 is not identified.");
 				break;
 		}
 	}
-- 
cgit v1.2.3-70-g09d2