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

Merge pull request #822 from RomeroMalaquias/master

Browse Source 
Avoiding conditional directives that break statements
This commit is contained in:
lighta 2015-12-31 01:40:24 -04:00
commit 1ed2c92995
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/map/mob.c
View File

@ -1934,23 +1934,22 @@ static int mob_delay_item_drop(int tid, unsigned int tick, int id, intptr_t data
static void mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, struct item_drop *ditem, int loot, int drop_rate, unsigned short flag)
{
TBL_PC* sd;
bool test_autoloot;
//Logs items, dropped by mobs [Lupus]
log_pick_mob(md, loot?LOG_TYPE_LOOT:LOG_TYPE_PICKDROP_MONSTER, -ditem->item_data.amount, &ditem->item_data);
sd = map_charid2sd(dlist->first_charid);
if( sd == NULL ) sd = map_charid2sd(dlist->second_charid);
if( sd == NULL ) sd = map_charid2sd(dlist->third_charid);
if( sd
test_autoloot = sd
&& (drop_rate <= sd->state.autoloot || pc_isautolooting(sd, ditem->item_data.nameid))
&& (battle_config.idle_no_autoloot == 0 || DIFF_TICK(last_tick, sd->idletime) < battle_config.idle_no_autoloot)
&& (battle_config.homunculus_autoloot?1:!flag)
&& (battle_config.homunculus_autoloot?1:!flag);
#ifdef AUTOLOOT_DISTANCE
&& sd->bl.m == md->bl.m
&& check_distance_blxy(&sd->bl, dlist->x, dlist->y, AUTOLOOT_DISTANCE)
test_autoloot = test_autoloot && sd->bl.m == md->bl.m
&& check_distance_blxy(&sd->bl, dlist->x, dlist->y, AUTOLOOT_DISTANCE);
#endif
) { //Autoloot.
if( test_autoloot ) { //Autoloot.
struct party_data *p = party_search(sd->status.party_id);
if (party_share_loot(party_search(sd->status.party_id),