diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-09-19 18:37:21 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-09-20 00:10:28 -0300 |
| commit | 59863921348e17a62f239685e14e6cd7568bf101 (patch) | |
| tree | 892828ac2f297a14e901590b655af49911933593 /src/map/script.c | |
| parent | 8245a269b1f611c93a87cd829d10f1846fe8f08c (diff) | |
| download | hercules-59863921348e17a62f239685e14e6cd7568bf101.tar.gz hercules-59863921348e17a62f239685e14e6cd7568bf101.tar.bz2 hercules-59863921348e17a62f239685e14e6cd7568bf101.tar.xz hercules-59863921348e17a62f239685e14e6cd7568bf101.zip | |
The Mana World modifications for Evolved Server.
******
commit a417c12ee435301498f2d4b162c7f849cefc302a
> Disable Official Walkpath and Partly reverts b5a92f944f126e920442307bebd3c2b53c9b0d54.
> Hopefully will reduce a bit the perceived lag. Official Walkpath only do something if path length > 14.
commit 373b7ffae57f3649cc7f5ecaae1c499833ddb816
> Reserve first char "~" for vault accounts.
commit 823d9ab3138e3d0a447bbf69b1df44bab603cb51
> CI: removed i386 support
commit 6e100e065272887f04ce5b2be03fa80b2c3621ee
commit ee34abef805262263e6d6a196ff0a4e1f5a72259
commit 3218f7ff3076ed390d71b5a6ec717ee96f3e4b85
> Rename command @hide to @invisible
commit d8576b040e4c1e0c2786a4d8472e8152bad57314
> Remove misceffect()
commit a141a20b3a34081e2c4e6eadd0588c47eec76f4e
> Disable renewal mode, while retaining some properties of it.
> It was done directly on server-code but it probably will work with CPPFLAGS.
Also squashes:
commit 719d697fed5bab40e0a2fae6372ecbf88bec16d3
commit fd1996fc83d4b2ab3d8d090ad99af1767fbbcaee
commit afa8255e16445721ac6d33c09934914cc27e019c
commit 08126b77ca9def4524e3d58a48e7943263b29222
commit 53cdeba6f32d786001e195aeb88e3b5814991b4f
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/map/script.c b/src/map/script.c index 9372299bb..7c03840c8 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4416,7 +4416,8 @@ static void op_2num(struct script_state *st, int op, int i1, int i2) case C_LT: ret = (i1 < i2); break; case C_LE: ret = (i1 <= i2); break; case C_R_SHIFT: ret = i1>>i2; break; - case C_L_SHIFT: ret = i1<<i2; break; + case C_L_SHIFT: if (i1 < 0) { ShowError("Invalid left shift op=%s i1=%d i2=%d\n", script->op2name(op), i1, i2); script->reportsrc(st); script_pushnil(st); st->state = END; return; } else { ret = i1<<i2; } + break; case C_DIV: case C_MOD: if( i2 == 0 ) @@ -16073,25 +16074,6 @@ static BUILDIN(classchange) } /*========================================== - * Display an effect - *------------------------------------------*/ -static BUILDIN(misceffect) -{ - int type; - - type=script_getnum(st,2); - if(st->oid && st->oid != npc->fake_nd->bl.id) { - struct block_list *bl = map->id2bl(st->oid); - if (bl) - clif->specialeffect(bl,type,AREA); - } else { - struct map_session_data *sd = script->rid2sd(st); - if (sd != NULL) - clif->specialeffect(&sd->bl,type,AREA); - } - return true; -} -/*========================================== * Play a BGM on a single client [Rikter/Yommy] *------------------------------------------*/ static BUILDIN(playbgm) @@ -27486,7 +27468,7 @@ static void script_parse_builtin(void) BUILDIN_DEF(getskilllist,""), BUILDIN_DEF(clearitem,""), BUILDIN_DEF(classchange,"ii?"), - BUILDIN_DEF_DEPRECATED(misceffect,"i"), + //BUILDIN_DEF_DEPRECATED(misceffect,"i"), BUILDIN_DEF(playbgm,"s"), BUILDIN_DEF(playbgmall,"s?????"), BUILDIN_DEF(soundeffect,"si"), |