summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-14 14:21:47 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-14 14:21:47 +0000
commitc9d4051012392245ec08e1ee25395bd22555e638 (patch)
tree772d7b672d421ed0e07df450d7904d9174f2eb56 /src/map/battle.c
parentaf5a9674dc39e941466fe92502d77f1a6861d0c0 (diff)
downloadhercules-c9d4051012392245ec08e1ee25395bd22555e638.tar.gz
hercules-c9d4051012392245ec08e1ee25395bd22555e638.tar.bz2
hercules-c9d4051012392245ec08e1ee25395bd22555e638.tar.xz
hercules-c9d4051012392245ec08e1ee25395bd22555e638.zip
- Characters with Karma may fight amongst them anywhere.
- Added mapflags partylock and guildlock, which lock the state of the parties/guilds on said maps. partylock blocks user party requests to create/invite/leave/kick, while guildlock blocks user guild requests to create/invite/leave/expel/make alliance/make opposition/delete alliance/delete opposition/break git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9216 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 0a7dee67c..ffc39c595 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3230,6 +3230,9 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
case BL_PC:
{
TBL_PC *sd = (TBL_PC*)t_bl;
+ if (sd->status.karma && t_bl != s_bl && s_bl->type == BL_PC &&
+ ((TBL_PC*)s_bl)->status.karma)
+ state |= BCT_ENEMY; //Characters with bad karma may fight amongst them.
if (sd->state.monster_ignore && t_bl != s_bl && flag&BCT_ENEMY)
return 0; //Global inmunity to attacks.
if (sd->state.killable && t_bl != s_bl)