diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 07:29:10 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 07:29:10 +0000 |
| commit | 518e5b50c5e8ca277d2748f541958119e775ef50 (patch) | |
| tree | 18499e4211a1de591c0159fab6b4f03778245433 | |
| parent | 9df3b0b2c5469afaba385dbfdadc973830c00ce2 (diff) | |
| download | hercules-518e5b50c5e8ca277d2748f541958119e775ef50.tar.gz hercules-518e5b50c5e8ca277d2748f541958119e775ef50.tar.bz2 hercules-518e5b50c5e8ca277d2748f541958119e775ef50.tar.xz hercules-518e5b50c5e8ca277d2748f541958119e775ef50.zip | |
[Fixed]
- Battle mechanics in battle_check_target
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6836 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1d2ce15b2..b6ab82526 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/05/29
* [Fixed]:
+ - Battle mechanics in battle_check_target [Lance]
+ * [Fixed]:
- Typo in mob_dead causing crash. Thanks to reddozen and his gang for testing.
[Lance]
* Cleaned up friend list saving and fixed loading of friends.txt file
diff --git a/src/map/battle.c b/src/map/battle.c index 0287fb8f8..1770e3df9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3124,11 +3124,11 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f case BL_MOB: { TBL_MOB*md = (TBL_MOB*)s_bl; - if(md->state.killer) // Is on a rampage too :D - state |= BCT_ENEMY; if (!agit_flag && md->guardian_data && md->guardian_data->guild_id) return 0; //Disable guardians/emperium owned by Guilds on non-woe times. - if (!md->special_state.ai) { //Normal mobs. + if(md->state.killer) // Is on a rampage too :D + state |= BCT_ENEMY; + else if (!md->special_state.ai) { //Normal mobs. if (t_bl->type == BL_MOB && !((TBL_MOB*)t_bl)->special_state.ai) state |= BCT_PARTY; //Normal mobs with no ai are friends. else |