diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-25 06:04:18 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-25 06:04:18 +0000 |
| commit | 86dd5f28d4100ba6d0ddbd6f6c4f20579e0578d8 (patch) | |
| tree | 99edbf0cc443a59c807058ccdb26cb176eb5c4ba /src/map | |
| parent | 22c17ec129a57ecd08ca69805d718bb3dce07c94 (diff) | |
| download | hercules-86dd5f28d4100ba6d0ddbd6f6c4f20579e0578d8.tar.gz hercules-86dd5f28d4100ba6d0ddbd6f6c4f20579e0578d8.tar.bz2 hercules-86dd5f28d4100ba6d0ddbd6f6c4f20579e0578d8.tar.xz hercules-86dd5f28d4100ba6d0ddbd6f6c4f20579e0578d8.zip | |
- Bugreport #2800 ( Atcommands usables without restriction :S )
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13547 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 3 | ||||
| -rw-r--r-- | src/map/script.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 7836cefcb..f6928dcc0 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9028,8 +9028,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message //Grab the command information and check for the proper GM level required to use it or if the command exists info = get_atcommandinfo_byname(command); - if( info == NULL || info->func == NULL || ( *atcmd_msg == atcommand_symbol && ((info) ? 99:pc_isGM(sd)) < info->level ) - || ( *atcmd_msg == charcommand_symbol && ((info) ? 99:pc_isGM(sd)) < info->level2 ) ) + if( info == NULL || info->func == NULL || ( type && ((*atcmd_msg == atcommand_symbol && pc_isGM(sd) < info->level) || (*atcmd_msg == charcommand_symbol && pc_isGM(sd) < info->level2)) ) ) { sprintf(output, msg_txt(153), command); // "%s is Unknown Command." clif_displaymessage(fd, output); diff --git a/src/map/script.c b/src/map/script.c index 178bbdf4b..05779ed9e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10734,7 +10734,6 @@ BUILDIN_FUNC(atcommand) } is_atcommand(fd, sd, cmd, 0); - return 0; } @@ -10770,8 +10769,7 @@ BUILDIN_FUNC(charcommand) return 1; } - is_atcommand(0, sd, cmd, 0); - + is_atcommand(fd, sd, cmd, 0); return 0; } |