diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-01-22 22:30:37 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-01-22 22:30:37 -0300 |
| commit | faa48875eae1c360fd00a187787bb07ccbe400f4 (patch) | |
| tree | 7ed99ffb8589102d351de055065a84965031d6c2 | |
| parent | d3b3c110080e893547d70d957b008ed3e26230c2 (diff) | |
| parent | 63068d47650898f292aea877ce797e11c3f3404f (diff) | |
| download | evol-hercules-faa48875eae1c360fd00a187787bb07ccbe400f4.tar.gz evol-hercules-faa48875eae1c360fd00a187787bb07ccbe400f4.tar.bz2 evol-hercules-faa48875eae1c360fd00a187787bb07ccbe400f4.tar.xz evol-hercules-faa48875eae1c360fd00a187787bb07ccbe400f4.zip | |
Merge branch 'master' into tmw2
Rewrite readbattleparam() to rEvolt syntax
| -rw-r--r-- | src/emap/init.c | 2 | ||||
| -rw-r--r-- | src/emap/script_buildins.c | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/emap/init.c b/src/emap/init.c index 8838aab..b469281 100644 --- a/src/emap/init.c +++ b/src/emap/init.c @@ -213,7 +213,7 @@ HPExport void plugin_init (void) addScriptCommand("getitemoptionparambyindex", "ii", getItemOptionParamByIndex); addScriptCommand("setitemoptionbyindex", "iii*", setItemOptionByIndex); addScriptCommand("isinstance", "i", isInstance); - addScriptCommand("readbattleparam","i?",readBattleParam); + addScriptCommand("readbattleparam","ii",readBattleParam); // TMW2 Custom Script Commands addScriptCommand("getguildinfo","i",getguildinfo); diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c index e0e22ce..297fb4e 100644 --- a/src/emap/script_buildins.c +++ b/src/emap/script_buildins.c @@ -2402,18 +2402,8 @@ BUILDIN(isInstance) BUILDIN(readBattleParam) { struct map_session_data *sd; - int data = script_getnum(st,2); - - // Account ID/Player Name is also supported - if (script_hasdata(st, 3)) { - if (script_isstringtype(st, 3)) { - sd = script->nick2sd(st, script_getstr(st, 3)); - } else { - sd = script->id2sd(st, script_getnum(st, 3)); - } - } else { - sd = script->rid2sd(st); - } + sd = script->id2sd(st, script_getnum(st, 2)); + int data = script_getnum(st,3); // Error if (sd == NULL) { @@ -2966,3 +2956,4 @@ BUILDIN(countitem) return true; } + |