diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-04 18:23:57 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-04 18:23:57 +0000 |
| commit | 8214af442ea63919d69d368221ae2d61456488b9 (patch) | |
| tree | 9efad3f11ace58a29ad05c0c3c9e9fa31964def8 /src/map/battle.c | |
| parent | 46ca642c09468dbc52ca390c8f1d368e7ffa2966 (diff) | |
| download | hercules-8214af442ea63919d69d368221ae2d61456488b9.tar.gz hercules-8214af442ea63919d69d368221ae2d61456488b9.tar.bz2 hercules-8214af442ea63919d69d368221ae2d61456488b9.tar.xz hercules-8214af442ea63919d69d368221ae2d61456488b9.zip | |
- Some code cleanups.
- Added new Cell types (NoChat and NoDamage)
- Added JobChangeLevel and FreeSKPoints to #stats
- Added a Crash protection in clif_send with invalid fd values.
- Merged a missing update in TK Mission.
- Added script command 'getmapflag'
- Merged some new Status Change to Stable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12175 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 437f95253..9e5d05623 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3020,6 +3020,9 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f return -1; } + if (flag&BCT_ENEMY && map_getcell(m,src->x,src->y,CELL_CHKNODAMAGE) || map_getcell(m,target->x,target->y,CELL_CHKNODAMAGE)) + return -1; // [NoDamage] + //t_bl/s_bl hold the 'master' of the attack, while src/target are the actual //objects involved. if ((t_bl = battle_get_master(target)) == NULL) |