diff options
| author | shennetsind <ind@henn.et> | 2013-05-15 21:56:21 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-05-15 21:56:21 -0300 |
| commit | c7f3f6c2ceae862866a019d0a438d8f965b042c2 (patch) | |
| tree | 1da2a986123b23a05c8722ccc68a949473d84fb9 /src/map/battle.c | |
| parent | c811ddb181a15eae8a6d01a6956ae7c654f424b2 (diff) | |
| download | hercules-c7f3f6c2ceae862866a019d0a438d8f965b042c2.tar.gz hercules-c7f3f6c2ceae862866a019d0a438d8f965b042c2.tar.bz2 hercules-c7f3f6c2ceae862866a019d0a438d8f965b042c2.tar.xz hercules-c7f3f6c2ceae862866a019d0a438d8f965b042c2.zip | |
Hercules Renewal Phase One: guild.c started
http://hercules.ws/board/topic/237-hercules-renewal/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e16f2ece2..1cb6bea4f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1306,12 +1306,12 @@ int battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int dama } } if(src->type != BL_MOB) { - struct guild *g = src->type == BL_PC ? ((TBL_PC *)src)->guild : guild_search(status_get_guild_id(src)); + struct guild *g = src->type == BL_PC ? ((TBL_PC *)src)->guild : guild->search(status_get_guild_id(src)); - if (class_ == MOBID_EMPERIUM && (!g || guild_checkskill(g,GD_APPROVAL) <= 0 )) + if (class_ == MOBID_EMPERIUM && (!g || guild->checkskill(g,GD_APPROVAL) <= 0 )) return 0; - if (g && battle_config.guild_max_castles && guild_checkcastles(g)>=battle_config.guild_max_castles) + if (g && battle_config.guild_max_castles && guild->checkcastles(g)>=battle_config.guild_max_castles) return 0; // [MouseJstr] } } @@ -5477,7 +5477,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f { int s_guild = status_get_guild_id(s_bl); int t_guild = status_get_guild_id(t_bl); - if( !(map[m].flag.pvp && map[m].flag.pvp_noguild) && s_guild && t_guild && (s_guild == t_guild || guild_isallied(s_guild, t_guild)) && (!map[m].flag.battleground || sbg_id == tbg_id) ) + if( !(map[m].flag.pvp && map[m].flag.pvp_noguild) && s_guild && t_guild && (s_guild == t_guild || guild->isallied(s_guild, t_guild)) && (!map[m].flag.battleground || sbg_id == tbg_id) ) state |= BCT_GUILD; else state |= BCT_ENEMY; @@ -5510,7 +5510,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f { int s_guild = status_get_guild_id(s_bl); int t_guild = status_get_guild_id(t_bl); - if(s_guild && t_guild && (s_guild == t_guild || guild_isallied(s_guild, t_guild))) + if(s_guild && t_guild && (s_guild == t_guild || guild->isallied(s_guild, t_guild))) state |= BCT_GUILD; } } //end non pvp/gvg chk rivality |