From ba28b56a6b3180c7d13c196ecb44fddd3d63a4f6 Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 7 Feb 2018 03:56:01 +0100 Subject: Fix some minor issues in the clan system, as reported by coverity Signed-off-by: Haru --- src/map/clan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/clan.c') diff --git a/src/map/clan.c b/src/map/clan.c index 6855e449d..2c12df492 100644 --- a/src/map/clan.c +++ b/src/map/clan.c @@ -523,7 +523,7 @@ int clan_inactivity_kick(int tid, int64 tick, int id, intptr_t data) if ((c = clan->search(id)) != NULL) { if (!c->kick_time || c->tid != tid || tid == INVALID_TIMER || c->tid == INVALID_TIMER) { ShowError("Timer Mismatch (Time: %d seconds) %d != %d", c->kick_time, c->tid, tid); - Assert_retr(0, 0); + Assert_report(0); return 0; } for (i = 0; i < VECTOR_LENGTH(c->members); i++) { -- cgit v1.2.3-70-g09d2 From 952df452e7ac9a62c9bc2db3e26958649270f2f4 Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 7 Feb 2018 04:13:05 +0100 Subject: Clean up trailing whitespace and non-indent tabs Signed-off-by: Haru --- src/char/char.c | 2 +- src/char/int_clan.c | 6 ++-- src/common/mmo.h | 3 +- src/common/socket.c | 4 +-- src/login/lclif.p.h | 2 +- src/map/atcommand.c | 6 ++-- src/map/battle.c | 4 +-- src/map/battle.h | 2 +- src/map/clan.c | 84 ++++++++++++++++++++++++++--------------------------- src/map/clif.c | 12 ++++---- src/map/clif.h | 2 +- src/map/intif.c | 14 ++++----- src/map/pc.c | 2 +- src/map/rodex.c | 14 ++++----- src/map/script.c | 20 ++++++------- src/map/skill.h | 2 +- src/map/status.c | 4 +-- src/map/status.h | 4 +-- src/map/unit.c | 2 +- 19 files changed, 94 insertions(+), 95 deletions(-) (limited to 'src/map/clan.c') diff --git a/src/char/char.c b/src/char/char.c index 2532ca154..aef35f216 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1616,7 +1616,7 @@ int char_make_new_char_sql(struct char_session_data *sd, const char *name_, int case JOB_NOVICE: break; default: - return -2; // Char Creation Denied + return -2; // Char Creation Denied } //check other inputs diff --git a/src/char/int_clan.c b/src/char/int_clan.c index c75f8f6e1..e68f6a655 100644 --- a/src/char/int_clan.c +++ b/src/char/int_clan.c @@ -43,10 +43,10 @@ struct inter_clan_interface *inter_clan; /** * Kick offline members of a clan - * + * * Perform the update on the DB to reset clan id to 0 * of the members that are inactive for too long - * + * * @param clan_id Id of the clan * @param kick_interval Time needed to consider a player inactive and kick it * @return 0 on failure, 1 on success @@ -77,7 +77,7 @@ int inter_clan_kick_inactive_members(int clan_id, int kick_interval) /** * Count members of a clan - * + * * @param clan_id Id of the clan * @param kick_interval Time needed to consider a player inactive and ignore it on the count */ diff --git a/src/common/mmo.h b/src/common/mmo.h index d7d0820b3..04daedca0 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -360,7 +360,7 @@ struct item { char favorite; unsigned char bound; uint64 unique_id; - + struct { int16 index; int16 value; @@ -899,7 +899,6 @@ struct rodex_message { struct { struct item item; int idx; - } items[RODEX_MAX_ITEM]; int64 zeny; uint8 type; diff --git a/src/common/socket.c b/src/common/socket.c index d4b8bb43f..c74cd4661 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1537,7 +1537,7 @@ void socket_close(int fd) // Epoll based Event Dispatcher epevent.data.fd = fd; epevent.events = EPOLLIN; - epoll_ctl(epfd, EPOLL_CTL_DEL, fd, &epevent); // removing the socket from epoll when it's being closed is not required but recommended + epoll_ctl(epfd, EPOLL_CTL_DEL, fd, &epevent); // removing the socket from epoll when it's being closed is not required but recommended #endif // SOCKET_EPOLL sShutdown(fd, SHUT_RDWR); // Disallow further reads/writes @@ -1694,7 +1694,7 @@ void socket_init(void) #else // SOCKET_EPOLL // Epoll based Event Dispatcher: - epfd = epoll_create(FD_SETSIZE); // 2.6.8 or newer ignores the expected socket amount argument + epfd = epoll_create(FD_SETSIZE); // 2.6.8 or newer ignores the expected socket amount argument if(epfd == SOCKET_ERROR){ ShowError("Failed to Create Epoll Event Dispatcher: %s\n", error_msg()); exit(EXIT_FAILURE); diff --git a/src/login/lclif.p.h b/src/login/lclif.p.h index 024280b37..5c5c062d3 100644 --- a/src/login/lclif.p.h +++ b/src/login/lclif.p.h @@ -122,7 +122,7 @@ struct packet_CA_LOGIN4 { */ struct packet_CA_LOGIN_PCBANG { int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN_PCBANG) - uint32 version; ///< Client Version + uint32 version; ///< Client Version char id[24]; ///< Username char password[24]; ///< Password uint8 clienttype; ///< Client Type diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 6b7606cb4..cb6428f1f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7596,7 +7596,7 @@ ACMD(mapflag) { CHECKFLAG(noexppenalty); CHECKFLAG(pvp); CHECKFLAG(pvp_noparty); CHECKFLAG(pvp_noguild); CHECKFLAG(pvp_nightmaredrop); CHECKFLAG(pvp_nocalcrank); CHECKFLAG(gvg_castle); CHECKFLAG(gvg); CHECKFLAG(gvg_dungeon); CHECKFLAG(gvg_noparty); CHECKFLAG(battleground); CHECKFLAG(cvc); - CHECKFLAG(nozenypenalty); CHECKFLAG(notrade); CHECKFLAG(noskill); CHECKFLAG(nowarp); + CHECKFLAG(nozenypenalty); CHECKFLAG(notrade); CHECKFLAG(noskill); CHECKFLAG(nowarp); CHECKFLAG(nowarpto); CHECKFLAG(noicewall); CHECKFLAG(snow); CHECKFLAG(clouds); CHECKFLAG(clouds2); CHECKFLAG(fog); CHECKFLAG(fireworks); CHECKFLAG(sakura); CHECKFLAG(leaves); CHECKFLAG(nobaseexp); @@ -8473,7 +8473,7 @@ void atcommand_commands_sub(struct map_session_data* sd, const int fd, AtCommand } } if (count_bind > 0) - clif->message(fd, line_buff); // Last Line + clif->message(fd, line_buff); // Last Line count += count_bind; } @@ -9506,7 +9506,7 @@ ACMD(claninfo) struct DBIterator *iter = db_iterator(clan->db); struct clan *c; int i, count; - + for (c = dbi_first(iter); dbi_exists(iter); c = dbi_next(iter)) { safesnprintf(atcmd_output, sizeof(atcmd_output), "Clan #%d:", c->clan_id); clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output); diff --git a/src/map/battle.c b/src/map/battle.c index d52d20f24..bd7e31d05 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6799,7 +6799,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f } else if (!(map->list[m].flag.pvp && map->list[m].flag.pvp_noparty) && (!map->list[m].flag.battleground || sbg_id == tbg_id)) { state |= BCT_PARTY; - } else if (!map->list[m].flag.cvc || s_clan == t_clan) { + } else if (!map->list[m].flag.cvc || s_clan == t_clan) { state |= BCT_PARTY; } else { state |= BCT_ENEMY; @@ -7309,7 +7309,7 @@ static const struct battle_data { { "max_body_style", &battle_config.max_body_style, 4, 0, SHRT_MAX, }, { "save_body_style", &battle_config.save_body_style, 0, 0, 1, }, { "player_warp_keep_direction", &battle_config.player_warp_keep_direction, 0, 0, 1, }, - { "atcommand_levelup_events", &battle_config.atcommand_levelup_events, 0, 0, 1, }, + { "atcommand_levelup_events", &battle_config.atcommand_levelup_events, 0, 0, 1, }, { "bow_unequip_arrow", &battle_config.bow_unequip_arrow, 1, 0, 1, }, { "max_summoner_parameter", &battle_config.max_summoner_parameter, 120, 10, 10000, }, { "mvp_exp_reward_message", &battle_config.mvp_exp_reward_message, 0, 0, 1, }, diff --git a/src/map/battle.h b/src/map/battle.h index 429249dca..8b7fea29f 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -546,7 +546,7 @@ struct Battle_Config { // Warp Face Direction int player_warp_keep_direction; - int atcommand_levelup_events; // Enable atcommands trigger level up events for NPCs + int atcommand_levelup_events; // Enable atcommands trigger level up events for NPCs int bow_unequip_arrow; diff --git a/src/map/clan.c b/src/map/clan.c index 2c12df492..865f5a4cd 100644 --- a/src/map/clan.c +++ b/src/map/clan.c @@ -94,7 +94,7 @@ struct clan *clan_searchname(const char *name) /** * Returns the first online character of clan - * + * * @param (struct clan *) c clan structure * @return (struct map_session_data *) */ @@ -150,7 +150,7 @@ void clan_buff_end(struct map_session_data *sd, struct clan *c) { nullpo_retv(sd); nullpo_retv(c); - + if (c->buff.icon <= 0) { return; } @@ -171,7 +171,7 @@ bool clan_join(struct map_session_data *sd, int clan_id) struct clan_member m; nullpo_ret(sd); - + // Already joined a guild or clan if (sd->status.guild_id > 0 || sd->guild != NULL) { ShowError("clan_join: Player already joined in a guild. char_id: %d\n", sd->status.char_id); @@ -200,24 +200,24 @@ bool clan_join(struct map_session_data *sd, int clan_id) ShowError("clan_join: Clan '%s' already reached its max capacity!\n", c->name); return false; } - + VECTOR_ENSURE(c->members, 1, 1); - + m.sd = sd; m.char_id = sd->status.char_id; m.online = 1; m.last_login = sd->status.last_login; VECTOR_PUSH(c->members, m); - + c->connect_member++; c->member_count++; - + sd->status.clan_id = c->clan_id; sd->clan = c; - + sc_start2(NULL, &sd->bl, SC_CLAN_INFO, 10000, 0, c->clan_id, INFINITE_DURATION); status_calc_pc(sd, SCO_FORCE); - + chrif->save(sd, 0); clif->clan_basicinfo(sd); clif->clan_onlinecount(c); @@ -256,11 +256,11 @@ void clan_member_online(struct map_session_data *sd, bool first) clif->clan_leave(sd); return; } - + if (!c->received) { return; } - + if (c->max_member <= c->member_count || VECTOR_LENGTH(c->members) >= c->max_member) { ShowError("Clan System: More members than the maximum allowed in clan #%d\n", c->clan_id); return; @@ -270,7 +270,7 @@ void clan_member_online(struct map_session_data *sd, bool first) inactivity = (int)(time(NULL) - sd->status.last_login); if (i == INDEX_NOT_FOUND) { struct clan_member m; - + if (c->kick_time > 0 && inactivity > c->kick_time) { sd->status.clan_id = 0; sd->clan = NULL; @@ -290,7 +290,7 @@ void clan_member_online(struct map_session_data *sd, bool first) } else { struct clan_member *m = &VECTOR_INDEX(c->members, i); - + if (c->kick_time > 0 && inactivity > c->kick_time) { if (m->online == 1) { m->online = 0; @@ -311,7 +311,7 @@ void clan_member_online(struct map_session_data *sd, bool first) m->online = 1; m->last_login = sd->status.last_login; } - + sd->clan = c; c->connect_member++; @@ -385,7 +385,7 @@ bool clan_leave(struct map_session_data *sd, bool first) /** * Sets a player offline - * + * * @param (struct map_session_data *) sd Player Data */ void clan_member_offline(struct map_session_data *sd) @@ -394,9 +394,9 @@ void clan_member_offline(struct map_session_data *sd) int i; nullpo_retv(sd); - + c = sd->clan; - + if (c == NULL) { return; } @@ -650,11 +650,11 @@ void clan_read_buffs(struct clan *c, struct config_setting_t *buff, const char * int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool reload) { int total, s, valid = 0; - + nullpo_retr(false, settings); - + total = libconfig->setting_length(settings); - + for (s = 0; s < total; s++) { struct clan *c; struct config_setting_t *cl, *buff, *allies, *antagonists; @@ -668,7 +668,7 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool ShowError("clan_read_db: Invalid Clan Id %d, skipping...\n", id); return false; } - + if (clan->search(id) != NULL) { ShowError("clan_read_db: Duplicate entry for Clan Id %d, skipping...\n", id); return false; @@ -677,18 +677,18 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool ShowError("clan_read_db: failed to find 'Id' for clan #%d\n", s); return false; } - + if (libconfig->setting_lookup_string(cl, "Const", &aConst)) { if (!*aConst) { ShowError("clan_read_db: Invalid Clan Const '%s', skipping...\n", aConst); return false; } - + if (strlen(aConst) > NAME_LENGTH) { ShowError("clan_read_db: Clan Name '%s' is longer than %d characters, skipping...\n", aConst, NAME_LENGTH); return false; } - + if (clan->searchname(aConst) != NULL) { ShowError("clan_read_db: Duplicate entry for Clan Const '%s', skipping...\n", aConst); return false; @@ -697,18 +697,18 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool ShowError("clan_read_db: failed to find 'Const' for clan #%d\n", s); return false; } - + if (libconfig->setting_lookup_string(cl, "Name", &aName)) { if (!*aName) { ShowError("clan_read_db: Invalid Clan Name '%s', skipping...\n", aName); return false; } - + if (strlen(aName) > NAME_LENGTH) { ShowError("clan_read_db: Clan Name '%s' is longer than %d characters, skipping...\n", aName, NAME_LENGTH); return false; } - + if (clan->searchname(aName) != NULL) { ShowError("clan_read_db: Duplicate entry for Clan Name '%s', skipping...\n", aName); return false; @@ -717,19 +717,19 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool ShowError("clan_read_db: failed to find 'Name' for clan #%d\n", s); return false; } - + if (!libconfig->setting_lookup_string(cl, "Leader", &aLeader)) { ShowError("clan_read_db: failed to find 'Leader' for clan #%d\n", s); return false; } - + if (!libconfig->setting_lookup_string(cl, "Map", &aMap)) { ShowError("clan_read_db: failed to find 'Map' for clan #%d\n", s); return false; } CREATE(c, struct clan, 1); - + c->clan_id = id; safestrncpy(c->constant, aConst, NAME_LENGTH); safestrncpy(c->name, aName, NAME_LENGTH); @@ -770,19 +770,19 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool } allies = libconfig->setting_get_member(cl, "Allies"); - + if (allies != NULL) { int a = libconfig->setting_length(allies); - + VECTOR_INIT(c->allies); if (a > 0 && clan->max_relations > 0) { const char *allyConst; - + if (a > clan->max_relations) { ShowWarning("clan_read_db: Clan %d has more allies(%d) than allowed(%d), reading only the first %d...\n", c->clan_id, a, clan->max_relations, clan->max_relations); a = clan->max_relations; } - + VECTOR_ENSURE(c->allies, a, 1); for (i = 0; i < a; i++) { struct clan_relationship r; @@ -810,12 +810,12 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool VECTOR_INIT(c->antagonists); if (a > 0 && clan->max_relations > 0) { const char *antagonistConst; - + if (a > clan->max_relations) { ShowWarning("clan_read_db: Clan %d has more antagonists(%d) than allowed(%d), reading only the first %d...\n", c->clan_id, a, clan->max_relations, clan->max_relations); a = clan->max_relations; } - + VECTOR_ENSURE(c->antagonists, a, 1); for (i = 0; i < a; i++) { struct clan_relationship r; @@ -834,7 +834,7 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool } } } - + clan->read_db_additional_fields(c, cl, s, source); if (c->kick_time > 0) { c->tid = timer->add(timer->gettick() + c->check_time, clan->inactivity_kick, c->clan_id, 0); @@ -846,13 +846,13 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool VECTOR_INIT(c->members); valid++; } - + // Validating Relations if (valid > 0) { struct DBIterator *iter = db_iterator(clan->db); struct clan *c_ok, *c; int i; - + for (c_ok = dbi_first(iter); dbi_exists(iter); c_ok = dbi_next(iter)) { i = VECTOR_LENGTH(c_ok->allies); while ( i > 0) { @@ -871,7 +871,7 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool i = VECTOR_LENGTH(c_ok->antagonists); while ( i > 0) { struct clan_relationship *r; - + i--; r = &VECTOR_INDEX(c_ok->antagonists, i); if ((c = clan->searchname(r->constant)) == NULL) { @@ -903,7 +903,7 @@ void clan_read_db(struct config_setting_t *settings, const char *source, bool re if ((clans = libconfig->setting_get_member(settings, "clans")) != NULL) { int read; - + read = clan->read_db_sub(clans, source, reload); if (read > 0) { clan->set_constants(); @@ -988,7 +988,7 @@ void clan_config_read_additional_settings(struct config_setting_t *settings, con * Reloads Clan DB */ void clan_reload(void) -{ +{ clan->config_read(true); } diff --git a/src/map/clif.c b/src/map/clif.c index ea239ba21..0000c7aba 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7409,7 +7409,7 @@ void clif_mvp_item(struct map_session_data *sd,int nameid) /// 010b .L void clif_mvp_exp(struct map_session_data *sd, unsigned int exp) { -#if PACKETVER >= 20131223 // Kro removed this packet [Napster] +#if PACKETVER >= 20131223 // Kro removed this packet [Napster] if (battle_config.mvp_exp_reward_message) { char e_msg[CHAT_SIZE_MAX]; sprintf(e_msg, msg_txt(855), exp); @@ -11889,8 +11889,8 @@ void clif_parse_ItemIdentify(int fd,struct map_session_data *sd) clif_menuskill_clear(sd); } -/// Identifying item with right-click (CZ_REQ_ONECLICK_ITEMIDENTIFY). -/// 0A35 .W +/// Identifying item with right-click (CZ_REQ_ONECLICK_ITEMIDENTIFY). +/// 0A35 .W void clif_parse_OneClick_ItemIdentify(int fd, struct map_session_data *sd) { int cmd = RFIFOW(fd,0); @@ -19358,10 +19358,10 @@ void clif_clan_basicinfo(struct map_session_data *sd) len += NAME_LENGTH; } } - + for (i = 0; i < VECTOR_LENGTH(c->antagonists); i++) { struct clan_relationship *an = &VECTOR_INDEX(c->antagonists, i); - + if ((antagonist = clan->search(an->clan_id)) != NULL) { safestrncpy(WFIFOP(fd, len), antagonist->name, NAME_LENGTH); len += NAME_LENGTH; @@ -19384,7 +19384,7 @@ void clif_clan_onlinecount(struct clan *c) struct PACKET_ZC_NOTIFY_CLAN_CONNECTINFO p; nullpo_retv(c); - + p.PacketType = clanOnlineCount; p.NumConnect = c->connect_member; p.NumTotal = c->max_member; diff --git a/src/map/clif.h b/src/map/clif.h index c393c4f64..0711546df 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -110,7 +110,7 @@ typedef enum send_target { BG_AREA_WOS, BG_QUEUE, - + CLAN, // Clan System } send_target; diff --git a/src/map/intif.c b/src/map/intif.c index c933ceb15..0e5cd3db2 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -751,7 +751,7 @@ int intif_party_leaderchange(int party_id,int account_id,int char_id) /** * Request clan member count - * + * * @param clan_id Id of the clan to have members counted * @param kick_interval Interval of the inactivity kick */ @@ -759,7 +759,7 @@ int intif_clan_membercount(int clan_id, int kick_interval) { if (intif->CheckForCharServer() || clan_id == 0 || kick_interval <= 0) return 0; - + WFIFOHEAD(inter_fd, 10); WFIFOW(inter_fd, 0) = 0x3044; WFIFOL(inter_fd, 2) = clan_id; @@ -791,7 +791,7 @@ void intif_parse_RecvClanMemberAction(int fd) ShowError("intif_parse_RecvClanMemberAction: Received invalid clan_id '%d'\n", clan_id); return; } - + if (count < 0) { ShowError("intif_parse_RecvClanMemberAction: Received invalid member count value '%d'\n", count); return; @@ -2599,10 +2599,10 @@ void intif_parse_RodexNotifications(int fd) /// Updates a mail /// flag: -/// 0 - user Read -/// 1 - user got Zeny -/// 2 - user got Items -/// 3 - delete +/// 0 - user Read +/// 1 - user got Zeny +/// 2 - user got Items +/// 3 - delete int intif_rodex_updatemail(int64 mail_id, int8 flag) { if (intif->CheckForCharServer()) diff --git a/src/map/pc.c b/src/map/pc.c index c18fdee9e..0b30b1221 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1524,7 +1524,7 @@ int pc_reg_received(struct map_session_data *sd) status_calc_pc(sd,SCO_FIRST|SCO_FORCE); chrif->scdata_request(sd->status.account_id, sd->status.char_id); - + if (sd->status.clan_id) clan->member_online(sd, true); diff --git a/src/map/rodex.c b/src/map/rodex.c index dcecb6b8f..d5a6064cf 100644 --- a/src/map/rodex.c +++ b/src/map/rodex.c @@ -216,11 +216,11 @@ void rodex_check_player(struct map_session_data *sd, const char *name, int *base /// @param title : Mail Title /// @param zeny : Amount of zeny attached /// Returns result code: -/// RODEX_SEND_MAIL_SUCCESS = 0, -/// RODEX_SEND_MAIL_FATAL_ERROR = 1, -/// RODEX_SEND_MAIL_COUNT_ERROR = 2, -/// RODEX_SEND_MAIL_ITEM_ERROR = 3, -/// RODEX_SEND_MAIL_RECEIVER_ERROR = 4 +/// RODEX_SEND_MAIL_SUCCESS = 0, +/// RODEX_SEND_MAIL_FATAL_ERROR = 1, +/// RODEX_SEND_MAIL_COUNT_ERROR = 2, +/// RODEX_SEND_MAIL_ITEM_ERROR = 3, +/// RODEX_SEND_MAIL_RECEIVER_ERROR = 4 int rodex_send_mail(struct map_session_data *sd, const char *receiver_name, const char *body, const char *title, int64 zeny) { int i; @@ -532,8 +532,8 @@ void rodex_get_items(struct map_session_data *sd, int8 opentype, int64 mail_id) /// - should be called everytime we're going to stop using rodex in this character /// @param sd : Target to clean /// @param flag : -/// 0 - clear everything -/// 1 - clear tmp only +/// 0 - clear everything +/// 1 - clear tmp only void rodex_clean(struct map_session_data *sd, int8 flag) { nullpo_retv(sd); diff --git a/src/map/script.c b/src/map/script.c index 36f37abb9..26de803d7 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -8284,7 +8284,7 @@ BUILDIN(makeitem2) map->search_freecell(NULL, m, &x, &y, -1, -1, 1); } else { range = (script_hasdata(st, 14) ? cap_value(script_getnum(st, 14), 1, battle_config.area_size) : 3); - map->search_freecell(&sd->bl, sd->bl.m, &x, &y, range, range, 0); // Locate spot next to player. + map->search_freecell(&sd->bl, sd->bl.m, &x, &y, range, range, 0); // Locate spot next to player. } } @@ -8635,7 +8635,7 @@ BUILDIN(readparam) { BUILDIN(getcharid) { int num = script_getnum(st, 2); struct map_session_data *sd; - + if (script_hasdata(st, 3)) sd = map->nick2sd(script_getstr(st, 3)); else @@ -8647,22 +8647,22 @@ BUILDIN(getcharid) { } switch (num) { - case 0: + case 0: script_pushint(st, sd->status.char_id); break; - case 1: + case 1: script_pushint(st, sd->status.party_id); break; - case 2: + case 2: script_pushint(st, sd->status.guild_id); break; - case 3: + case 3: script_pushint(st, sd->status.account_id); break; - case 4: + case 4: script_pushint(st, sd->bg_id); break; - case 5: + case 5: script_pushint(st, sd->status.clan_id); break; default: @@ -23943,7 +23943,7 @@ BUILDIN(clan_master) { struct npc_data *nd = map->id2nd(st->oid); int clan_id = script_getnum(st, 2); - + if (nd == NULL) { script_pushint(st, false); return false; @@ -24664,7 +24664,7 @@ void script_parse_builtin(void) { BUILDIN_DEF(clan_join,"i?"), BUILDIN_DEF(clan_leave,"?"), BUILDIN_DEF(clan_master,"i"), - + BUILDIN_DEF(channelmes, "ss"), BUILDIN_DEF(addchannelhandler, "ss"), BUILDIN_DEF(removechannelhandler, "ss"), diff --git a/src/map/skill.h b/src/map/skill.h index bd4d82df2..d7590921a 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -1371,7 +1371,7 @@ enum e_skill { GM_FORCE_TRANSFER, GM_WIDE_RESURRECTION, ALL_NIFLHEIM_RECALL, - ALL_PRONTERA_RECALL, + ALL_PRONTERA_RECALL, ALL_GLASTHEIM_RECALL, ALL_THANATOS_RECALL, diff --git a/src/map/status.c b/src/map/status.c index 3bb511970..3e4b4a45c 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -9763,8 +9763,8 @@ int status_get_val_flag(enum sc_type type) { int val_flag = 0; switch (type) { - case SC_CLAN_INFO: - val_flag |= 1 | 2; + case SC_CLAN_INFO: + val_flag |= 1 | 2; break; case SC_FIGHTINGSPIRIT: val_flag |= 1 | 2; diff --git a/src/map/status.h b/src/map/status.h index 66e773720..5a031fa48 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -838,9 +838,9 @@ typedef enum sc_type { SC_BITESCAR, SC_ARCLOUSEDASH, SC_TUNAPARTY, - SC_SHRIMP, // 650 + SC_SHRIMP, // 650 SC_FRESHSHRIMP, - + SC_DRESS_UP, // Rodex diff --git a/src/map/unit.c b/src/map/unit.c index 6e98fc093..938b587f3 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2058,7 +2058,7 @@ bool unit_can_reach_bl(struct block_list *bl,struct block_list *tbl, int range, #ifdef OFFICIAL_WALKPATH if( !path->search_long(NULL, bl, bl->m, bl->x, bl->y, tbl->x-dx, tbl->y-dy, CELL_CHKNOPASS) // Check if there is an obstacle between - && wpd.path_len > 14 // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] + && wpd.path_len > 14 // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] && (bl->type != BL_NPC) ) // If type is a NPC, please disregard. return false; #endif -- cgit v1.2.3-70-g09d2