Override built-in atcommand() to ensure it'll survive upstream changes.

3 files changed, 40 insertions, 0 deletions

diff --git a/src/emap/init.c b/src/emap/init.c
index 95f9e19..6a34ee6 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -241,6 +241,7 @@ HPExport void plugin_init (void)
     // Overrides
     addScriptCommand("debugmes","v*",debugmes);
     addScriptCommand("countitem","v?",countitem);
+    addScriptCommand("atcommand","s",atcommand);
 
     do_init_langs();
 
diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c
index f021658..cacc0d8 100644
--- a/src/emap/script_buildins.c
+++ b/src/emap/script_buildins.c
@@ -2939,6 +2939,44 @@ BUILDIN(debugmes)
 }
 
 /*==========================================
+ * gmcommand [MouseJstr]
+ *------------------------------------------*/
+BUILDIN(atcommand)
+{
+	struct map_session_data *sd, *dummy_sd = NULL;
+	int fd;
+	const char* cmd;
+	bool ret = true;
+
+	cmd = script_getstr(st,2);
+
+	if (st->rid) {
+		sd = script->rid2sd(st);
+		if (sd == NULL)
+			return true;
+		fd = sd->fd;
+	} else { //Use a dummy character.
+		sd = dummy_sd = pc->get_dummy_sd();
+		fd = 0;
+
+		if (st->oid) {
+			struct block_list* bl = map->id2bl(st->oid);
+			memcpy(&sd->bl, bl, sizeof(struct block_list));
+			if (bl->type == BL_NPC)
+				safestrncpy(sd->status.name, BL_UCAST(BL_NPC, bl)->name, NAME_LENGTH);
+		}
+	}
+
+	if (!atcommand->exec(fd, sd, cmd, false)) {
+		ShowWarning("script: buildin_atcommand: failed to execute command '%s'\n", cmd);
+		script->reportsrc(st);
+		ret = false;
+	}
+	if (dummy_sd) aFree(dummy_sd);
+	return ret;
+}
+
+/*==========================================
  *
  *------------------------------------------*/
 BUILDIN(countitem)
diff --git a/src/emap/script_buildins.h b/src/emap/script_buildins.h
index 73769b9..685dabd 100644
--- a/src/emap/script_buildins.h
+++ b/src/emap/script_buildins.h
@@ -125,5 +125,6 @@ BUILDIN(resetrng);
 // Overrides
 BUILDIN(countitem);
 BUILDIN(debugmes);
+BUILDIN(atcommand);
 
 #endif  // EVOL_MAP_SCRIPT_BUILDINS