diff options
author | shennetsind <ind@henn.et> | 2013-06-27 18:58:21 -0300 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-06-27 18:58:21 -0300 |
commit | bd509c99b5015b3590d25598ae1ddabcb3c01434 (patch) | |
tree | 3b5d9e1b0680cefd92f98ab9e96f6c49ea9700c7 | |
parent | 0ef72c659c3e7b706f39eac36ce9d61bd0b37ee7 (diff) | |
download | hercules-bd509c99b5015b3590d25598ae1ddabcb3c01434.tar.gz hercules-bd509c99b5015b3590d25598ae1ddabcb3c01434.tar.bz2 hercules-bd509c99b5015b3590d25598ae1ddabcb3c01434.tar.xz hercules-bd509c99b5015b3590d25598ae1ddabcb3c01434.zip |
Fixed Bug #7433
http://hercules.ws/board/tracker/issue-7433-mount-and-mount2-command-bug/
Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r-- | conf/messages.conf | 2 | ||||
-rw-r--r-- | src/map/atcommand.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/conf/messages.conf b/conf/messages.conf index d9472952d..21e24e91a 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1505,5 +1505,7 @@ //src/map/pc.c::pc_isUseitem 1474: You cannot use this item while sitting +1476: You are already mounting something else + //Custom translations import: conf/import/msg_conf.txt diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 7b0d45199..b778aab6c 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4023,6 +4023,11 @@ ACMD(mount_peco) return false; } + if( sd->sc.data[SC_ALL_RIDING] ) { + clif->message(fd, msg_txt(1476)); // You are already mounting something else + return false; + } + if( (sd->class_&MAPID_THIRDMASK) == MAPID_RUNE_KNIGHT && pc->checkskill(sd,RK_DRAGONTRAINING) > 0 ) { if( !(sd->sc.option&OPTION_DRAGON1) ) { clif->message(sd->fd,msg_txt(1119)); // You have mounted your Dragon. @@ -8473,6 +8478,11 @@ ACMD(charcommands) /* for new mounts */ ACMD(mount2) { + if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ) { + clif->message(fd, msg_txt(1476)); // You are already mounting something else + return false; + } + clif->message(sd->fd,msg_txt(1362)); // NOTICE: If you crash with mount your LUA is outdated. if( !(sd->sc.data[SC_ALL_RIDING]) ) { clif->message(sd->fd,msg_txt(1363)); // You have mounted. |