From 069f39e8a1ebee3e4a4ce8302d0099842876782b Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 13 Dec 2012 16:25:50 -0800 Subject: Some formatting fixes before I go insane Also delete the French translation from ladmin. --- src/map/atcommand.cpp | 4231 +++++++++++---------- src/map/atcommand.hpp | 26 +- src/map/battle.cpp | 1579 ++++---- src/map/battle.hpp | 498 +-- src/map/chat.cpp | 176 +- src/map/chat.hpp | 24 +- src/map/chrif.cpp | 692 ++-- src/map/chrif.hpp | 40 +- src/map/clif.cpp | 6817 +++++++++++++++++----------------- src/map/clif.hpp | 322 +- src/map/intif.cpp | 464 ++- src/map/intif.hpp | 34 +- src/map/itemdb.cpp | 328 +- src/map/itemdb.hpp | 64 +- src/map/magic-expr-eval.hpp | 4 +- src/map/magic-expr.cpp | 881 +++-- src/map/magic-expr.hpp | 32 +- src/map/magic-interpreter-base.cpp | 230 +- src/map/magic-interpreter-lexer.lpp | 172 +- src/map/magic-interpreter-parser.ypp | 468 +-- src/map/magic-interpreter.hpp | 272 +- src/map/magic-stmt.cpp | 786 ++-- src/map/magic.cpp | 60 +- src/map/magic.hpp | 22 +- src/map/map.cpp | 991 +++-- src/map/map.hpp | 400 +- src/map/mob.cpp | 1987 +++++----- src/map/mob.hpp | 122 +- src/map/npc.cpp | 1198 +++--- src/map/npc.hpp | 64 +- src/map/party.cpp | 350 +- src/map/party.hpp | 58 +- src/map/path.cpp | 202 +- src/map/pc.cpp | 3152 ++++++++-------- src/map/pc.hpp | 298 +- src/map/script.cpp | 3568 +++++++++--------- src/map/script.hpp | 30 +- src/map/skill-pools.cpp | 62 +- src/map/skill.cpp | 4686 ++++++++++++----------- src/map/skill.hpp | 204 +- src/map/storage.cpp | 174 +- src/map/storage.hpp | 36 +- src/map/tmw.cpp | 75 +- src/map/tmw.hpp | 12 +- src/map/trade.cpp | 166 +- src/map/trade.hpp | 14 +- 46 files changed, 17994 insertions(+), 18077 deletions(-) (limited to 'src/map') diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 3d9e409..de2030c 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -39,169 +39,169 @@ static char command_symbol = '@'; // first char of the commands (by [Yor]) -#define ATCOMMAND_FUNC(x) int atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message) -ATCOMMAND_FUNC (setup); -ATCOMMAND_FUNC (broadcast); -ATCOMMAND_FUNC (localbroadcast); -ATCOMMAND_FUNC (charwarp); +#define ATCOMMAND_FUNC(x) int atcommand_ ## x(const int fd, struct map_session_data* sd, const char* command, const char* message) +ATCOMMAND_FUNC(setup); +ATCOMMAND_FUNC(broadcast); +ATCOMMAND_FUNC(localbroadcast); +ATCOMMAND_FUNC(charwarp); //ATCOMMAND_FUNC (warp); -ATCOMMAND_FUNC (where); +ATCOMMAND_FUNC(where); //ATCOMMAND_FUNC (goto); -ATCOMMAND_FUNC (jump); -ATCOMMAND_FUNC (who); -ATCOMMAND_FUNC (whogroup); -ATCOMMAND_FUNC (whomap); -ATCOMMAND_FUNC (whomapgroup); -ATCOMMAND_FUNC (whogm); // by Yor -ATCOMMAND_FUNC (save); -ATCOMMAND_FUNC (load); -ATCOMMAND_FUNC (speed); -ATCOMMAND_FUNC (storage); -ATCOMMAND_FUNC (option); -ATCOMMAND_FUNC (hide); -ATCOMMAND_FUNC (die); -ATCOMMAND_FUNC (kill); -ATCOMMAND_FUNC (alive); -ATCOMMAND_FUNC (kami); -ATCOMMAND_FUNC (heal); +ATCOMMAND_FUNC(jump); +ATCOMMAND_FUNC(who); +ATCOMMAND_FUNC(whogroup); +ATCOMMAND_FUNC(whomap); +ATCOMMAND_FUNC(whomapgroup); +ATCOMMAND_FUNC(whogm); // by Yor +ATCOMMAND_FUNC(save); +ATCOMMAND_FUNC(load); +ATCOMMAND_FUNC(speed); +ATCOMMAND_FUNC(storage); +ATCOMMAND_FUNC(option); +ATCOMMAND_FUNC(hide); +ATCOMMAND_FUNC(die); +ATCOMMAND_FUNC(kill); +ATCOMMAND_FUNC(alive); +ATCOMMAND_FUNC(kami); +ATCOMMAND_FUNC(heal); //ATCOMMAND_FUNC (item); -ATCOMMAND_FUNC (itemreset); -ATCOMMAND_FUNC (itemcheck); -ATCOMMAND_FUNC (baselevelup); -ATCOMMAND_FUNC (joblevelup); -ATCOMMAND_FUNC (help); -ATCOMMAND_FUNC (gm); -ATCOMMAND_FUNC (pvpoff); -ATCOMMAND_FUNC (pvpon); -ATCOMMAND_FUNC (model); -ATCOMMAND_FUNC (go); +ATCOMMAND_FUNC(itemreset); +ATCOMMAND_FUNC(itemcheck); +ATCOMMAND_FUNC(baselevelup); +ATCOMMAND_FUNC(joblevelup); +ATCOMMAND_FUNC(help); +ATCOMMAND_FUNC(gm); +ATCOMMAND_FUNC(pvpoff); +ATCOMMAND_FUNC(pvpon); +ATCOMMAND_FUNC(model); +ATCOMMAND_FUNC(go); //ATCOMMAND_FUNC (spawn); -ATCOMMAND_FUNC (killmonster); -ATCOMMAND_FUNC (killmonster2); -ATCOMMAND_FUNC (refine); -ATCOMMAND_FUNC (produce); -ATCOMMAND_FUNC (memo); -ATCOMMAND_FUNC (gat); -ATCOMMAND_FUNC (packet); -ATCOMMAND_FUNC (statuspoint); -ATCOMMAND_FUNC (skillpoint); -ATCOMMAND_FUNC (zeny); -ATCOMMAND_FUNC (param); +ATCOMMAND_FUNC(killmonster); +ATCOMMAND_FUNC(killmonster2); +ATCOMMAND_FUNC(refine); +ATCOMMAND_FUNC(produce); +ATCOMMAND_FUNC(memo); +ATCOMMAND_FUNC(gat); +ATCOMMAND_FUNC(packet); +ATCOMMAND_FUNC(statuspoint); +ATCOMMAND_FUNC(skillpoint); +ATCOMMAND_FUNC(zeny); +ATCOMMAND_FUNC(param); //ATCOMMAND_FUNC (recall); -ATCOMMAND_FUNC (recallall); -ATCOMMAND_FUNC (revive); -ATCOMMAND_FUNC (character_stats); -ATCOMMAND_FUNC (character_stats_all); -ATCOMMAND_FUNC (character_option); -ATCOMMAND_FUNC (character_save); -ATCOMMAND_FUNC (night); -ATCOMMAND_FUNC (day); -ATCOMMAND_FUNC (doom); -ATCOMMAND_FUNC (doommap); -ATCOMMAND_FUNC (raise); -ATCOMMAND_FUNC (raisemap); -ATCOMMAND_FUNC (character_baselevel); -ATCOMMAND_FUNC (character_joblevel); -ATCOMMAND_FUNC (kick); -ATCOMMAND_FUNC (kickall); -ATCOMMAND_FUNC (allskills); -ATCOMMAND_FUNC (questskill); -ATCOMMAND_FUNC (charquestskill); -ATCOMMAND_FUNC (lostskill); -ATCOMMAND_FUNC (charlostskill); -ATCOMMAND_FUNC (party); -ATCOMMAND_FUNC (charskreset); -ATCOMMAND_FUNC (charstreset); -ATCOMMAND_FUNC (charreset); -ATCOMMAND_FUNC (charstpoint); -ATCOMMAND_FUNC (charmodel); -ATCOMMAND_FUNC (charskpoint); -ATCOMMAND_FUNC (charzeny); -ATCOMMAND_FUNC (reloaditemdb); -ATCOMMAND_FUNC (reloadmobdb); -ATCOMMAND_FUNC (reloadskilldb); -ATCOMMAND_FUNC (reloadscript); -ATCOMMAND_FUNC (reloadgmdb); // by Yor -ATCOMMAND_FUNC (mapexit); -ATCOMMAND_FUNC (idsearch); -ATCOMMAND_FUNC (mapinfo); -ATCOMMAND_FUNC (dye); //** by fritz -ATCOMMAND_FUNC (hair_style); //** by fritz -ATCOMMAND_FUNC (hair_color); //** by fritz -ATCOMMAND_FUNC (all_stats); //** by fritz -ATCOMMAND_FUNC (char_change_sex); // by Yor -ATCOMMAND_FUNC (char_block); // by Yor -ATCOMMAND_FUNC (char_ban); // by Yor -ATCOMMAND_FUNC (char_unblock); // by Yor -ATCOMMAND_FUNC (char_unban); // by Yor -ATCOMMAND_FUNC (mount_peco); // by Valaris -ATCOMMAND_FUNC (char_mount_peco); // by Yor -ATCOMMAND_FUNC (partyspy); // [Syrus22] -ATCOMMAND_FUNC (partyrecall); // by Yor -ATCOMMAND_FUNC (enablenpc); -ATCOMMAND_FUNC (disablenpc); -ATCOMMAND_FUNC (servertime); // by Yor -ATCOMMAND_FUNC (chardelitem); // by Yor -ATCOMMAND_FUNC (jail); // by Yor -ATCOMMAND_FUNC (unjail); // by Yor -ATCOMMAND_FUNC (disguise); // [Valaris] -ATCOMMAND_FUNC (undisguise); // by Yor -ATCOMMAND_FUNC (ignorelist); // by Yor -ATCOMMAND_FUNC (charignorelist); // by Yor -ATCOMMAND_FUNC (inall); // by Yor -ATCOMMAND_FUNC (exall); // by Yor -ATCOMMAND_FUNC (chardisguise); // Kalaspuff -ATCOMMAND_FUNC (charundisguise); // Kalaspuff -ATCOMMAND_FUNC (email); // by Yor -ATCOMMAND_FUNC (effect); //by Apple -ATCOMMAND_FUNC (character_item_list); // by Yor -ATCOMMAND_FUNC (character_storage_list); // by Yor -ATCOMMAND_FUNC (character_cart_list); // by Yor -ATCOMMAND_FUNC (addwarp); // by MouseJstr -ATCOMMAND_FUNC (follow); // by MouseJstr -ATCOMMAND_FUNC (skillon); // by MouseJstr -ATCOMMAND_FUNC (skilloff); // by MouseJstr -ATCOMMAND_FUNC (killer); // by MouseJstr -ATCOMMAND_FUNC (npcmove); // by MouseJstr -ATCOMMAND_FUNC (killable); // by MouseJstr -ATCOMMAND_FUNC (charkillable); // by MouseJstr -ATCOMMAND_FUNC (chareffect); // by MouseJstr -ATCOMMAND_FUNC (chardye); // by MouseJstr -ATCOMMAND_FUNC (charhairstyle); // by MouseJstr -ATCOMMAND_FUNC (charhaircolor); // by MouseJstr -ATCOMMAND_FUNC (dropall); // by MouseJstr -ATCOMMAND_FUNC (chardropall); // by MouseJstr -ATCOMMAND_FUNC (storeall); // by MouseJstr -ATCOMMAND_FUNC (charstoreall); // by MouseJstr -ATCOMMAND_FUNC (skillid); // by MouseJstr -ATCOMMAND_FUNC (useskill); // by MouseJstr -ATCOMMAND_FUNC (summon); -ATCOMMAND_FUNC (rain); -ATCOMMAND_FUNC (snow); -ATCOMMAND_FUNC (sakura); -ATCOMMAND_FUNC (fog); -ATCOMMAND_FUNC (leaves); -ATCOMMAND_FUNC (adjgmlvl); // by MouseJstr -ATCOMMAND_FUNC (adjcmdlvl); // by MouseJstr -ATCOMMAND_FUNC (trade); // by MouseJstr -ATCOMMAND_FUNC (unmute); // [Valaris] -ATCOMMAND_FUNC (char_wipe); // [Fate] -ATCOMMAND_FUNC (set_magic); // [Fate] -ATCOMMAND_FUNC (magic_info); // [Fate] -ATCOMMAND_FUNC (log); // [Fate] -ATCOMMAND_FUNC (tee); // [Fate] -ATCOMMAND_FUNC (invisible); // [Fate] -ATCOMMAND_FUNC (visible); // [Fate] -ATCOMMAND_FUNC (list_nearby); // [Fate] -ATCOMMAND_FUNC (iterate_forward_over_players); // [Fate] -ATCOMMAND_FUNC (iterate_backwards_over_players); // [Fate] -ATCOMMAND_FUNC (skillpool_info); // [Fate] -ATCOMMAND_FUNC (skillpool_focus); // [Fate] -ATCOMMAND_FUNC (skillpool_unfocus); // [Fate] -ATCOMMAND_FUNC (skill_learn); // [Fate] -ATCOMMAND_FUNC (wgm); -ATCOMMAND_FUNC (ipcheck); -ATCOMMAND_FUNC (doomspot); +ATCOMMAND_FUNC(recallall); +ATCOMMAND_FUNC(revive); +ATCOMMAND_FUNC(character_stats); +ATCOMMAND_FUNC(character_stats_all); +ATCOMMAND_FUNC(character_option); +ATCOMMAND_FUNC(character_save); +ATCOMMAND_FUNC(night); +ATCOMMAND_FUNC(day); +ATCOMMAND_FUNC(doom); +ATCOMMAND_FUNC(doommap); +ATCOMMAND_FUNC(raise); +ATCOMMAND_FUNC(raisemap); +ATCOMMAND_FUNC(character_baselevel); +ATCOMMAND_FUNC(character_joblevel); +ATCOMMAND_FUNC(kick); +ATCOMMAND_FUNC(kickall); +ATCOMMAND_FUNC(allskills); +ATCOMMAND_FUNC(questskill); +ATCOMMAND_FUNC(charquestskill); +ATCOMMAND_FUNC(lostskill); +ATCOMMAND_FUNC(charlostskill); +ATCOMMAND_FUNC(party); +ATCOMMAND_FUNC(charskreset); +ATCOMMAND_FUNC(charstreset); +ATCOMMAND_FUNC(charreset); +ATCOMMAND_FUNC(charstpoint); +ATCOMMAND_FUNC(charmodel); +ATCOMMAND_FUNC(charskpoint); +ATCOMMAND_FUNC(charzeny); +ATCOMMAND_FUNC(reloaditemdb); +ATCOMMAND_FUNC(reloadmobdb); +ATCOMMAND_FUNC(reloadskilldb); +ATCOMMAND_FUNC(reloadscript); +ATCOMMAND_FUNC(reloadgmdb); // by Yor +ATCOMMAND_FUNC(mapexit); +ATCOMMAND_FUNC(idsearch); +ATCOMMAND_FUNC(mapinfo); +ATCOMMAND_FUNC(dye); //** by fritz +ATCOMMAND_FUNC(hair_style); //** by fritz +ATCOMMAND_FUNC(hair_color); //** by fritz +ATCOMMAND_FUNC(all_stats); //** by fritz +ATCOMMAND_FUNC(char_change_sex); // by Yor +ATCOMMAND_FUNC(char_block); // by Yor +ATCOMMAND_FUNC(char_ban); // by Yor +ATCOMMAND_FUNC(char_unblock); // by Yor +ATCOMMAND_FUNC(char_unban); // by Yor +ATCOMMAND_FUNC(mount_peco); // by Valaris +ATCOMMAND_FUNC(char_mount_peco); // by Yor +ATCOMMAND_FUNC(partyspy); // [Syrus22] +ATCOMMAND_FUNC(partyrecall); // by Yor +ATCOMMAND_FUNC(enablenpc); +ATCOMMAND_FUNC(disablenpc); +ATCOMMAND_FUNC(servertime); // by Yor +ATCOMMAND_FUNC(chardelitem); // by Yor +ATCOMMAND_FUNC(jail); // by Yor +ATCOMMAND_FUNC(unjail); // by Yor +ATCOMMAND_FUNC(disguise); // [Valaris] +ATCOMMAND_FUNC(undisguise); // by Yor +ATCOMMAND_FUNC(ignorelist); // by Yor +ATCOMMAND_FUNC(charignorelist); // by Yor +ATCOMMAND_FUNC(inall); // by Yor +ATCOMMAND_FUNC(exall); // by Yor +ATCOMMAND_FUNC(chardisguise); // Kalaspuff +ATCOMMAND_FUNC(charundisguise); // Kalaspuff +ATCOMMAND_FUNC(email); // by Yor +ATCOMMAND_FUNC(effect); //by Apple +ATCOMMAND_FUNC(character_item_list); // by Yor +ATCOMMAND_FUNC(character_storage_list); // by Yor +ATCOMMAND_FUNC(character_cart_list); // by Yor +ATCOMMAND_FUNC(addwarp); // by MouseJstr +ATCOMMAND_FUNC(follow); // by MouseJstr +ATCOMMAND_FUNC(skillon); // by MouseJstr +ATCOMMAND_FUNC(skilloff); // by MouseJstr +ATCOMMAND_FUNC(killer); // by MouseJstr +ATCOMMAND_FUNC(npcmove); // by MouseJstr +ATCOMMAND_FUNC(killable); // by MouseJstr +ATCOMMAND_FUNC(charkillable); // by MouseJstr +ATCOMMAND_FUNC(chareffect); // by MouseJstr +ATCOMMAND_FUNC(chardye); // by MouseJstr +ATCOMMAND_FUNC(charhairstyle); // by MouseJstr +ATCOMMAND_FUNC(charhaircolor); // by MouseJstr +ATCOMMAND_FUNC(dropall); // by MouseJstr +ATCOMMAND_FUNC(chardropall); // by MouseJstr +ATCOMMAND_FUNC(storeall); // by MouseJstr +ATCOMMAND_FUNC(charstoreall); // by MouseJstr +ATCOMMAND_FUNC(skillid); // by MouseJstr +ATCOMMAND_FUNC(useskill); // by MouseJstr +ATCOMMAND_FUNC(summon); +ATCOMMAND_FUNC(rain); +ATCOMMAND_FUNC(snow); +ATCOMMAND_FUNC(sakura); +ATCOMMAND_FUNC(fog); +ATCOMMAND_FUNC(leaves); +ATCOMMAND_FUNC(adjgmlvl); // by MouseJstr +ATCOMMAND_FUNC(adjcmdlvl); // by MouseJstr +ATCOMMAND_FUNC(trade); // by MouseJstr +ATCOMMAND_FUNC(unmute); // [Valaris] +ATCOMMAND_FUNC(char_wipe); // [Fate] +ATCOMMAND_FUNC(set_magic); // [Fate] +ATCOMMAND_FUNC(magic_info); // [Fate] +ATCOMMAND_FUNC(log); // [Fate] +ATCOMMAND_FUNC(tee); // [Fate] +ATCOMMAND_FUNC(invisible); // [Fate] +ATCOMMAND_FUNC(visible); // [Fate] +ATCOMMAND_FUNC(list_nearby); // [Fate] +ATCOMMAND_FUNC(iterate_forward_over_players); // [Fate] +ATCOMMAND_FUNC(iterate_backwards_over_players); // [Fate] +ATCOMMAND_FUNC(skillpool_info); // [Fate] +ATCOMMAND_FUNC(skillpool_focus); // [Fate] +ATCOMMAND_FUNC(skillpool_unfocus); // [Fate] +ATCOMMAND_FUNC(skill_learn); // [Fate] +ATCOMMAND_FUNC(wgm); +ATCOMMAND_FUNC(ipcheck); +ATCOMMAND_FUNC(doomspot); /*========================================== *AtCommandInfo atcommand_info[]構造体の定義 @@ -400,7 +400,7 @@ static AtCommandInfo atcommand_info[] = { *---------------------------------------------------- */ static -const char *job_name (int pc_class) +const char *job_name(int pc_class) { switch (pc_class) { @@ -550,9 +550,9 @@ const char *job_name (int pc_class) * get_atcommand_level @コマンドの必要レベルを取得 *------------------------------------------ */ -int get_atcommand_level (const AtCommandType type) +int get_atcommand_level(const AtCommandType type) { - int i; + int i; for (i = 0; atcommand_info[i].type != AtCommand_None; i++) if (atcommand_info[i].type == type) @@ -564,16 +564,16 @@ int get_atcommand_level (const AtCommandType type) /*======================================== * At-command logging */ -void log_atcommand (struct map_session_data *sd, const char *fmt, ...) +void log_atcommand(struct map_session_data *sd, const char *fmt, ...) { char message[512]; va_list ap; - va_start (ap, fmt); - vsnprintf (message, 511, fmt, ap); - va_end (ap); + va_start(ap, fmt); + vsnprintf(message, 511, fmt, ap); + va_end(ap); - gm_log ("%s(%d,%d) %s(%d) : %s", map[sd->bl.m].name, sd->bl.x, + gm_log("%s(%d,%d) %s(%d) : %s", map[sd->bl.m].name, sd->bl.x, sd->bl.y, sd->status.name, sd->status.account_id, message); } @@ -582,25 +582,25 @@ char *gm_logfile_name = NULL; * Log a timestamped line to GM log file *------------------------------------------ */ -void gm_log (const char *fmt, ...) +void gm_log(const char *fmt, ...) { static int last_logfile_nr = 0; static FILE *gm_logfile = NULL; time_t time_v; struct tm ctime; - int month, year, logfile_nr; + int month, year, logfile_nr; char message[512]; va_list ap; if (!gm_logfile_name) return; - va_start (ap, fmt); - vsnprintf (message, 511, fmt, ap); - va_end (ap); + va_start(ap, fmt); + vsnprintf(message, 511, fmt, ap); + va_end(ap); - time (&time_v); - gmtime_r (&time_v, &ctime); + time(&time_v); + gmtime_r(&time_v, &ctime); year = ctime.tm_year + 1900; month = ctime.tm_mon + 1; @@ -608,28 +608,28 @@ void gm_log (const char *fmt, ...) if (logfile_nr != last_logfile_nr) { - char *fullname = (char *)malloc (strlen (gm_logfile_name) + 10); - sprintf (fullname, "%s.%04d-%02d", gm_logfile_name, year, month); + char *fullname = (char *)malloc(strlen(gm_logfile_name) + 10); + sprintf(fullname, "%s.%04d-%02d", gm_logfile_name, year, month); if (gm_logfile) - fclose_ (gm_logfile); + fclose_(gm_logfile); - gm_logfile = fopen_ (fullname, "a"); - free (fullname); + gm_logfile = fopen_(fullname, "a"); + free(fullname); if (!gm_logfile) { - perror ("GM log file"); + perror("GM log file"); gm_logfile_name = NULL; } last_logfile_nr = logfile_nr; } - fprintf (gm_logfile, "[%04d-%02d-%02d %02d:%02d:%02d] %s\n", + fprintf(gm_logfile, "[%04d-%02d-%02d %02d:%02d:%02d] %s\n", year, month, ctime.tm_mday, ctime.tm_hour, ctime.tm_min, ctime.tm_sec, message); - fflush (gm_logfile); + fflush(gm_logfile); } /*========================================== @@ -637,53 +637,53 @@ void gm_log (const char *fmt, ...) *------------------------------------------ */ AtCommandType -is_atcommand (const int fd, struct map_session_data *sd, const char *message, +is_atcommand(const int fd, struct map_session_data *sd, const char *message, int gmlvl) { AtCommandInfo info; AtCommandType type; - nullpo_retr (AtCommand_None, sd); + nullpo_retr(AtCommand_None, sd); if (!message || !*message) return AtCommand_None; - memset (&info, 0, sizeof (info)); + memset(&info, 0, sizeof(info)); - type = atcommand (gmlvl > 0 ? gmlvl : pc_isGM (sd), message, &info); + type = atcommand(gmlvl > 0 ? gmlvl : pc_isGM(sd), message, &info); if (type != AtCommand_None) { char command[100]; char output[200]; const char *str = message; const char *p = message; - memset (command, '\0', sizeof (command)); - memset (output, '\0', sizeof (output)); - while (*p && !isspace (*p)) + memset(command, '\0', sizeof(command)); + memset(output, '\0', sizeof(output)); + while (*p && !isspace(*p)) p++; - if (p - str >= sizeof (command)) // too long + if (p - str >= sizeof(command)) // too long return AtCommand_Unknown; - strncpy (command, str, p - str); - while (isspace (*p)) + strncpy(command, str, p - str); + while (isspace(*p)) p++; if (type == AtCommand_Unknown || info.proc == NULL) { - sprintf (output, "%s is Unknown Command.", command); - clif_displaymessage (fd, output); + sprintf(output, "%s is Unknown Command.", command); + clif_displaymessage(fd, output); } else { - if (info.proc (fd, sd, command, p) != 0) + if (info.proc(fd, sd, command, p) != 0) { // Command can not be executed - sprintf (output, "%s failed.", command); - clif_displaymessage (fd, output); + sprintf(output, "%s failed.", command); + clif_displaymessage(fd, output); } else { - if (get_atcommand_level (type) != 0) // Don't log level 0 commands - log_atcommand (sd, "%s %s", command, p); + if (get_atcommand_level(type) != 0) // Don't log level 0 commands + log_atcommand(sd, "%s %s", command, p); } } @@ -697,7 +697,7 @@ is_atcommand (const int fd, struct map_session_data *sd, const char *message, * *------------------------------------------ */ -AtCommandType atcommand (const int level, const char *message, +AtCommandType atcommand(const int level, const char *message, struct AtCommandInfo * info) { char *p = (char *) message; // it's 'char' and not 'const char' to have possibility to modify the first character if necessary @@ -708,21 +708,21 @@ AtCommandType atcommand (const int level, const char *message, return AtCommand_None; if (!p || !*p) { - fprintf (stderr, "at command message is empty\n"); + fprintf(stderr, "at command message is empty\n"); return AtCommand_None; } if (*p == command_symbol) { // check first char. char command[101]; - int i = 0; - memset (info, 0, sizeof (AtCommandInfo)); - sscanf (p, "%100s", command); - command[sizeof (command) - 1] = '\0'; + int i = 0; + memset(info, 0, sizeof(AtCommandInfo)); + sscanf(p, "%100s", command); + command[sizeof(command) - 1] = '\0'; while (atcommand_info[i].type != AtCommand_Unknown) { - if (strcasecmp (command + 1, atcommand_info[i].command + 1) == 0 + if (strcasecmp(command + 1, atcommand_info[i].command + 1) == 0 && level >= atcommand_info[i].level) { p[0] = atcommand_info[i].command[0]; // set correct first symbol for after. @@ -739,7 +739,7 @@ AtCommandType atcommand (const int level, const char *message, else return AtCommand_Unknown; } - memcpy (info, &atcommand_info[i], sizeof atcommand_info[i]); + memcpy(info, &atcommand_info[i], sizeof atcommand_info[i]); } else { @@ -754,29 +754,29 @@ AtCommandType atcommand (const int level, const char *message, *------------------------------------------ */ static -void atkillmonster_sub (struct block_list *bl, va_list ap) +void atkillmonster_sub(struct block_list *bl, va_list ap) { - int flag = va_arg (ap, int); + int flag = va_arg(ap, int); - nullpo_retv (bl); + nullpo_retv(bl); if (flag) - mob_damage (NULL, (struct mob_data *) bl, + mob_damage(NULL, (struct mob_data *) bl, ((struct mob_data *) bl)->hp, 2); else - mob_delete ((struct mob_data *) bl); + mob_delete((struct mob_data *) bl); } /*========================================== * *------------------------------------------ */ -static AtCommandInfo *get_atcommandinfo_byname (const char *name) +static AtCommandInfo *get_atcommandinfo_byname(const char *name) { - int i; + int i; for (i = 0; atcommand_info[i].type != AtCommand_Unknown; i++) - if (strcasecmp (atcommand_info[i].command + 1, name) == 0) + if (strcasecmp(atcommand_info[i].command + 1, name) == 0) return &atcommand_info[i]; return NULL; @@ -786,42 +786,42 @@ static AtCommandInfo *get_atcommandinfo_byname (const char *name) * *------------------------------------------ */ -int atcommand_config_read (const char *cfgName) +int atcommand_config_read(const char *cfgName) { char line[1024], w1[1024], w2[1024]; AtCommandInfo *p; FILE *fp; - if ((fp = fopen_ (cfgName, "r")) == NULL) + if ((fp = fopen_(cfgName, "r")) == NULL) { - printf ("At commands configuration file not found: %s\n", cfgName); + printf("At commands configuration file not found: %s\n", cfgName); return 1; } - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { if (line[0] == '/' && line[1] == '/') continue; - if (sscanf (line, "%1023[^:]:%1023s", w1, w2) != 2) + if (sscanf(line, "%1023[^:]:%1023s", w1, w2) != 2) continue; - p = get_atcommandinfo_byname (w1); + p = get_atcommandinfo_byname(w1); if (p != NULL) { - p->level = atoi (w2); + p->level = atoi(w2); if (p->level > 100) p->level = 100; else if (p->level < 0) p->level = 0; } - if (strcasecmp (w1, "import") == 0) - atcommand_config_read (w2); - else if (strcasecmp (w1, "command_symbol") == 0 && w2[0] > 31 && w2[0] != '/' && // symbol of standard ragnarok GM commands + if (strcasecmp(w1, "import") == 0) + atcommand_config_read(w2); + else if (strcasecmp(w1, "command_symbol") == 0 && w2[0] > 31 && w2[0] != '/' && // symbol of standard ragnarok GM commands w2[0] != '%') // symbol of party chat speaking command_symbol = w2[0]; } - fclose_ (fp); + fclose_(fp); return 0; } @@ -836,43 +836,43 @@ int atcommand_config_read (const char *cfgName) * TAW Specific *------------------------------------------ */ -int atcommand_setup (const int fd, struct map_session_data *sd, +int atcommand_setup(const int fd, struct map_session_data *sd, const char *command, const char *message) { char buf[256]; char character[100]; - int level = 1; + int level = 1; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%d %99[^\n]", &level, character) < 2) + || sscanf(message, "%d %99[^\n]", &level, character) < 2) { - clif_displaymessage (fd, "Usage: @setup "); + clif_displaymessage(fd, "Usage: @setup "); return -1; } level--; - snprintf (buf, 255, "-255 %s", character); - atcommand_character_baselevel (fd, sd, "@charbaselvl", buf); + snprintf(buf, 255, "-255 %s", character); + atcommand_character_baselevel(fd, sd, "@charbaselvl", buf); - snprintf (buf, 255, "%d %s", level, character); - atcommand_character_baselevel (fd, sd, "@charbaselvl", buf); + snprintf(buf, 255, "%d %s", level, character); + atcommand_character_baselevel(fd, sd, "@charbaselvl", buf); // Emote skill - snprintf (buf, 255, "1 1 %s", character); + snprintf(buf, 255, "1 1 %s", character); atcommand_skill_learn(fd, sd, "@skill-learn", buf); // Trade skill - snprintf (buf, 255, "2 1 %s", character); + snprintf(buf, 255, "2 1 %s", character); atcommand_skill_learn(fd, sd, "@skill-learn", buf); // Party skill - snprintf (buf, 255, "2 2 %s", character); + snprintf(buf, 255, "2 2 %s", character); atcommand_skill_learn(fd, sd, "@skill-learn", buf); - snprintf (buf, 255, "018-1.gat 24 98 %s", character); - atcommand_charwarp (fd, sd, "@charwarp", buf); + snprintf(buf, 255, "018-1.gat 24 98 %s", character); + atcommand_charwarp(fd, sd, "@charwarp", buf); return (0); @@ -882,81 +882,81 @@ int atcommand_setup (const int fd, struct map_session_data *sd, * @rura+ *------------------------------------------ */ -int atcommand_charwarp (const int fd, struct map_session_data *sd, +int atcommand_charwarp(const int fd, struct map_session_data *sd, const char *command, const char *message) { char map_name[100]; char character[100]; - int x = 0, y = 0; + int x = 0, y = 0; struct map_session_data *pl_sd; - int m; + int m; - memset (map_name, '\0', sizeof (map_name)); - memset (character, '\0', sizeof (character)); + memset(map_name, '\0', sizeof(map_name)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%99s %d %d %99[^\n]", map_name, &x, &y, + || sscanf(message, "%99s %d %d %99[^\n]", map_name, &x, &y, character) < 4) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Usage: @charwarp/@rura+ "); return -1; } if (x <= 0) - x = MRAND (399) + 1; + x = MRAND(399) + 1; if (y <= 0) - y = MRAND (399) + 1; - if (strstr (map_name, ".gat") == NULL && strstr (map_name, ".afm") == NULL && strlen (map_name) < 13) // 16 - 4 (.gat) - strcat (map_name, ".gat"); + y = MRAND(399) + 1; + if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < 13) // 16 - 4 (.gat) + strcat(map_name, ".gat"); - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (pc_isGM (sd) >= pc_isGM (pl_sd)) + if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can rura+ only lower or same GM level if (x > 0 && x < 800 && y > 0 && y < 800) { - m = map_mapname2mapid (map_name); + m = map_mapname2mapid(map_name); if (m >= 0 && map[m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp someone to this map."); return -1; } if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp this player from its actual map."); return -1; } - if (pc_setpos (pl_sd, map_name, x, y, 3) == 0) + if (pc_setpos(pl_sd, map_name, x, y, 3) == 0) { - clif_displaymessage (pl_sd->fd, "Warped."); - clif_displaymessage (fd, "Player warped (message sends to player too)."); + clif_displaymessage(pl_sd->fd, "Warped."); + clif_displaymessage(fd, "Player warped (message sends to player too)."); } else { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); return -1; } } else { - clif_displaymessage (fd, "Coordinates out of range."); + clif_displaymessage(fd, "Coordinates out of range."); return -1; } } else { - clif_displaymessage (fd, "Your GM level don't authorise you to do this action on this player."); + clif_displaymessage(fd, "Your GM level don't authorise you to do this action on this player."); return -1; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -967,59 +967,59 @@ int atcommand_charwarp (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_warp (const int fd, struct map_session_data *sd, +int atcommand_warp(const int fd, struct map_session_data *sd, const char *command, const char *message) { char map_name[100]; - int x = 0, y = 0; - int m; + int x = 0, y = 0; + int m; - memset (map_name, '\0', sizeof (map_name)); + memset(map_name, '\0', sizeof(map_name)); if (!message || !*message - || sscanf (message, "%99s %d %d", map_name, &x, &y) < 1) + || sscanf(message, "%99s %d %d", map_name, &x, &y) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a map (usage: @warp )."); return -1; } if (x <= 0) - x = MRAND (399) + 1; + x = MRAND(399) + 1; if (y <= 0) - y = MRAND (399) + 1; + y = MRAND(399) + 1; - if (strstr (map_name, ".gat") == NULL && strstr (map_name, ".afm") == NULL && strlen (map_name) < 13) // 16 - 4 (.gat) - strcat (map_name, ".gat"); + if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < 13) // 16 - 4 (.gat) + strcat(map_name, ".gat"); if (x > 0 && x < 800 && y > 0 && y < 800) { - m = map_mapname2mapid (map_name); + m = map_mapname2mapid(map_name); if (m >= 0 && map[m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you to this map."); return -1; } if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you from your actual map."); return -1; } - if (pc_setpos (sd, map_name, x, y, 3) == 0) - clif_displaymessage (fd, "Warped."); + if (pc_setpos(sd, map_name, x, y, 3) == 0) + clif_displaymessage(fd, "Warped."); else { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); return -1; } } else { - clif_displaymessage (fd, "Coordinates out of range."); + clif_displaymessage(fd, "Coordinates out of range."); return -1; } @@ -1030,31 +1030,31 @@ int atcommand_warp (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_where (const int fd, struct map_session_data *sd, +int atcommand_where(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; char output[200]; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); - memset (output, '\0', sizeof (output)); + memset(character, '\0', sizeof(character)); + memset(output, '\0', sizeof(output)); - if (sscanf (message, "%99[^\n]", character) < 1) - strcpy (character, sd->status.name); + if (sscanf(message, "%99[^\n]", character) < 1) + strcpy(character, sd->status.name); - if ((pl_sd = map_nick2sd (character)) != NULL && + if ((pl_sd = map_nick2sd(character)) != NULL && !((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_HIDE)) - && (pc_isGM (pl_sd) > pc_isGM (sd)))) + && (pc_isGM(pl_sd) > pc_isGM(sd)))) { // you can look only lower or same level - sprintf (output, "%s: %s (%d,%d)", pl_sd->status.name, pl_sd->mapname, + sprintf(output, "%s: %s (%d,%d)", pl_sd->status.name, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -1065,46 +1065,46 @@ int atcommand_where (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_goto (const int fd, struct map_session_data *sd, +int atcommand_goto(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; char output[200]; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); - memset (output, '\0', sizeof (output)); + memset(character, '\0', sizeof(character)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a player name (usage: @jumpto/@warpto/@goto )."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you to the map of this player."); return -1; } if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you from your actual map."); return -1; } - pc_setpos (sd, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y, 3); - sprintf (output, "Jump to %s", character); - clif_displaymessage (fd, output); + pc_setpos(sd, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y, 3); + sprintf(output, "Jump to %s", character); + clif_displaymessage(fd, output); } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -1115,43 +1115,43 @@ int atcommand_goto (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_jump (const int fd, struct map_session_data *sd, +int atcommand_jump(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[200]; - int x = 0, y = 0; + int x = 0, y = 0; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - sscanf (message, "%d %d", &x, &y); + sscanf(message, "%d %d", &x, &y); if (x <= 0) - x = MRAND (399) + 1; + x = MRAND(399) + 1; if (y <= 0) - y = MRAND (399) + 1; + y = MRAND(399) + 1; if (x > 0 && x < 800 && y > 0 && y < 800) { if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you to your actual map."); return -1; } if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you from your actual map."); return -1; } - pc_setpos (sd, sd->mapname, x, y, 3); - sprintf (output, "Jump to %d %d", x, y); - clif_displaymessage (fd, output); + pc_setpos(sd, sd->mapname, x, y, 3); + sprintf(output, "Jump to %d %d", x, y); + clif_displaymessage(fd, output); } else { - clif_displaymessage (fd, "Coordinates out of range."); + clif_displaymessage(fd, "Coordinates out of range."); return -1; } @@ -1162,53 +1162,53 @@ int atcommand_jump (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_who (const int fd, struct map_session_data *sd, +int atcommand_who(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[200]; struct map_session_data *pl_sd; - int i, j, count; - int pl_GM_level, GM_level; + int i, j, count; + int pl_GM_level, GM_level; char match_text[100]; char player_name[24]; - memset (output, '\0', sizeof (output)); - memset (match_text, '\0', sizeof (match_text)); - memset (player_name, '\0', sizeof (player_name)); + memset(output, '\0', sizeof(output)); + memset(match_text, '\0', sizeof(match_text)); + memset(player_name, '\0', sizeof(player_name)); - if (sscanf (message, "%99[^\n]", match_text) < 1) - strcpy (match_text, ""); + if (sscanf(message, "%99[^\n]", match_text) < 1) + strcpy(match_text, ""); for (j = 0; match_text[j]; j++) - match_text[j] = tolower (match_text[j]); + match_text[j] = tolower(match_text[j]); count = 0; - GM_level = pc_isGM (sd); + GM_level = pc_isGM(sd); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) { - pl_GM_level = pc_isGM (pl_sd); + pl_GM_level = pc_isGM(pl_sd); if (! ((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_HIDE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level - memcpy (player_name, pl_sd->status.name, 24); + memcpy(player_name, pl_sd->status.name, 24); for (j = 0; player_name[j]; j++) - player_name[j] = tolower (player_name[j]); - if (strstr (player_name, match_text) != NULL) + player_name[j] = tolower(player_name[j]); + if (strstr(player_name, match_text) != NULL) { // search with no case sensitive if (pl_GM_level > 0) - sprintf (output, + sprintf(output, "Name: %s (GM:%d) | Location: %s %d %d", pl_sd->status.name, pl_GM_level, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y); else - sprintf (output, "Name: %s | Location: %s %d %d", + sprintf(output, "Name: %s | Location: %s %d %d", pl_sd->status.name, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); count++; } } @@ -1216,13 +1216,13 @@ int atcommand_who (const int fd, struct map_session_data *sd, } if (count == 0) - clif_displaymessage (fd, "No player found."); + clif_displaymessage(fd, "No player found."); else if (count == 1) - clif_displaymessage (fd, "1 player found."); + clif_displaymessage(fd, "1 player found."); else { - sprintf (output, "%d players found.", count); - clif_displaymessage (fd, output); + sprintf(output, "%d players found.", count); + clif_displaymessage(fd, output); } return 0; @@ -1232,62 +1232,62 @@ int atcommand_who (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_whogroup (const int fd, struct map_session_data *sd, +int atcommand_whogroup(const int fd, struct map_session_data *sd, const char *command, const char *message) { char temp0[100]; char temp1[100]; char output[200]; struct map_session_data *pl_sd; - int i, j, count; - int pl_GM_level, GM_level; + int i, j, count; + int pl_GM_level, GM_level; char match_text[100]; char player_name[24]; struct party *p; - memset (temp0, '\0', sizeof (temp0)); - memset (temp1, '\0', sizeof (temp1)); - memset (output, '\0', sizeof (output)); - memset (match_text, '\0', sizeof (match_text)); - memset (player_name, '\0', sizeof (player_name)); + memset(temp0, '\0', sizeof(temp0)); + memset(temp1, '\0', sizeof(temp1)); + memset(output, '\0', sizeof(output)); + memset(match_text, '\0', sizeof(match_text)); + memset(player_name, '\0', sizeof(player_name)); - if (sscanf (message, "%99[^\n]", match_text) < 1) - strcpy (match_text, ""); + if (sscanf(message, "%99[^\n]", match_text) < 1) + strcpy(match_text, ""); for (j = 0; match_text[j]; j++) - match_text[j] = tolower (match_text[j]); + match_text[j] = tolower(match_text[j]); count = 0; - GM_level = pc_isGM (sd); + GM_level = pc_isGM(sd); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) { - pl_GM_level = pc_isGM (pl_sd); + pl_GM_level = pc_isGM(pl_sd); if (! ((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_HIDE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level - memcpy (player_name, pl_sd->status.name, 24); + memcpy(player_name, pl_sd->status.name, 24); for (j = 0; player_name[j]; j++) - player_name[j] = tolower (player_name[j]); - if (strstr (player_name, match_text) != NULL) + player_name[j] = tolower(player_name[j]); + if (strstr(player_name, match_text) != NULL) { // search with no case sensitive - p = party_search (pl_sd->status.party_id); + p = party_search(pl_sd->status.party_id); if (p == NULL) - sprintf (temp0, "None"); + sprintf(temp0, "None"); else - sprintf (temp0, "%s", p->name); + sprintf(temp0, "%s", p->name); if (pl_GM_level > 0) - sprintf (output, + sprintf(output, "Name: %s (GM:%d) | Party: '%s'", pl_sd->status.name, pl_GM_level, temp0); else - sprintf (output, + sprintf(output, "Name: %s | Party: '%s' | Guild: '%s'", pl_sd->status.name, temp0, temp1); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); count++; } } @@ -1295,13 +1295,13 @@ int atcommand_whogroup (const int fd, struct map_session_data *sd, } if (count == 0) - clif_displaymessage (fd, "No player found."); + clif_displaymessage(fd, "No player found."); else if (count == 1) - clif_displaymessage (fd, "1 player found."); + clif_displaymessage(fd, "1 player found."); else { - sprintf (output, "%d players found.", count); - clif_displaymessage (fd, output); + sprintf(output, "%d players found.", count); + clif_displaymessage(fd, output); } return 0; @@ -1311,38 +1311,38 @@ int atcommand_whogroup (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_whomap (const int fd, struct map_session_data *sd, +int atcommand_whomap(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[200]; struct map_session_data *pl_sd; - int i, count; - int pl_GM_level, GM_level; - int map_id; + int i, count; + int pl_GM_level, GM_level; + int map_id; char map_name[100]; - memset (output, '\0', sizeof (output)); - memset (map_name, '\0', sizeof (map_name)); + memset(output, '\0', sizeof(output)); + memset(map_name, '\0', sizeof(map_name)); if (!message || !*message) map_id = sd->bl.m; else { - sscanf (message, "%99s", map_name); - if (strstr (map_name, ".gat") == NULL && strstr (map_name, ".afm") == NULL && strlen (map_name) < 13) // 16 - 4 (.gat) - strcat (map_name, ".gat"); - if ((map_id = map_mapname2mapid (map_name)) < 0) + sscanf(message, "%99s", map_name); + if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < 13) // 16 - 4 (.gat) + strcat(map_name, ".gat"); + if ((map_id = map_mapname2mapid(map_name)) < 0) map_id = sd->bl.m; } count = 0; - GM_level = pc_isGM (sd); + GM_level = pc_isGM(sd); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) { - pl_GM_level = pc_isGM (pl_sd); + pl_GM_level = pc_isGM(pl_sd); if (! ((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_HIDE)) @@ -1351,15 +1351,15 @@ int atcommand_whomap (const int fd, struct map_session_data *sd, if (pl_sd->bl.m == map_id) { if (pl_GM_level > 0) - sprintf (output, + sprintf(output, "Name: %s (GM:%d) | Location: %s %d %d", pl_sd->status.name, pl_GM_level, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y); else - sprintf (output, "Name: %s | Location: %s %d %d", + sprintf(output, "Name: %s | Location: %s %d %d", pl_sd->status.name, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); count++; } } @@ -1367,14 +1367,14 @@ int atcommand_whomap (const int fd, struct map_session_data *sd, } if (count == 0) - sprintf (output, "No player found in map '%s'.", map[map_id].name); + sprintf(output, "No player found in map '%s'.", map[map_id].name); else if (count == 1) - sprintf (output, "1 player found in map '%s'.", map[map_id].name); + sprintf(output, "1 player found in map '%s'.", map[map_id].name); else { - sprintf (output, "%d players found in map '%s'.", count, map[map_id].name); + sprintf(output, "%d players found in map '%s'.", count, map[map_id].name); } - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return 0; } @@ -1383,41 +1383,41 @@ int atcommand_whomap (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_whomapgroup (const int fd, struct map_session_data *sd, +int atcommand_whomapgroup(const int fd, struct map_session_data *sd, const char *command, const char *message) { char temp0[100]; char output[200]; struct map_session_data *pl_sd; - int i, count; - int pl_GM_level, GM_level; - int map_id = 0; + int i, count; + int pl_GM_level, GM_level; + int map_id = 0; char map_name[100]; struct party *p; - memset (temp0, '\0', sizeof (temp0)); - memset (output, '\0', sizeof (output)); - memset (map_name, '\0', sizeof (map_name)); + memset(temp0, '\0', sizeof(temp0)); + memset(output, '\0', sizeof(output)); + memset(map_name, '\0', sizeof(map_name)); if (!message || !*message) map_id = sd->bl.m; else { - sscanf (message, "%99s", map_name); - if (strstr (map_name, ".gat") == NULL && strstr (map_name, ".afm") == NULL && strlen (map_name) < 13) // 16 - 4 (.gat) - strcat (map_name, ".gat"); - if ((map_id = map_mapname2mapid (map_name)) < 0) + sscanf(message, "%99s", map_name); + if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < 13) // 16 - 4 (.gat) + strcat(map_name, ".gat"); + if ((map_id = map_mapname2mapid(map_name)) < 0) map_id = sd->bl.m; } count = 0; - GM_level = pc_isGM (sd); + GM_level = pc_isGM(sd); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) { - pl_GM_level = pc_isGM (pl_sd); + pl_GM_level = pc_isGM(pl_sd); if (! ((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_HIDE)) @@ -1426,20 +1426,20 @@ int atcommand_whomapgroup (const int fd, struct map_session_data *sd, // you can look only lower or same level if (pl_sd->bl.m == map_id) { - p = party_search (pl_sd->status.party_id); + p = party_search(pl_sd->status.party_id); if (p == NULL) - sprintf (temp0, "None"); + sprintf(temp0, "None"); else - sprintf (temp0, "%s", p->name); + sprintf(temp0, "%s", p->name); if (pl_GM_level > 0) - sprintf (output, + sprintf(output, "Name: %s (GM:%d) | Party: '%s'", pl_sd->status.name, pl_GM_level, temp0); else - sprintf (output, + sprintf(output, "Name: %s | Party: '%s'", pl_sd->status.name, temp0); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); count++; } } @@ -1447,14 +1447,14 @@ int atcommand_whomapgroup (const int fd, struct map_session_data *sd, } if (count == 0) - sprintf (output, "No player found in map '%s'.", map[map_id].name); + sprintf(output, "No player found in map '%s'.", map[map_id].name); else if (count == 1) - sprintf (output, "1 player found in map '%s'.", map[map_id].name); + sprintf(output, "1 player found in map '%s'.", map[map_id].name); else { - sprintf (output, "%d players found in map '%s'.", count, map[map_id].name); + sprintf(output, "%d players found in map '%s'.", count, map[map_id].name); } - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return 0; } @@ -1463,36 +1463,36 @@ int atcommand_whomapgroup (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_whogm (const int fd, struct map_session_data *sd, +int atcommand_whogm(const int fd, struct map_session_data *sd, const char *command, const char *message) { char temp0[100]; char output[200]; struct map_session_data *pl_sd; - int i, j, count; - int pl_GM_level, GM_level; + int i, j, count; + int pl_GM_level, GM_level; char match_text[100]; char player_name[24]; struct party *p; - memset (temp0, '\0', sizeof (temp0)); - memset (output, '\0', sizeof (output)); - memset (match_text, '\0', sizeof (match_text)); - memset (player_name, '\0', sizeof (player_name)); + memset(temp0, '\0', sizeof(temp0)); + memset(output, '\0', sizeof(output)); + memset(match_text, '\0', sizeof(match_text)); + memset(player_name, '\0', sizeof(player_name)); - if (sscanf (message, "%99[^\n]", match_text) < 1) - strcpy (match_text, ""); + if (sscanf(message, "%99[^\n]", match_text) < 1) + strcpy(match_text, ""); for (j = 0; match_text[j]; j++) - match_text[j] = tolower (match_text[j]); + match_text[j] = tolower(match_text[j]); count = 0; - GM_level = pc_isGM (sd); + GM_level = pc_isGM(sd); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) { - pl_GM_level = pc_isGM (pl_sd); + pl_GM_level = pc_isGM(pl_sd); if (pl_GM_level > 0) { if (! @@ -1500,30 +1500,30 @@ int atcommand_whogm (const int fd, struct map_session_data *sd, || (pl_sd->status.option & OPTION_HIDE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level - memcpy (player_name, pl_sd->status.name, 24); + memcpy(player_name, pl_sd->status.name, 24); for (j = 0; player_name[j]; j++) - player_name[j] = tolower (player_name[j]); - if (strstr (player_name, match_text) != NULL) + player_name[j] = tolower(player_name[j]); + if (strstr(player_name, match_text) != NULL) { // search with no case sensitive - sprintf (output, + sprintf(output, "Name: %s (GM:%d) | Location: %s %d %d", pl_sd->status.name, pl_GM_level, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y); - clif_displaymessage (fd, output); - sprintf (output, + clif_displaymessage(fd, output); + sprintf(output, " BLvl: %d | Job: %s (Lvl: %d)", pl_sd->status.base_level, - job_name (pl_sd->status.pc_class), + job_name(pl_sd->status.pc_class), pl_sd->status.job_level); - clif_displaymessage (fd, output); - p = party_search (pl_sd->status.party_id); + clif_displaymessage(fd, output); + p = party_search(pl_sd->status.party_id); if (p == NULL) - sprintf (temp0, "None"); + sprintf(temp0, "None"); else - sprintf (temp0, "%s", p->name); - sprintf (output, " Party: '%s'", + sprintf(temp0, "%s", p->name); + sprintf(output, " Party: '%s'", temp0); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); count++; } } @@ -1532,13 +1532,13 @@ int atcommand_whogm (const int fd, struct map_session_data *sd, } if (count == 0) - clif_displaymessage (fd, "No GM found."); + clif_displaymessage(fd, "No GM found."); else if (count == 1) - clif_displaymessage (fd, "1 GM found."); + clif_displaymessage(fd, "1 GM found."); else { - sprintf (output, "%d GMs found.", count); - clif_displaymessage (fd, output); + sprintf(output, "%d GMs found.", count); + clif_displaymessage(fd, output); } return 0; @@ -1548,15 +1548,15 @@ int atcommand_whogm (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_save (const int fd, struct map_session_data *sd, +int atcommand_save(const int fd, struct map_session_data *sd, const char *command, const char *message) { - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); - pc_setsavepoint (sd, sd->mapname, sd->bl.x, sd->bl.y); - pc_makesavestatus (sd); - chrif_save (sd); - clif_displaymessage (fd, "Character data respawn point saved."); + pc_setsavepoint(sd, sd->mapname, sd->bl.x, sd->bl.y); + pc_makesavestatus(sd); + chrif_save(sd); + clif_displaymessage(fd, "Character data respawn point saved."); return 0; } @@ -1565,30 +1565,30 @@ int atcommand_save (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_load (const int fd, struct map_session_data *sd, +int atcommand_load(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int m; + int m; - m = map_mapname2mapid (sd->status.save_point.map); + m = map_mapname2mapid(sd->status.save_point.map); if (m >= 0 && map[m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you to your save map."); return -1; } if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you from your actual map."); return -1; } - pc_setpos (sd, sd->status.save_point.map, sd->status.save_point.x, + pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 0); - clif_displaymessage (fd, "Warping to respawn point."); + clif_displaymessage(fd, "Warping to respawn point."); return 0; } @@ -1597,38 +1597,38 @@ int atcommand_load (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_speed (const int fd, struct map_session_data *sd, +int atcommand_speed(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[200]; - int speed; + int speed; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); if (!message || !*message) { - sprintf (output, + sprintf(output, "Please, enter a speed value (usage: @speed <%d-%d>).", MIN_WALK_SPEED, MAX_WALK_SPEED); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } - speed = atoi (message); + speed = atoi(message); if (speed >= MIN_WALK_SPEED && speed <= MAX_WALK_SPEED) { sd->speed = speed; //sd->walktimer = x; //この文を追加 by れ - clif_updatestatus (sd, SP_SPEED); - clif_displaymessage (fd, "Speed changed."); + clif_updatestatus(sd, SP_SPEED); + clif_displaymessage(fd, "Speed changed."); } else { - sprintf (output, + sprintf(output, "Please, enter a valid speed value (usage: @speed <%d-%d>).", MIN_WALK_SPEED, MAX_WALK_SPEED); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } @@ -1639,26 +1639,26 @@ int atcommand_speed (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_storage (const int fd, struct map_session_data *sd, +int atcommand_storage(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct storage *stor; //changes from Freya/Yor - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (sd->state.storage_open) { - clif_displaymessage (fd, "msg_table[250]"); + clif_displaymessage(fd, "msg_table[250]"); return -1; } - if ((stor = account2storage2 (sd->status.account_id)) != NULL + if ((stor = account2storage2(sd->status.account_id)) != NULL && stor->storage_status == 1) { - clif_displaymessage (fd, "msg_table[250]"); + clif_displaymessage(fd, "msg_table[250]"); return -1; } - storage_storageopen (sd); + storage_storageopen(sd); return 0; } @@ -1667,17 +1667,17 @@ int atcommand_storage (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_option (const int fd, struct map_session_data *sd, +int atcommand_option(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int param1 = 0, param2 = 0, param3 = 0; - nullpo_retr (-1, sd); + int param1 = 0, param2 = 0, param3 = 0; + nullpo_retr(-1, sd); if (!message || !*message - || sscanf (message, "%d %d %d", ¶m1, ¶m2, ¶m3) < 1 + || sscanf(message, "%d %d %d", ¶m1, ¶m2, ¶m3) < 1 || param1 < 0 || param2 < 0 || param3 < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter at least a option (usage: @option )."); return -1; } @@ -1686,16 +1686,16 @@ int atcommand_option (const int fd, struct map_session_data *sd, sd->opt2 = param2; if (!(sd->status.option & CART_MASK) && param3 & CART_MASK) { - clif_cart_itemlist (sd); - clif_cart_equiplist (sd); - clif_updatestatus (sd, SP_CARTINFO); + clif_cart_itemlist(sd); + clif_cart_equiplist(sd); + clif_updatestatus(sd, SP_CARTINFO); } sd->status.option = param3; // fix pecopeco display if (sd->status.pc_class == 13 || sd->status.pc_class == 21 || sd->status.pc_class == 4014 || sd->status.pc_class == 4022) { - if (!pc_isriding (sd)) + if (!pc_isriding(sd)) { // sd have the new value... if (sd->status.pc_class == 13) sd->status.pc_class = sd->view_class = 7; @@ -1709,7 +1709,7 @@ int atcommand_option (const int fd, struct map_session_data *sd, } else { - if (pc_isriding (sd)) + if (pc_isriding(sd)) { // sd have the new value... if (sd->disguise > 0) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] (code added by [Yor]) @@ -1731,9 +1731,9 @@ int atcommand_option (const int fd, struct map_session_data *sd, } } - clif_changeoption (&sd->bl); - pc_calcstatus (sd, 0); - clif_displaymessage (fd, "Options changed."); + clif_changeoption(&sd->bl); + pc_calcstatus(sd, 0); + clif_displaymessage(fd, "Options changed."); return 0; } @@ -1742,20 +1742,20 @@ int atcommand_option (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_hide (const int fd, struct map_session_data *sd, +int atcommand_hide(const int fd, struct map_session_data *sd, const char *command, const char *message) { if (sd->status.option & OPTION_HIDE) { sd->status.option &= ~OPTION_HIDE; - clif_displaymessage (fd, "Invisible: Off."); // Invisible: Off + clif_displaymessage(fd, "Invisible: Off."); // Invisible: Off } else { sd->status.option |= OPTION_HIDE; - clif_displaymessage (fd, "Invisible: On."); // Invisible: On + clif_displaymessage(fd, "Invisible: On."); // Invisible: On } - clif_changeoption (&sd->bl); + clif_changeoption(&sd->bl); return 0; } @@ -1764,11 +1764,11 @@ int atcommand_hide (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_die (const int fd, struct map_session_data *sd, +int atcommand_die(const int fd, struct map_session_data *sd, const char *command, const char *message) { - pc_damage (NULL, sd, sd->status.hp + 1); - clif_displaymessage (fd, "A pity! You've died."); + pc_damage(NULL, sd, sd->status.hp + 1); + clif_displaymessage(fd, "A pity! You've died."); return 0; } @@ -1777,37 +1777,37 @@ int atcommand_die (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_kill (const int fd, struct map_session_data *sd, +int atcommand_kill(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a player name (usage: @kill )."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (pc_isGM (sd) >= pc_isGM (pl_sd)) + if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kill only lower or same level - pc_damage (NULL, pl_sd, pl_sd->status.hp + 1); - clif_displaymessage (fd, "Character killed."); + pc_damage(NULL, pl_sd, pl_sd->status.hp + 1); + clif_displaymessage(fd, "Character killed."); } else { - clif_displaymessage (fd, "Your GM level don't authorise you to do this action on this player."); + clif_displaymessage(fd, "Your GM level don't authorise you to do this action on this player."); return -1; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -1818,18 +1818,18 @@ int atcommand_kill (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_alive (const int fd, struct map_session_data *sd, +int atcommand_alive(const int fd, struct map_session_data *sd, const char *command, const char *message) { sd->status.hp = sd->status.max_hp; sd->status.sp = sd->status.max_sp; - pc_setstand (sd); + pc_setstand(sd); if (battle_config.pc_invincible_time > 0) - pc_setinvincibletimer (sd, battle_config.pc_invincible_time); - clif_updatestatus (sd, SP_HP); - clif_updatestatus (sd, SP_SP); - clif_resurrection (&sd->bl, 1); - clif_displaymessage (fd, "You've been revived! It's a miracle!"); + pc_setinvincibletimer(sd, battle_config.pc_invincible_time); + clif_updatestatus(sd, SP_HP); + clif_updatestatus(sd, SP_SP); + clif_resurrection(&sd->bl, 1); + clif_displaymessage(fd, "You've been revived! It's a miracle!"); return 0; } @@ -1838,22 +1838,22 @@ int atcommand_alive (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_kami (const int fd, struct map_session_data *sd, +int atcommand_kami(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); if (!message || !*message) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a message (usage: @kami )."); return -1; } - sscanf (message, "%199[^\n]", output); - intif_GMmessage (output, strlen (output) + 1, 0); + sscanf(message, "%199[^\n]", output); + intif_GMmessage(output, strlen(output) + 1, 0); return 0; } @@ -1862,12 +1862,12 @@ int atcommand_kami (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_heal (const int fd, struct map_session_data *sd, +int atcommand_heal(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int hp = 0, sp = 0; // [Valaris] thanks to fov + int hp = 0, sp = 0; // [Valaris] thanks to fov - sscanf (message, "%d %d", &hp, &sp); + sscanf(message, "%d %d", &hp, &sp); if (hp == 0 && sp == 0) { @@ -1887,23 +1887,23 @@ int atcommand_heal (const int fd, struct map_session_data *sd, } if (hp > 0) // display like heal - clif_heal (fd, SP_HP, hp); + clif_heal(fd, SP_HP, hp); else if (hp < 0) // display like damage - clif_damage (&sd->bl, &sd->bl, gettick (), 0, 0, -hp, 0, 4, 0); + clif_damage(&sd->bl, &sd->bl, gettick(), 0, 0, -hp, 0, 4, 0); if (sp > 0) // no display when we lost SP - clif_heal (fd, SP_SP, sp); + clif_heal(fd, SP_SP, sp); if (hp != 0 || sp != 0) { - pc_heal (sd, hp, sp); + pc_heal(sd, hp, sp); if (hp >= 0 && sp >= 0) - clif_displaymessage (fd, "HP, SP recovered."); + clif_displaymessage(fd, "HP, SP recovered."); else - clif_displaymessage (fd, "HP or/and SP modified."); + clif_displaymessage(fd, "HP or/and SP modified."); } else { - clif_displaymessage (fd, "HP and SP are already with the good value."); + clif_displaymessage(fd, "HP and SP are already with the good value."); return -1; } @@ -1914,21 +1914,21 @@ int atcommand_heal (const int fd, struct map_session_data *sd, * @item command (usage: @item ) *------------------------------------------ */ -int atcommand_item (const int fd, struct map_session_data *sd, +int atcommand_item(const int fd, struct map_session_data *sd, const char *command, const char *message) { char item_name[100]; - int number = 0, item_id, flag; + int number = 0, item_id, flag; struct item item_tmp; struct item_data *item_data; - int get_count, i; + int get_count, i; - memset (item_name, '\0', sizeof (item_name)); + memset(item_name, '\0', sizeof(item_name)); if (!message || !*message - || sscanf (message, "%99s %d", item_name, &number) < 1) + || sscanf(message, "%99s %d", item_name, &number) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter an item name/id (usage: @item [quantity])."); return -1; } @@ -1937,8 +1937,8 @@ int atcommand_item (const int fd, struct map_session_data *sd, number = 1; item_id = 0; - if ((item_data = itemdb_searchname (item_name)) != NULL || - (item_data = itemdb_exists (atoi (item_name))) != NULL) + if ((item_data = itemdb_searchname(item_name)) != NULL || + (item_data = itemdb_exists(atoi(item_name))) != NULL) item_id = item_data->nameid; if (item_id >= 500) @@ -1951,19 +1951,19 @@ int atcommand_item (const int fd, struct map_session_data *sd, } for (i = 0; i < number; i += get_count) { - memset (&item_tmp, 0, sizeof (item_tmp)); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = item_id; item_tmp.identify = 1; if ((flag = - pc_additem ((struct map_session_data *) sd, &item_tmp, + pc_additem((struct map_session_data *) sd, &item_tmp, get_count))) - clif_additem ((struct map_session_data *) sd, 0, 0, flag); + clif_additem((struct map_session_data *) sd, 0, 0, flag); } - clif_displaymessage (fd, "Item created."); + clif_displaymessage(fd, "Item created."); } else { - clif_displaymessage (fd, "Invalid item ID or name."); + clif_displaymessage(fd, "Invalid item ID or name."); return -1; } @@ -1974,18 +1974,18 @@ int atcommand_item (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_itemreset (const int fd, struct map_session_data *sd, +int atcommand_itemreset(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i; + int i; for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].amount && sd->status.inventory[i].equip == 0) - pc_delitem (sd, i, sd->status.inventory[i].amount, 0); + pc_delitem(sd, i, sd->status.inventory[i].amount, 0); } - clif_displaymessage (fd, "All of your items have been removed."); + clif_displaymessage(fd, "All of your items have been removed."); return 0; } @@ -1994,10 +1994,10 @@ int atcommand_itemreset (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_itemcheck (const int fd, struct map_session_data *sd, +int atcommand_itemcheck(const int fd, struct map_session_data *sd, const char *command, const char *message) { - pc_checkitem (sd); + pc_checkitem(sd); return 0; } @@ -2006,14 +2006,14 @@ int atcommand_itemcheck (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_baselevelup (const int fd, struct map_session_data *sd, +int atcommand_baselevelup(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int level, i; + int level, i; - if (!message || !*message || (level = atoi (message)) == 0) + if (!message || !*message || (level = atoi(message)) == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a level adjustement (usage: @blvl )."); return -1; } @@ -2022,7 +2022,7 @@ int atcommand_baselevelup (const int fd, struct map_session_data *sd, { if (sd->status.base_level == battle_config.maximum_level) { // check for max level by Valaris - clif_displaymessage (fd, "Base level can't go any higher."); + clif_displaymessage(fd, "Base level can't go any higher."); return -1; } // End Addition if (level > battle_config.maximum_level || level > (battle_config.maximum_level - sd->status.base_level)) // fix positiv overflow @@ -2030,19 +2030,19 @@ int atcommand_baselevelup (const int fd, struct map_session_data *sd, for (i = 1; i <= level; i++) sd->status.status_point += (sd->status.base_level + i + 14) / 4; sd->status.base_level += level; - clif_updatestatus (sd, SP_BASELEVEL); - clif_updatestatus (sd, SP_NEXTBASEEXP); - clif_updatestatus (sd, SP_STATUSPOINT); - pc_calcstatus (sd, 0); - pc_heal (sd, sd->status.max_hp, sd->status.max_sp); - clif_misceffect (&sd->bl, 0); - clif_displaymessage (fd, "Base level raised."); + clif_updatestatus(sd, SP_BASELEVEL); + clif_updatestatus(sd, SP_NEXTBASEEXP); + clif_updatestatus(sd, SP_STATUSPOINT); + pc_calcstatus(sd, 0); + pc_heal(sd, sd->status.max_hp, sd->status.max_sp); + clif_misceffect(&sd->bl, 0); + clif_displaymessage(fd, "Base level raised."); } else { if (sd->status.base_level == 1) { - clif_displaymessage (fd, "Base level can't go any lower."); + clif_displaymessage(fd, "Base level can't go any lower."); return -1; } if (level < -battle_config.maximum_level || level < (1 - sd->status.base_level)) // fix negativ overflow @@ -2054,13 +2054,13 @@ int atcommand_baselevelup (const int fd, struct map_session_data *sd, (sd->status.base_level + i + 14) / 4; if (sd->status.status_point < 0) sd->status.status_point = 0; - clif_updatestatus (sd, SP_STATUSPOINT); + clif_updatestatus(sd, SP_STATUSPOINT); } // to add: remove status points from stats sd->status.base_level += level; - clif_updatestatus (sd, SP_BASELEVEL); - clif_updatestatus (sd, SP_NEXTBASEEXP); - pc_calcstatus (sd, 0); - clif_displaymessage (fd, "Base level lowered."); + clif_updatestatus(sd, SP_BASELEVEL); + clif_updatestatus(sd, SP_NEXTBASEEXP); + pc_calcstatus(sd, 0); + clif_displaymessage(fd, "Base level lowered."); } return 0; @@ -2070,14 +2070,14 @@ int atcommand_baselevelup (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_joblevelup (const int fd, struct map_session_data *sd, +int atcommand_joblevelup(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int up_level = 50, level; + int up_level = 50, level; - if (!message || !*message || (level = atoi (message)) == 0) + if (!message || !*message || (level = atoi(message)) == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a level adjustement (usage: @jlvl )."); return -1; } @@ -2092,41 +2092,41 @@ int atcommand_joblevelup (const int fd, struct map_session_data *sd, { if (sd->status.job_level == up_level) { - clif_displaymessage (fd, "Job level can't go any higher."); + clif_displaymessage(fd, "Job level can't go any higher."); return -1; } if (level > up_level || level > (up_level - sd->status.job_level)) // fix positiv overflow level = up_level - sd->status.job_level; sd->status.job_level += level; - clif_updatestatus (sd, SP_JOBLEVEL); - clif_updatestatus (sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_JOBLEVEL); + clif_updatestatus(sd, SP_NEXTJOBEXP); sd->status.skill_point += level; - clif_updatestatus (sd, SP_SKILLPOINT); - pc_calcstatus (sd, 0); - clif_misceffect (&sd->bl, 1); - clif_displaymessage (fd, "Job level raised."); + clif_updatestatus(sd, SP_SKILLPOINT); + pc_calcstatus(sd, 0); + clif_misceffect(&sd->bl, 1); + clif_displaymessage(fd, "Job level raised."); } else { if (sd->status.job_level == 1) { - clif_displaymessage (fd, "Job level can't go any lower."); + clif_displaymessage(fd, "Job level can't go any lower."); return -1; } if (level < -up_level || level < (1 - sd->status.job_level)) // fix negativ overflow level = 1 - sd->status.job_level; sd->status.job_level += level; - clif_updatestatus (sd, SP_JOBLEVEL); - clif_updatestatus (sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_JOBLEVEL); + clif_updatestatus(sd, SP_NEXTJOBEXP); if (sd->status.skill_point > 0) { sd->status.skill_point += level; if (sd->status.skill_point < 0) sd->status.skill_point = 0; - clif_updatestatus (sd, SP_SKILLPOINT); + clif_updatestatus(sd, SP_SKILLPOINT); } // to add: remove status points from skills - pc_calcstatus (sd, 0); - clif_displaymessage (fd, "Job level lowered."); + pc_calcstatus(sd, 0); + clif_displaymessage(fd, "Job level lowered."); } return 0; @@ -2136,20 +2136,20 @@ int atcommand_joblevelup (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_help (const int fd, struct map_session_data *sd, +int atcommand_help(const int fd, struct map_session_data *sd, const char *command, const char *message) { char buf[2048], w1[2048], w2[2048]; - int i, gm_level; + int i, gm_level; FILE *fp; - memset (buf, '\0', sizeof (buf)); + memset(buf, '\0', sizeof(buf)); - if ((fp = fopen_ (help_txt, "r")) != NULL) + if ((fp = fopen_(help_txt, "r")) != NULL) { - clif_displaymessage (fd, "Help commands:"); - gm_level = pc_isGM (sd); - while (fgets (buf, sizeof (buf) - 1, fp) != NULL) + clif_displaymessage(fd, "Help commands:"); + gm_level = pc_isGM(sd); + while (fgets(buf, sizeof(buf) - 1, fp) != NULL) { if (buf[0] == '/' && buf[1] == '/') continue; @@ -2161,16 +2161,16 @@ int atcommand_help (const int fd, struct map_session_data *sd, break; } } - if (sscanf (buf, "%2047[^:]:%2047[^\n]", w1, w2) < 2) - clif_displaymessage (fd, buf); - else if (gm_level >= atoi (w1)) - clif_displaymessage (fd, w2); + if (sscanf(buf, "%2047[^:]:%2047[^\n]", w1, w2) < 2) + clif_displaymessage(fd, buf); + else if (gm_level >= atoi(w1)) + clif_displaymessage(fd, w2); } - fclose_ (fp); + fclose_(fp); } else { - clif_displaymessage (fd, "File help.txt not found."); + clif_displaymessage(fd, "File help.txt not found."); return -1; } @@ -2181,28 +2181,28 @@ int atcommand_help (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_gm (const int fd, struct map_session_data *sd, +int atcommand_gm(const int fd, struct map_session_data *sd, const char *command, const char *message) { char password[100]; - memset (password, '\0', sizeof (password)); + memset(password, '\0', sizeof(password)); - if (!message || !*message || sscanf (message, "%99[^\n]", password) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", password) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a password (usage: @gm )."); return -1; } - if (pc_isGM (sd)) + if (pc_isGM(sd)) { // a GM can not use this function. only a normal player (become gm is not for gm!) - clif_displaymessage (fd, "You already have some GM powers."); + clif_displaymessage(fd, "You already have some GM powers."); return -1; } else - chrif_changegm (sd->status.account_id, password, - strlen (password) + 1); + chrif_changegm(sd->status.account_id, password, + strlen(password) + 1); return 0; } @@ -2211,22 +2211,22 @@ int atcommand_gm (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_pvpoff (const int fd, struct map_session_data *sd, +int atcommand_pvpoff(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; if (battle_config.pk_mode) { //disable command if server is in PK mode [Valaris] - clif_displaymessage (fd, "This option cannot be used in PK Mode."); + clif_displaymessage(fd, "This option cannot be used in PK Mode."); return -1; } if (map[sd->bl.m].flag.pvp) { map[sd->bl.m].flag.pvp = 0; - clif_send0199 (sd->bl.m, 0); + clif_send0199(sd->bl.m, 0); for (i = 0; i < fd_max; i++) { //人数分ループ if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) @@ -2234,21 +2234,21 @@ int atcommand_pvpoff (const int fd, struct map_session_data *sd, { if (sd->bl.m == pl_sd->bl.m) { - clif_pvpset (pl_sd, 0, 0, 2); + clif_pvpset(pl_sd, 0, 0, 2); if (pl_sd->pvp_timer != -1) { - delete_timer (pl_sd->pvp_timer, + delete_timer(pl_sd->pvp_timer, pc_calc_pvprank_timer); pl_sd->pvp_timer = -1; } } } } - clif_displaymessage (fd, "PvP: Off."); + clif_displaymessage(fd, "PvP: Off."); } else { - clif_displaymessage (fd, "PvP is already Off."); + clif_displaymessage(fd, "PvP is already Off."); return -1; } @@ -2259,22 +2259,22 @@ int atcommand_pvpoff (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_pvpon (const int fd, struct map_session_data *sd, +int atcommand_pvpon(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; if (battle_config.pk_mode) { //disable command if server is in PK mode [Valaris] - clif_displaymessage (fd, "This option cannot be used in PK Mode."); + clif_displaymessage(fd, "This option cannot be used in PK Mode."); return -1; } if (!map[sd->bl.m].flag.pvp && !map[sd->bl.m].flag.nopvp) { map[sd->bl.m].flag.pvp = 1; - clif_send0199 (sd->bl.m, 1); + clif_send0199(sd->bl.m, 1); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) @@ -2282,7 +2282,7 @@ int atcommand_pvpon (const int fd, struct map_session_data *sd, { if (sd->bl.m == pl_sd->bl.m && pl_sd->pvp_timer == -1) { - pl_sd->pvp_timer = add_timer (gettick () + 200, + pl_sd->pvp_timer = add_timer(gettick() + 200, pc_calc_pvprank_timer, pl_sd->bl.id, 0); pl_sd->pvp_rank = 0; @@ -2291,11 +2291,11 @@ int atcommand_pvpon (const int fd, struct map_session_data *sd, } } } - clif_displaymessage (fd, "PvP: On."); + clif_displaymessage(fd, "PvP: On."); } else { - clif_displaymessage (fd, "PvP is already On."); + clif_displaymessage(fd, "PvP is already On."); return -1; } @@ -2306,23 +2306,23 @@ int atcommand_pvpon (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_model (const int fd, struct map_session_data *sd, +int atcommand_model(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int hair_style = 0, hair_color = 0, cloth_color = 0; + int hair_style = 0, hair_color = 0, cloth_color = 0; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); if (!message || !*message - || sscanf (message, "%d %d %d", &hair_style, &hair_color, + || sscanf(message, "%d %d %d", &hair_style, &hair_color, &cloth_color) < 1) { - sprintf (output, + sprintf(output, "Please, enter at least a value (usage: @model ).", MIN_HAIR_STYLE, MAX_HAIR_STYLE, MIN_HAIR_COLOR, MAX_HAIR_COLOR, MIN_CLOTH_COLOR, MAX_CLOTH_COLOR); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } @@ -2335,20 +2335,20 @@ int atcommand_model (const int fd, struct map_session_data *sd, && (sd->status.pc_class == 12 || sd->status.pc_class == 17)) { //服の色未実装職の判定 - clif_displaymessage (fd, "You can't use this command with this class."); + clif_displaymessage(fd, "You can't use this command with this class."); return -1; } else { - pc_changelook (sd, LOOK_HAIR, hair_style); - pc_changelook (sd, LOOK_HAIR_COLOR, hair_color); - pc_changelook (sd, LOOK_CLOTHES_COLOR, cloth_color); - clif_displaymessage (fd, "Appearence changed."); + pc_changelook(sd, LOOK_HAIR, hair_style); + pc_changelook(sd, LOOK_HAIR_COLOR, hair_color); + pc_changelook(sd, LOOK_CLOTHES_COLOR, cloth_color); + clif_displaymessage(fd, "Appearence changed."); } } else { - clif_displaymessage (fd, "An invalid number was specified."); + clif_displaymessage(fd, "An invalid number was specified."); return -1; } @@ -2359,20 +2359,20 @@ int atcommand_model (const int fd, struct map_session_data *sd, * @dye && @ccolor *------------------------------------------ */ -int atcommand_dye (const int fd, struct map_session_data *sd, +int atcommand_dye(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int cloth_color = 0; + int cloth_color = 0; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%d", &cloth_color) < 1) + if (!message || !*message || sscanf(message, "%d", &cloth_color) < 1) { - sprintf (output, + sprintf(output, "Please, enter a clothes color (usage: @dye/@ccolor ).", MIN_CLOTH_COLOR, MAX_CLOTH_COLOR); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } @@ -2381,18 +2381,18 @@ int atcommand_dye (const int fd, struct map_session_data *sd, if (cloth_color != 0 && sd->status.sex == 1 && (sd->status.pc_class == 12 || sd->status.pc_class == 17)) { - clif_displaymessage (fd, "You can't use this command with this class."); + clif_displaymessage(fd, "You can't use this command with this class."); return -1; } else { - pc_changelook (sd, LOOK_CLOTHES_COLOR, cloth_color); - clif_displaymessage (fd, "Appearence changed."); + pc_changelook(sd, LOOK_CLOTHES_COLOR, cloth_color); + clif_displaymessage(fd, "Appearence changed."); } } else { - clif_displaymessage (fd, "An invalid number was specified."); + clif_displaymessage(fd, "An invalid number was specified."); return -1; } @@ -2404,7 +2404,7 @@ int atcommand_dye (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_chardye (const int fd, struct map_session_data *sd, +atcommand_chardye(const int fd, struct map_session_data *sd, const char *command, const char *message) { return 0; @@ -2414,20 +2414,20 @@ atcommand_chardye (const int fd, struct map_session_data *sd, * @hairstyle && @hstyle *------------------------------------------ */ -int atcommand_hair_style (const int fd, struct map_session_data *sd, +int atcommand_hair_style(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int hair_style = 0; + int hair_style = 0; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%d", &hair_style) < 1) + if (!message || !*message || sscanf(message, "%d", &hair_style) < 1) { - sprintf (output, + sprintf(output, "Please, enter a hair style (usage: @hairstyle/@hstyle ).", MIN_HAIR_STYLE, MAX_HAIR_STYLE); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } @@ -2436,18 +2436,18 @@ int atcommand_hair_style (const int fd, struct map_session_data *sd, if (hair_style != 0 && sd->status.sex == 1 && (sd->status.pc_class == 12 || sd->status.pc_class == 17)) { - clif_displaymessage (fd, "You can't use this command with this class."); + clif_displaymessage(fd, "You can't use this command with this class."); return -1; } else { - pc_changelook (sd, LOOK_HAIR, hair_style); - clif_displaymessage (fd, "Appearence changed."); + pc_changelook(sd, LOOK_HAIR, hair_style); + clif_displaymessage(fd, "Appearence changed."); } } else { - clif_displaymessage (fd, "An invalid number was specified."); + clif_displaymessage(fd, "An invalid number was specified."); return -1; } @@ -2459,7 +2459,7 @@ int atcommand_hair_style (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_charhairstyle (const int fd, struct map_session_data *sd, +atcommand_charhairstyle(const int fd, struct map_session_data *sd, const char *command, const char *message) { return 0; @@ -2469,20 +2469,20 @@ atcommand_charhairstyle (const int fd, struct map_session_data *sd, * @haircolor && @hcolor *------------------------------------------ */ -int atcommand_hair_color (const int fd, struct map_session_data *sd, +int atcommand_hair_color(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int hair_color = 0; + int hair_color = 0; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%d", &hair_color) < 1) + if (!message || !*message || sscanf(message, "%d", &hair_color) < 1) { - sprintf (output, + sprintf(output, "Please, enter a hair color (usage: @haircolor/@hcolor ).", MIN_HAIR_COLOR, MAX_HAIR_COLOR); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } @@ -2491,18 +2491,18 @@ int atcommand_hair_color (const int fd, struct map_session_data *sd, if (hair_color != 0 && sd->status.sex == 1 && (sd->status.pc_class == 12 || sd->status.pc_class == 17)) { - clif_displaymessage (fd, "You can't use this command with this class."); + clif_displaymessage(fd, "You can't use this command with this class."); return -1; } else { - pc_changelook (sd, LOOK_HAIR_COLOR, hair_color); - clif_displaymessage (fd, "Appearence changed."); + pc_changelook(sd, LOOK_HAIR_COLOR, hair_color); + clif_displaymessage(fd, "Appearence changed."); } } else { - clif_displaymessage (fd, "An invalid number was specified."); + clif_displaymessage(fd, "An invalid number was specified."); return -1; } @@ -2514,7 +2514,7 @@ int atcommand_hair_color (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_charhaircolor (const int fd, struct map_session_data *sd, +atcommand_charhaircolor(const int fd, struct map_session_data *sd, const char *command, const char *message) { return 0; @@ -2524,19 +2524,19 @@ atcommand_charhaircolor (const int fd, struct map_session_data *sd, * @go [city_number/city_name]: improved by [yor] to add city names and help *------------------------------------------ */ -int atcommand_go (const int fd, struct map_session_data *sd, +int atcommand_go(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i; - int town; + int i; + int town; char map_name[100]; char output[200]; - int m; + int m; struct { char map[16]; - int x, y; + int x, y; } data[] = { { @@ -2575,118 +2575,118 @@ int atcommand_go (const int fd, struct map_session_data *sd, "sec_pri.gat", 23, 61}, // 16=Prison }; - memset (map_name, '\0', sizeof (map_name)); - memset (output, '\0', sizeof (output)); + memset(map_name, '\0', sizeof(map_name)); + memset(output, '\0', sizeof(output)); // get the number - town = atoi (message); + town = atoi(message); // if no value, display all value - if (!message || !*message || sscanf (message, "%99s", map_name) < 1 - || town < -3 || town >= (int) (sizeof (data) / sizeof (data[0]))) + if (!message || !*message || sscanf(message, "%99s", map_name) < 1 + || town < -3 || town >= (int)(sizeof(data) / sizeof(data[0]))) { - clif_displaymessage (fd, "Invalid location number or name."); - clif_displaymessage (fd, "Please, use one of this number/name:"); - clif_displaymessage (fd, + clif_displaymessage(fd, "Invalid location number or name."); + clif_displaymessage(fd, "Please, use one of this number/name:"); + clif_displaymessage(fd, "-3=(Memo point 2) 4=Alberta 11=Gon Ryun"); - clif_displaymessage (fd, + clif_displaymessage(fd, "-2=(Memo point 1) 5=Izlude 12=Umbala"); - clif_displaymessage (fd, + clif_displaymessage(fd, "-1=(Memo point 0) 6=Al de Baran 13=Niflheim"); - clif_displaymessage (fd, + clif_displaymessage(fd, " 0=Prontera 7=Lutie 14=Lou Yang"); - clif_displaymessage (fd, + clif_displaymessage(fd, " 1=Morroc 8=Comodo 15=Start point"); - clif_displaymessage (fd, + clif_displaymessage(fd, " 2=Geffen 9=Yuno 16=Prison"); - clif_displaymessage (fd, " 3=Payon 10=Amatsu"); + clif_displaymessage(fd, " 3=Payon 10=Amatsu"); return -1; } else { // get possible name of the city and add .gat if not in the name - map_name[sizeof (map_name) - 1] = '\0'; + map_name[sizeof(map_name) - 1] = '\0'; for (i = 0; map_name[i]; i++) - map_name[i] = tolower (map_name[i]); - if (strstr (map_name, ".gat") == NULL && strstr (map_name, ".afm") == NULL && strlen (map_name) < 13) // 16 - 4 (.gat) - strcat (map_name, ".gat"); + map_name[i] = tolower(map_name[i]); + if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < 13) // 16 - 4 (.gat) + strcat(map_name, ".gat"); // try to see if it's a name, and not a number (try a lot of possibilities, write errors and abbreviations too) - if (strncmp (map_name, "prontera.gat", 3) == 0) + if (strncmp(map_name, "prontera.gat", 3) == 0) { // 3 first characters town = 0; } - else if (strncmp (map_name, "morocc.gat", 3) == 0) + else if (strncmp(map_name, "morocc.gat", 3) == 0) { // 3 first characters town = 1; } - else if (strncmp (map_name, "geffen.gat", 3) == 0) + else if (strncmp(map_name, "geffen.gat", 3) == 0) { // 3 first characters town = 2; } - else if (strncmp (map_name, "payon.gat", 3) == 0 || // 3 first characters - strncmp (map_name, "paion.gat", 3) == 0) + else if (strncmp(map_name, "payon.gat", 3) == 0 || // 3 first characters + strncmp(map_name, "paion.gat", 3) == 0) { // writing error (3 first characters) town = 3; } - else if (strncmp (map_name, "alberta.gat", 3) == 0) + else if (strncmp(map_name, "alberta.gat", 3) == 0) { // 3 first characters town = 4; } - else if (strncmp (map_name, "izlude.gat", 3) == 0 || // 3 first characters - strncmp (map_name, "islude.gat", 3) == 0) + else if (strncmp(map_name, "izlude.gat", 3) == 0 || // 3 first characters + strncmp(map_name, "islude.gat", 3) == 0) { // writing error (3 first characters) town = 5; } - else if (strncmp (map_name, "aldebaran.gat", 3) == 0 || // 3 first characters - strcmp (map_name, "al.gat") == 0) + else if (strncmp(map_name, "aldebaran.gat", 3) == 0 || // 3 first characters + strcmp(map_name, "al.gat") == 0) { // al (de baran) town = 6; } - else if (strncmp (map_name, "lutie.gat", 3) == 0 || // name of the city, not name of the map (3 first characters) - strcmp (map_name, "christmas.gat") == 0 || // name of the symbol - strncmp (map_name, "xmas.gat", 3) == 0 || // 3 first characters - strncmp (map_name, "x-mas.gat", 3) == 0) + else if (strncmp(map_name, "lutie.gat", 3) == 0 || // name of the city, not name of the map (3 first characters) + strcmp(map_name, "christmas.gat") == 0 || // name of the symbol + strncmp(map_name, "xmas.gat", 3) == 0 || // 3 first characters + strncmp(map_name, "x-mas.gat", 3) == 0) { // writing error (3 first characters) town = 7; } - else if (strncmp (map_name, "comodo.gat", 3) == 0) + else if (strncmp(map_name, "comodo.gat", 3) == 0) { // 3 first characters town = 8; } - else if (strncmp (map_name, "yuno.gat", 3) == 0) + else if (strncmp(map_name, "yuno.gat", 3) == 0) { // 3 first characters town = 9; } - else if (strncmp (map_name, "amatsu.gat", 3) == 0 || // 3 first characters - strncmp (map_name, "ammatsu.gat", 3) == 0) + else if (strncmp(map_name, "amatsu.gat", 3) == 0 || // 3 first characters + strncmp(map_name, "ammatsu.gat", 3) == 0) { // writing error (3 first characters) town = 10; } - else if (strncmp (map_name, "gonryun.gat", 3) == 0) + else if (strncmp(map_name, "gonryun.gat", 3) == 0) { // 3 first characters town = 11; } - else if (strncmp (map_name, "umbala.gat", 3) == 0) + else if (strncmp(map_name, "umbala.gat", 3) == 0) { // 3 first characters town = 12; } - else if (strncmp (map_name, "niflheim.gat", 3) == 0) + else if (strncmp(map_name, "niflheim.gat", 3) == 0) { // 3 first characters town = 13; } - else if (strncmp (map_name, "louyang.gat", 3) == 0) + else if (strncmp(map_name, "louyang.gat", 3) == 0) { // 3 first characters town = 14; } - else if (strncmp (map_name, "new_1-1.gat", 3) == 0 || // 3 first characters (or "newbies") - strncmp (map_name, "startpoint.gat", 3) == 0 || // name of the position (3 first characters) - strncmp (map_name, "begining.gat", 3) == 0) + else if (strncmp(map_name, "new_1-1.gat", 3) == 0 || // 3 first characters (or "newbies") + strncmp(map_name, "startpoint.gat", 3) == 0 || // name of the position (3 first characters) + strncmp(map_name, "begining.gat", 3) == 0) { // name of the position (3 first characters) town = 15; } - else if (strncmp (map_name, "sec_pri.gat", 3) == 0 || // 3 first characters - strncmp (map_name, "prison.gat", 3) == 0 || // name of the position (3 first characters) - strncmp (map_name, "jails.gat", 3) == 0) + else if (strncmp(map_name, "sec_pri.gat", 3) == 0 || // 3 first characters + strncmp(map_name, "prison.gat", 3) == 0 || // name of the position (3 first characters) + strncmp(map_name, "jails.gat", 3) == 0) { // name of the position town = 16; } @@ -2695,72 +2695,71 @@ int atcommand_go (const int fd, struct map_session_data *sd, { if (sd->status.memo_point[-town - 1].map[0]) { - m = map_mapname2mapid (sd->status.memo_point[-town - 1].map); + m = map_mapname2mapid(sd->status.memo_point[-town - 1].map); if (m >= 0 && map[m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you to this memo map."); return -1; } if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you from your actual map."); return -1; } - if (pc_setpos - (sd, sd->status.memo_point[-town - 1].map, + if (pc_setpos(sd, sd->status.memo_point[-town - 1].map, sd->status.memo_point[-town - 1].x, sd->status.memo_point[-town - 1].y, 3) == 0) { - clif_displaymessage (fd, "Warped."); + clif_displaymessage(fd, "Warped."); } else { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); return -1; } } else { - sprintf (output, "Your memo point #%d doesn't exist.", -town - 1); - clif_displaymessage (fd, output); + sprintf(output, "Your memo point #%d doesn't exist.", -town - 1); + clif_displaymessage(fd, output); return -1; } } - else if (town >= 0 && town < (int) (sizeof (data) / sizeof (data[0]))) + else if (town >= 0 && town < (int)(sizeof(data) / sizeof(data[0]))) { - m = map_mapname2mapid (data[town].map); + m = map_mapname2mapid(data[town].map); if (m >= 0 && map[m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you to this destination map."); return -1; } if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp you from your actual map."); return -1; } - if (pc_setpos (sd, data[town].map, data[town].x, data[town].y, 3) + if (pc_setpos(sd, data[town].map, data[town].x, data[town].y, 3) == 0) { - clif_displaymessage (fd, "Warped."); + clif_displaymessage(fd, "Warped."); } else { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); return -1; } } else { // if you arrive here, you have an error in town variable when reading of names - clif_displaymessage (fd, "Invalid location number or name."); + clif_displaymessage(fd, "Invalid location number or name."); return -1; } } @@ -2772,41 +2771,41 @@ int atcommand_go (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_spawn (const int fd, struct map_session_data *sd, +int atcommand_spawn(const int fd, struct map_session_data *sd, const char *command, const char *message) { char monster[100]; char output[200]; - int mob_id; - int number = 0; - int x = 0, y = 0; - int count; - int i, j, k; - int mx, my, range; + int mob_id; + int number = 0; + int x = 0, y = 0; + int count; + int i, j, k; + int mx, my, range; - memset (monster, '\0', sizeof (monster)); - memset (output, '\0', sizeof (output)); + memset(monster, '\0', sizeof(monster)); + memset(output, '\0', sizeof(output)); if (!message || !*message - || sscanf (message, "%99s %d %d %d", monster, &number, &x, &y) < 1) + || sscanf(message, "%99s %d %d %d", monster, &number, &x, &y) < 1) { - clif_displaymessage (fd, "Give a monster name/id please."); + clif_displaymessage(fd, "Give a monster name/id please."); return -1; } // If monster identifier/name argument is a name - if ((mob_id = mobdb_searchname (monster)) == 0) // check name first (to avoid possible name begining by a number) - mob_id = mobdb_checkid (atoi (monster)); + if ((mob_id = mobdb_searchname(monster)) == 0) // check name first (to avoid possible name begining by a number) + mob_id = mobdb_checkid(atoi(monster)); if (mob_id == 0) { - clif_displaymessage (fd, "Invalid monster ID or name."); + clif_displaymessage(fd, "Invalid monster ID or name."); return -1; } if (mob_id == 1288) { - clif_displaymessage (fd, "Cannot spawn emperium."); + clif_displaymessage(fd, "Cannot spawn emperium."); return -1; } @@ -2819,11 +2818,11 @@ int atcommand_spawn (const int fd, struct map_session_data *sd, number = battle_config.atc_spawn_quantity_limit; if (battle_config.etc_log) - printf ("%s monster='%s' id=%d count=%d (%d,%d)\n", command, monster, + printf("%s monster='%s' id=%d count=%d (%d,%d)\n", command, monster, mob_id, number, x, y); count = 0; - range = sqrt (number) / 2; + range = sqrt(number) / 2; range = range * 2 + 5; // calculation of an odd number (+ 4 area around) for (i = 0; i < number; i++) { @@ -2832,14 +2831,14 @@ int atcommand_spawn (const int fd, struct map_session_data *sd, while (j++ < 8 && k == 0) { // try 8 times to spawn the monster (needed for close area) if (x <= 0) - mx = sd->bl.x + (MRAND (range) - (range / 2)); + mx = sd->bl.x + (MRAND(range) - (range / 2)); else mx = x; if (y <= 0) - my = sd->bl.y + (MRAND (range) - (range / 2)); + my = sd->bl.y + (MRAND(range) - (range / 2)); else my = y; - k = mob_once_spawn ((struct map_session_data *) sd, "this", mx, + k = mob_once_spawn((struct map_session_data *) sd, "this", mx, my, "", mob_id, 1, ""); } count += (k != 0) ? 1 : 0; @@ -2847,15 +2846,15 @@ int atcommand_spawn (const int fd, struct map_session_data *sd, if (count != 0) if (number == count) - clif_displaymessage (fd, "All monster summoned!"); + clif_displaymessage(fd, "All monster summoned!"); else { - sprintf (output, "%d monster(s) summoned!", count); - clif_displaymessage (fd, output); + sprintf(output, "%d monster(s) summoned!", count); + clif_displaymessage(fd, output); } else { - clif_displaymessage (fd, "Invalid monster ID or name."); + clif_displaymessage(fd, "Invalid monster ID or name."); return -1; } @@ -2867,28 +2866,28 @@ int atcommand_spawn (const int fd, struct map_session_data *sd, *------------------------------------------ */ static -void atcommand_killmonster_sub (const int fd, struct map_session_data *sd, +void atcommand_killmonster_sub(const int fd, struct map_session_data *sd, const char *message, const int drop) { - int map_id; + int map_id; char map_name[100]; - memset (map_name, '\0', sizeof (map_name)); + memset(map_name, '\0', sizeof(map_name)); - if (!message || !*message || sscanf (message, "%99s", map_name) < 1) + if (!message || !*message || sscanf(message, "%99s", map_name) < 1) map_id = sd->bl.m; else { - if (strstr (map_name, ".gat") == NULL && strstr (map_name, ".afm") == NULL && strlen (map_name) < 13) // 16 - 4 (.gat) - strcat (map_name, ".gat"); - if ((map_id = map_mapname2mapid (map_name)) < 0) + if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < 13) // 16 - 4 (.gat) + strcat(map_name, ".gat"); + if ((map_id = map_mapname2mapid(map_name)) < 0) map_id = sd->bl.m; } - map_foreachinarea (atkillmonster_sub, map_id, 0, 0, map[map_id].xs, + map_foreachinarea(atkillmonster_sub, map_id, 0, 0, map[map_id].xs, map[map_id].ys, BL_MOB, drop); - clif_displaymessage (fd, "All monsters killed!"); + clif_displaymessage(fd, "All monsters killed!"); return; } @@ -2897,10 +2896,10 @@ void atcommand_killmonster_sub (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_killmonster (const int fd, struct map_session_data *sd, +int atcommand_killmonster(const int fd, struct map_session_data *sd, const char *command, const char *message) { - atcommand_killmonster_sub (fd, sd, message, 1); + atcommand_killmonster_sub(fd, sd, message, 1); return 0; } @@ -2910,25 +2909,25 @@ int atcommand_killmonster (const int fd, struct map_session_data *sd, *------------------------------------------ */ static -void atlist_nearby_sub (struct block_list *bl, va_list ap) +void atlist_nearby_sub(struct block_list *bl, va_list ap) { char buf[32]; - int fd = va_arg (ap, int); - nullpo_retv (bl); + int fd = va_arg(ap, int); + nullpo_retv(bl); - sprintf (buf, " - \"%s\"", ((struct map_session_data *) bl)->status.name); - clif_displaymessage (fd, buf); + sprintf(buf, " - \"%s\"", ((struct map_session_data *) bl)->status.name); + clif_displaymessage(fd, buf); } /*========================================== * *------------------------------------------ */ -int atcommand_list_nearby (const int fd, struct map_session_data *sd, +int atcommand_list_nearby(const int fd, struct map_session_data *sd, const char *command, const char *message) { - clif_displaymessage (fd, "Nearby players:"); - map_foreachinarea (atlist_nearby_sub, sd->bl.m, sd->bl.x - 1, + clif_displaymessage(fd, "Nearby players:"); + map_foreachinarea(atlist_nearby_sub, sd->bl.m, sd->bl.x - 1, sd->bl.y - 1, sd->bl.x + 1, sd->bl.x + 1, BL_PC, fd); return 0; @@ -2938,10 +2937,10 @@ int atcommand_list_nearby (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_killmonster2 (const int fd, struct map_session_data *sd, +int atcommand_killmonster2(const int fd, struct map_session_data *sd, const char *command, const char *message) { - atcommand_killmonster_sub (fd, sd, message, 0); + atcommand_killmonster_sub(fd, sd, message, 0); return 0; } @@ -2950,62 +2949,62 @@ int atcommand_killmonster2 (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_produce (const int fd, struct map_session_data *sd, +int atcommand_produce(const int fd, struct map_session_data *sd, const char *command, const char *message) { char item_name[100]; - int item_id, attribute = 0, star = 0; - int flag = 0; + int item_id, attribute = 0, star = 0; + int flag = 0; struct item_data *item_data; struct item tmp_item; char output[200]; - memset (output, '\0', sizeof (output)); - memset (item_name, '\0', sizeof (item_name)); + memset(output, '\0', sizeof(output)); + memset(item_name, '\0', sizeof(item_name)); if (!message || !*message - || sscanf (message, "%99s %d %d", item_name, &attribute, &star) < 1) + || sscanf(message, "%99s %d %d", item_name, &attribute, &star) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter at least an item name/id (usage: @produce <# of very's>)."); return -1; } item_id = 0; - if ((item_data = itemdb_searchname (item_name)) != NULL || - (item_data = itemdb_exists (atoi (item_name))) != NULL) + if ((item_data = itemdb_searchname(item_name)) != NULL || + (item_data = itemdb_exists(atoi(item_name))) != NULL) item_id = item_data->nameid; - if (itemdb_exists (item_id) && + if (itemdb_exists(item_id) && (item_id <= 500 || item_id > 1099) && (item_id < 4001 || item_id > 4148) && - (item_id < 7001 || item_id > 10019) && itemdb_isequip (item_id)) + (item_id < 7001 || item_id > 10019) && itemdb_isequip(item_id)) { if (attribute < MIN_ATTRIBUTE || attribute > MAX_ATTRIBUTE) attribute = ATTRIBUTE_NORMAL; if (star < MIN_STAR || star > MAX_STAR) star = 0; - memset (&tmp_item, 0, sizeof tmp_item); + memset(&tmp_item, 0, sizeof tmp_item); tmp_item.nameid = item_id; tmp_item.amount = 1; tmp_item.identify = 1; tmp_item.card[0] = 0x00ff; tmp_item.card[1] = ((star * 5) << 8) + attribute; *((unsigned long *) (&tmp_item.card[2])) = sd->char_id; - clif_produceeffect (sd, 0, item_id); // 製造エフェクトパケット - clif_misceffect (&sd->bl, 3); // 他人にも成功を通知 - if ((flag = pc_additem (sd, &tmp_item, 1))) - clif_additem (sd, 0, 0, flag); + clif_produceeffect(sd, 0, item_id); // 製造エフェクトパケット + clif_misceffect(&sd->bl, 3); // 他人にも成功を通知 + if ((flag = pc_additem(sd, &tmp_item, 1))) + clif_additem(sd, 0, 0, flag); } else { if (battle_config.error_log) - printf ("@produce NOT WEAPON [%d]\n", item_id); - if (item_id != 0 && itemdb_exists (item_id)) - sprintf (output, "This item (%d: '%s') is not an equipment.", item_id, item_data->name); + printf("@produce NOT WEAPON [%d]\n", item_id); + if (item_id != 0 && itemdb_exists(item_id)) + sprintf(output, "This item (%d: '%s') is not an equipment.", item_id, item_data->name); else - sprintf (output, "%s", "This item is not an equipment."); - clif_displaymessage (fd, output); + sprintf(output, "%s", "This item is not an equipment."); + clif_displaymessage(fd, output); return -1; } @@ -3017,24 +3016,24 @@ int atcommand_produce (const int fd, struct map_session_data *sd, *------------------------------------------ */ static -void atcommand_memo_sub (struct map_session_data *sd) +void atcommand_memo_sub(struct map_session_data *sd) { - int i; + int i; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your actual memo positions are (except respawn point):"); for (i = MIN_PORTAL_MEMO; i <= MAX_PORTAL_MEMO; i++) { if (sd->status.memo_point[i].map[0]) - sprintf (output, "%d - %s (%d,%d)", i, + sprintf(output, "%d - %s (%d,%d)", i, sd->status.memo_point[i].map, sd->status.memo_point[i].x, sd->status.memo_point[i].y); else - sprintf (output, "%d - void", i); - clif_displaymessage (sd->fd, output); + sprintf(output, "%d - void", i); + clif_displaymessage(sd->fd, output); } return; @@ -3044,48 +3043,48 @@ void atcommand_memo_sub (struct map_session_data *sd) * *------------------------------------------ */ -int atcommand_memo (const int fd, struct map_session_data *sd, +int atcommand_memo(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int position = 0; + int position = 0; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%d", &position) < 1) - atcommand_memo_sub (sd); + if (!message || !*message || sscanf(message, "%d", &position) < 1) + atcommand_memo_sub(sd); else { if (position >= MIN_PORTAL_MEMO && position <= MAX_PORTAL_MEMO) { if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to memo this map."); return -1; } if (sd->status.memo_point[position].map[0]) { - sprintf (output, "You replace previous memo position %d - %s (%d,%d).", position, sd->status.memo_point[position].map, sd->status.memo_point[position].x, sd->status.memo_point[position].y); - clif_displaymessage (fd, output); + sprintf(output, "You replace previous memo position %d - %s (%d,%d).", position, sd->status.memo_point[position].map, sd->status.memo_point[position].x, sd->status.memo_point[position].y); + clif_displaymessage(fd, output); } - memcpy (sd->status.memo_point[position].map, map[sd->bl.m].name, + memcpy(sd->status.memo_point[position].map, map[sd->bl.m].name, 24); sd->status.memo_point[position].x = sd->bl.x; sd->status.memo_point[position].y = sd->bl.y; - clif_skill_memo (sd, 0); - if (pc_checkskill (sd, AL_WARP) <= (position + 1)) - clif_displaymessage (fd, "Note: you don't have the 'Warp' skill level to use it."); - atcommand_memo_sub (sd); + clif_skill_memo(sd, 0); + if (pc_checkskill(sd, AL_WARP) <= (position + 1)) + clif_displaymessage(fd, "Note: you don't have the 'Warp' skill level to use it."); + atcommand_memo_sub(sd); } else { - sprintf (output, + sprintf(output, "Please, enter a valid position (usage: @memo ).", MIN_PORTAL_MEMO, MAX_PORTAL_MEMO); - clif_displaymessage (fd, output); - atcommand_memo_sub (sd); + clif_displaymessage(fd, output); + atcommand_memo_sub(sd); return -1; } } @@ -3097,24 +3096,24 @@ int atcommand_memo (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_gat (const int fd, struct map_session_data *sd, +int atcommand_gat(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[200]; - int y; + int y; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); for (y = 2; y >= -2; y--) { - sprintf (output, "%s (x= %d, y= %d) %02X %02X %02X %02X %02X", + sprintf(output, "%s (x= %d, y= %d) %02X %02X %02X %02X %02X", map[sd->bl.m].name, sd->bl.x - 2, sd->bl.y + y, - map_getcell (sd->bl.m, sd->bl.x - 2, sd->bl.y + y), - map_getcell (sd->bl.m, sd->bl.x - 1, sd->bl.y + y), - map_getcell (sd->bl.m, sd->bl.x, sd->bl.y + y), - map_getcell (sd->bl.m, sd->bl.x + 1, sd->bl.y + y), - map_getcell (sd->bl.m, sd->bl.x + 2, sd->bl.y + y)); - clif_displaymessage (fd, output); + map_getcell(sd->bl.m, sd->bl.x - 2, sd->bl.y + y), + map_getcell(sd->bl.m, sd->bl.x - 1, sd->bl.y + y), + map_getcell(sd->bl.m, sd->bl.x, sd->bl.y + y), + map_getcell(sd->bl.m, sd->bl.x + 1, sd->bl.y + y), + map_getcell(sd->bl.m, sd->bl.x + 2, sd->bl.y + y)); + clif_displaymessage(fd, output); } return 0; @@ -3124,19 +3123,19 @@ int atcommand_gat (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_packet (const int fd, struct map_session_data *sd, +int atcommand_packet(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int x = 0, y = 0; + int x = 0, y = 0; - if (!message || !*message || sscanf (message, "%d %d", &x, &y) < 2) + if (!message || !*message || sscanf(message, "%d %d", &x, &y) < 2) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a status type/flag (usage: @packet )."); return -1; } - clif_status_change (&sd->bl, x, y); + clif_status_change(&sd->bl, x, y); return 0; } @@ -3145,14 +3144,14 @@ int atcommand_packet (const int fd, struct map_session_data *sd, * @stpoint (Rewritten by [Yor]) *------------------------------------------ */ -int atcommand_statuspoint (const int fd, struct map_session_data *sd, +int atcommand_statuspoint(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int point, new_status_point; + int point, new_status_point; - if (!message || !*message || (point = atoi (message)) == 0) + if (!message || !*message || (point = atoi(message)) == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a number (usage: @stpoint )."); return -1; } @@ -3166,15 +3165,15 @@ int atcommand_statuspoint (const int fd, struct map_session_data *sd, if (new_status_point != (int) sd->status.status_point) { sd->status.status_point = (short) new_status_point; - clif_updatestatus (sd, SP_STATUSPOINT); - clif_displaymessage (fd, "Number of status points changed!"); + clif_updatestatus(sd, SP_STATUSPOINT); + clif_displaymessage(fd, "Number of status points changed!"); } else { if (point < 0) - clif_displaymessage (fd, "Impossible to decrease the number/value."); + clif_displaymessage(fd, "Impossible to decrease the number/value."); else - clif_displaymessage (fd, "Impossible to increase the number/value."); + clif_displaymessage(fd, "Impossible to increase the number/value."); return -1; } @@ -3185,14 +3184,14 @@ int atcommand_statuspoint (const int fd, struct map_session_data *sd, * @skpoint (Rewritten by [Yor]) *------------------------------------------ */ -int atcommand_skillpoint (const int fd, struct map_session_data *sd, +int atcommand_skillpoint(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int point, new_skill_point; + int point, new_skill_point; - if (!message || !*message || (point = atoi (message)) == 0) + if (!message || !*message || (point = atoi(message)) == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a number (usage: @skpoint )."); return -1; } @@ -3206,15 +3205,15 @@ int atcommand_skillpoint (const int fd, struct map_session_data *sd, if (new_skill_point != (int) sd->status.skill_point) { sd->status.skill_point = (short) new_skill_point; - clif_updatestatus (sd, SP_SKILLPOINT); - clif_displaymessage (fd, "Number of skill points changed!"); + clif_updatestatus(sd, SP_SKILLPOINT); + clif_displaymessage(fd, "Number of skill points changed!"); } else { if (point < 0) - clif_displaymessage (fd, "Impossible to decrease the number/value."); + clif_displaymessage(fd, "Impossible to decrease the number/value."); else - clif_displaymessage (fd, "Impossible to increase the number/value."); + clif_displaymessage(fd, "Impossible to increase the number/value."); return -1; } @@ -3225,14 +3224,14 @@ int atcommand_skillpoint (const int fd, struct map_session_data *sd, * @zeny (Rewritten by [Yor]) *------------------------------------------ */ -int atcommand_zeny (const int fd, struct map_session_data *sd, +int atcommand_zeny(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int zeny, new_zeny; + int zeny, new_zeny; - if (!message || !*message || (zeny = atoi (message)) == 0) + if (!message || !*message || (zeny = atoi(message)) == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter an amount (usage: @zeny )."); return -1; } @@ -3246,15 +3245,15 @@ int atcommand_zeny (const int fd, struct map_session_data *sd, if (new_zeny != sd->status.zeny) { sd->status.zeny = new_zeny; - clif_updatestatus (sd, SP_ZENY); - clif_displaymessage (fd, "Number of zenys changed!"); + clif_updatestatus(sd, SP_ZENY); + clif_displaymessage(fd, "Number of zenys changed!"); } else { if (zeny < 0) - clif_displaymessage (fd, "Impossible to decrease the number/value."); + clif_displaymessage(fd, "Impossible to decrease the number/value."); else - clif_displaymessage (fd, "Impossible to increase the number/value."); + clif_displaymessage(fd, "Impossible to increase the number/value."); return -1; } @@ -3265,10 +3264,10 @@ int atcommand_zeny (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_param (const int fd, struct map_session_data *sd, +int atcommand_param(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i, index, value = 0, new_value; + int i, index, value = 0, new_value; const char *param[] = { "@str", "@agi", "@vit", "@int", "@dex", "@luk", NULL }; short *status[] = { @@ -3277,21 +3276,21 @@ int atcommand_param (const int fd, struct map_session_data *sd, }; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%d", &value) < 1 + if (!message || !*message || sscanf(message, "%d", &value) < 1 || value == 0) { - sprintf (output, + sprintf(output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>)."); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } index = -1; for (i = 0; param[i] != NULL; i++) { - if (strcasecmp (command, param[i]) == 0) + if (strcasecmp(command, param[i]) == 0) { index = i; break; @@ -3299,9 +3298,9 @@ int atcommand_param (const int fd, struct map_session_data *sd, } if (index < 0 || index > MAX_STATUS_TYPE) { // normaly impossible... - sprintf (output, + sprintf(output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>)."); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return -1; } @@ -3314,17 +3313,17 @@ int atcommand_param (const int fd, struct map_session_data *sd, if (new_value != (int) *status[index]) { *status[index] = new_value; - clif_updatestatus (sd, SP_STR + index); - clif_updatestatus (sd, SP_USTR + index); - pc_calcstatus (sd, 0); - clif_displaymessage (fd, "Stat changed."); + clif_updatestatus(sd, SP_STR + index); + clif_updatestatus(sd, SP_USTR + index); + pc_calcstatus(sd, 0); + clif_displaymessage(fd, "Stat changed."); } else { if (value < 0) - clif_displaymessage (fd, "Impossible to decrease the number/value."); + clif_displaymessage(fd, "Impossible to decrease the number/value."); else - clif_displaymessage (fd, "Impossible to increase the number/value."); + clif_displaymessage(fd, "Impossible to increase the number/value."); return -1; } @@ -3336,21 +3335,21 @@ int atcommand_param (const int fd, struct map_session_data *sd, *------------------------------------------ */ //** Stat all by fritz (rewritten by [Yor]) -int atcommand_all_stats (const int fd, struct map_session_data *sd, +int atcommand_all_stats(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int index, count, value = 0, new_value; + int index, count, value = 0, new_value; short *status[] = { &sd->status.str, &sd->status.agi, &sd->status.vit, &sd->status.int_, &sd->status.dex, &sd->status.luk }; - if (!message || !*message || sscanf (message, "%d", &value) < 1 + if (!message || !*message || sscanf(message, "%d", &value) < 1 || value == 0) value = battle_config.max_parameter; count = 0; - for (index = 0; index < (int) (sizeof (status) / sizeof (status[0])); + for (index = 0; index < (int)(sizeof(status) / sizeof(status[0])); index++) { @@ -3363,21 +3362,21 @@ int atcommand_all_stats (const int fd, struct map_session_data *sd, if (new_value != (int) *status[index]) { *status[index] = new_value; - clif_updatestatus (sd, SP_STR + index); - clif_updatestatus (sd, SP_USTR + index); - pc_calcstatus (sd, 0); + clif_updatestatus(sd, SP_STR + index); + clif_updatestatus(sd, SP_USTR + index); + pc_calcstatus(sd, 0); count++; } } if (count > 0) // if at least 1 stat modified - clif_displaymessage (fd, "All stats changed!"); + clif_displaymessage(fd, "All stats changed!"); else { if (value < 0) - clif_displaymessage (fd, "Impossible to decrease a stat."); + clif_displaymessage(fd, "Impossible to decrease a stat."); else - clif_displaymessage (fd, "Impossible to increase a stat."); + clif_displaymessage(fd, "Impossible to increase a stat."); return -1; } @@ -3388,54 +3387,54 @@ int atcommand_all_stats (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_recall (const int fd, struct map_session_data *sd, +int atcommand_recall(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; char output[200]; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); - memset (output, '\0', sizeof (output)); + memset(character, '\0', sizeof(character)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a player name (usage: @recall )."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (pc_isGM (sd) >= pc_isGM (pl_sd)) + if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can recall only lower or same level if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarpto - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp somenone to your actual map."); return -1; } if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarp - && battle_config.any_warp_GM_min_level > pc_isGM (sd)) + && battle_config.any_warp_GM_min_level > pc_isGM(sd)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "You are not authorised to warp this player from its actual map."); return -1; } - pc_setpos (pl_sd, sd->mapname, sd->bl.x, sd->bl.y, 2); - sprintf (output, "%s recalled!", character); - clif_displaymessage (fd, output); + pc_setpos(pl_sd, sd->mapname, sd->bl.x, sd->bl.y, 2); + sprintf(output, "%s recalled!", character); + clif_displaymessage(fd, output); } else { - clif_displaymessage (fd, "Your GM level don't authorise you to do this action on this player."); + clif_displaymessage(fd, "Your GM level don't authorise you to do this action on this player."); return -1; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -3446,35 +3445,35 @@ int atcommand_recall (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_revive (const int fd, struct map_session_data *sd, +int atcommand_revive(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a player name (usage: @revive )."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { pl_sd->status.hp = pl_sd->status.max_hp; - pc_setstand (pl_sd); + pc_setstand(pl_sd); if (battle_config.pc_invincible_time > 0) - pc_setinvincibletimer (sd, battle_config.pc_invincible_time); - clif_updatestatus (pl_sd, SP_HP); - clif_updatestatus (pl_sd, SP_SP); - clif_resurrection (&pl_sd->bl, 1); - clif_displaymessage (fd, "Character revived."); + pc_setinvincibletimer(sd, battle_config.pc_invincible_time); + clif_updatestatus(pl_sd, SP_HP); + clif_updatestatus(pl_sd, SP_SP); + clif_resurrection(&pl_sd->bl, 1); + clif_displaymessage(fd, "Character revived."); } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -3485,32 +3484,32 @@ int atcommand_revive (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_character_stats (const int fd, struct map_session_data *sd, +int atcommand_character_stats(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; char job_jobname[100]; char output[200]; struct map_session_data *pl_sd; - int i; + int i; - memset (character, '\0', sizeof (character)); - memset (job_jobname, '\0', sizeof (job_jobname)); - memset (output, '\0', sizeof (output)); + memset(character, '\0', sizeof(character)); + memset(job_jobname, '\0', sizeof(job_jobname)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a player name (usage: @charstats )."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { struct { const char *format; - int value; + int value; } output_table[] = { { @@ -3542,19 +3541,19 @@ int atcommand_character_stats (const int fd, struct map_session_data *sd, { NULL, 0} }; - sprintf (job_jobname, "Job - %s %s", job_name (pl_sd->status.pc_class), + sprintf(job_jobname, "Job - %s %s", job_name(pl_sd->status.pc_class), "(level %d)"); - sprintf (output, "'%s' stats:", pl_sd->status.name); - clif_displaymessage (fd, output); + sprintf(output, "'%s' stats:", pl_sd->status.name); + clif_displaymessage(fd, output); for (i = 0; output_table[i].format != NULL; i++) { - sprintf (output, output_table[i].format, output_table[i].value); - clif_displaymessage (fd, output); + sprintf(output, output_table[i].format, output_table[i].value); + clif_displaymessage(fd, output); } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -3566,16 +3565,16 @@ int atcommand_character_stats (const int fd, struct map_session_data *sd, *------------------------------------------ */ //** Character Stats All by fritz -int atcommand_character_stats_all (const int fd, struct map_session_data *sd, +int atcommand_character_stats_all(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[1024], gmlevel[1024]; - int i; - int count; + int i; + int count; struct map_session_data *pl_sd; - memset (output, '\0', sizeof (output)); - memset (gmlevel, '\0', sizeof (gmlevel)); + memset(output, '\0', sizeof(output)); + memset(gmlevel, '\0', sizeof(gmlevel)); count = 0; for (i = 0; i < fd_max; i++) @@ -3584,37 +3583,37 @@ int atcommand_character_stats_all (const int fd, struct map_session_data *sd, && pl_sd->state.auth) { - if (pc_isGM (pl_sd) > 0) - sprintf (gmlevel, "| GM Lvl: %d", pc_isGM (pl_sd)); + if (pc_isGM(pl_sd) > 0) + sprintf(gmlevel, "| GM Lvl: %d", pc_isGM(pl_sd)); else - sprintf (gmlevel, " "); + sprintf(gmlevel, " "); - sprintf (output, + sprintf(output, "Name: %s | BLvl: %d | Job: %s (Lvl: %d) | HP: %d/%d | SP: %d/%d", pl_sd->status.name, pl_sd->status.base_level, - job_name (pl_sd->status.pc_class), pl_sd->status.job_level, + job_name(pl_sd->status.pc_class), pl_sd->status.job_level, pl_sd->status.hp, pl_sd->status.max_hp, pl_sd->status.sp, pl_sd->status.max_sp); - clif_displaymessage (fd, output); - sprintf (output, + clif_displaymessage(fd, output); + sprintf(output, "STR: %d | AGI: %d | VIT: %d | INT: %d | DEX: %d | LUK: %d | Zeny: %d %s", pl_sd->status.str, pl_sd->status.agi, pl_sd->status.vit, pl_sd->status.int_, pl_sd->status.dex, pl_sd->status.luk, pl_sd->status.zeny, gmlevel); - clif_displaymessage (fd, output); - clif_displaymessage (fd, "--------"); + clif_displaymessage(fd, output); + clif_displaymessage(fd, "--------"); count++; } } if (count == 0) - clif_displaymessage (fd, "No player found."); + clif_displaymessage(fd, "No player found."); else if (count == 1) - clif_displaymessage (fd, "1 player found."); + clif_displaymessage(fd, "1 player found."); else { - sprintf (output, "%d players found.", count); - clif_displaymessage (fd, output); + sprintf(output, "%d players found.", count); + clif_displaymessage(fd, output); } return 0; @@ -3624,27 +3623,27 @@ int atcommand_character_stats_all (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_character_option (const int fd, struct map_session_data *sd, +int atcommand_character_option(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; - int opt1 = 0, opt2 = 0, opt3 = 0; + int opt1 = 0, opt2 = 0, opt3 = 0; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%d %d %d %99[^\n]", &opt1, &opt2, &opt3, + || sscanf(message, "%d %d %d %99[^\n]", &opt1, &opt2, &opt3, character) < 4 || opt1 < 0 || opt2 < 0 || opt3 < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter valid options and a player name (usage: @charoption )."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (pc_isGM (sd) >= pc_isGM (pl_sd)) + if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can change option only to lower or same level pl_sd->opt1 = opt1; pl_sd->opt2 = opt2; @@ -3653,7 +3652,7 @@ int atcommand_character_option (const int fd, struct map_session_data *sd, if (pl_sd->status.pc_class == 13 || pl_sd->status.pc_class == 21 || pl_sd->status.pc_class == 4014 || pl_sd->status.pc_class == 4022) { - if (!pc_isriding (pl_sd)) + if (!pc_isriding(pl_sd)) { // pl_sd have the new value... if (pl_sd->status.pc_class == 13) pl_sd->status.pc_class = pl_sd->view_class = 7; @@ -3667,7 +3666,7 @@ int atcommand_character_option (const int fd, struct map_session_data *sd, } else { - if (pc_isriding (pl_sd)) + if (pc_isriding(pl_sd)) { // pl_sd have the new value... if (pl_sd->disguise > 0) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] (code added by [Yor]) @@ -3688,19 +3687,19 @@ int atcommand_character_option (const int fd, struct map_session_data *sd, } } } - clif_changeoption (&pl_sd->bl); - pc_calcstatus (pl_sd, 0); - clif_displaymessage (fd, "Character's options changed."); + clif_changeoption(&pl_sd->bl); + pc_calcstatus(pl_sd, 0); + clif_displaymessage(fd, "Character's options changed."); } else { - clif_displaymessage (fd, "Your GM level don't authorise you to do this action on this player."); + clif_displaymessage(fd, "Your GM level don't authorise you to do this action on this player."); return -1; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -3711,35 +3710,35 @@ int atcommand_character_option (const int fd, struct map_session_data *sd, * charchangesex command (usage: charchangesex ) *------------------------------------------ */ -int atcommand_char_change_sex (const int fd, struct map_session_data *sd, +int atcommand_char_change_sex(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a player name (usage: @charchangesex )."); return -1; } // check player name - if (strlen (character) < 4) + if (strlen(character) < 4) { - clif_displaymessage (fd, "Sorry, but a player name have at least 4 characters."); + clif_displaymessage(fd, "Sorry, but a player name have at least 4 characters."); return -1; } - else if (strlen (character) > 23) + else if (strlen(character) > 23) { - clif_displaymessage (fd, "Sorry, but a player name have 23 characters maximum."); + clif_displaymessage(fd, "Sorry, but a player name have 23 characters maximum."); return -1; } else { - chrif_char_ask_name (sd->status.account_id, character, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex - clif_displaymessage (fd, "Character name sends to char-server to ask it."); + chrif_char_ask_name(sd->status.account_id, character, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex + clif_displaymessage(fd, "Character name sends to char-server to ask it."); } return 0; @@ -3750,35 +3749,35 @@ int atcommand_char_change_sex (const int fd, struct map_session_data *sd, * This command do a definitiv ban on a player *------------------------------------------ */ -int atcommand_char_block (const int fd, struct map_session_data *sd, +int atcommand_char_block(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a player name (usage: @block )."); return -1; } // check player name - if (strlen (character) < 4) + if (strlen(character) < 4) { - clif_displaymessage (fd, "Sorry, but a player name have at least 4 characters."); + clif_displaymessage(fd, "Sorry, but a player name have at least 4 characters."); return -1; } - else if (strlen (character) > 23) + else if (strlen(character) > 23) { - clif_displaymessage (fd, "Sorry, but a player name have 23 characters maximum."); + clif_displaymessage(fd, "Sorry, but a player name have 23 characters maximum."); return -1; } else { - chrif_char_ask_name (sd->status.account_id, character, 1, 0, 0, 0, 0, 0, 0); // type: 1 - block - clif_displaymessage (fd, "Character name sends to char-server to ask it."); + chrif_char_ask_name(sd->status.account_id, character, 1, 0, 0, 0, 0, 0, 0); // type: 1 - block + clif_displaymessage(fd, "Character name sends to char-server to ask it."); } return 0; @@ -3800,32 +3799,32 @@ int atcommand_char_block (const int fd, struct map_session_data *sd, * this example adds 1 month and 1 second, and substracts 2 minutes and 6 years at the same time. *------------------------------------------ */ -int atcommand_char_ban (const int fd, struct map_session_data *sd, +int atcommand_char_ban(const int fd, struct map_session_data *sd, const char *command, const char *message) { char modif[100], character[100]; char *modif_p; - int year, month, day, hour, minute, second, value; + int year, month, day, hour, minute, second, value; - memset (modif, '\0', sizeof (modif)); - memset (character, '\0', sizeof (character)); + memset(modif, '\0', sizeof(modif)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%s %99[^\n]", modif, character) < 2) + || sscanf(message, "%s %99[^\n]", modif, character) < 2) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter ban time and a player name (usage: @charban/@ban/@banish/@charbanish