Apply code style to pc_dead() function

1 files changed, 224 insertions, 183 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index 6680a81bc..90282209b 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -8068,161 +8068,177 @@ static void pc_damage(struct map_session_data *sd, struct block_list *src, unsig
 	}
 }
 
-/*==========================================
- * Invoked when a player has negative current hp
- *------------------------------------------*/
+/**
+ * Invoked when a character died.
+ *
+ * @param sd The died character.
+ * @param src The unit which caused the death.
+ * @retval 0 Death canceled.
+ * @retval 1 Standard death.
+ * @retval 9 Died in PVP/GVG/BG.
+ *
+ **/
 static int pc_dead(struct map_session_data *sd, struct block_list *src)
 {
-	int i=0,j=0;
-	int64 tick = timer->gettick();
+	nullpo_ret(sd);
 
-	nullpo_retr(0, sd);
+	for (int i = 0; i < MAX_PC_DEVOTION; i++) {
+		if (sd->devotion[i] != 0) {
+			struct map_session_data *devsd = map->id2sd(sd->devotion[i]);
 
-	for (j = 0; j < MAX_PC_DEVOTION; j++) {
-		if (sd->devotion[j]) {
-			struct map_session_data *devsd = map->id2sd(sd->devotion[j]);
-			if (devsd)
+			if (devsd != NULL)
 				status_change_end(&devsd->bl, SC_DEVOTION, INVALID_TIMER);
-			sd->devotion[j] = 0;
+
+			sd->devotion[i] = 0;
 		}
 	}
 
-	if(sd->status.pet_id > 0 && sd->pd) {
+	if (sd->status.pet_id > 0 && sd->pd != NULL) {
 		struct pet_data *pd = sd->pd;
-		if( !map->list[sd->bl.m].flag.noexppenalty ) {
+
+		if (map->list[sd->bl.m].flag.noexppenalty == 0) {
 			pet->set_intimate(pd, pd->pet.intimate - pd->petDB->die);
-			clif->send_petdata(sd,sd->pd,1,pd->pet.intimate);
+			clif->send_petdata(sd, sd->pd, 1, pd->pet.intimate);
 		}
-		if( sd->pd->target_id ) // Unlock all targets...
+
+		if (sd->pd->target_id != 0) // Unlock all targets.
 			pet->unlocktarget(sd->pd);
 	}
 
-	if (sd->status.hom_id > 0){
-	    if(battle_config.homunculus_auto_vapor && sd->hd)
-		    homun->vaporize(sd, HOM_ST_REST, true);
-	}
+	if (sd->status.hom_id > 0 && sd->hd != NULL && battle_config.homunculus_auto_vapor != 0)
+		homun->vaporize(sd, HOM_ST_REST, true);
 
-	if( sd->md )
-		mercenary->delete(sd->md, 3); // Your mercenary soldier has ran away.
+	if (sd->md != NULL)
+		mercenary->delete(sd->md, 3); // Your mercenary soldier ran away.
 
-	if( sd->ed )
+	if (sd->ed != NULL)
 		elemental->delete(sd->ed, 0);
 
-	// Leave duel if you die [LuzZza]
-	if(battle_config.duel_autoleave_when_die) {
-		if(sd->duel_group > 0)
+	if (battle_config.duel_autoleave_when_die != 0) { // Leave duel if character died. [LuzZza]
+		if (sd->duel_group > 0)
 			duel->leave(sd->duel_group, sd);
-		if(sd->duel_invite > 0)
+		if (sd->duel_invite > 0)
 			duel->reject(sd->duel_invite, sd);
 	}
 
-	if (sd->npc_id && sd->st && sd->st->state != RUN)
+	if (sd->npc_id != 0 && sd->st != NULL && sd->st->state != RUN)
 		npc->event_dequeue(sd);
 
-	pc_setglobalreg(sd,script->add_variable("PC_DIE_COUNTER"),sd->die_counter+1);
-	pc->setparam(sd, SP_KILLERRID, src?src->id:0);
+	pc_setglobalreg(sd, script->add_variable("PC_DIE_COUNTER"), sd->die_counter + 1);
+	pc->setparam(sd, SP_KILLERRID, (src != NULL) ? src->id : 0);
+
+	if (sd->bg_id != 0) { //TODO: Purge when bgqueue is deemed ok.
+		struct battleground_data *bgd = bg->team_search(sd->bg_id);
 
-	if( sd->bg_id ) {/* TODO: purge when bgqueue is deemed ok */
-		struct battleground_data *bgd;
-		if( (bgd = bg->team_search(sd->bg_id)) != NULL && bgd->die_event[0] )
+		if (bgd != NULL && bgd->die_event[0] != '\0')
 			npc->event(sd, bgd->die_event, 0);
 	}
 
-	for (i = 0; i < VECTOR_LENGTH(sd->script_queues); i++ ) {
+	for (int i = 0; i < VECTOR_LENGTH(sd->script_queues); i++) {
 		struct script_queue *queue = script->queue(VECTOR_INDEX(sd->script_queues, i));
-		if (queue && queue->event_death[0] != '\0')
+
+		if (queue != NULL && queue->event_death[0] != '\0')
 			npc->event(sd, queue->event_death, 0);
 	}
 
-	npc->script_event(sd,NPCE_DIE);
+	npc->script_event(sd, NPCE_DIE);
 
-	// Clear anything NPC-related when you die and was interacting with one.
-	if ( (sd->npc_id || sd->npc_shopid) && sd->state.dialog) {
-		if (sd->state.using_fake_npc) {
+	// Clear anything NPC-related if character died while interacting with one.
+	if ((sd->npc_id != 0 || sd->npc_shopid != 0) && sd->state.dialog != 0) {
+		if (sd->state.using_fake_npc != 0) {
 			clif->clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd);
 			sd->state.using_fake_npc = 0;
 		}
-		if (sd->state.menu_or_input)
+
+		if (sd->state.menu_or_input != 0)
 			sd->state.menu_or_input = 0;
-		if (sd->npc_menu)
+
+		if (sd->npc_menu != 0)
 			sd->npc_menu = 0;
 
 		sd->npc_id = 0;
 		sd->npc_shopid = 0;
-		if (sd->st && sd->st->state != END)
+
+		if (sd->st != NULL && sd->st->state != END)
 			sd->st->state = END;
 	}
 
-	/* e.g. not killed through pc->damage */
-	if( pc_issit(sd) ) {
+	// E.g. not killed through pc->damage().
+	if (pc_issit(sd))
 		clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_SIT));
-	}
 
 	pc_setdead(sd);
-
 	clif->party_dead_notification(sd);
 
 	pc->autocast_clear(sd); // Unset auto-cast data.
 
-	// Reset menu skills.
-	if (sd->menuskill_id)
-		sd->menuskill_id = sd->menuskill_val = 0;
-	//Reset ticks.
-	sd->hp_loss.tick = sd->sp_loss.tick = sd->hp_regen.tick = sd->sp_regen.tick = 0;
+	if (sd->menuskill_id != 0) { // Reset menu skills.
+		sd->menuskill_id = 0;
+		sd->menuskill_val = 0;
+	}
+
+	// Reset ticks.
+	sd->hp_loss.tick = 0;
+	sd->sp_loss.tick = 0;
+	sd->hp_regen.tick = 0;
+	sd->sp_regen.tick = 0;
 
-	if ( sd->spiritball )
+	if (sd->spiritball != 0)
 		pc->delspiritball(sd, sd->spiritball, 0);
+
 	if (sd->charm_type != CHARM_TYPE_NONE && sd->charm_count > 0)
 		pc->del_charm(sd, sd->charm_count, sd->charm_type);
 
+	int64 tick = timer->gettick();
+
 	if (src != NULL) {
 		switch (src->type) {
-			case BL_MOB:
-			{
-				struct mob_data *md = BL_UCAST(BL_MOB, src);
-				if (md->target_id==sd->bl.id)
-					mob->unlocktarget(md,tick);
-				if (battle_config.mobs_level_up && md->status.hp
-				 && md->level < pc->maxbaselv(sd)
-				 && !md->guardian_data && md->special_state.ai == AI_NONE// Guardians/summons should not level. [Skotlex]
-				) {
-					// monster level up [Valaris]
-					clif->misceffect(&md->bl,0);
-					md->level++;
-					status_calc_mob(md, SCO_NONE);
-					status_percent_heal(src,10,0);
-
-					if( battle_config.show_mob_info&4 )
-					{// update name with new level
-						clif->blname_ack(0, &md->bl);
-					}
-				}
-				src = battle->get_master(src); // Maybe Player Summon
+		case BL_MOB: {
+			struct mob_data *md = BL_UCAST(BL_MOB, src);
+
+			if (md->target_id == sd->bl.id)
+				mob->unlocktarget(md, tick);
+
+			if (battle_config.mobs_level_up != 0 && md->status.hp != 0 && md->level < pc->maxbaselv(sd)
+			    && md->guardian_data == NULL && md->special_state.ai == AI_NONE) { // Guardians/summons should not level up. [Skotlex]
+				/// Monster level up. [Valaris]
+				clif->misceffect(&md->bl, 0);
+				md->level++;
+				status_calc_mob(md, SCO_NONE);
+				status_percent_heal(src, 10, 0);
+
+				if ((battle_config.show_mob_info & 4) != 0)
+					clif->blname_ack(0, &md->bl); // Update name with new level.
 			}
+
+			src = battle->get_master(src); // Maybe character summon.
 			break;
-			case BL_PET: //Pass on to master...
-				src = &BL_UCAST(BL_PET, src)->msd->bl;
+		}
+		case BL_PET:
+			src = &BL_UCAST(BL_PET, src)->msd->bl; // Pass on to master.
 			break;
-			case BL_HOM:
-				src = &BL_UCAST(BL_HOM, src)->master->bl;
+		case BL_HOM:
+			src = &BL_UCAST(BL_HOM, src)->master->bl; // Pass on to master.
 			break;
-			case BL_MER:
-				src = &BL_UCAST(BL_MER, src)->master->bl;
+		case BL_MER:
+			src = &BL_UCAST(BL_MER, src)->master->bl; // Pass on to master.
 			break;
 		}
 	}
 
 	if (src != NULL && src->type == BL_PC) {
 		struct map_session_data *ssd = BL_UCAST(BL_PC, src);
+
 		pc->setparam(ssd, SP_KILLEDRID, sd->bl.id);
 		npc->script_event(ssd, NPCE_KILLPC);
+		achievement->validate_pc_kill(ssd, sd);
 
-		achievement->validate_pc_kill(ssd, sd); // Achievements [Smokexyz/Hercules]
-
-		if (battle_config.pk_mode&2) {
+		if ((battle_config.pk_mode & 2) != 0) {
 			ssd->status.manner -= 5;
-			if(ssd->status.manner < 0)
-				sc_start(NULL,src,SC_NOCHAT,100,0,0);
+
+			if (ssd->status.manner < 0)
+				sc_start(NULL, src, SC_NOCHAT, 100, 0, 0);
+
 #if 0
 			// PK/Karma system code (not enabled yet) [celest]
 			// originally from Kade Online, so i don't know if any of these is correct ^^;
@@ -8234,14 +8250,15 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src)
 				// If player killed was more evil
 				sd->status.karma--;
 				ssd->status.karma--;
-			}
-			else if (sd->status.karma < ssd->status.karma) // If player killed was more good
+			} else if (sd->status.karma < ssd->status.karma) { // If player killed was more good
 				ssd->status.karma++;
+			}
 
 			// or the PK System way...
 
 			if (sd->status.karma > 0) // player killed is dishonourable?
 				ssd->status.karma--; // honour points earned
+
 			sd->status.karma++; // honour points lost
 
 			// To-do: Receive exp on certain occasions
@@ -8249,137 +8266,156 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src)
 		}
 	}
 
-	if( battle_config.bone_drop==2
-	 || (battle_config.bone_drop==1 && map->list[sd->bl.m].flag.pvp)
-	) {
+	if (battle_config.bone_drop == 2 || (battle_config.bone_drop == 1 && map->list[sd->bl.m].flag.pvp != 0)) {
 		struct item item_tmp;
-		memset(&item_tmp,0,sizeof(item_tmp));
-		item_tmp.nameid=ITEMID_SKULL_;
-		item_tmp.identify=1;
-		item_tmp.card[0]=CARD0_CREATE;
-		item_tmp.card[1]=0;
-		item_tmp.card[2]=GetWord(sd->status.char_id,0); // CharId
-		item_tmp.card[3]=GetWord(sd->status.char_id,1);
+
+		memset(&item_tmp, 0, sizeof(item_tmp));
+		item_tmp.nameid = ITEMID_SKULL_;
+		item_tmp.identify = 1;
+		item_tmp.card[0] = CARD0_CREATE;
+		item_tmp.card[1] = 0;
+		item_tmp.card[2] = GetWord(sd->status.char_id, 0);
+		item_tmp.card[3] = GetWord(sd->status.char_id, 1);
 		map->addflooritem(&sd->bl, &item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 0, false);
 	}
 
-	// activate Steel body if a super novice dies at 99+% exp [celest]
-	if ((sd->job & MAPID_UPPERMASK) == MAPID_SUPER_NOVICE && !sd->state.snovice_dead_flag) {
+	// Activate Steel Body if a Super Novice dies at 99+% EXP. [celest]
+	if ((sd->job & MAPID_UPPERMASK) == MAPID_SUPER_NOVICE && sd->state.snovice_dead_flag == 0) {
 		uint64 next = pc->nextbaseexp(sd);
-		if( next == 0 ) next = pc->thisbaseexp(sd);
+
+		if (next == 0)
+			next = pc->thisbaseexp(sd);
+
 		if (get_percentage64(sd->status.base_exp, next) >= 99) {
 			sd->state.snovice_dead_flag = 1;
 			pc->setstand(sd);
 			status_percent_heal(&sd->bl, 100, 100);
 			clif->resurrection(&sd->bl, 1);
-			if(battle_config.pc_invincible_time)
+
+			if (battle_config.pc_invincible_time != 0)
 				pc->setinvincibletimer(sd, battle_config.pc_invincible_time);
-			sc_start(NULL,&sd->bl,status->skill2sc(MO_STEELBODY),100,1,skill->get_time(MO_STEELBODY,1));
-			if(map_flag_gvg2(sd->bl.m))
+
+			sc_start(NULL, &sd->bl, status->skill2sc(MO_STEELBODY), 100, 1, skill->get_time(MO_STEELBODY, 1));
+
+			if (map_flag_gvg2(sd->bl.m))
 				pc->respawn_timer(INVALID_TIMER, timer->gettick(), sd->bl.id, 0);
+
 			return 0;
 		}
 	}
 
-	// changed penalty options, added death by player if pk_mode [Valaris]
-	if (battle_config.death_penalty_type
-	   && pc->isDeathPenaltyJob(sd->job)
-	   && !map->list[sd->bl.m].flag.noexppenalty && !map_flag_gvg2(sd->bl.m)
-	   && !sd->sc.data[SC_BABY] && !sd->sc.data[SC_CASH_DEATHPENALTY]
-	   && !pc->auto_exp_insurance(sd)
-	   ) {
+	if (battle_config.death_penalty_type != 0 && pc->isDeathPenaltyJob(sd->job) && !map_flag_gvg2(sd->bl.m)
+	    && map->list[sd->bl.m].flag.noexppenalty == 0 && sd->sc.data[SC_BABY] == NULL
+	    && sd->sc.data[SC_CASH_DEATHPENALTY] == NULL && !pc->auto_exp_insurance(sd)) {
 		if (battle_config.death_penalty_base > 0) {
 			unsigned int base_penalty = 0;
+			int rate = battle_config.death_penalty_base;
+
 			switch (battle_config.death_penalty_type) {
-				case 1:
-					base_penalty = (unsigned int) apply_percentrate64(pc->nextbaseexp(sd), battle_config.death_penalty_base, 10000);
-					break;
-				case 2:
-					base_penalty = (unsigned int) apply_percentrate64(sd->status.base_exp, battle_config.death_penalty_base, 10000);
-					break;
+			case 1:
+				base_penalty = (unsigned int)apply_percentrate64(pc->nextbaseexp(sd), rate, 10000);
+				break;
+			case 2:
+				base_penalty = (unsigned int)apply_percentrate64(sd->status.base_exp, rate, 10000);
+				break;
 			}
 
 			if (base_penalty != 0) {
-				if (battle_config.pk_mode && src && src->type==BL_PC)
-					base_penalty*=2;
-				if( sd->status.mod_death != 100 )
-					base_penalty = base_penalty * sd->status.mod_death / 100;
+				if (battle_config.pk_mode != 0 && src != NULL && src->type == BL_PC)
+					base_penalty *= 2;
+
+				if (sd->status.mod_death != 100)
+					base_penalty *= sd->status.mod_death / 100;
+
 				sd->status.base_exp -= min(sd->status.base_exp, base_penalty);
-				clif->updatestatus(sd,SP_BASEEXP);
+				clif->updatestatus(sd, SP_BASEEXP);
 			}
 		}
 
-		if(battle_config.death_penalty_job > 0) {
+		if (battle_config.death_penalty_job > 0) {
 			unsigned int job_penalty = 0;
+			int rate = battle_config.death_penalty_job;
 
 			switch (battle_config.death_penalty_type) {
-				case 1:
-					job_penalty = (unsigned int) apply_percentrate64(pc->nextjobexp(sd), battle_config.death_penalty_job, 10000);
-					break;
-				case 2:
-					job_penalty = (unsigned int) apply_percentrate64(sd->status.job_exp, battle_config.death_penalty_job, 10000);
-					break;
+			case 1:
+				job_penalty = (unsigned int)apply_percentrate64(pc->nextjobexp(sd), rate, 10000);
+				break;
+			case 2:
+				job_penalty = (unsigned int)apply_percentrate64(sd->status.job_exp, rate, 10000);
+				break;
 			}
 
 			if (job_penalty != 0) {
-				if (battle_config.pk_mode && src && src->type==BL_PC)
-					job_penalty*=2;
-				if( sd->status.mod_death != 100 )
-					job_penalty = job_penalty * sd->status.mod_death / 100;
+				if (battle_config.pk_mode != 0 && src != NULL && src->type == BL_PC)
+					job_penalty *= 2;
+
+				if (sd->status.mod_death != 100)
+					job_penalty *= sd->status.mod_death / 100;
+
 				sd->status.job_exp -= min(sd->status.job_exp, job_penalty);
-				clif->updatestatus(sd,SP_JOBEXP);
+				clif->updatestatus(sd, SP_JOBEXP);
 			}
 		}
 
-		if (battle_config.zeny_penalty > 0 && !map->list[sd->bl.m].flag.nozenypenalty) {
+		if (battle_config.zeny_penalty > 0 && map->list[sd->bl.m].flag.nozenypenalty == 0) {
 			int zeny_penalty = apply_percentrate(sd->status.zeny, battle_config.zeny_penalty, 10000);
+
 			if (zeny_penalty != 0)
 				pc->payzeny(sd, zeny_penalty, LOG_TYPE_PICKDROP_PLAYER, NULL);
 		}
 	}
 
-	if(map->list[sd->bl.m].flag.pvp_nightmaredrop) {
-		// Moved this outside so it works when PVP isn't enabled and during pk mode [Ancyker]
-		for(j=0;j<map->list[sd->bl.m].drop_list_count;j++){
-			int id = map->list[sd->bl.m].drop_list[j].drop_id;
-			int type = map->list[sd->bl.m].drop_list[j].drop_type;
-			int per = map->list[sd->bl.m].drop_list[j].drop_per;
-			if(id == 0)
+	if (map->list[sd->bl.m].flag.pvp_nightmaredrop != 0) {
+		// Moved this outside so it works when PVP isn't enabled and during pk mode. [Ancyker]
+		for (int i = 0; i < map->list[sd->bl.m].drop_list_count; i++) {
+			int id = map->list[sd->bl.m].drop_list[i].drop_id;
+			int type = map->list[sd->bl.m].drop_list[i].drop_type;
+			int per = map->list[sd->bl.m].drop_list[i].drop_per;
+
+			if (id == 0)
 				continue;
-			if(id == -1){
-				int eq_num = 0, eq_n[MAX_INVENTORY], k;
-				memset(eq_n,0,sizeof(eq_n));
-				for(i = 0; i < sd->status.inventorySize; i++) {
-					if( (type == 1 && !sd->status.inventory[i].equip)
-						|| (type == 2 && sd->status.inventory[i].equip)
-						||  type == 3)
-					{
+
+			if (id == -1) {
+				int eq_num = 0;
+				int eq_n[MAX_INVENTORY];
+
+				memset(eq_n, 0, sizeof(eq_n));
+
+				for (int j = 0; j < sd->status.inventorySize; j++) {
+					bool is_equipped = (sd->status.inventory[j].equip != 0);
+
+					if ((type == 1 && !is_equipped) || (type == 2 && is_equipped) || type == 3) {
+						int k;
+
 						ARR_FIND(0, sd->status.inventorySize, k, eq_n[k] <= 0);
+
 						if (k < sd->status.inventorySize)
-							eq_n[k] = i;
+							eq_n[k] = j;
 
 						eq_num++;
 					}
 				}
-				if(eq_num > 0){
-					int n = eq_n[rnd()%eq_num];
-					if(rnd()%10000 < per){
-						if(sd->status.inventory[n].equip)
+
+				if (eq_num > 0) {
+					int n = eq_n[rnd() % eq_num];
+
+					if (rnd() % 10000 < per) {
+						if (sd->status.inventory[n].equip != 0)
 							pc->unequipitem(sd, n, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE);
-						pc->dropitem(sd,n,1);
+
+						pc->dropitem(sd, n, 1);
 					}
 				}
-			}
-			else if(id > 0){
-				for( i = 0; i < sd->status.inventorySize; i++) {
-					if(sd->status.inventory[i].nameid == id
-						&& rnd()%10000 < per
-						&& ((type == 1 && !sd->status.inventory[i].equip)
-							|| (type == 2 && sd->status.inventory[i].equip)
-							|| type == 3) ){
-						if(sd->status.inventory[i].equip)
-							pc->unequipitem(sd, i, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE);
-						pc->dropitem(sd,i,1);
+			} else if (id > 0) {
+				for (int j = 0; j < sd->status.inventorySize; j++) {
+					bool is_equipped = (sd->status.inventory[j].equip != 0);
+
+					if (((type == 1 && !is_equipped) || (type == 2 && is_equipped) || type == 3)
+					    && sd->status.inventory[j].nameid == id && rnd() % 10000 < per) {
+						if (is_equipped)
+							pc->unequipitem(sd, j, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE);
+
+						pc->dropitem(sd, j, 1);
 						break;
 					}
 				}
@@ -8387,46 +8423,51 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src)
 		}
 	}
 
-	// Remove autotrade to prevent autotrading from save point
-	if( (sd->state.standalone || sd->state.autotrade)
-	 && (map->list[sd->bl.m].flag.pvp || map->list[sd->bl.m].flag.gvg)
-	  ) {
+	// Remove autotrade to prevent autotrading from save point.
+	if ((map->list[sd->bl.m].flag.pvp != 0 || map->list[sd->bl.m].flag.gvg != 0)
+	    && (sd->state.standalone != 0 || sd->state.autotrade != 0)) {
 		sd->state.autotrade = 0;
 		sd->state.standalone = 0;
-		pc->autotrade_update(sd,PAUC_REMOVE);
+		pc->autotrade_update(sd, PAUC_REMOVE);
 		map->quit(sd);
 	}
 
-	// pvp
-	// disable certain pvp functions on pk_mode [Valaris]
-	if( map->list[sd->bl.m].flag.pvp && !battle_config.pk_mode && !map->list[sd->bl.m].flag.pvp_nocalcrank ) {
+	// Disable certain PVP functions on pk_mode. [Valaris]
+	if (map->list[sd->bl.m].flag.pvp != 0 && battle_config.pk_mode == 0
+	    && map->list[sd->bl.m].flag.pvp_nocalcrank == 0) {
 		sd->pvp_point -= 5;
 		sd->pvp_lost++;
+
 		if (src != NULL && src->type == BL_PC) {
 			struct map_session_data *ssd = BL_UCAST(BL_PC, src);
+
 			ssd->pvp_point++;
 			ssd->pvp_won++;
 		}
-		if( sd->pvp_point < 0 )
-		{
-			timer->add(tick+1, pc->respawn_timer,sd->bl.id,0);
+
+		if (sd->pvp_point < 0) {
+			timer->add(tick + 1, pc->respawn_timer, sd->bl.id, 0);
 			return 1|8;
 		}
 	}
-	//GvG
-	if( map_flag_gvg2(sd->bl.m) ) {
-		timer->add(tick+1, pc->respawn_timer, sd->bl.id, 0);
+
+	// GVG
+	if (map_flag_gvg2(sd->bl.m)) {
+		timer->add(tick + 1, pc->respawn_timer, sd->bl.id, 0);
 		return 1|8;
-	} else if( sd->bg_id ) {
+	}
+
+	if (sd->bg_id != 0) {
 		struct battleground_data *bgd = bg->team_search(sd->bg_id);
-		if( bgd && bgd->mapindex > 0 ) { // Respawn by BG
-			timer->add(tick+1000, pc->respawn_timer, sd->bl.id, 0);
+
+		if (bgd != NULL && bgd->mapindex > 0) { // Respawn by BG.
+			timer->add(tick + 1000, pc->respawn_timer, sd->bl.id, 0);
 			return 1|8;
 		}
 	}
 
-	//Reset "can log out" tick.
-	if( battle_config.prevent_logout )
+	// Reset "can log out" tick.
+	if (battle_config.prevent_logout != 0)
 		sd->canlog_tick = timer->gettick() - battle_config.prevent_logout;
 
 	return 1;