diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-02 18:56:16 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-02 18:56:16 +0000 |
commit | 6a60859867c8033d17fb19276d7aed282e6227f5 (patch) | |
tree | 407efed7224757dd1ace81e17a970bee0de4f019 /src/map/clif.c | |
parent | dde9e3d7efb425245c55811525f4876f2061a1e0 (diff) | |
download | hercules-6a60859867c8033d17fb19276d7aed282e6227f5.tar.gz hercules-6a60859867c8033d17fb19276d7aed282e6227f5.tar.bz2 hercules-6a60859867c8033d17fb19276d7aed282e6227f5.tar.xz hercules-6a60859867c8033d17fb19276d7aed282e6227f5.zip |
- Added mosk_que to the mapcache (follow up to r13903).
- Fixed some input checks and variable types in Megingjard quest.
- Updated SQL item/mob databases to latest.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13926 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r-- | src/map/clif.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 16cf4720c..6809ba2e9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8415,28 +8415,27 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd) { switch (sd->state.snovice_call_flag) { case 0: - if( strstr(message, msg_txt(504)) ) // "Guardian Angel, can you hear my voice? ^^;" - sd->state.snovice_call_flag++; - break; - case 1: { - char buf[256]; - sprintf(buf, msg_txt(505), sd->status.name); - if( strstr(message, buf) ) // "My name is %s, and I'm a Super Novice~" - sd->state.snovice_call_flag++; - } - break; + if( strstr(message, msg_txt(504)) ) // "Guardian Angel, can you hear my voice? ^^;" + sd->state.snovice_call_flag++; + break; + case 1: + char buf[256]; + sprintf(buf, msg_txt(505), sd->status.name); + if( strstr(message, buf) ) // "My name is %s, and I'm a Super Novice~" + sd->state.snovice_call_flag++; + break; case 2: - if( strstr(message, msg_txt(506)) ) // "Please help me~ T.T" - sd->state.snovice_call_flag++; - break; + if( strstr(message, msg_txt(506)) ) // "Please help me~ T.T" + sd->state.snovice_call_flag++; + break; case 3: - if( skillnotok(MO_EXPLOSIONSPIRITS,sd) ) - break; //Do not override the noskill mapflag. [Skotlex] - clif_skill_nodamage(&sd->bl,&sd->bl,MO_EXPLOSIONSPIRITS,-1, - sc_start(&sd->bl,status_skill2sc(MO_EXPLOSIONSPIRITS),100, - 17,skill_get_time(MO_EXPLOSIONSPIRITS,1))); //Lv17-> +50 critical (noted by Poki) [Skotlex] - sd->state.snovice_call_flag = 0; - break; + if( skillnotok(MO_EXPLOSIONSPIRITS,sd) ) + break; //Do not override the noskill mapflag. [Skotlex] + clif_skill_nodamage(&sd->bl,&sd->bl,MO_EXPLOSIONSPIRITS,-1, + sc_start(&sd->bl,status_skill2sc(MO_EXPLOSIONSPIRITS),100, + 17,skill_get_time(MO_EXPLOSIONSPIRITS,1))); //Lv17-> +50 critical (noted by Poki) [Skotlex] + sd->state.snovice_call_flag = 0; + break; } } } |