diff options
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/src/map/script.c b/src/map/script.c index cfc7ed052..401b0308a 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -1,7 +1,23 @@ -// Copyright (c) Hercules Dev Team, licensed under GNU GPL. -// See the LICENSE file -// Portions Copyright (c) Athena Dev Teams - +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) Athena Dev Teams + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ #define HERCULES_CORE #include "config/core.h" // RENEWAL, RENEWAL_ASPD, RENEWAL_CAST, RENEWAL_DROP, RENEWAL_EDP, RENEWAL_EXP, RENEWAL_LVDMG, SCRIPT_CALLFUNC_CHECK, SECURE_NPCTIMEOUT, SECURE_NPCTIMEOUT_INTERVAL @@ -11747,9 +11763,9 @@ BUILDIN(setmapflag) { case MF_NOWARPTO: map->list[m].flag.nowarpto = 1; break; case MF_NIGHTMAREDROP: map->list[m].flag.pvp_nightmaredrop = 1; break; case MF_ZONE: - if( val2 ) { - char zone[6] = "zone\0"; - char empty[1] = "\0"; + if (val2 != NULL) { + const char *zone = "zone"; + const char *empty = ""; char params[MAP_ZONE_MAPFLAG_LENGTH]; memcpy(params, val2, MAP_ZONE_MAPFLAG_LENGTH); npc->parse_mapflag(map->list[m].name, empty, zone, params, empty, empty, empty, NULL); @@ -14620,8 +14636,19 @@ BUILDIN(setbattleflag) BUILDIN(getbattleflag) { const char *flag; + int value; + flag = script_getstr(st,2); - script_pushint(st,battle->config_get_value(flag)); + + if (battle->config_get_value(flag, &value)) { + script_pushint(st,value); + return true; + } else { + script_pushint(st,0); + ShowWarning("buildin_getbattleflag: non-exist battle config requested %s \n", flag); + return false; + } + return true; } |