diff options
author | Haru <haru@dotalux.com> | 2018-06-25 20:40:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-25 20:40:00 +0200 |
commit | 9694bd186896b75ba74f86e6d6c169d0ee97062c (patch) | |
tree | a13ac81dc8dbd00428aadb791440fb2316f95f0a | |
parent | 9b0ab441ebc1a69df627c4b665f02ab28d995020 (diff) | |
parent | a69f1ef5d09b66abdc8e9fe20c197414175b6b27 (diff) | |
download | hercules-9694bd186896b75ba74f86e6d6c169d0ee97062c.tar.gz hercules-9694bd186896b75ba74f86e6d6c169d0ee97062c.tar.bz2 hercules-9694bd186896b75ba74f86e6d6c169d0ee97062c.tar.xz hercules-9694bd186896b75ba74f86e6d6c169d0ee97062c.zip |
Merge pull request #2075 from guilherme-gm/rodex-script
Fixed rodex_sendmail_acc script command and rodex examples
-rw-r--r-- | doc/sample/npc_rodex.txt | 4 | ||||
-rw-r--r-- | src/map/script.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/sample/npc_rodex.txt b/doc/sample/npc_rodex.txt index a808a1aa9..0975e609c 100644 --- a/doc/sample/npc_rodex.txt +++ b/doc/sample/npc_rodex.txt @@ -20,12 +20,12 @@ prontera,150,150,4 script Rodex Mail 1_M_01,{ // Sends a messsage to attached player "Account Box" from "Rodex Test", with title "Rodex Test3", // with message "Hello World, How are You?", 1000 Zenies and 5 Red Potions attached rodex_sendmail_acc( - getcharid(CHAR_ID_CHAR), "Rodex Test", "Rodex Test3", "Hello World, How are You?", + getcharid(CHAR_ID_ACCOUNT), "Rodex Test", "Rodex Test3", "Hello World, How are You?", 1000, Red_Potion, 5 ); - // Sends a messsage to attached player "Account Box" from "Rodex Test", with title "Rodex Test6", + // Sends a messsage to attached player from "Rodex Test", with title "Rodex Test6", // with message "Hello World, How are You?", 1000 Zenies, 5 Red Potions and // 1 +10 Knife[3] with 3 Poring Cards (Broken) rodex_sendmail2( diff --git a/src/map/script.c b/src/map/script.c index 39552a441..8a3744f27 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -23882,7 +23882,7 @@ bool rodex_sendmail_sub(struct script_state* st, struct rodex_message *msg) { const char *sender_name, *title, *body; - if (!strcmp(script->getfuncname(st), "rodex_sendmail_acc2")) + if (strcmp(script->getfuncname(st), "rodex_sendmail_acc") == 0 || strcmp(script->getfuncname(st), "rodex_sendmail_acc2") == 0) msg->receiver_accountid = script_getnum(st, 2); else msg->receiver_id = script_getnum(st, 2); |