Changes demanded by testing

4 files changed, 3 insertions, 50 deletions

diff --git a/src/emap/init.c b/src/emap/init.c
index eafb828..17d2d56 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -222,9 +222,6 @@ HPExport void plugin_init (void)
     addScriptCommand("getnpcsubtype", "?", getNpcSubtype);
     addScriptCommand("kick", "v?", kick);
     addScriptCommand("getskillname", "i", getskillname);
-
-    // From Moubootaur Legends
-    addScriptCommand("aggravate", "i", aggravate);
     addScriptCommand("harm", "ii??", harm);
 
     // Overrides
diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c
index 4053158..7cea6c3 100644
--- a/src/emap/script_buildins.c
+++ b/src/emap/script_buildins.c
@@ -2707,47 +2707,6 @@ BUILDIN(debugmes)
 	return true;
 }
 
-// Advanced monster data overrider
-// aggravate(guid)
-BUILDIN(aggravate)
-{
-	struct block_list *bl;
-	struct map_session_data *sd = NULL;
-
-	bl = map->id2bl(script_getnum(st, 2));
-
-    // We only work with mobs
-	if (bl == NULL) {
-		ShowWarning("buildin_aggravate: Error in finding object with given GID %d!\n", script_getnum(st, 2));
-		script_pushint(st, -1);
-		return false;
-	}
-
-	if (bl->type != BL_MOB) {
-		ShowWarning("buildin_aggravate: GID %d is not a monster!\n", script_getnum(st, 2));
-		script_pushint(st, -1);
-		return false;
-	}
-
-    // Player must be attached
-	sd = script->rid2sd(st);
-	if (sd == NULL) {
-		ShowWarning("buildin_aggravate: Ran without player attached!");
-		return true;
-    }
-
-    // Create monster structure
-	struct mob_data *md = BL_UCAST(BL_MOB, bl);
-
-    // Override the provoke flag
-    md->state.provoke_flag = sd->status.account_id;
-    // We could use mob->target()
-    // But I want aggravate to apply without any checks
-    // Skipping chase checks
-    md->target_id = sd->status.account_id;
-    return true;
-}
-
 
 // Like heal() but works against anything (casts battle funcs)
 // types: 1- physical; 2- magic.
diff --git a/src/emap/script_buildins.h b/src/emap/script_buildins.h
index 13d818a..c4c587f 100644
--- a/src/emap/script_buildins.h
+++ b/src/emap/script_buildins.h
@@ -107,9 +107,6 @@ BUILDIN(getNpcSubtype);
 BUILDIN(kick);
 BUILDIN(getCraftRecipe);
 BUILDIN(getskillname);
-
-// Imported from Moubootaur Legends
-BUILDIN(aggravate);
 BUILDIN(harm);
 
 // Overrides
diff --git a/src/emap/skill.c b/src/emap/skill.c
index 77cff19..30aa9c7 100644
--- a/src/emap/skill.c
+++ b/src/emap/skill.c
@@ -43,9 +43,9 @@ int eskill_get_index_post(int retVal,
 }
 
 int eskill_check_condition_castend_post(int retVal,
-                                        TBL_PC* sd,
-                                        uint16 skill_id,
-                                        uint16 skill_lv)
+                                        TBL_PC* sd __attribute__ ((unused)),
+                                        uint16 skill_id __attribute__ ((unused)),
+                                        uint16 skill_lv __attribute__ ((unused)))
 {
     return retVal;
 }