Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #854

Browse Source 
Thanks to @theultramage for reporting and pinpointing the error as always!

Commiting this one for @aleos89, he fixed it for you guys.
This commit is contained in:
Lemongrass3110 2015-12-30 21:20:25 +01:00
parent 2f471a135c
commit 4871dab7de
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/mmo.h
View File

@ -822,6 +822,11 @@ enum e_pc_reg_loading {
#error MAX_ZENY is too big #error MAX_ZENY is too big
#endif #endif
// This sanity check is required, because some other places(like skill.c) rely on this
#if MAX_PARTY < 2
#error MAX_PARTY is too small, you need at least 2 players for a party
#endif
#ifndef VIP_ENABLE #ifndef VIP_ENABLE
#define MIN_STORAGE MAX_STORAGE // If the VIP system is disabled the min = max. #define MIN_STORAGE MAX_STORAGE // If the VIP system is disabled the min = max.
#define MIN_CHARS MAX_CHARS // Default number of characters per account. #define MIN_CHARS MAX_CHARS // Default number of characters per account.

12
src/map/skill.c
View File

@ -14132,8 +14132,14 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
p_sd = va_arg(ap, int *); p_sd = va_arg(ap, int *);
skill_id = va_arg(ap,int); skill_id = va_arg(ap,int);
if ( ((skill_id != PR_BENEDICTIO && *c >=1) || *c >=2) && !(skill_get_inf2(skill_id)&INF2_CHORUS_SKILL) ) if (skill_id == PR_BENEDICTIO && *c >= 2)
return 0; //Partner found for ensembles, or the two companions for Benedictio. [Skotlex] return 0; // Two companions found for Benedictio. [Skotlex]
if (skill_get_inf2(skill_id)&INF2_ENSEMBLE_SKILL && *c >= 1)
return 0; // Partner found for ensembles.
if ((skill_get_inf2(skill_id)&INF2_CHORUS_SKILL || skill_id == WL_COMET) && *c == MAX_PARTY)
return 0; // Entire party accounted for.
if (bl == src) if (bl == src)
return 0; return 0;
@ -14207,7 +14213,7 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
int skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag) int skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag)
{ {
static int c=0; static int c=0;
static int p_sd[2] = { 0, 0 }; static int p_sd[MAX_PARTY];
int i; int i;
bool is_chorus = ( skill_get_inf2(skill_id)&INF2_CHORUS_SKILL ); bool is_chorus = ( skill_get_inf2(skill_id)&INF2_CHORUS_SKILL );