From 02fcaed6bd32b0ffbc4f03b8f9de6f0720e6253f Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 16 Nov 2014 06:35:51 +0100 Subject: Whitespace cleanup (no code changes) This includes, and is not limited to: mixed or wrong indentation, excess whitespace (horizontal and vertical), misalignment, trailing spaces. Signed-off-by: Haru --- src/map/intif.c | 147 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 74 insertions(+), 73 deletions(-) (limited to 'src/map/intif.c') diff --git a/src/map/intif.c b/src/map/intif.c index c20905bcf..73fb648ae 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -210,8 +210,8 @@ int intif_wis_message(struct map_session_data *sd, char *nick, char *mes, size_t if (intif->CheckForCharServer()) return 0; - if (chrif->other_mapserver_count < 1) - { //Character not found. + if (chrif->other_mapserver_count < 1) { + //Character not found. clif->wis_end(sd->fd, 1); return 0; } @@ -924,8 +924,8 @@ void intif_parse_WisMessage(int fd) { strcmp(sd->ignore[i].name, wisp_source) != 0 ; i++); - if (i < MAX_IGNORE_LIST && sd->ignore[i].name[0] != '\0') - { //Ignored + if (i < MAX_IGNORE_LIST && sd->ignore[i].name[0] != '\0') { + //Ignored intif_wis_replay(id, 2); return; } @@ -1113,7 +1113,7 @@ void intif_parse_LoadGuildStorage(int fd) } if (RFIFOW(fd,2)-13 != sizeof(struct guild_storage)) { ShowError("intif_parse_LoadGuildStorage: data size mismatch %d != %"PRIuS"\n", RFIFOW(fd,2)-13, sizeof(struct guild_storage)); - gstor->storage_status = 0; + gstor->storage_status = 0; return; } @@ -2136,7 +2136,7 @@ void intif_request_accinfo( int u_fd, int aid, int group_lv, char* query ) { WFIFOL(inter_fd,2) = u_fd; WFIFOL(inter_fd,6) = aid; WFIFOL(inter_fd,10) = group_lv; - safestrncpy((char *)WFIFOP(inter_fd,14), query, NAME_LENGTH); + safestrncpy((char *)WFIFOP(inter_fd,14), query, NAME_LENGTH); WFIFOSET(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH); @@ -2196,12 +2196,13 @@ int intif_parse(int fd) { int packet_len, cmd; cmd = RFIFOW(fd,0); - // Verify ID of the packet - if(cmd<0x3800 || cmd>=0x3800+(sizeof(intif->packet_len_table)/sizeof(intif->packet_len_table[0])) || - intif->packet_len_table[cmd-0x3800]==0){ - return 0; + // Verify ID of the packet + if (cmd < 0x3800 || cmd >= 0x3800+(sizeof(intif->packet_len_table)/sizeof(intif->packet_len_table[0])) + || intif->packet_len_table[cmd-0x3800] == 0 + ) { + return 0; } - // Check the length of the packet + // Check the length of the packet packet_len = intif->packet_len_table[cmd-0x3800]; if(packet_len==-1){ if(RFIFOREST(fd)<4) @@ -2211,7 +2212,7 @@ int intif_parse(int fd) if((int)RFIFOREST(fd)broadcast2(NULL, (char *) RFIFOP(fd,16), packet_len-16, RFIFOL(fd,4), RFIFOW(fd,8), RFIFOW(fd,10), RFIFOW(fd,12), RFIFOW(fd,14), ALL_CLIENT); break; - case 0x3801: intif->pWisMessage(fd); break; - case 0x3802: intif->pWisEnd(fd); break; - case 0x3803: intif->pWisToGM(fd); break; - case 0x3804: intif->pRegisters(fd); break; - case 0x3806: intif->pChangeNameOk(fd); break; - case 0x3807: intif->pMessageToFD(fd); break; - case 0x3818: intif->pLoadGuildStorage(fd); break; - case 0x3819: intif->pSaveGuildStorage(fd); break; - case 0x3820: intif->pPartyCreated(fd); break; - case 0x3821: intif->pPartyInfo(fd); break; - case 0x3822: intif->pPartyMemberAdded(fd); break; - case 0x3823: intif->pPartyOptionChanged(fd); break; - case 0x3824: intif->pPartyMemberWithdraw(fd); break; - case 0x3825: intif->pPartyMove(fd); break; - case 0x3826: intif->pPartyBroken(fd); break; - case 0x3827: intif->pPartyMessage(fd); break; - case 0x3830: intif->pGuildCreated(fd); break; - case 0x3831: intif->pGuildInfo(fd); break; - case 0x3832: intif->pGuildMemberAdded(fd); break; - case 0x3834: intif->pGuildMemberWithdraw(fd); break; - case 0x3835: intif->pGuildMemberInfoShort(fd); break; - case 0x3836: intif->pGuildBroken(fd); break; - case 0x3837: intif->pGuildMessage(fd); break; - case 0x3839: intif->pGuildBasicInfoChanged(fd); break; - case 0x383a: intif->pGuildMemberInfoChanged(fd); break; - case 0x383b: intif->pGuildPosition(fd); break; - case 0x383c: intif->pGuildSkillUp(fd); break; - case 0x383d: intif->pGuildAlliance(fd); break; - case 0x383e: intif->pGuildNotice(fd); break; - case 0x383f: intif->pGuildEmblem(fd); break; - case 0x3840: intif->pGuildCastleDataLoad(fd); break; - case 0x3843: intif->pGuildMasterChanged(fd); break; + case 0x3801: intif->pWisMessage(fd); break; + case 0x3802: intif->pWisEnd(fd); break; + case 0x3803: intif->pWisToGM(fd); break; + case 0x3804: intif->pRegisters(fd); break; + case 0x3806: intif->pChangeNameOk(fd); break; + case 0x3807: intif->pMessageToFD(fd); break; + case 0x3818: intif->pLoadGuildStorage(fd); break; + case 0x3819: intif->pSaveGuildStorage(fd); break; + case 0x3820: intif->pPartyCreated(fd); break; + case 0x3821: intif->pPartyInfo(fd); break; + case 0x3822: intif->pPartyMemberAdded(fd); break; + case 0x3823: intif->pPartyOptionChanged(fd); break; + case 0x3824: intif->pPartyMemberWithdraw(fd); break; + case 0x3825: intif->pPartyMove(fd); break; + case 0x3826: intif->pPartyBroken(fd); break; + case 0x3827: intif->pPartyMessage(fd); break; + case 0x3830: intif->pGuildCreated(fd); break; + case 0x3831: intif->pGuildInfo(fd); break; + case 0x3832: intif->pGuildMemberAdded(fd); break; + case 0x3834: intif->pGuildMemberWithdraw(fd); break; + case 0x3835: intif->pGuildMemberInfoShort(fd); break; + case 0x3836: intif->pGuildBroken(fd); break; + case 0x3837: intif->pGuildMessage(fd); break; + case 0x3839: intif->pGuildBasicInfoChanged(fd); break; + case 0x383a: intif->pGuildMemberInfoChanged(fd); break; + case 0x383b: intif->pGuildPosition(fd); break; + case 0x383c: intif->pGuildSkillUp(fd); break; + case 0x383d: intif->pGuildAlliance(fd); break; + case 0x383e: intif->pGuildNotice(fd); break; + case 0x383f: intif->pGuildEmblem(fd); break; + case 0x3840: intif->pGuildCastleDataLoad(fd); break; + case 0x3843: intif->pGuildMasterChanged(fd); break; //Quest system - case 0x3860: intif->pQuestLog(fd); break; - case 0x3861: intif->pQuestSave(fd); break; + case 0x3860: intif->pQuestLog(fd); break; + case 0x3861: intif->pQuestSave(fd); break; // Mail System - case 0x3848: intif->pMailInboxReceived(fd); break; - case 0x3849: intif->pMailNew(fd); break; - case 0x384a: intif->pMailGetAttach(fd); break; - case 0x384b: intif->pMailDelete(fd); break; - case 0x384c: intif->pMailReturn(fd); break; - case 0x384d: intif->pMailSend(fd); break; + case 0x3848: intif->pMailInboxReceived(fd); break; + case 0x3849: intif->pMailNew(fd); break; + case 0x384a: intif->pMailGetAttach(fd); break; + case 0x384b: intif->pMailDelete(fd); break; + case 0x384c: intif->pMailReturn(fd); break; + case 0x384d: intif->pMailSend(fd); break; // Auction System - case 0x3850: intif->pAuctionResults(fd); break; - case 0x3851: intif->pAuctionRegister(fd); break; - case 0x3852: intif->pAuctionCancel(fd); break; - case 0x3853: intif->pAuctionClose(fd); break; - case 0x3854: intif->pAuctionMessage(fd); break; - case 0x3855: intif->pAuctionBid(fd); break; + case 0x3850: intif->pAuctionResults(fd); break; + case 0x3851: intif->pAuctionRegister(fd); break; + case 0x3852: intif->pAuctionCancel(fd); break; + case 0x3853: intif->pAuctionClose(fd); break; + case 0x3854: intif->pAuctionMessage(fd); break; + case 0x3855: intif->pAuctionBid(fd); break; //Bound items case 0x3856: #ifdef GP_BOUND_ITEMS @@ -2279,27 +2280,27 @@ int intif_parse(int fd) #endif break; // Mercenary System - case 0x3870: intif->pMercenaryReceived(fd); break; - case 0x3871: intif->pMercenaryDeleted(fd); break; - case 0x3872: intif->pMercenarySaved(fd); break; + case 0x3870: intif->pMercenaryReceived(fd); break; + case 0x3871: intif->pMercenaryDeleted(fd); break; + case 0x3872: intif->pMercenarySaved(fd); break; // Elemental System - case 0x387c: intif->pElementalReceived(fd); break; - case 0x387d: intif->pElementalDeleted(fd); break; - case 0x387e: intif->pElementalSaved(fd); break; + case 0x387c: intif->pElementalReceived(fd); break; + case 0x387d: intif->pElementalDeleted(fd); break; + case 0x387e: intif->pElementalSaved(fd); break; - case 0x3880: intif->pCreatePet(fd); break; - case 0x3881: intif->pRecvPetData(fd); break; - case 0x3882: intif->pSavePetOk(fd); break; - case 0x3883: intif->pDeletePetOk(fd); break; - case 0x3890: intif->pCreateHomunculus(fd); break; - case 0x3891: intif->pRecvHomunculusData(fd); break; - case 0x3892: intif->pSaveHomunculusOk(fd); break; - case 0x3893: intif->pDeleteHomunculusOk(fd); break; + case 0x3880: intif->pCreatePet(fd); break; + case 0x3881: intif->pRecvPetData(fd); break; + case 0x3882: intif->pSavePetOk(fd); break; + case 0x3883: intif->pDeletePetOk(fd); break; + case 0x3890: intif->pCreateHomunculus(fd); break; + case 0x3891: intif->pRecvHomunculusData(fd); break; + case 0x3892: intif->pSaveHomunculusOk(fd); break; + case 0x3893: intif->pDeleteHomunculusOk(fd); break; default: ShowError("intif_parse : unknown packet %d %x\n",fd,RFIFOW(fd,0)); return 0; } - // Skip packet + // Skip packet RFIFOSKIP(fd,packet_len); return 1; } -- cgit v1.2.3-60-g2f50