Merge branch 'jesusalva/music' into 'master'

changeplayermusic() script function

See merge request evol/evol-hercules!29

5 files changed, 45 insertions, 0 deletions

diff --git a/src/emap/init.c b/src/emap/init.c
index f2e781a..5069ffe 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -169,6 +169,7 @@ HPExport void plugin_init (void)
     addScriptCommand("setavataraction", "i", setAvatarAction);
     addScriptCommand("clear", "", clear);
     addScriptCommand("changemusic", "ss", changeMusic);
+    addScriptCommand("changeplayermusic", "s", changePlayerMusic);
     addScriptCommand("setnpcdialogtitle", "s", setNpcDialogTitle);
     addScriptCommand("getmapname", "", getMapName);
     addScriptCommand("unequipbyid", "i", unequipById);
diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c
index 85e81b2..263e3a6 100644
--- a/src/emap/script_buildins.c
+++ b/src/emap/script_buildins.c
@@ -921,6 +921,30 @@ BUILDIN(changeMusic)
     return true;
 }
 
+// changePlayerMusic(music)
+BUILDIN(changePlayerMusic)
+{
+    const char *const music = script_getstr(st, 2);
+    if (!music)
+    {
+        ShowWarning("invalid music file\n");
+        script->reportsrc(st);
+        return false;
+    }
+
+    struct map_session_data *sd = NULL;
+    sd = script->rid2sd(st);
+    if (sd == NULL)
+    {
+        ShowWarning("player not attached\n");
+        script->reportsrc(st);
+        return false;
+    }
+
+    send_changemusic(sd->fd, music);
+    return true;
+}
+
 BUILDIN(setNpcDialogTitle)
 {
     const char *const name = script_getstr(st, 2);
diff --git a/src/emap/script_buildins.h b/src/emap/script_buildins.h
index bcffa7a..ea77fdb 100644
--- a/src/emap/script_buildins.h
+++ b/src/emap/script_buildins.h
@@ -39,6 +39,7 @@ BUILDIN(setAvatarDir);
 BUILDIN(setAvatarAction);
 BUILDIN(clear);
 BUILDIN(changeMusic);
+BUILDIN(changePlayerMusic);
 BUILDIN(setNpcDialogTitle);
 BUILDIN(getMapName);
 BUILDIN(unequipById);
diff --git a/src/emap/send.c b/src/emap/send.c
index 08c57b0..7938048 100644
--- a/src/emap/send.c
+++ b/src/emap/send.c
@@ -298,6 +298,24 @@ void send_advmoving(struct unit_data* ud, bool moving, struct block_list *tbl, e
     aFree(buf);
 }
 
+void send_changemusic(int fd, const char *music)
+{
+    if (!music)
+        return;
+
+    const int sz = (int)strlen(music) + 5;
+    char *buf;
+
+    CREATE(buf, char, sz);
+    WBUFW (buf, 0) = 0xb05 + evolPacketOffset;
+    WBUFW (buf, 2) = sz;
+    strcpy (WBUFP (buf, 4), music);
+	WFIFOHEAD(fd,sz);
+	memcpy(WFIFOP(fd,0), buf, sz);
+	WFIFOSET(fd,sz);
+    aFree(buf);
+}
+
 void send_changemusic_brodcast(const int map, const char *music)
 {
     if (!music)
diff --git a/src/emap/send.h b/src/emap/send.h
index b89f1fc..880cdb7 100644
--- a/src/emap/send.h
+++ b/src/emap/send.h
@@ -22,6 +22,7 @@ void send_mapmask(int fd, int mask);
 void send_mapmask_brodcast(const int map, const int mask);
 void send_mob_info(struct block_list* bl1, struct block_list* bl2, enum send_target target);
 void send_advmoving(struct unit_data* ud, bool moving, struct block_list *tbl, enum send_target target);
+void send_changemusic(int fd, const char *music);
 void send_changemusic_brodcast(const int map, const char *music);
 void send_changenpc_title (struct map_session_data *sd, const int npcId, const char *name);
 void send_join_ack(int fd, const char *const name, int flag);