diff options
| author | Dastgir <dastgirpojee@rocketmail.com> | 2015-08-10 15:29:41 +0530 |
|---|---|---|
| committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-08-10 15:29:41 +0530 |
| commit | ad6e02cc4cd1e3bd079888b1de847788e95e4c3b (patch) | |
| tree | a8db4ee3b054c244ab26295966f62971c4de2a80 /src/map/pc.c | |
| parent | d23d21735e03f4657d7107309e520d03f5afc0f5 (diff) | |
| download | hercules-ad6e02cc4cd1e3bd079888b1de847788e95e4c3b.tar.gz hercules-ad6e02cc4cd1e3bd079888b1de847788e95e4c3b.tar.bz2 hercules-ad6e02cc4cd1e3bd079888b1de847788e95e4c3b.tar.xz hercules-ad6e02cc4cd1e3bd079888b1de847788e95e4c3b.zip | |
Fixes #630, RC_NonBoss was including all races even if they weren't meant to be.
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 107d656f0..5abf1050f 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2834,7 +2834,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) break; } if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ) { + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -2887,7 +2887,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2) { if (type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -2948,7 +2948,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2){ if ( type2 >= RC_MAX ){ - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3149,7 +3149,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) if(sd->state.lr_flag == 2) break; if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3178,7 +3178,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2){ if ( type2 >= RC_MAX ){ - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3367,7 +3367,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2) { if ( type2 >= RC_MAX ){ - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3388,7 +3388,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2) { if ( type2 >= RC_MAX ){ - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3424,7 +3424,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) break; } if ( type2 >= RC_MAX ){ - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3453,7 +3453,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) break; } if ( type2 >= RC_MAX ){ - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3491,7 +3491,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2) { if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3512,7 +3512,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2) { if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3636,7 +3636,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } if(sd->state.lr_flag != 2) { if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3715,7 +3715,7 @@ int pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val) break; } if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3748,7 +3748,7 @@ int pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val) break; } if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3888,7 +3888,7 @@ int pc_bonus4(struct map_session_data *sd,int type,int type2,int type3,int type4 if(sd->state.lr_flag == 2) break; if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || @@ -3914,7 +3914,7 @@ int pc_bonus4(struct map_session_data *sd,int type,int type2,int type3,int type4 if(sd->state.lr_flag == 2) break; if ( type2 >= RC_MAX ) { - for ( i = RC_FORMLESS; i < RC_MAX; i++ ){ + for ( i = RC_FORMLESS; i < RC_BOSS; i++ ) { if ( (type2 == RC_NONPLAYER && i == RC_PLAYER) || (type2 == RC_NONDEMIHUMAN && i == RC_DEMIHUMAN) || (type2 == RC_DEMIPLAYER && (i != RC_PLAYER && i != RC_DEMIHUMAN)) || |