diff options
| author | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-23 18:32:43 +0000 |
|---|---|---|
| committer | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-23 18:32:43 +0000 |
| commit | 0c2aa46ad3af72ade35d6389a5227f7b8bc0c3c0 (patch) | |
| tree | 5c9aead5af5ef4f0dca17dc99c3b51ab863ca45a /src/map/clif.c | |
| parent | c2e7fc730554fc9dcd572969a4c1d0e0910ac846 (diff) | |
| download | hercules-0c2aa46ad3af72ade35d6389a5227f7b8bc0c3c0.tar.gz hercules-0c2aa46ad3af72ade35d6389a5227f7b8bc0c3c0.tar.bz2 hercules-0c2aa46ad3af72ade35d6389a5227f7b8bc0c3c0.tar.xz hercules-0c2aa46ad3af72ade35d6389a5227f7b8bc0c3c0.zip | |
* Consolidated is_atcommand() and is_atcommand_sub()
- replaced gmlvl arg with a flag arg for internal/player generated checks. (dummy sds that used this arg are given gm levels)
- each command check runs through is_atcommand() and is checked for its origin (internal or player generated)
- charcommands are also parsed in this function.
- script atcommand/charcommand function calls to is_atcommand() have been updated
- also updated some clif/map functions calls to is_atcommand()
* charcommands should now log properly with the target of the command included.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13545 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 2759f29ea..94f0dceef 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8217,7 +8217,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd) if( !clif_process_message(sd, 0, &name, &namelen, &message, &messagelen) ) return; - if( is_atcommand(fd, sd, message) ) + if( is_atcommand(fd, sd, message, 1) ) return; if( sd->sc.data[SC_BERSERK] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT) ) @@ -8528,7 +8528,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) if( !clif_process_message(sd, 1, &target, &namelen, &message, &messagelen) ) return; - if (is_atcommand(fd, sd, message) ) + if (is_atcommand(fd, sd, message, 1) ) return; if (sd->sc.data[SC_BERSERK] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT)) @@ -10055,7 +10055,7 @@ void clif_parse_PartyMessage(int fd, struct map_session_data* sd) if( !clif_process_message(sd, 0, &name, &namelen, &message, &messagelen) ) return; - if( is_atcommand(fd, sd, message) ) + if( is_atcommand(fd, sd, message, 1) ) return; if( sd->sc.data[SC_BERSERK] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT) ) @@ -10333,7 +10333,7 @@ void clif_parse_GuildMessage(int fd, struct map_session_data* sd) if( !clif_process_message(sd, 0, &name, &namelen, &message, &messagelen) ) return; - if( is_atcommand(fd, sd, message) ) + if( is_atcommand(fd, sd, message, 1) ) return; if( sd->sc.data[SC_BERSERK] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT) ) @@ -10548,7 +10548,7 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd) *------------------------------------------*/ void clif_parse_GMKickAll(int fd, struct map_session_data* sd) { - is_atcommand(fd, sd, "@kickall"); + is_atcommand(fd, sd, "@kickall", 1); } /*========================================== |