diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-24 17:28:13 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-24 17:28:13 +0000 |
| commit | f8ebb28853a8a9c51725778688af0c4bb54d31e0 (patch) | |
| tree | e4a98a2a275761ced9d306ca399837c7a1955787 /src/map/script.c | |
| parent | 252476c27cc0829e15fb1f08a50a52e1ec5041b5 (diff) | |
| download | hercules-f8ebb28853a8a9c51725778688af0c4bb54d31e0.tar.gz hercules-f8ebb28853a8a9c51725778688af0c4bb54d31e0.tar.bz2 hercules-f8ebb28853a8a9c51725778688af0c4bb54d31e0.tar.xz hercules-f8ebb28853a8a9c51725778688af0c4bb54d31e0.zip | |
- Added a check to prevent Deluge/Volcano/Violent Gale from being placed on top of each other. Reverted the previous 'fix' where atk was being increased based on armor element rather than element of attack.
- Added flag 0x002 (no reiteration) to Deluge/Volcano/Violent Gale (skill_unit_db)
- Removed the noreturn mapflag check from script command warp.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7858 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/map/script.c b/src/map/script.c index d17b84fdd..3b1fbfe23 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3054,15 +3054,9 @@ int buildin_warp(struct script_state *st) if(strcmp(str,"Random")==0) pc_randomwarp(sd,3); else if(strcmp(str,"SavePoint")==0){ - if(map[sd->bl.m].flag.noreturn) // ’±‹ÖŽ~ - return 0; - pc_setpos(sd,sd->status.save_point.map, sd->status.save_point.x,sd->status.save_point.y,3); }else if(strcmp(str,"Save")==0){ - if(map[sd->bl.m].flag.noreturn) // ’±‹ÖŽ~ - return 0; - pc_setpos(sd,sd->status.save_point.map, sd->status.save_point.x,sd->status.save_point.y,3); }else |