summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-11-14 00:32:41 +0000
committerJesusaves <cpntb1@ymail.com>2020-11-14 00:32:41 +0000
commit3db95edc1d79e290c3d18ec6f2f6af9b42b89396 (patch)
tree87ee5a886b48f17fb25a130c70ac76a524f94274
parent5838c6001f2bf57c9cbe5753d3a667ac5a8ab984 (diff)
parentc518cb081bd4fc31dd217481c589ea8baf846375 (diff)
downloadserverdata-3db95edc1d79e290c3d18ec6f2f6af9b42b89396.tar.gz
serverdata-3db95edc1d79e290c3d18ec6f2f6af9b42b89396.tar.bz2
serverdata-3db95edc1d79e290c3d18ec6f2f6af9b42b89396.tar.xz
serverdata-3db95edc1d79e290c3d18ec6f2f6af9b42b89396.zip
Merge branch 'livio/20201112_musicfix' into 'master'
Music commands: introduced error/success messages See merge request evol/serverdata!281
-rw-r--r--npc/commands/music.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/npc/commands/music.txt b/npc/commands/music.txt
index d2578d1a..4803e7eb 100644
--- a/npc/commands/music.txt
+++ b/npc/commands/music.txt
@@ -29,9 +29,11 @@ OnCall:
if (.@m$ == "Not found")
{
.@m$ = implode(.@atcmd_parameters$[0], " ");
+ message(getcharid(CHAR_ID_ACCOUNT), sprintf("Can't broadcast: %s", .@m$));
+ } else {
+ message(getcharid(CHAR_ID_ACCOUNT), sprintf("Now broadcasting: %s", .@m$));
+ changemusic .@map$, .@m$ + ".ogg";
}
-
- changemusic .@map$, .@m$ + ".ogg";
end;
OnMyself:
@@ -41,9 +43,11 @@ OnMyself:
if (.@m$ == "Not found")
{
.@m$ = implode(.@atcmd_parameters$[0], " ");
+ message(getcharid(CHAR_ID_ACCOUNT), sprintf("Can't play: %s", .@m$));
+ } else {
+ message(getcharid(CHAR_ID_ACCOUNT), sprintf("Now playing: %s", .@m$));
+ changeplayermusic .@m$ + ".ogg";
}
-
- changeplayermusic .@m$ + ".ogg";
end;
OnInit: