diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-13 16:25:50 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-14 16:18:22 -0800 |
| commit | 069f39e8a1ebee3e4a4ce8302d0099842876782b (patch) | |
| tree | 57d8de5f57d65878f8ef560e2884b9dee08e9323 /src/map | |
| parent | f9563edf69f083287630f4b17db70d97524196d6 (diff) | |
| download | tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.gz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.bz2 tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.xz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.zip | |
Some formatting fixes before I go insane
Also delete the French translation from ladmin.
Diffstat (limited to 'src/map')
46 files changed, 17994 insertions, 18077 deletions
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 <level> <char name>"); + clif_displaymessage(fd, "Usage: @setup <level> <char name>"); 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+ <mapname> <x> <y> <char name>"); 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 <mapname> <x> <y>)."); 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 <char name>)."); 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 <param1:0+> <param2:0+> <param3:0+>)."); 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 <char name>)."); 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 <message>)."); 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 <name/id_of_item> <quantity>) *------------------------------------------ */ -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 <item name or ID> [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 <number of levels>)."); 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 <number of levels>)."); 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 <password>)."); 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 <hair ID: %d-%d> <hair color: %d-%d> <clothes color: %d-%d>).", 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 <clothes color: %d-%d>).", 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 <hair ID: %d-%d>).", 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 <hair color: %d-%d>).", 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 <equip name or equip ID> <element> <# 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 <memo_position:%d-%d>).", 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 <status type> <flag>)."); 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 <number of points>)."); 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 <number of points>)."); 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 <amount>)."); 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 <char name>)."); 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 <char name>)."); 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 <char name>)."); 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 <param1> <param2> <param3> <charname>)."); 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 <player_name>) *------------------------------------------ */ -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 <name>)."); 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 <name>)."); 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 <time> <name>)."); return -1; } - modif[sizeof (modif) - 1] = '\0'; - character[sizeof (character) - 1] = '\0'; + modif[sizeof(modif) - 1] = '\0'; + character[sizeof(character) - 1] = '\0'; modif_p = modif; year = month = day = hour = minute = second = 0; while (modif_p[0] != '\0') { - value = atoi (modif_p); + value = atoi(modif_p); if (value == 0) modif_p++; else @@ -3873,25 +3872,25 @@ int atcommand_char_ban (const int fd, struct map_session_data *sd, if (year == 0 && month == 0 && day == 0 && hour == 0 && minute == 0 && second == 0) { - clif_displaymessage (fd, "Invalid time for ban command."); + clif_displaymessage(fd, "Invalid time for ban command."); 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, 2, year, month, day, hour, minute, second); // type: 2 - ban - clif_displaymessage (fd, "Character name sends to char-server to ask it."); + chrif_char_ask_name(sd->status.account_id, character, 2, year, month, day, hour, minute, second); // type: 2 - ban + clif_displaymessage(fd, "Character name sends to char-server to ask it."); } return 0; @@ -3901,36 +3900,36 @@ int atcommand_char_ban (const int fd, struct map_session_data *sd, * charunblock command (usage: charunblock <player_name>) *------------------------------------------ */ -int atcommand_char_unblock (const int fd, struct map_session_data *sd, +int atcommand_char_unblock(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: @charunblock <player_name>)."); 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 { // send answer to login server via char-server - chrif_char_ask_name (sd->status.account_id, character, 3, 0, 0, 0, 0, 0, 0); // type: 3 - unblock - clif_displaymessage (fd, "Character name sends to char-server to ask it."); + chrif_char_ask_name(sd->status.account_id, character, 3, 0, 0, 0, 0, 0, 0); // type: 3 - unblock + clif_displaymessage(fd, "Character name sends to char-server to ask it."); } return 0; @@ -3940,36 +3939,36 @@ int atcommand_char_unblock (const int fd, struct map_session_data *sd, * charunban command (usage: charunban <player_name>) *------------------------------------------ */ -int atcommand_char_unban (const int fd, struct map_session_data *sd, +int atcommand_char_unban(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: @charunban <player_name>)."); 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 { // send answer to login server via char-server - chrif_char_ask_name (sd->status.account_id, character, 4, 0, 0, 0, 0, 0, 0); // type: 4 - unban - clif_displaymessage (fd, "Character name sends to char-server to ask it."); + chrif_char_ask_name(sd->status.account_id, character, 4, 0, 0, 0, 0, 0, 0); // type: 4 - unban + clif_displaymessage(fd, "Character name sends to char-server to ask it."); } return 0; @@ -3979,62 +3978,62 @@ int atcommand_char_unban (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_character_save (const int fd, struct map_session_data *sd, +int atcommand_character_save(const int fd, struct map_session_data *sd, const char *command, const char *message) { char map_name[100]; char character[100]; struct map_session_data *pl_sd; - int x = 0, y = 0; - int m; + int x = 0, y = 0; + 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 || x < 0 || y < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a valid save point and a player name (usage: @charsave <map> <x> <y> <charname>)."); return -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 ((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 save point only to lower or same gm level - m = map_mapname2mapid (map_name); + m = map_mapname2mapid(map_name); if (m < 0) { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); return -1; } else { 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 set this map as a save map."); return -1; } - pc_setsavepoint (pl_sd, map_name, x, y); - clif_displaymessage (fd, "Character's respawn point changed."); + pc_setsavepoint(pl_sd, map_name, x, y); + clif_displaymessage(fd, "Character's respawn point 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; } @@ -4045,11 +4044,11 @@ int atcommand_character_save (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_night (const int fd, struct map_session_data *sd, +int atcommand_night(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 (night_flag != 1) { @@ -4060,14 +4059,14 @@ int atcommand_night (const int fd, struct map_session_data *sd, && pl_sd->state.auth) { pl_sd->opt2 |= STATE_BLIND; - clif_changeoption (&pl_sd->bl); - clif_displaymessage (pl_sd->fd, "Night has fallen."); + clif_changeoption(&pl_sd->bl); + clif_displaymessage(pl_sd->fd, "Night has fallen."); } } } else { - clif_displaymessage (fd, "Sorry, it's already the night. Impossible to execute the command."); + clif_displaymessage(fd, "Sorry, it's already the night. Impossible to execute the command."); return -1; } @@ -4078,11 +4077,11 @@ int atcommand_night (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_day (const int fd, struct map_session_data *sd, +int atcommand_day(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 (night_flag != 0) { @@ -4093,14 +4092,14 @@ int atcommand_day (const int fd, struct map_session_data *sd, && pl_sd->state.auth) { pl_sd->opt2 &= ~STATE_BLIND; - clif_changeoption (&pl_sd->bl); - clif_displaymessage (pl_sd->fd, "Day has arrived."); + clif_changeoption(&pl_sd->bl); + clif_displaymessage(pl_sd->fd, "Day has arrived."); } } } else { - clif_displaymessage (fd, "Sorry, it's already the day. Impossible to execute the command."); + clif_displaymessage(fd, "Sorry, it's already the day. Impossible to execute the command."); return -1; } @@ -4111,23 +4110,23 @@ int atcommand_day (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_doom (const int fd, struct map_session_data *sd, +int atcommand_doom(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth && i != fd - && pc_isGM (sd) >= pc_isGM (pl_sd)) + && pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can doom only lower or same gm level - pc_damage (NULL, pl_sd, pl_sd->status.hp + 1); - clif_displaymessage (pl_sd->fd, "The holy messenger has given judgement."); + pc_damage(NULL, pl_sd, pl_sd->status.hp + 1); + clif_displaymessage(pl_sd->fd, "The holy messenger has given judgement."); } } - clif_displaymessage (fd, "Judgement was made."); + clif_displaymessage(fd, "Judgement was made."); return 0; } @@ -4136,23 +4135,23 @@ int atcommand_doom (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_doommap (const int fd, struct map_session_data *sd, +int atcommand_doommap(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth && i != fd && sd->bl.m == pl_sd->bl.m - && pc_isGM (sd) >= pc_isGM (pl_sd)) + && pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can doom only lower or same gm level - pc_damage (NULL, pl_sd, pl_sd->status.hp + 1); - clif_displaymessage (pl_sd->fd, "The holy messenger has given judgement."); + pc_damage(NULL, pl_sd, pl_sd->status.hp + 1); + clif_displaymessage(pl_sd->fd, "The holy messenger has given judgement."); } } - clif_displaymessage (fd, "Judgement was made."); + clif_displaymessage(fd, "Judgement was made."); return 0; } @@ -4161,17 +4160,17 @@ int atcommand_doommap (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -static void atcommand_raise_sub (struct map_session_data *sd) +static void atcommand_raise_sub(struct map_session_data *sd) { - if (sd && sd->state.auth && pc_isdead (sd)) + if (sd && sd->state.auth && pc_isdead(sd)) { sd->status.hp = sd->status.max_hp; sd->status.sp = sd->status.max_sp; - pc_setstand (sd); - clif_updatestatus (sd, SP_HP); - clif_updatestatus (sd, SP_SP); - clif_resurrection (&sd->bl, 1); - clif_displaymessage (sd->fd, "Mercy has been shown."); + pc_setstand(sd); + clif_updatestatus(sd, SP_HP); + clif_updatestatus(sd, SP_SP); + clif_resurrection(&sd->bl, 1); + clif_displaymessage(sd->fd, "Mercy has been shown."); } } @@ -4179,17 +4178,17 @@ static void atcommand_raise_sub (struct map_session_data *sd) * *------------------------------------------ */ -int atcommand_raise (const int fd, struct map_session_data *sd, +int atcommand_raise(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i]) - atcommand_raise_sub ((struct map_session_data *)session[i]->session_data); + atcommand_raise_sub((struct map_session_data *)session[i]->session_data); } - clif_displaymessage (fd, "Mercy has been granted."); + clif_displaymessage(fd, "Mercy has been granted."); return 0; } @@ -4198,19 +4197,19 @@ int atcommand_raise (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_raisemap (const int fd, struct map_session_data *sd, +int atcommand_raisemap(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth && sd->bl.m == pl_sd->bl.m) - atcommand_raise_sub (pl_sd); + atcommand_raise_sub(pl_sd); } - clif_displaymessage (fd, "Mercy has been granted."); + clif_displaymessage(fd, "Mercy has been granted."); return 0; } @@ -4219,34 +4218,34 @@ int atcommand_raisemap (const int fd, struct map_session_data *sd, * atcommand_character_baselevel @charbaselvlで対象キャラのレベルを上げる *------------------------------------------ */ -int atcommand_character_baselevel (const int fd, struct map_session_data *sd, +int atcommand_character_baselevel(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; char character[100]; - int level = 0, i; + int level = 0, i; - 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 || level == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a level adjustement and a player name (usage: @charblvl <#> <nickname>)."); 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 base level only lower or same gm level if (level > 0) { if (pl_sd->status.base_level == battle_config.maximum_level) { // check for max level by Valaris - clif_displaymessage (fd, "Character's base level can't go any higher."); + clif_displaymessage(fd, "Character's base level can't go any higher."); return 0; } // End Addition if (level > battle_config.maximum_level || level > (battle_config.maximum_level - pl_sd->status.base_level)) // fix positiv overflow @@ -4257,19 +4256,19 @@ int atcommand_character_baselevel (const int fd, struct map_session_data *sd, pl_sd->status.status_point += (pl_sd->status.base_level + i + 14) / 4; pl_sd->status.base_level += level; - clif_updatestatus (pl_sd, SP_BASELEVEL); - clif_updatestatus (pl_sd, SP_NEXTBASEEXP); - clif_updatestatus (pl_sd, SP_STATUSPOINT); - pc_calcstatus (pl_sd, 0); - pc_heal (pl_sd, pl_sd->status.max_hp, pl_sd->status.max_sp); - clif_misceffect (&pl_sd->bl, 0); - clif_displaymessage (fd, "Character's base level raised."); + clif_updatestatus(pl_sd, SP_BASELEVEL); + clif_updatestatus(pl_sd, SP_NEXTBASEEXP); + clif_updatestatus(pl_sd, SP_STATUSPOINT); + pc_calcstatus(pl_sd, 0); + pc_heal(pl_sd, pl_sd->status.max_hp, pl_sd->status.max_sp); + clif_misceffect(&pl_sd->bl, 0); + clif_displaymessage(fd, "Character's base level raised."); } else { if (pl_sd->status.base_level == 1) { - clif_displaymessage (fd, "Character's base level can't go any lower."); + clif_displaymessage(fd, "Character's base level can't go any lower."); return -1; } if (level < -battle_config.maximum_level || level < (1 - pl_sd->status.base_level)) // fix negativ overflow @@ -4281,28 +4280,28 @@ int atcommand_character_baselevel (const int fd, struct map_session_data *sd, (pl_sd->status.base_level + i + 14) / 4; if (pl_sd->status.status_point < 0) pl_sd->status.status_point = 0; - clif_updatestatus (pl_sd, SP_STATUSPOINT); + clif_updatestatus(pl_sd, SP_STATUSPOINT); } // to add: remove status points from stats pl_sd->status.base_level += level; pl_sd->status.base_exp = 0; - clif_updatestatus (pl_sd, SP_BASELEVEL); - clif_updatestatus (pl_sd, SP_NEXTBASEEXP); - clif_updatestatus (pl_sd, SP_BASEEXP); - pc_calcstatus (pl_sd, 0); - clif_displaymessage (fd, "Character's base level lowered."); + clif_updatestatus(pl_sd, SP_BASELEVEL); + clif_updatestatus(pl_sd, SP_NEXTBASEEXP); + clif_updatestatus(pl_sd, SP_BASEEXP); + pc_calcstatus(pl_sd, 0); + clif_displaymessage(fd, "Character's base level lowered."); } - // Reset their stat points to prevent extra points from stacking - atcommand_charstreset(fd, sd,"@charstreset", character); + // Reset their stat points to prevent extra points from stacking + atcommand_charstreset(fd, sd,"@charstreset", character); } 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; } @@ -4313,30 +4312,30 @@ int atcommand_character_baselevel (const int fd, struct map_session_data *sd, * atcommand_character_joblevel @charjoblvlで対象キャラのJobレベルを上げる *------------------------------------------ */ -int atcommand_character_joblevel (const int fd, struct map_session_data *sd, +int atcommand_character_joblevel(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; char character[100]; - int max_level = 50, level = 0; + int max_level = 50, level = 0; //転生や養子の場合の元の職業を算出する struct pc_base_job pl_s_class; - 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 || level == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a level adjustement and a player name (usage: @charjlvl <#> <nickname>)."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - pl_s_class = pc_calc_base_job (pl_sd->status.pc_class); - if (pc_isGM (sd) >= pc_isGM (pl_sd)) + pl_s_class = pc_calc_base_job(pl_sd->status.pc_class); + if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can change job level only lower or same gm level if (pl_s_class.job == 0) max_level -= 40; @@ -4347,52 +4346,52 @@ int atcommand_character_joblevel (const int fd, struct map_session_data *sd, { if (pl_sd->status.job_level == max_level) { - clif_displaymessage (fd, "Character's job level can't go any higher."); + clif_displaymessage(fd, "Character's job level can't go any higher."); return -1; } if (pl_sd->status.job_level + level > max_level) level = max_level - pl_sd->status.job_level; pl_sd->status.job_level += level; - clif_updatestatus (pl_sd, SP_JOBLEVEL); - clif_updatestatus (pl_sd, SP_NEXTJOBEXP); + clif_updatestatus(pl_sd, SP_JOBLEVEL); + clif_updatestatus(pl_sd, SP_NEXTJOBEXP); pl_sd->status.skill_point += level; - clif_updatestatus (pl_sd, SP_SKILLPOINT); - pc_calcstatus (pl_sd, 0); - clif_misceffect (&pl_sd->bl, 1); - clif_displaymessage (fd, "character's job level raised."); + clif_updatestatus(pl_sd, SP_SKILLPOINT); + pc_calcstatus(pl_sd, 0); + clif_misceffect(&pl_sd->bl, 1); + clif_displaymessage(fd, "character's job level raised."); } else { if (pl_sd->status.job_level == 1) { - clif_displaymessage (fd, "Character's job level can't go any lower."); + clif_displaymessage(fd, "Character's job level can't go any lower."); return -1; } if (pl_sd->status.job_level + level < 1) level = 1 - pl_sd->status.job_level; pl_sd->status.job_level += level; - clif_updatestatus (pl_sd, SP_JOBLEVEL); - clif_updatestatus (pl_sd, SP_NEXTJOBEXP); + clif_updatestatus(pl_sd, SP_JOBLEVEL); + clif_updatestatus(pl_sd, SP_NEXTJOBEXP); if (pl_sd->status.skill_point > 0) { pl_sd->status.skill_point += level; if (pl_sd->status.skill_point < 0) pl_sd->status.skill_point = 0; - clif_updatestatus (pl_sd, SP_SKILLPOINT); + clif_updatestatus(pl_sd, SP_SKILLPOINT); } // to add: remove status points from skills - pc_calcstatus (pl_sd, 0); - clif_displaymessage (fd, "Character's job level lowered."); + pc_calcstatus(pl_sd, 0); + clif_displaymessage(fd, "Character's job level lowered."); } } 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; } @@ -4403,34 +4402,34 @@ int atcommand_character_joblevel (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_kick (const int fd, struct map_session_data *sd, +int atcommand_kick(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; 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: @kick <charname>)."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (pc_isGM (sd) >= pc_isGM (pl_sd)) // you can kick only lower or same gm level - clif_GM_kick (sd, pl_sd, 1); + if (pc_isGM(sd) >= pc_isGM(pl_sd)) // you can kick only lower or same gm level + clif_GM_kick(sd, pl_sd, 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; } @@ -4441,23 +4440,23 @@ int atcommand_kick (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_kickall (const int fd, struct map_session_data *sd, +int atcommand_kickall(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) - && pl_sd->state.auth && pc_isGM (sd) >= pc_isGM (pl_sd)) + && pl_sd->state.auth && pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kick only lower or same gm level if (sd->status.account_id != pl_sd->status.account_id) - clif_GM_kick (sd, pl_sd, 0); + clif_GM_kick(sd, pl_sd, 0); } } - clif_displaymessage (fd, "All players have been kicked!"); + clif_displaymessage(fd, "All players have been kicked!"); return 0; } @@ -4466,13 +4465,13 @@ int atcommand_kickall (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_allskills (const int fd, struct map_session_data *sd, +int atcommand_allskills(const int fd, struct map_session_data *sd, const char *command, const char *message) { - pc_allskillup (sd); // all skills + pc_allskillup(sd); // all skills sd->status.skill_point = 0; // 0 skill points - clif_updatestatus (sd, SP_SKILLPOINT); // update - clif_displaymessage (fd, "You have received all skills."); + clif_updatestatus(sd, SP_SKILLPOINT); // update + clif_displaymessage(fd, "You have received all skills."); return 0; } @@ -4481,42 +4480,42 @@ int atcommand_allskills (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_questskill (const int fd, struct map_session_data *sd, +int atcommand_questskill(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int skill_id; + int skill_id; - if (!message || !*message || (skill_id = atoi (message)) < 0) + if (!message || !*message || (skill_id = atoi(message)) < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a quest skill number (usage: @questskill <#:0+>)."); return -1; } if (skill_id >= 0 && skill_id < MAX_SKILL_DB) { - if (skill_get_inf2 (skill_id) & 0x01) + if (skill_get_inf2(skill_id) & 0x01) { - if (pc_checkskill (sd, skill_id) == 0) + if (pc_checkskill(sd, skill_id) == 0) { - pc_skill (sd, skill_id, 1, 0); - clif_displaymessage (fd, "You have learned the skill."); + pc_skill(sd, skill_id, 1, 0); + clif_displaymessage(fd, "You have learned the skill."); } else { - clif_displaymessage (fd, "You already have this quest skill."); + clif_displaymessage(fd, "You already have this quest skill."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist or isn't a quest skill."); + clif_displaymessage(fd, "This skill number doesn't exist or isn't a quest skill."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist."); + clif_displaymessage(fd, "This skill number doesn't exist."); return -1; } @@ -4527,56 +4526,56 @@ int atcommand_questskill (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_charquestskill (const int fd, struct map_session_data *sd, +int atcommand_charquestskill(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; struct map_session_data *pl_sd; - int skill_id = 0; + int skill_id = 0; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%d %99[^\n]", &skill_id, character) < 2 + || sscanf(message, "%d %99[^\n]", &skill_id, character) < 2 || skill_id < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a quest skill number and a player name (usage: @charquestskill <#:0+> <char_name>)."); return -1; } if (skill_id >= 0 && skill_id < MAX_SKILL_DB) { - if (skill_get_inf2 (skill_id) & 0x01) + if (skill_get_inf2(skill_id) & 0x01) { - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (pc_checkskill (pl_sd, skill_id) == 0) + if (pc_checkskill(pl_sd, skill_id) == 0) { - pc_skill (pl_sd, skill_id, 1, 0); - clif_displaymessage (fd, "This player has learned the skill."); + pc_skill(pl_sd, skill_id, 1, 0); + clif_displaymessage(fd, "This player has learned the skill."); } else { - clif_displaymessage (fd, "This player already has this quest skill."); + clif_displaymessage(fd, "This player already has this quest skill."); return -1; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist or isn't a quest skill."); + clif_displaymessage(fd, "This skill number doesn't exist or isn't a quest skill."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist."); + clif_displaymessage(fd, "This skill number doesn't exist."); return -1; } @@ -4587,44 +4586,44 @@ int atcommand_charquestskill (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_lostskill (const int fd, struct map_session_data *sd, +int atcommand_lostskill(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int skill_id; + int skill_id; - if (!message || !*message || (skill_id = atoi (message)) < 0) + if (!message || !*message || (skill_id = atoi(message)) < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a quest skill number (usage: @lostskill <#:0+>)."); return -1; } if (skill_id >= 0 && skill_id < MAX_SKILL) { - if (skill_get_inf2 (skill_id) & 0x01) + if (skill_get_inf2(skill_id) & 0x01) { - if (pc_checkskill (sd, skill_id) > 0) + if (pc_checkskill(sd, skill_id) > 0) { sd->status.skill[skill_id].lv = 0; sd->status.skill[skill_id].flags = 0; - clif_skillinfoblock (sd); - clif_displaymessage (fd, "You have forgotten the skill."); + clif_skillinfoblock(sd); + clif_displaymessage(fd, "You have forgotten the skill."); } else { - clif_displaymessage (fd, "You don't have this quest skill."); + clif_displaymessage(fd, "You don't have this quest skill."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist or isn't a quest skill."); + clif_displaymessage(fd, "This skill number doesn't exist or isn't a quest skill."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist."); + clif_displaymessage(fd, "This skill number doesn't exist."); return -1; } @@ -4635,58 +4634,58 @@ int atcommand_lostskill (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_charlostskill (const int fd, struct map_session_data *sd, +int atcommand_charlostskill(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; struct map_session_data *pl_sd; - int skill_id = 0; + int skill_id = 0; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%d %99[^\n]", &skill_id, character) < 2 + || sscanf(message, "%d %99[^\n]", &skill_id, character) < 2 || skill_id < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a quest skill number and a player name (usage: @charlostskill <#:0+> <char_name>)."); return -1; } if (skill_id >= 0 && skill_id < MAX_SKILL) { - if (skill_get_inf2 (skill_id) & 0x01) + if (skill_get_inf2(skill_id) & 0x01) { - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (pc_checkskill (pl_sd, skill_id) > 0) + if (pc_checkskill(pl_sd, skill_id) > 0) { pl_sd->status.skill[skill_id].lv = 0; pl_sd->status.skill[skill_id].flags = 0; - clif_skillinfoblock (pl_sd); - clif_displaymessage (fd, "This player has forgotten the skill."); + clif_skillinfoblock(pl_sd); + clif_displaymessage(fd, "This player has forgotten the skill."); } else { - clif_displaymessage (fd, "This player doesn't have this quest skill."); + clif_displaymessage(fd, "This player doesn't have this quest skill."); return -1; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist or isn't a quest skill."); + clif_displaymessage(fd, "This skill number doesn't exist or isn't a quest skill."); return -1; } } else { - clif_displaymessage (fd, "This skill number doesn't exist."); + clif_displaymessage(fd, "This skill number doesn't exist."); return -1; } @@ -4697,21 +4696,21 @@ int atcommand_charlostskill (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_party (const int fd, struct map_session_data *sd, +int atcommand_party(const int fd, struct map_session_data *sd, const char *command, const char *message) { char party[100]; - memset (party, '\0', sizeof (party)); + memset(party, '\0', sizeof(party)); - if (!message || !*message || sscanf (message, "%99[^\n]", party) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", party) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a party name (usage: @party <party_name>)."); return -1; } - party_create (sd, party); + party_create(sd, party); return 0; } @@ -4720,11 +4719,11 @@ int atcommand_party (const int fd, struct map_session_data *sd, * @mapexitでマップサーバーを終了させる *------------------------------------------ */ -int atcommand_mapexit (const int fd, struct map_session_data *sd, +int atcommand_mapexit(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; for (i = 0; i < fd_max; i++) { @@ -4732,10 +4731,10 @@ int atcommand_mapexit (const int fd, struct map_session_data *sd, && pl_sd->state.auth) { if (sd->status.account_id != pl_sd->status.account_id) - clif_GM_kick (sd, pl_sd, 0); + clif_GM_kick(sd, pl_sd, 0); } } - clif_GM_kick (sd, sd, 0); + clif_GM_kick(sd, sd, 0); runflag = 0; @@ -4746,39 +4745,39 @@ int atcommand_mapexit (const int fd, struct map_session_data *sd, * idsearch <part_of_name>: revrited by [Yor] *------------------------------------------ */ -int atcommand_idsearch (const int fd, struct map_session_data *sd, +int atcommand_idsearch(const int fd, struct map_session_data *sd, const char *command, const char *message) { char item_name[100]; char output[200]; - int i, match; + int i, match; struct item_data *item; - memset (item_name, '\0', sizeof (item_name)); - memset (output, '\0', sizeof (output)); + memset(item_name, '\0', sizeof(item_name)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%99s", item_name) < 0) + if (!message || !*message || sscanf(message, "%99s", item_name) < 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a part of item name (usage: @idsearch <part_of_item_name>)."); return -1; } - sprintf (output, "The reference result of '%s' (name: id):", item_name); - clif_displaymessage (fd, output); + sprintf(output, "The reference result of '%s' (name: id):", item_name); + clif_displaymessage(fd, output); match = 0; for (i = 0; i < 20000; i++) { - if ((item = itemdb_exists (i)) != NULL - && strstr (item->jname, item_name) != NULL) + if ((item = itemdb_exists(i)) != NULL + && strstr(item->jname, item_name) != NULL) { match++; - sprintf (output, "%s: %d", item->jname, item->nameid); - clif_displaymessage (fd, output); + sprintf(output, "%s: %d", item->jname, item->nameid); + clif_displaymessage(fd, output); } } - sprintf (output, "It is %d affair above.", match); - clif_displaymessage (fd, output); + sprintf(output, "It is %d affair above.", match); + clif_displaymessage(fd, output); return 0; } @@ -4787,40 +4786,40 @@ int atcommand_idsearch (const int fd, struct map_session_data *sd, * Character Skill Reset *------------------------------------------ */ -int atcommand_charskreset (const int fd, struct map_session_data *sd, +int atcommand_charskreset(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: @charskreset <charname>)."); 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 reset skill points only lower or same gm level - pc_resetskill (pl_sd); - sprintf (output, "'%s' skill points reseted!", character); - clif_displaymessage (fd, output); + pc_resetskill(pl_sd); + sprintf(output, "'%s' skill points reseted!", 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; } @@ -4831,40 +4830,40 @@ int atcommand_charskreset (const int fd, struct map_session_data *sd, * Character Stat Reset *------------------------------------------ */ -int atcommand_charstreset (const int fd, struct map_session_data *sd, +int atcommand_charstreset(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: @charstreset <charname>)."); 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 reset stats points only lower or same gm level - pc_resetstate (pl_sd); - sprintf (output, "'%s' stats points reseted!", character); - clif_displaymessage (fd, output); + pc_resetstate(pl_sd); + sprintf(output, "'%s' stats points reseted!", 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; } @@ -4875,43 +4874,43 @@ int atcommand_charstreset (const int fd, struct map_session_data *sd, * Character Reset *------------------------------------------ */ -int atcommand_charreset (const int fd, struct map_session_data *sd, +int atcommand_charreset(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: @charreset <charname>)."); 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 reset a character only for lower or same GM level - pc_resetstate (pl_sd); - pc_resetskill (pl_sd); - pc_setglobalreg (pl_sd, "MAGIC_FLAGS", 0); // [Fate] Reset magic quest variables - pc_setglobalreg (pl_sd, "MAGIC_EXP", 0); // [Fate] Reset magic experience - sprintf (output, "'%s' skill and stats points reseted!", character); - clif_displaymessage (fd, output); + pc_resetstate(pl_sd); + pc_resetskill(pl_sd); + pc_setglobalreg(pl_sd, "MAGIC_FLAGS", 0); // [Fate] Reset magic quest variables + pc_setglobalreg(pl_sd, "MAGIC_EXP", 0); // [Fate] Reset magic experience + sprintf(output, "'%s' skill and stats points reseted!", 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; } @@ -4922,46 +4921,46 @@ int atcommand_charreset (const int fd, struct map_session_data *sd, * Character Wipe *------------------------------------------ */ -int atcommand_char_wipe (const int fd, struct map_session_data *sd, +int atcommand_char_wipe(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: @charwipe <charname>)."); 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 reset a character only for lower or same GM level - int i; + int i; // Reset base level pl_sd->status.base_level = 1; pl_sd->status.base_exp = 0; - clif_updatestatus (pl_sd, SP_BASELEVEL); - clif_updatestatus (pl_sd, SP_NEXTBASEEXP); - clif_updatestatus (pl_sd, SP_BASEEXP); + clif_updatestatus(pl_sd, SP_BASELEVEL); + clif_updatestatus(pl_sd, SP_NEXTBASEEXP); + clif_updatestatus(pl_sd, SP_BASEEXP); // Reset job level pl_sd->status.job_level = 1; pl_sd->status.job_exp = 0; - clif_updatestatus (pl_sd, SP_JOBLEVEL); - clif_updatestatus (pl_sd, SP_NEXTJOBEXP); - clif_updatestatus (pl_sd, SP_JOBEXP); + clif_updatestatus(pl_sd, SP_JOBLEVEL); + clif_updatestatus(pl_sd, SP_NEXTJOBEXP); + clif_updatestatus(pl_sd, SP_JOBEXP); // Zeny to 50 pl_sd->status.zeny = 50; - clif_updatestatus (pl_sd, SP_ZENY); + clif_updatestatus(pl_sd, SP_ZENY); // Clear inventory for (i = 0; i < MAX_INVENTORY; i++) @@ -4969,8 +4968,8 @@ int atcommand_char_wipe (const int fd, struct map_session_data *sd, if (sd->status.inventory[i].amount) { if (sd->status.inventory[i].equip) - pc_unequipitem (pl_sd, i, 0); - pc_delitem (pl_sd, i, sd->status.inventory[i].amount, 0); + pc_unequipitem(pl_sd, i, 0); + pc_delitem(pl_sd, i, sd->status.inventory[i].amount, 0); } } @@ -4979,29 +4978,29 @@ int atcommand_char_wipe (const int fd, struct map_session_data *sd, item.nameid = 1201; // knife item.identify = 1; item.broken = 0; - pc_additem (pl_sd, &item, 1); + pc_additem(pl_sd, &item, 1); item.nameid = 1202; // shirt - pc_additem (pl_sd, &item, 1); + pc_additem(pl_sd, &item, 1); // Reset stats and skills - pc_calcstatus (pl_sd, 0); - pc_resetstate (pl_sd); - pc_resetskill (pl_sd); - pc_setglobalreg (pl_sd, "MAGIC_FLAGS", 0); // [Fate] Reset magic quest variables - pc_setglobalreg (pl_sd, "MAGIC_EXP", 0); // [Fate] Reset magic experience + pc_calcstatus(pl_sd, 0); + pc_resetstate(pl_sd); + pc_resetskill(pl_sd); + pc_setglobalreg(pl_sd, "MAGIC_FLAGS", 0); // [Fate] Reset magic quest variables + pc_setglobalreg(pl_sd, "MAGIC_EXP", 0); // [Fate] Reset magic experience - sprintf (output, "%s: wiped.", character); - clif_displaymessage (fd, output); + sprintf(output, "%s: wiped.", 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; } @@ -5012,31 +5011,31 @@ int atcommand_char_wipe (const int fd, struct map_session_data *sd, * Character Model by chbrules *------------------------------------------ */ -int atcommand_charmodel (const int fd, struct map_session_data *sd, +int atcommand_charmodel(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; struct map_session_data *pl_sd; char character[100]; char output[200]; - 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, "%d %d %d %99[^\n]", &hair_style, &hair_color, + || sscanf(message, "%d %d %d %99[^\n]", &hair_style, &hair_color, &cloth_color, character) < 4 || hair_style < 0 || hair_color < 0 || cloth_color < 0) { - sprintf (output, + sprintf(output, "Please, enter a valid model and a player name (usage: @charmodel <hair ID: %d-%d> <hair color: %d-%d> <clothes color: %d-%d> <name>).", 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; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { if (hair_style >= MIN_HAIR_STYLE && hair_style <= MAX_HAIR_STYLE && hair_color >= MIN_HAIR_COLOR && hair_color <= MAX_HAIR_COLOR && @@ -5047,26 +5046,26 @@ int atcommand_charmodel (const int fd, struct map_session_data *sd, pl_sd->status.sex == 1 && (pl_sd->status.pc_class == 12 || pl_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 (pl_sd, LOOK_HAIR, hair_style); - pc_changelook (pl_sd, LOOK_HAIR_COLOR, hair_color); - pc_changelook (pl_sd, LOOK_CLOTHES_COLOR, cloth_color); - clif_displaymessage (fd, "Appearence changed."); + pc_changelook(pl_sd, LOOK_HAIR, hair_style); + pc_changelook(pl_sd, LOOK_HAIR_COLOR, hair_color); + pc_changelook(pl_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; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -5077,26 +5076,26 @@ int atcommand_charmodel (const int fd, struct map_session_data *sd, * Character Skill Point (Rewritten by [Yor]) *------------------------------------------ */ -int atcommand_charskpoint (const int fd, struct map_session_data *sd, +int atcommand_charskpoint(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; char character[100]; - int new_skill_point; - int point = 0; + int new_skill_point; + int point = 0; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%d %99[^\n]", &point, character) < 2 + || sscanf(message, "%d %99[^\n]", &point, character) < 2 || point == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a number and a player name (usage: @charskpoint <amount> <name>)."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { new_skill_point = (int) pl_sd->status.skill_point + point; if (point > 0 && (point > 0x7FFF || new_skill_point > 0x7FFF)) // fix positiv overflow @@ -5106,21 +5105,21 @@ int atcommand_charskpoint (const int fd, struct map_session_data *sd, if (new_skill_point != (int) pl_sd->status.skill_point) { pl_sd->status.skill_point = new_skill_point; - clif_updatestatus (pl_sd, SP_SKILLPOINT); - clif_displaymessage (fd, "Character's number of skill points changed!"); + clif_updatestatus(pl_sd, SP_SKILLPOINT); + clif_displaymessage(fd, "Character's 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; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -5131,26 +5130,26 @@ int atcommand_charskpoint (const int fd, struct map_session_data *sd, * Character Status Point (rewritten by [Yor]) *------------------------------------------ */ -int atcommand_charstpoint (const int fd, struct map_session_data *sd, +int atcommand_charstpoint(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; char character[100]; - int new_status_point; - int point = 0; + int new_status_point; + int point = 0; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%d %99[^\n]", &point, character) < 2 + || sscanf(message, "%d %99[^\n]", &point, character) < 2 || point == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a number and a player name (usage: @charstpoint <amount> <name>)."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { new_status_point = (int) pl_sd->status.status_point + point; if (point > 0 && (point > 0x7FFF || new_status_point > 0x7FFF)) // fix positiv overflow @@ -5160,21 +5159,21 @@ int atcommand_charstpoint (const int fd, struct map_session_data *sd, if (new_status_point != (int) pl_sd->status.status_point) { pl_sd->status.status_point = new_status_point; - clif_updatestatus (pl_sd, SP_STATUSPOINT); - clif_displaymessage (fd, "Character's number of status points changed!"); + clif_updatestatus(pl_sd, SP_STATUSPOINT); + clif_displaymessage(fd, "Character's 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; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -5185,24 +5184,24 @@ int atcommand_charstpoint (const int fd, struct map_session_data *sd, * Character Zeny Point (Rewritten by [Yor]) *------------------------------------------ */ -int atcommand_charzeny (const int fd, struct map_session_data *sd, +int atcommand_charzeny(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; char character[100]; - int zeny = 0, new_zeny; + int zeny = 0, new_zeny; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%d %99[^\n]", &zeny, character) < 2 || zeny == 0) + || sscanf(message, "%d %99[^\n]", &zeny, character) < 2 || zeny == 0) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a number and a player name (usage: @charzeny <zeny> <name>)."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { new_zeny = pl_sd->status.zeny + zeny; if (zeny > 0 && (zeny > MAX_ZENY || new_zeny > MAX_ZENY)) // fix positiv overflow @@ -5212,21 +5211,21 @@ int atcommand_charzeny (const int fd, struct map_session_data *sd, if (new_zeny != pl_sd->status.zeny) { pl_sd->status.zeny = new_zeny; - clif_updatestatus (pl_sd, SP_ZENY); - clif_displaymessage (fd, "Character's number of zenys changed!"); + clif_updatestatus(pl_sd, SP_ZENY); + clif_displaymessage(fd, "Character's 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; } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -5237,20 +5236,20 @@ int atcommand_charzeny (const int fd, struct map_session_data *sd, * Recall All Characters Online To Your Location *------------------------------------------ */ -int atcommand_recallall (const int fd, struct map_session_data *sd, +int atcommand_recallall(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; - int count; + int i; + int count; char output[200]; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); 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; } @@ -5261,23 +5260,23 @@ int atcommand_recallall (const int fd, struct map_session_data *sd, if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth && sd->status.account_id != pl_sd->status.account_id - && pc_isGM (sd) >= pc_isGM (pl_sd)) + && pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can recall only lower or same level 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)) count++; else - pc_setpos (pl_sd, sd->mapname, sd->bl.x, sd->bl.y, 2); + pc_setpos(pl_sd, sd->mapname, sd->bl.x, sd->bl.y, 2); } } - clif_displaymessage (fd, "All characters recalled!"); + clif_displaymessage(fd, "All characters recalled!"); if (count) { - sprintf (output, + sprintf(output, "Because you are not authorised to warp from some maps, %d player(s) have not been recalled.", count); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } return 0; @@ -5287,36 +5286,36 @@ int atcommand_recallall (const int fd, struct map_session_data *sd, * Recall online characters of a party to your location *------------------------------------------ */ -int atcommand_partyrecall (const int fd, struct map_session_data *sd, +int atcommand_partyrecall(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i; + int i; struct map_session_data *pl_sd; char party_name[100]; char output[200]; struct party *p; - int count; + int count; - memset (party_name, '\0', sizeof (party_name)); - memset (output, '\0', sizeof (output)); + memset(party_name, '\0', sizeof(party_name)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%99[^\n]", party_name) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", party_name) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a party name/id (usage: @partyrecall <party_name/id>)."); return -1; } 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 ((p = party_searchname (party_name)) != NULL || // name first to avoid error when name begin with a number - (p = party_search (atoi (message))) != NULL) + if ((p = party_searchname(party_name)) != NULL || // name first to avoid error when name begin with a number + (p = party_search(atoi(message))) != NULL) { count = 0; for (i = 0; i < fd_max; i++) @@ -5327,25 +5326,25 @@ int atcommand_partyrecall (const int fd, struct map_session_data *sd, && pl_sd->status.party_id == p->party_id) { 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)) count++; else - pc_setpos (pl_sd, sd->mapname, sd->bl.x, sd->bl.y, 2); + pc_setpos(pl_sd, sd->mapname, sd->bl.x, sd->bl.y, 2); } } - sprintf (output, "All online characters of the %s party are near you.", p->name); - clif_displaymessage (fd, output); + sprintf(output, "All online characters of the %s party are near you.", p->name); + clif_displaymessage(fd, output); if (count) { - sprintf (output, + sprintf(output, "Because you are not authorised to warp from some maps, %d player(s) have not been recalled.", count); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } } else { - clif_displaymessage (fd, "Incorrect name or ID, or no one from the party is online."); + clif_displaymessage(fd, "Incorrect name or ID, or no one from the party is online."); return -1; } @@ -5356,11 +5355,11 @@ int atcommand_partyrecall (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_reloaditemdb (const int fd, struct map_session_data *sd, +int atcommand_reloaditemdb(const int fd, struct map_session_data *sd, const char *command, const char *message) { - itemdb_reload (); - clif_displaymessage (fd, "Item database reloaded."); + itemdb_reload(); + clif_displaymessage(fd, "Item database reloaded."); return 0; } @@ -5369,11 +5368,11 @@ int atcommand_reloaditemdb (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_reloadmobdb (const int fd, struct map_session_data *sd, +int atcommand_reloadmobdb(const int fd, struct map_session_data *sd, const char *command, const char *message) { - mob_reload (); - clif_displaymessage (fd, "Monster database reloaded."); + mob_reload(); + clif_displaymessage(fd, "Monster database reloaded."); return 0; } @@ -5382,11 +5381,11 @@ int atcommand_reloadmobdb (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_reloadskilldb (const int fd, struct map_session_data *sd, +int atcommand_reloadskilldb(const int fd, struct map_session_data *sd, const char *command, const char *message) { - skill_reload (); - clif_displaymessage (fd, "Skill database reloaded."); + skill_reload(); + clif_displaymessage(fd, "Skill database reloaded."); return 0; } @@ -5395,15 +5394,15 @@ int atcommand_reloadskilldb (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_reloadscript (const int fd, struct map_session_data *sd, +int atcommand_reloadscript(const int fd, struct map_session_data *sd, const char *command, const char *message) { - do_init_npc (); - do_init_script (); + do_init_npc(); + do_init_script(); - npc_event_do_oninit (); + npc_event_do_oninit(); - clif_displaymessage (fd, "Scripts reloaded."); + clif_displaymessage(fd, "Scripts reloaded."); return 0; } @@ -5412,13 +5411,13 @@ int atcommand_reloadscript (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_reloadgmdb ( // by [Yor] +int atcommand_reloadgmdb( // by [Yor] const int fd, struct map_session_data *sd, const char *command, const char *message) { - chrif_reloadGMdb (); + chrif_reloadGMdb(); - clif_displaymessage (fd, "Login-server asked to reload GM accounts and their level."); + clif_displaymessage(fd, "Login-server asked to reload GM accounts and their level."); return 0; } @@ -5432,7 +5431,7 @@ int atcommand_reloadgmdb ( // by [Yor] * 3 = Shows the shops/chats in that map (not implemented) *------------------------------------------ */ -int atcommand_mapinfo (const int fd, struct map_session_data *sd, +int atcommand_mapinfo(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; @@ -5440,80 +5439,80 @@ int atcommand_mapinfo (const int fd, struct map_session_data *sd, struct chat_data *cd = NULL; char output[200], map_name[100]; char direction[12]; - int m_id, i, chat_num, list = 0; + int m_id, i, chat_num, list = 0; - memset (output, '\0', sizeof (output)); - memset (map_name, '\0', sizeof (map_name)); - memset (direction, '\0', sizeof (direction)); + memset(output, '\0', sizeof(output)); + memset(map_name, '\0', sizeof(map_name)); + memset(direction, '\0', sizeof(direction)); - sscanf (message, "%d %99[^\n]", &list, map_name); + sscanf(message, "%d %99[^\n]", &list, map_name); if (list < 0 || list > 3) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter at least a valid list number (usage: @mapinfo <0-3> [map])."); return -1; } if (map_name[0] == '\0') - strcpy (map_name, sd->mapname); - if (strstr (map_name, ".gat") == NULL && strstr (map_name, ".afm") == NULL && strlen (map_name) < 13) // 16 - 4 (.gat) - strcat (map_name, ".gat"); + strcpy(map_name, sd->mapname); + if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < 13) // 16 - 4 (.gat) + strcat(map_name, ".gat"); - if ((m_id = map_mapname2mapid (map_name)) < 0) + if ((m_id = map_mapname2mapid(map_name)) < 0) { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); return -1; } - clif_displaymessage (fd, "------ Map Info ------"); - sprintf (output, "Map Name: %s", map_name); - clif_displaymessage (fd, output); - sprintf (output, "Players In Map: %d", map[m_id].users); - clif_displaymessage (fd, output); - sprintf (output, "NPCs In Map: %d", map[m_id].npc_num); - clif_displaymessage (fd, output); + clif_displaymessage(fd, "------ Map Info ------"); + sprintf(output, "Map Name: %s", map_name); + clif_displaymessage(fd, output); + sprintf(output, "Players In Map: %d", map[m_id].users); + clif_displaymessage(fd, output); + sprintf(output, "NPCs In Map: %d", map[m_id].npc_num); + clif_displaymessage(fd, output); chat_num = 0; for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth - && (cd = (struct chat_data *) map_id2bl (pl_sd->chatID))) + && (cd = (struct chat_data *) map_id2bl(pl_sd->chatID))) { chat_num++; } } - sprintf (output, "Chats In Map: %d", chat_num); - clif_displaymessage (fd, output); - clif_displaymessage (fd, "------ Map Flags ------"); - sprintf (output, "Player vs Player: %s | No Party: %s", + sprintf(output, "Chats In Map: %d", chat_num); + clif_displaymessage(fd, output); + clif_displaymessage(fd, "------ Map Flags ------"); + sprintf(output, "Player vs Player: %s | No Party: %s", (map[m_id].flag.pvp) ? "True" : "False", (map[m_id].flag.pvp_noparty) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Dead Branch: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Dead Branch: %s", (map[m_id].flag.nobranch) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Memo: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Memo: %s", (map[m_id].flag.nomemo) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Penalty: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Penalty: %s", (map[m_id].flag.nopenalty) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Return: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Return: %s", (map[m_id].flag.noreturn) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Save: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Save: %s", (map[m_id].flag.nosave) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Teleport: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Teleport: %s", (map[m_id].flag.noteleport) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Monster Teleport: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Monster Teleport: %s", (map[m_id].flag.monster_noteleport) ? "True" : "False"); - clif_displaymessage (fd, output); - sprintf (output, "No Zeny Penalty: %s", + clif_displaymessage(fd, output); + sprintf(output, "No Zeny Penalty: %s", (map[m_id].flag.nozenypenalty) ? "True" : "False"); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); switch (list) { @@ -5521,90 +5520,90 @@ int atcommand_mapinfo (const int fd, struct map_session_data *sd, // Do nothing. It's list 0, no additional display. break; case 1: - clif_displaymessage (fd, "----- Players in Map -----"); + clif_displaymessage(fd, "----- Players in Map -----"); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth - && strcmp (pl_sd->mapname, map_name) == 0) + && strcmp(pl_sd->mapname, map_name) == 0) { - sprintf (output, + sprintf(output, "Player '%s' (session #%d) | Location: %d,%d", pl_sd->status.name, i, pl_sd->bl.x, pl_sd->bl.y); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } } break; case 2: - clif_displaymessage (fd, "----- NPCs in Map -----"); + clif_displaymessage(fd, "----- NPCs in Map -----"); for (i = 0; i < map[m_id].npc_num;) { nd = map[m_id].npc[i]; switch (nd->dir) { case 0: - strcpy (direction, "North"); + strcpy(direction, "North"); break; case 1: - strcpy (direction, "North West"); + strcpy(direction, "North West"); break; case 2: - strcpy (direction, "West"); + strcpy(direction, "West"); break; case 3: - strcpy (direction, "South West"); + strcpy(direction, "South West"); break; case 4: - strcpy (direction, "South"); + strcpy(direction, "South"); break; case 5: - strcpy (direction, "South East"); + strcpy(direction, "South East"); break; case 6: - strcpy (direction, "East"); + strcpy(direction, "East"); break; case 7: - strcpy (direction, "North East"); + strcpy(direction, "North East"); break; case 9: - strcpy (direction, "North"); + strcpy(direction, "North"); break; default: - strcpy (direction, "Unknown"); + strcpy(direction, "Unknown"); break; } - sprintf (output, + sprintf(output, "NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d", ++i, nd->name, direction, nd->npc_class, nd->bl.x, nd->bl.y); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } break; case 3: - clif_displaymessage (fd, "----- Chats in Map -----"); + clif_displaymessage(fd, "----- Chats in Map -----"); for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth - && (cd = (struct chat_data *) map_id2bl (pl_sd->chatID)) - && strcmp (pl_sd->mapname, map_name) == 0 + && (cd = (struct chat_data *) map_id2bl(pl_sd->chatID)) + && strcmp(pl_sd->mapname, map_name) == 0 && cd->usersd[0] == pl_sd) { - sprintf (output, + sprintf(output, "Chat %d: %s | Player: %s | Location: %d %d", i, cd->title, pl_sd->status.name, cd->bl.x, cd->bl.y); - clif_displaymessage (fd, output); - sprintf (output, + clif_displaymessage(fd, output); + sprintf(output, " Users: %d/%d | Password: %s | Public: %s", cd->users, cd->limit, cd->pass, (cd->pub) ? "Yes" : "No"); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } } break; default: // normally impossible to arrive here - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter at least a valid list number (usage: @mapinfo <0-3> [map])."); return -1; break; @@ -5617,16 +5616,16 @@ int atcommand_mapinfo (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_mount_peco (const int fd, struct map_session_data *sd, +int atcommand_mount_peco(const int fd, struct map_session_data *sd, const char *command, const char *message) { if (sd->disguise > 0) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] - clif_displaymessage (fd, "Cannot mount a Peco while in disguise."); + clif_displaymessage(fd, "Cannot mount a Peco while in disguise."); return -1; } - if (!pc_isriding (sd)) + if (!pc_isriding(sd)) { // if actually no peco if (sd->status.pc_class == 7 || sd->status.pc_class == 14 || sd->status.pc_class == 4008 || sd->status.pc_class == 4015) @@ -5639,12 +5638,12 @@ int atcommand_mount_peco (const int fd, struct map_session_data *sd, sd->status.pc_class = sd->view_class = 4014; else if (sd->status.pc_class == 4015) sd->status.pc_class = sd->view_class = 4022; - pc_setoption (sd, sd->status.option | 0x0020); - clif_displaymessage (fd, "Mounted Peco."); + pc_setoption(sd, sd->status.option | 0x0020); + clif_displaymessage(fd, "Mounted Peco."); } else { - clif_displaymessage (fd, "You can not mount a peco with your job."); + clif_displaymessage(fd, "You can not mount a peco with your job."); return -1; } } @@ -5658,8 +5657,8 @@ int atcommand_mount_peco (const int fd, struct map_session_data *sd, sd->status.pc_class = sd->view_class = 4008; else if (sd->status.pc_class == 4022) sd->status.pc_class = sd->view_class = 4015; - pc_setoption (sd, sd->status.option & ~0x0020); - clif_displaymessage (fd, "Unmounted Peco."); + pc_setoption(sd, sd->status.option & ~0x0020); + clif_displaymessage(fd, "Unmounted Peco."); } return 0; @@ -5669,30 +5668,30 @@ int atcommand_mount_peco (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_char_mount_peco (const int fd, struct map_session_data *sd, +int atcommand_char_mount_peco(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: @charmountpeco <char_name>)."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { if (pl_sd->disguise > 0) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] - clif_displaymessage (fd, "This player cannot mount a Peco while in disguise."); + clif_displaymessage(fd, "This player cannot mount a Peco while in disguise."); return -1; } - if (!pc_isriding (pl_sd)) + if (!pc_isriding(pl_sd)) { // if actually no peco if (pl_sd->status.pc_class == 7 || pl_sd->status.pc_class == 14 || pl_sd->status.pc_class == 4008 || pl_sd->status.pc_class == 4015) @@ -5705,12 +5704,12 @@ int atcommand_char_mount_peco (const int fd, struct map_session_data *sd, pl_sd->status.pc_class = pl_sd->view_class = 4014; else if (pl_sd->status.pc_class == 4015) pl_sd->status.pc_class = pl_sd->view_class = 4022; - pc_setoption (pl_sd, pl_sd->status.option | 0x0020); - clif_displaymessage (fd, "Now, this player mounts a peco."); + pc_setoption(pl_sd, pl_sd->status.option | 0x0020); + clif_displaymessage(fd, "Now, this player mounts a peco."); } else { - clif_displaymessage (fd, "This player can not mount a peco with his/her job."); + clif_displaymessage(fd, "This player can not mount a peco with his/her job."); return -1; } } @@ -5724,13 +5723,13 @@ int atcommand_char_mount_peco (const int fd, struct map_session_data *sd, pl_sd->status.pc_class = pl_sd->view_class = 4008; else if (pl_sd->status.pc_class == 4022) pl_sd->status.pc_class = pl_sd->view_class = 4015; - pc_setoption (pl_sd, pl_sd->status.option & ~0x0020); - clif_displaymessage (fd, "Now, this player has not more peco."); + pc_setoption(pl_sd, pl_sd->status.option & ~0x0020); + clif_displaymessage(fd, "Now, this player has not more peco."); } } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -5741,42 +5740,42 @@ int atcommand_char_mount_peco (const int fd, struct map_session_data *sd, *Spy Commands by Syrus22 *------------------------------------------ */ -int atcommand_partyspy (const int fd, struct map_session_data *sd, +int atcommand_partyspy(const int fd, struct map_session_data *sd, const char *command, const char *message) { char party_name[100]; char output[200]; struct party *p; - memset (party_name, '\0', sizeof (party_name)); - memset (output, '\0', sizeof (output)); + memset(party_name, '\0', sizeof(party_name)); + memset(output, '\0', sizeof(output)); - if (!message || !*message || sscanf (message, "%99[^\n]", party_name) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", party_name) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a party name/id (usage: @partyspy <party_name/id>)."); return -1; } - if ((p = party_searchname (party_name)) != NULL || // name first to avoid error when name begin with a number - (p = party_search (atoi (message))) != NULL) + if ((p = party_searchname(party_name)) != NULL || // name first to avoid error when name begin with a number + (p = party_search(atoi(message))) != NULL) { if (sd->partyspy == p->party_id) { sd->partyspy = 0; - sprintf (output, "No longer spying on the %s party.", p->name); - clif_displaymessage (fd, output); + sprintf(output, "No longer spying on the %s party.", p->name); + clif_displaymessage(fd, output); } else { sd->partyspy = p->party_id; - sprintf (output, "Spying on the %s party.", p->name); - clif_displaymessage (fd, output); + sprintf(output, "Spying on the %s party.", p->name); + clif_displaymessage(fd, output); } } else { - clif_displaymessage (fd, "Incorrect name or ID, or no one from the party is online."); + clif_displaymessage(fd, "Incorrect name or ID, or no one from the party is online."); return -1; } @@ -5787,28 +5786,28 @@ int atcommand_partyspy (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_enablenpc (const int fd, struct map_session_data *sd, +int atcommand_enablenpc(const int fd, struct map_session_data *sd, const char *command, const char *message) { char NPCname[100]; - memset (NPCname, '\0', sizeof (NPCname)); + memset(NPCname, '\0', sizeof(NPCname)); - if (!message || !*message || sscanf (message, "%99[^\n]", NPCname) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", NPCname) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a NPC name (usage: @npcon <NPC_name>)."); return -1; } - if (npc_name2id (NPCname) != NULL) + if (npc_name2id(NPCname) != NULL) { - npc_enable (NPCname, 1); - clif_displaymessage (fd, "Npc Enabled."); + npc_enable(NPCname, 1); + clif_displaymessage(fd, "Npc Enabled."); } else { - clif_displaymessage (fd, "This NPC doesn't exist."); + clif_displaymessage(fd, "This NPC doesn't exist."); return -1; } @@ -5819,28 +5818,28 @@ int atcommand_enablenpc (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_disablenpc (const int fd, struct map_session_data *sd, +int atcommand_disablenpc(const int fd, struct map_session_data *sd, const char *command, const char *message) { char NPCname[100]; - memset (NPCname, '\0', sizeof (NPCname)); + memset(NPCname, '\0', sizeof(NPCname)); - if (!message || !*message || sscanf (message, "%99[^\n]", NPCname) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", NPCname) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a NPC name (usage: @npcoff <NPC_name>)."); return -1; } - if (npc_name2id (NPCname) != NULL) + if (npc_name2id(NPCname) != NULL) { - npc_enable (NPCname, 0); - clif_displaymessage (fd, "Npc Disabled."); + npc_enable(NPCname, 0); + clif_displaymessage(fd, "Npc Disabled."); } else { - clif_displaymessage (fd, "This NPC doesn't exist."); + clif_displaymessage(fd, "This NPC doesn't exist."); return -1; } @@ -5852,14 +5851,14 @@ int atcommand_disablenpc (const int fd, struct map_session_data *sd, *------------------------------------------ */ static -const char *txt_time (unsigned int duration) +const char *txt_time(unsigned int duration) { - int days, hours, minutes, seconds; + int days, hours, minutes, seconds; char temp[256]; static char temp1[256]; - memset (temp, '\0', sizeof (temp)); - memset (temp1, '\0', sizeof (temp1)); + memset(temp, '\0', sizeof(temp)); + memset(temp1, '\0', sizeof(temp1)); if (duration < 0) duration = 0; @@ -5872,21 +5871,21 @@ const char *txt_time (unsigned int duration) seconds = duration - (60 * minutes); if (days < 2) - sprintf (temp, "%d day", days); + sprintf(temp, "%d day", days); else - sprintf (temp, "%d days", days); + sprintf(temp, "%d days", days); if (hours < 2) - sprintf (temp1, "%s %d hour", temp, hours); + sprintf(temp1, "%s %d hour", temp, hours); else - sprintf (temp1, "%s %d hours", temp, hours); + sprintf(temp1, "%s %d hours", temp, hours); if (minutes < 2) - sprintf (temp, "%s %d minute", temp1, minutes); + sprintf(temp, "%s %d minute", temp1, minutes); else - sprintf (temp, "%s %d minutes", temp1, minutes); + sprintf(temp, "%s %d minutes", temp1, minutes); if (seconds < 2) - sprintf (temp1, "%s and %d second", temp, seconds); + sprintf(temp1, "%s and %d second", temp, seconds); else - sprintf (temp1, "%s and %d seconds", temp, seconds); + sprintf(temp1, "%s and %d seconds", temp, seconds); return temp1; } @@ -5896,7 +5895,7 @@ const char *txt_time (unsigned int duration) * Calculation management of GM modification (@day/@night GM commands) is done *------------------------------------------ */ -int atcommand_servertime (const int fd, struct map_session_data *sd, +int atcommand_servertime(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct TimerData *timer_data; @@ -5905,70 +5904,70 @@ int atcommand_servertime (const int fd, struct map_session_data *sd, struct tm *datetime; // variable for time in structure ->tm_mday, ->tm_sec, ... char temp[256]; - memset (temp, '\0', sizeof (temp)); + memset(temp, '\0', sizeof(temp)); - time (&time_server); // get time in seconds since 1/1/1970 - datetime = gmtime (&time_server); // convert seconds in structure + time(&time_server); // get time in seconds since 1/1/1970 + datetime = gmtime(&time_server); // convert seconds in structure // like sprintf, but only for date/time (Sunday, November 02 2003 15:12:52) - strftime (temp, sizeof (temp) - 1, "Server time (normal time): %A, %B %d %Y %X.", datetime); - clif_displaymessage (fd, temp); + strftime(temp, sizeof(temp) - 1, "Server time (normal time): %A, %B %d %Y %X.", datetime); + clif_displaymessage(fd, temp); if (battle_config.night_duration == 0 && battle_config.day_duration == 0) { if (night_flag == 0) - clif_displaymessage (fd, "Game time: The game is in permanent daylight."); + clif_displaymessage(fd, "Game time: The game is in permanent daylight."); else - clif_displaymessage (fd, "Game time: The game is in permanent night."); + clif_displaymessage(fd, "Game time: The game is in permanent night."); } else if (battle_config.night_duration == 0) if (night_flag == 1) { // we start with night - timer_data = get_timer (day_timer_tid); - sprintf (temp, "Game time: The game is actualy in night for %s.", txt_time ((timer_data->tick - gettick ()) / 1000)); - clif_displaymessage (fd, temp); - clif_displaymessage (fd, "Game time: After, the game will be in permanent daylight."); + timer_data = get_timer(day_timer_tid); + sprintf(temp, "Game time: The game is actualy in night for %s.", txt_time((timer_data->tick - gettick()) / 1000)); + clif_displaymessage(fd, temp); + clif_displaymessage(fd, "Game time: After, the game will be in permanent daylight."); } else - clif_displaymessage (fd, "Game time: The game is in permanent daylight."); + clif_displaymessage(fd, "Game time: The game is in permanent daylight."); else if (battle_config.day_duration == 0) if (night_flag == 0) { // we start with day - timer_data = get_timer (night_timer_tid); - sprintf (temp, "Game time: The game is actualy in daylight for %s.", txt_time ((timer_data->tick - gettick ()) / 1000)); - clif_displaymessage (fd, temp); - clif_displaymessage (fd, "Game time: After, the game will be in permanent night."); + timer_data = get_timer(night_timer_tid); + sprintf(temp, "Game time: The game is actualy in daylight for %s.", txt_time((timer_data->tick - gettick()) / 1000)); + clif_displaymessage(fd, temp); + clif_displaymessage(fd, "Game time: After, the game will be in permanent night."); } else - clif_displaymessage (fd, "Game time: The game is in permanent night."); + clif_displaymessage(fd, "Game time: The game is in permanent night."); else { if (night_flag == 0) { - timer_data = get_timer (night_timer_tid); - timer_data2 = get_timer (day_timer_tid); - sprintf (temp, "Game time: The game is actualy in daylight for %s.", txt_time ((timer_data->tick - gettick ()) / 1000)); - clif_displaymessage (fd, temp); + timer_data = get_timer(night_timer_tid); + timer_data2 = get_timer(day_timer_tid); + sprintf(temp, "Game time: The game is actualy in daylight for %s.", txt_time((timer_data->tick - gettick()) / 1000)); + clif_displaymessage(fd, temp); if (timer_data->tick > timer_data2->tick) - sprintf (temp, "Game time: After, the game will be in night for %s.", txt_time ((timer_data->interval - abs (timer_data->tick - timer_data2->tick)) / 1000)); + sprintf(temp, "Game time: After, the game will be in night for %s.", txt_time((timer_data->interval - abs(timer_data->tick - timer_data2->tick)) / 1000)); else - sprintf (temp, "Game time: After, the game will be in night for %s.", txt_time (abs (timer_data->tick - timer_data2->tick) / 1000)); - clif_displaymessage (fd, temp); - sprintf (temp, "Game time: A day cycle has a normal duration of %s.", txt_time (timer_data->interval / 1000)); - clif_displaymessage (fd, temp); + sprintf(temp, "Game time: After, the game will be in night for %s.", txt_time(abs(timer_data->tick - timer_data2->tick) / 1000)); + clif_displaymessage(fd, temp); + sprintf(temp, "Game time: A day cycle has a normal duration of %s.", txt_time(timer_data->interval / 1000)); + clif_displaymessage(fd, temp); } else { - timer_data = get_timer (day_timer_tid); - timer_data2 = get_timer (night_timer_tid); - sprintf (temp, "Game time: The game is actualy in night for %s.", txt_time ((timer_data->tick - gettick ()) / 1000)); - clif_displaymessage (fd, temp); + timer_data = get_timer(day_timer_tid); + timer_data2 = get_timer(night_timer_tid); + sprintf(temp, "Game time: The game is actualy in night for %s.", txt_time((timer_data->tick - gettick()) / 1000)); + clif_displaymessage(fd, temp); if (timer_data->tick > timer_data2->tick) - sprintf (temp, "Game time: After, the game will be in daylight for %s.", txt_time ((timer_data->interval - abs (timer_data->tick - timer_data2->tick)) / 1000)); + sprintf(temp, "Game time: After, the game will be in daylight for %s.", txt_time((timer_data->interval - abs(timer_data->tick - timer_data2->tick)) / 1000)); else - sprintf (temp, "Game time: After, the game will be in daylight for %s.", txt_time (abs (timer_data->tick - timer_data2->tick) / 1000)); - clif_displaymessage (fd, temp); - sprintf (temp, "Game time: A day cycle has a normal duration of %s.", txt_time (timer_data->interval / 1000)); - clif_displaymessage (fd, temp); + sprintf(temp, "Game time: After, the game will be in daylight for %s.", txt_time(abs(timer_data->tick - timer_data2->tick) / 1000)); + clif_displaymessage(fd, temp); + sprintf(temp, "Game time: A day cycle has a normal duration of %s.", txt_time(timer_data->interval / 1000)); + clif_displaymessage(fd, temp); } } @@ -5982,79 +5981,79 @@ int atcommand_servertime (const int fd, struct map_session_data *sd, * Inspired from a old command created by RoVeRT *------------------------------------------ */ -int atcommand_chardelitem (const int fd, struct map_session_data *sd, +int atcommand_chardelitem(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; char character[100]; char item_name[100]; - int i, number = 0, item_id, item_position, count; + int i, number = 0, item_id, item_position, count; char output[200]; struct item_data *item_data; - memset (character, '\0', sizeof (character)); - memset (item_name, '\0', sizeof (item_name)); - memset (output, '\0', sizeof (output)); + memset(character, '\0', sizeof(character)); + memset(item_name, '\0', sizeof(item_name)); + memset(output, '\0', sizeof(output)); if (!message || !*message - || sscanf (message, "%s %d %99[^\n]", item_name, &number, + || sscanf(message, "%s %d %99[^\n]", item_name, &number, character) < 3 || number < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter an item name/id, a quantity and a player name (usage: @chardelitem <item_name_or_ID> <quantity> <player>)."); 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 (item_id > 500) { - 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 - item_position = pc_search_inventory (pl_sd, item_id); + item_position = pc_search_inventory(pl_sd, item_id); if (item_position >= 0) { count = 0; for (i = 0; i < number && item_position >= 0; i++) { - pc_delitem (pl_sd, item_position, 1, 0); + pc_delitem(pl_sd, item_position, 1, 0); count++; - item_position = pc_search_inventory (pl_sd, item_id); // for next loop + item_position = pc_search_inventory(pl_sd, item_id); // for next loop } - sprintf (output, "%d item(s) removed by a GM.", count); - clif_displaymessage (pl_sd->fd, output); + sprintf(output, "%d item(s) removed by a GM.", count); + clif_displaymessage(pl_sd->fd, output); if (number == count) - sprintf (output, "%d item(s) removed from the player.", count); + sprintf(output, "%d item(s) removed from the player.", count); else - sprintf (output, "%d item(s) removed. Player had only %d on %d items.", count, count, number); - clif_displaymessage (fd, output); + sprintf(output, "%d item(s) removed. Player had only %d on %d items.", count, count, number); + clif_displaymessage(fd, output); } else { - clif_displaymessage (fd, "Character does not have the item."); + clif_displaymessage(fd, "Character does not have the item."); 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; } } else { - clif_displaymessage (fd, "Invalid item ID or name."); + clif_displaymessage(fd, "Invalid item ID or name."); return -1; } @@ -6066,27 +6065,27 @@ int atcommand_chardelitem (const int fd, struct map_session_data *sd, * Special warp! No check with nowarp and nowarpto flag *------------------------------------------ */ -int atcommand_jail (const int fd, struct map_session_data *sd, +int atcommand_jail(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; struct map_session_data *pl_sd; - int x, y; + int x, y; - 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: @jail <char_name>)."); 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 jail only lower or same GM - switch (MRAND (2)) + switch (MRAND(2)) { case 0: x = 24; @@ -6097,27 +6096,27 @@ int atcommand_jail (const int fd, struct map_session_data *sd, y = 75; break; } - if (pc_setpos (pl_sd, "sec_pri.gat", x, y, 3) == 0) + if (pc_setpos(pl_sd, "sec_pri.gat", x, y, 3) == 0) { - pc_setsavepoint (pl_sd, "sec_pri.gat", x, y); // Save Char Respawn Point in the jail room [Lupus] - clif_displaymessage (pl_sd->fd, "GM has send you in jails."); - clif_displaymessage (fd, "Player warped in jails."); + pc_setsavepoint(pl_sd, "sec_pri.gat", x, y); // Save Char Respawn Point in the jail room [Lupus] + clif_displaymessage(pl_sd->fd, "GM has send you in jails."); + clif_displaymessage(fd, "Player warped in jails."); } else { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); 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; } @@ -6129,51 +6128,51 @@ int atcommand_jail (const int fd, struct map_session_data *sd, * Special warp! No check with nowarp and nowarpto flag *------------------------------------------ */ -int atcommand_unjail (const int fd, struct map_session_data *sd, +int atcommand_unjail(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: @unjail/@discharge <char_name>)."); 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 jail only lower or same GM - if (pl_sd->bl.m != map_mapname2mapid ("sec_pri.gat")) + if (pl_sd->bl.m != map_mapname2mapid("sec_pri.gat")) { - clif_displaymessage (fd, "This player is not in jails."); + clif_displaymessage(fd, "This player is not in jails."); return -1; } - else if (pc_setpos (pl_sd, "prontera.gat", 156, 191, 3) == 0) + else if (pc_setpos(pl_sd, "prontera.gat", 156, 191, 3) == 0) { - pc_setsavepoint (pl_sd, "prontera.gat", 156, 191); // Save char respawn point in Prontera - clif_displaymessage (pl_sd->fd, "GM has discharge you."); - clif_displaymessage (fd, "Player warped to Prontera."); + pc_setsavepoint(pl_sd, "prontera.gat", 156, 191); // Save char respawn point in Prontera + clif_displaymessage(pl_sd->fd, "GM has discharge you."); + clif_displaymessage(fd, "Player warped to Prontera."); } else { - clif_displaymessage (fd, "Map not found."); + clif_displaymessage(fd, "Map not found."); 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; } @@ -6184,39 +6183,39 @@ int atcommand_unjail (const int fd, struct map_session_data *sd, * @disguise <mob_id> by [Valaris] (simplified by [Yor]) *------------------------------------------ */ -int atcommand_disguise (const int fd, struct map_session_data *sd, +int atcommand_disguise(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int mob_id; + int mob_id; if (!message || !*message) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a Monster/NPC name/id (usage: @disguise <monster_name_or_monster_ID>)."); return -1; } - if ((mob_id = mobdb_searchname (message)) == 0) // check name first (to avoid possible name begining by a number) - mob_id = atoi (message); + if ((mob_id = mobdb_searchname(message)) == 0) // check name first (to avoid possible name begining by a number) + mob_id = atoi(message); if ((mob_id >= 46 && mob_id <= 125) || (mob_id >= 700 && mob_id <= 718) || // NPC (mob_id >= 721 && mob_id <= 755) || (mob_id >= 757 && mob_id <= 811) || // NPC (mob_id >= 813 && mob_id <= 834) || // NPC (mob_id > 1000 && mob_id < 1521)) { // monsters - if (pc_isriding (sd)) + if (pc_isriding(sd)) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] - clif_displaymessage (fd, "Cannot wear disguise while riding a Peco."); + clif_displaymessage(fd, "Cannot wear disguise while riding a Peco."); return -1; } sd->disguiseflag = 1; // set to override items with disguise script [Valaris] sd->disguise = mob_id; - pc_setpos (sd, sd->mapname, sd->bl.x, sd->bl.y, 3); - clif_displaymessage (fd, "Disguise applied."); + pc_setpos(sd, sd->mapname, sd->bl.x, sd->bl.y, 3); + clif_displaymessage(fd, "Disguise applied."); } else { - clif_displaymessage (fd, "Monster/NPC name/id hasn't been found."); + clif_displaymessage(fd, "Monster/NPC name/id hasn't been found."); return -1; } @@ -6227,19 +6226,19 @@ int atcommand_disguise (const int fd, struct map_session_data *sd, * @undisguise by [Yor] *------------------------------------------ */ -int atcommand_undisguise (const int fd, struct map_session_data *sd, +int atcommand_undisguise(const int fd, struct map_session_data *sd, const char *command, const char *message) { if (sd->disguise) { - clif_clearchar (&sd->bl, 9); + clif_clearchar(&sd->bl, 9); sd->disguise = 0; - pc_setpos (sd, sd->mapname, sd->bl.x, sd->bl.y, 3); - clif_displaymessage (fd, "Undisguise applied."); + pc_setpos(sd, sd->mapname, sd->bl.x, sd->bl.y, 3); + clif_displaymessage(fd, "Undisguise applied."); } else { - clif_displaymessage (fd, "You're not disguised."); + clif_displaymessage(fd, "You're not disguised."); return -1; } @@ -6250,22 +6249,22 @@ int atcommand_undisguise (const int fd, struct map_session_data *sd, * @broadcast by [Valaris] *------------------------------------------ */ -int atcommand_broadcast (const int fd, struct map_session_data *sd, +int atcommand_broadcast(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: @broadcast <message>)."); return -1; } - snprintf (output, 199, "%s : %s", sd->status.name, message); - intif_GMmessage (output, strlen (output) + 1, 0); + snprintf(output, 199, "%s : %s", sd->status.name, message); + intif_GMmessage(output, strlen(output) + 1, 0); return 0; } @@ -6274,23 +6273,23 @@ int atcommand_broadcast (const int fd, struct map_session_data *sd, * @localbroadcast by [Valaris] *------------------------------------------ */ -int atcommand_localbroadcast (const int fd, struct map_session_data *sd, +int atcommand_localbroadcast(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: @localbroadcast <message>)."); return -1; } - snprintf (output, 199, "%s : %s", sd->status.name, message); + snprintf(output, 199, "%s : %s", sd->status.name, message); - clif_GMmessage (&sd->bl, output, strlen (output) + 1, 1); // 1: ALL_SAMEMAP + clif_GMmessage(&sd->bl, output, strlen(output) + 1, 1); // 1: ALL_SAMEMAP return 0; } @@ -6299,41 +6298,41 @@ int atcommand_localbroadcast (const int fd, struct map_session_data *sd, * @ignorelist by [Yor] *------------------------------------------ */ -int atcommand_ignorelist (const int fd, struct map_session_data *sd, +int atcommand_ignorelist(const int fd, struct map_session_data *sd, const char *command, const char *message) { char output[200]; - int count; - int i; + int count; + int i; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); count = 0; - for (i = 0; i < (int) (sizeof (sd->ignore) / sizeof (sd->ignore[0])); i++) + for (i = 0; i < (int)(sizeof(sd->ignore) / sizeof(sd->ignore[0])); i++) if (sd->ignore[i].name[0]) count++; if (sd->ignoreAll == 0) if (count == 0) - clif_displaymessage (fd, "You accept any wisp (no wisper is refused)."); + clif_displaymessage(fd, "You accept any wisp (no wisper is refused)."); else { - sprintf (output, "You accept any wisp, except thoses from %d player(s):", count); - clif_displaymessage (fd, output); + sprintf(output, "You accept any wisp, except thoses from %d player (s):", count); + clif_displaymessage(fd, output); } else if (count == 0) - clif_displaymessage (fd, "You refuse all wisps (no specifical wisper is refused)."); + clif_displaymessage(fd, "You refuse all wisps (no specifical wisper is refused)."); else { - sprintf (output, "You refuse all wisps, AND refuse wisps from %d player(s):", count); - clif_displaymessage (fd, output); + sprintf(output, "You refuse all wisps, AND refuse wisps from %d player (s):", count); + clif_displaymessage(fd, output); } if (count > 0) - for (i = 0; i < (int) (sizeof (sd->ignore) / sizeof (sd->ignore[0])); + for (i = 0; i < (int)(sizeof(sd->ignore) / sizeof(sd->ignore[0])); i++) if (sd->ignore[i].name[0]) - clif_displaymessage (fd, sd->ignore[i].name); + clif_displaymessage(fd, sd->ignore[i].name); return 0; } @@ -6342,30 +6341,30 @@ int atcommand_ignorelist (const int fd, struct map_session_data *sd, * @charignorelist <player_name> by [Yor] *------------------------------------------ */ -int atcommand_charignorelist (const int fd, struct map_session_data *sd, +int atcommand_charignorelist(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; struct map_session_data *pl_sd; char output[200]; - int count; - int i; + int count; + int i; - 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: @charignorelist <char name>)."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { count = 0; for (i = 0; - i < (int) (sizeof (pl_sd->ignore) / sizeof (pl_sd->ignore[0])); + i < (int)(sizeof(pl_sd->ignore) / sizeof(pl_sd->ignore[0])); i++) if (pl_sd->ignore[i].name[0]) count++; @@ -6373,37 +6372,37 @@ int atcommand_charignorelist (const int fd, struct map_session_data *sd, if (pl_sd->ignoreAll == 0) if (count == 0) { - sprintf (output, "'%s' accept any wisp (no wisper is refused).", pl_sd->status.name); - clif_displaymessage (fd, output); + sprintf(output, "'%s' accept any wisp (no wisper is refused).", pl_sd->status.name); + clif_displaymessage(fd, output); } else { - sprintf (output, "'%s' accept any wisp, except thoses from %d player(s):", pl_sd->status.name, count); - clif_displaymessage (fd, output); + sprintf(output, "'%s' accept any wisp, except thoses from %d player(s):", pl_sd->status.name, count); + clif_displaymessage(fd, output); } else if (count == 0) { - sprintf (output, "'%s' refuse all wisps (no specifical wisper is refused).", pl_sd->status.name); - clif_displaymessage (fd, output); + sprintf(output, "'%s' refuse all wisps (no specifical wisper is refused).", pl_sd->status.name); + clif_displaymessage(fd, output); } else { - sprintf (output, "'%s' refuse all wisps, AND refuse wisps from %d player(s):", pl_sd->status.name, count); - clif_displaymessage (fd, output); + sprintf(output, "'%s' refuse all wisps, AND refuse wisps from %d player(s):", pl_sd->status.name, count); + clif_displaymessage(fd, output); } if (count > 0) for (i = 0; i < - (int) (sizeof (pl_sd->ignore) / sizeof (pl_sd->ignore[0])); + (int)(sizeof(pl_sd->ignore) / sizeof(pl_sd->ignore[0])); i++) if (pl_sd->ignore[i].name[0]) - clif_displaymessage (fd, pl_sd->ignore[i].name); + clif_displaymessage(fd, pl_sd->ignore[i].name); } else { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } @@ -6414,55 +6413,55 @@ int atcommand_charignorelist (const int fd, struct map_session_data *sd, * @inall <player_name> by [Yor] *------------------------------------------ */ -int atcommand_inall (const int fd, struct map_session_data *sd, +int atcommand_inall(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: @inall <char name>)."); 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 wisp option only to lower or same level if (pl_sd->ignoreAll == 0) { - sprintf (output, "'%s' already accepts all wispers.", pl_sd->status.name); - clif_displaymessage (fd, output); + sprintf(output, "'%s' already accepts all wispers.", pl_sd->status.name); + clif_displaymessage(fd, output); return -1; } else { pl_sd->ignoreAll = 0; - sprintf (output, "'%s' now accepts all wispers.", pl_sd->status.name); - clif_displaymessage (fd, output); + sprintf(output, "'%s' now accepts all wispers.", pl_sd->status.name); + clif_displaymessage(fd, output); // message to player - clif_displaymessage (pl_sd->fd, "A GM has authorised all wispers for you."); - WFIFOW (pl_sd->fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail - WFIFOB (pl_sd->fd, 2) = 1; - WFIFOB (pl_sd->fd, 3) = 0; // success - WFIFOSET (pl_sd->fd, 4); // packet_len_table[0x0d2] + clif_displaymessage(pl_sd->fd, "A GM has authorised all wispers for you."); + WFIFOW(pl_sd->fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail + WFIFOB(pl_sd->fd, 2) = 1; + WFIFOB(pl_sd->fd, 3) = 0; // success + WFIFOSET(pl_sd->fd, 4); // packet_len_table[0x0d2] } } 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; } @@ -6473,55 +6472,55 @@ int atcommand_inall (const int fd, struct map_session_data *sd, * @exall <player_name> by [Yor] *------------------------------------------ */ -int atcommand_exall (const int fd, struct map_session_data *sd, +int atcommand_exall(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: @exall <char name>)."); 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 wisp option only to lower or same level if (pl_sd->ignoreAll == 1) { - sprintf (output, "'%s' already blocks all wispers.", pl_sd->status.name); - clif_displaymessage (fd, output); + sprintf(output, "'%s' already blocks all wispers.", pl_sd->status.name); + clif_displaymessage(fd, output); return -1; } else { pl_sd->ignoreAll = 1; - sprintf (output, "'%s' blocks now all wispers.", pl_sd->status.name); - clif_displaymessage (fd, output); + sprintf(output, "'%s' blocks now all wispers.", pl_sd->status.name); + clif_displaymessage(fd, output); // message to player - clif_displaymessage (pl_sd->fd, "A GM has blocked all wispers for you."); - WFIFOW (pl_sd->fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail - WFIFOB (pl_sd->fd, 2) = 0; - WFIFOB (pl_sd->fd, 3) = 0; // success - WFIFOSET (pl_sd->fd, 4); // packet_len_table[0x0d2] + clif_displaymessage(pl_sd->fd, "A GM has blocked all wispers for you."); + WFIFOW(pl_sd->fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail + WFIFOB(pl_sd->fd, 2) = 0; + WFIFOB(pl_sd->fd, 3) = 0; // success + WFIFOSET(pl_sd->fd, 4); // packet_len_table[0x0d2] } } 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; } @@ -6532,63 +6531,63 @@ int atcommand_exall (const int fd, struct map_session_data *sd, * @chardisguise <mob_id> <character> by Kalaspuff (based off Valaris' and Yor's work) *------------------------------------------ */ -int atcommand_chardisguise (const int fd, struct map_session_data *sd, +int atcommand_chardisguise(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int mob_id; + int mob_id; char character[100]; char mob_name[100]; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); - memset (mob_name, '\0', sizeof (mob_name)); + memset(character, '\0', sizeof(character)); + memset(mob_name, '\0', sizeof(mob_name)); if (!message || !*message - || sscanf (message, "%s %99[^\n]", mob_name, character) < 2) + || sscanf(message, "%s %99[^\n]", mob_name, character) < 2) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter a Monster/NPC name/id and a player name (usage: @chardisguise <monster_name_or_monster_ID> <char name>)."); return -1; } - if ((mob_id = mobdb_searchname (mob_name)) == 0) // check name first (to avoid possible name begining by a number) - mob_id = atoi (mob_name); + if ((mob_id = mobdb_searchname(mob_name)) == 0) // check name first (to avoid possible name begining by a number) + mob_id = atoi(mob_name); - 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 disguise only lower or same level if ((mob_id >= 46 && mob_id <= 125) || (mob_id >= 700 && mob_id <= 718) || // NPC (mob_id >= 721 && mob_id <= 755) || (mob_id >= 757 && mob_id <= 811) || // NPC (mob_id >= 813 && mob_id <= 834) || // NPC (mob_id > 1000 && mob_id < 1521)) { // monsters - if (pc_isriding (pl_sd)) + if (pc_isriding(pl_sd)) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] - clif_displaymessage (fd, "Character cannot wear disguise while riding a Peco."); + clif_displaymessage(fd, "Character cannot wear disguise while riding a Peco."); return -1; } pl_sd->disguiseflag = 1; // set to override items with disguise script [Valaris] pl_sd->disguise = mob_id; - pc_setpos (pl_sd, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y, + pc_setpos(pl_sd, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y, 3); - clif_displaymessage (fd, "Character's disguise applied."); + clif_displaymessage(fd, "Character's disguise applied."); } else { - clif_displaymessage (fd, "Monster/NPC name/id hasn't been found."); + clif_displaymessage(fd, "Monster/NPC name/id hasn't been found."); 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; } @@ -6599,48 +6598,48 @@ int atcommand_chardisguise (const int fd, struct map_session_data *sd, * @charundisguise <character> by Kalaspuff (based off Yor's work) *------------------------------------------ */ -int atcommand_charundisguise (const int fd, struct map_session_data *sd, +int atcommand_charundisguise(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: @charundisguise <char name>)."); 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 undisguise only lower or same level if (pl_sd->disguise) { - clif_clearchar (&pl_sd->bl, 9); + clif_clearchar(&pl_sd->bl, 9); pl_sd->disguise = 0; - pc_setpos (pl_sd, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y, + pc_setpos(pl_sd, pl_sd->mapname, pl_sd->bl.x, pl_sd->bl.y, 3); - clif_displaymessage (fd, "Character's undisguise applied."); + clif_displaymessage(fd, "Character's undisguise applied."); } else { - clif_displaymessage (fd, "Character is not disguised."); + clif_displaymessage(fd, "Character is not disguised."); 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; } @@ -6651,47 +6650,47 @@ int atcommand_charundisguise (const int fd, struct map_session_data *sd, * @email <actual@email> <new@email> by [Yor] *------------------------------------------ */ -int atcommand_email (const int fd, struct map_session_data *sd, +int atcommand_email(const int fd, struct map_session_data *sd, const char *command, const char *message) { char actual_email[100]; char new_email[100]; - memset (actual_email, '\0', sizeof (actual_email)); - memset (new_email, '\0', sizeof (new_email)); + memset(actual_email, '\0', sizeof(actual_email)); + memset(new_email, '\0', sizeof(new_email)); if (!message || !*message - || sscanf (message, "%99s %99s", actual_email, new_email) < 2) + || sscanf(message, "%99s %99s", actual_email, new_email) < 2) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please enter 2 emails (usage: @email <actual@email> <new@email>)."); return -1; } - if (e_mail_check (actual_email) == 0) + if (e_mail_check(actual_email) == 0) { - clif_displaymessage (fd, "Invalid actual email. If you have default e-mail, type a@a.com."); // Invalid actual email. If you have default e-mail, give a@a.com. + clif_displaymessage(fd, "Invalid actual email. If you have default e-mail, type a@a.com."); // Invalid actual email. If you have default e-mail, give a@a.com. return -1; } - else if (e_mail_check (new_email) == 0) + else if (e_mail_check(new_email) == 0) { - clif_displaymessage (fd, "Invalid new email. Please enter a real e-mail."); + clif_displaymessage(fd, "Invalid new email. Please enter a real e-mail."); return -1; } - else if (strcasecmp (new_email, "a@a.com") == 0) + else if (strcasecmp(new_email, "a@a.com") == 0) { - clif_displaymessage (fd, "New email must be a real e-mail."); + clif_displaymessage(fd, "New email must be a real e-mail."); return -1; } - else if (strcasecmp (actual_email, new_email) == 0) + else if (strcasecmp(actual_email, new_email) == 0) { - clif_displaymessage (fd, "New email must be different of the actual e-mail."); + clif_displaymessage(fd, "New email must be different of the actual e-mail."); return -1; } else { - chrif_changeemail (sd->status.account_id, actual_email, new_email); - clif_displaymessage (fd, "Information sended to login-server via char-server."); + chrif_changeemail(sd->status.account_id, actual_email, new_email); + clif_displaymessage(fd, "Information sended to login-server via char-server."); } return 0; @@ -6701,22 +6700,22 @@ int atcommand_email (const int fd, struct map_session_data *sd, *@effect *------------------------------------------ */ -int atcommand_effect (const int fd, struct map_session_data *sd, +int atcommand_effect(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int type = 0, flag = 0, i; + int type = 0, flag = 0, i; - if (!message || !*message || sscanf (message, "%d %d", &type, &flag) < 2) + if (!message || !*message || sscanf(message, "%d %d", &type, &flag) < 2) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Please, enter at least a option (usage: @effect <type+>)."); return -1; } if (flag <= 0) { - clif_specialeffect (&sd->bl, type, flag); - clif_displaymessage (fd, "Your Effect Has Changed."); // Your effect has changed. + clif_specialeffect(&sd->bl, type, flag); + clif_displaymessage(fd, "Your Effect Has Changed."); // Your effect has changed. } else { @@ -6725,8 +6724,8 @@ int atcommand_effect (const int fd, struct map_session_data *sd, if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) { - clif_specialeffect (&pl_sd->bl, type, flag); - clif_displaymessage (pl_sd->fd, "Your Effect Has Changed."); // Your effect has changed. + clif_specialeffect(&pl_sd->bl, type, flag); + clif_displaymessage(pl_sd->fd, "Your Effect Has Changed."); // Your effect has changed. } } } @@ -6739,29 +6738,29 @@ int atcommand_effect (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_character_item_list (const int fd, struct map_session_data *sd, +atcommand_character_item_list(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; struct item_data *item_data, *item_temp; - int i, j, equip, count, counter, counter2; + int i, j, equip, count, counter, counter2; char character[100], output[200], equipstr[100], outputtmp[200]; - memset (character, '\0', sizeof (character)); - memset (output, '\0', sizeof (output)); - memset (equipstr, '\0', sizeof (equipstr)); - memset (outputtmp, '\0', sizeof (outputtmp)); + memset(character, '\0', sizeof(character)); + memset(output, '\0', sizeof(output)); + memset(equipstr, '\0', sizeof(equipstr)); + memset(outputtmp, '\0', sizeof(outputtmp)); - 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: @charitemlist <char name>)."); 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 look items only lower or same level counter = 0; count = 0; @@ -6769,55 +6768,55 @@ atcommand_character_item_list (const int fd, struct map_session_data *sd, { if (pl_sd->status.inventory[i].nameid > 0 && (item_data = - itemdb_search (pl_sd->status.inventory[i].nameid)) != + itemdb_search(pl_sd->status.inventory[i].nameid)) != NULL) { counter = counter + pl_sd->status.inventory[i].amount; count++; if (count == 1) { - sprintf (output, "------ Items list of '%s' ------", + sprintf(output, "------ Items list of '%s' ------", pl_sd->status.name); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } if ((equip = pl_sd->status.inventory[i].equip)) { - strcpy (equipstr, "| equiped: "); + strcpy(equipstr, "| equiped: "); if (equip & 4) - strcat (equipstr, "robe/gargment, "); + strcat(equipstr, "robe/gargment, "); if (equip & 8) - strcat (equipstr, "left accessory, "); + strcat(equipstr, "left accessory, "); if (equip & 16) - strcat (equipstr, "body/armor, "); + strcat(equipstr, "body/armor, "); if ((equip & 34) == 2) - strcat (equipstr, "right hand, "); + strcat(equipstr, "right hand, "); if ((equip & 34) == 32) - strcat (equipstr, "left hand, "); + strcat(equipstr, "left hand, "); if ((equip & 34) == 34) - strcat (equipstr, "both hands, "); + strcat(equipstr, "both hands, "); if (equip & 64) - strcat (equipstr, "feet, "); + strcat(equipstr, "feet, "); if (equip & 128) - strcat (equipstr, "right accessory, "); + strcat(equipstr, "right accessory, "); if ((equip & 769) == 1) - strcat (equipstr, "lower head, "); + strcat(equipstr, "lower head, "); if ((equip & 769) == 256) - strcat (equipstr, "top head, "); + strcat(equipstr, "top head, "); if ((equip & 769) == 257) - strcat (equipstr, "lower/top head, "); + strcat(equipstr, "lower/top head, "); if ((equip & 769) == 512) - strcat (equipstr, "mid head, "); + strcat(equipstr, "mid head, "); if ((equip & 769) == 512) - strcat (equipstr, "lower/mid head, "); + strcat(equipstr, "lower/mid head, "); if ((equip & 769) == 769) - strcat (equipstr, "lower/mid/top head, "); + strcat(equipstr, "lower/mid/top head, "); // remove final ', ' - equipstr[strlen (equipstr) - 2] = '\0'; + equipstr[strlen(equipstr) - 2] = '\0'; } else - memset (equipstr, '\0', sizeof (equipstr)); + memset(equipstr, '\0', sizeof(equipstr)); if (sd->status.inventory[i].refine) - sprintf (output, "%d %s %+d (%s %+d, id: %d) %s", + sprintf(output, "%d %s %+d (%s %+d, id: %d) %s", pl_sd->status.inventory[i].amount, item_data->name, pl_sd->status.inventory[i].refine, @@ -6825,61 +6824,61 @@ atcommand_character_item_list (const int fd, struct map_session_data *sd, pl_sd->status.inventory[i].refine, pl_sd->status.inventory[i].nameid, equipstr); else - sprintf (output, "%d %s (%s, id: %d) %s", + sprintf(output, "%d %s (%s, id: %d) %s", pl_sd->status.inventory[i].amount, item_data->name, item_data->jname, pl_sd->status.inventory[i].nameid, equipstr); - clif_displaymessage (fd, output); - memset (output, '\0', sizeof (output)); + clif_displaymessage(fd, output); + memset(output, '\0', sizeof(output)); counter2 = 0; for (j = 0; j < item_data->slot; j++) { if (pl_sd->status.inventory[i].card[j]) { if ((item_temp = - itemdb_search (pl_sd->status. + itemdb_search(pl_sd->status. inventory[i].card[j])) != NULL) { if (output[0] == '\0') - sprintf (outputtmp, + sprintf(outputtmp, " -> (card(s): #%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname); else - sprintf (outputtmp, "#%d %s (%s), ", + sprintf(outputtmp, "#%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname); - strcat (output, outputtmp); + strcat(output, outputtmp); } } } if (output[0] != '\0') { - output[strlen (output) - 2] = ')'; - output[strlen (output) - 1] = '\0'; - clif_displaymessage (fd, output); + output[strlen(output) - 2] = ')'; + output[strlen(output) - 1] = '\0'; + clif_displaymessage(fd, output); } } } if (count == 0) - clif_displaymessage (fd, "No item found on this player."); + clif_displaymessage(fd, "No item found on this player."); else { - sprintf (output, "%d item(s) found in %d kind(s) of items.", + sprintf(output, "%d item(s) found in %d kind(s) of items.", counter, count); - clif_displaymessage (fd, output); + 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; } @@ -6891,31 +6890,31 @@ atcommand_character_item_list (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_character_storage_list (const int fd, struct map_session_data *sd, +atcommand_character_storage_list(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct storage *stor; struct map_session_data *pl_sd; struct item_data *item_data, *item_temp; - int i, j, count, counter, counter2; + int i, j, count, counter, counter2; char character[100], output[200], outputtmp[200]; - memset (character, '\0', sizeof (character)); - memset (output, '\0', sizeof (output)); - memset (outputtmp, '\0', sizeof (outputtmp)); + memset(character, '\0', sizeof(character)); + memset(output, '\0', sizeof(output)); + memset(outputtmp, '\0', sizeof(outputtmp)); - 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: @charitemlist <char name>)."); 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 look items only lower or same level - if ((stor = account2storage2 (pl_sd->status.account_id)) != NULL) + if ((stor = account2storage2(pl_sd->status.account_id)) != NULL) { counter = 0; count = 0; @@ -6923,19 +6922,19 @@ atcommand_character_storage_list (const int fd, struct map_session_data *sd, { if (stor->storage_[i].nameid > 0 && (item_data = - itemdb_search (stor->storage_[i].nameid)) != NULL) + itemdb_search(stor->storage_[i].nameid)) != NULL) { counter = counter + stor->storage_[i].amount; count++; if (count == 1) { - sprintf (output, + sprintf(output, "------ Storage items list of '%s' ------", pl_sd->status.name); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } if (stor->storage_[i].refine) - sprintf (output, "%d %s %+d (%s %+d, id: %d)", + sprintf(output, "%d %s %+d (%s %+d, id: %d)", stor->storage_[i].amount, item_data->name, stor->storage_[i].refine, @@ -6943,69 +6942,69 @@ atcommand_character_storage_list (const int fd, struct map_session_data *sd, stor->storage_[i].refine, stor->storage_[i].nameid); else - sprintf (output, "%d %s (%s, id: %d)", + sprintf(output, "%d %s (%s, id: %d)", stor->storage_[i].amount, item_data->name, item_data->jname, stor->storage_[i].nameid); - clif_displaymessage (fd, output); - memset (output, '\0', sizeof (output)); + clif_displaymessage(fd, output); + memset(output, '\0', sizeof(output)); counter2 = 0; for (j = 0; j < item_data->slot; j++) { if (stor->storage_[i].card[j]) { if ((item_temp = - itemdb_search (stor-> + itemdb_search(stor-> storage_[i].card[j])) != NULL) { if (output[0] == '\0') - sprintf (outputtmp, + sprintf(outputtmp, " -> (card(s): #%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname); else - sprintf (outputtmp, "#%d %s (%s), ", + sprintf(outputtmp, "#%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname); - strcat (output, outputtmp); + strcat(output, outputtmp); } } } if (output[0] != '\0') { - output[strlen (output) - 2] = ')'; - output[strlen (output) - 1] = '\0'; - clif_displaymessage (fd, output); + output[strlen(output) - 2] = ')'; + output[strlen(output) - 1] = '\0'; + clif_displaymessage(fd, output); } } } if (count == 0) - clif_displaymessage (fd, + clif_displaymessage(fd, "No item found in the storage of this player."); else { - sprintf (output, + sprintf(output, "%d item(s) found in %d kind(s) of items.", counter, count); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } } else { - clif_displaymessage (fd, "This player has no storage."); + clif_displaymessage(fd, "This player has no storage."); 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; } @@ -7017,28 +7016,28 @@ atcommand_character_storage_list (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_character_cart_list (const int fd, struct map_session_data *sd, +atcommand_character_cart_list(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; struct item_data *item_data, *item_temp; - int i, j, count, counter, counter2; + int i, j, count, counter, counter2; char character[100], output[200], outputtmp[200]; - memset (character, '\0', sizeof (character)); - memset (output, '\0', sizeof (output)); - memset (outputtmp, '\0', sizeof (outputtmp)); + memset(character, '\0', sizeof(character)); + memset(output, '\0', sizeof(output)); + memset(outputtmp, '\0', sizeof(outputtmp)); - 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: @charitemlist <char name>)."); 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 look items only lower or same level counter = 0; count = 0; @@ -7046,19 +7045,19 @@ atcommand_character_cart_list (const int fd, struct map_session_data *sd, { if (pl_sd->status.cart[i].nameid > 0 && (item_data = - itemdb_search (pl_sd->status.cart[i].nameid)) != NULL) + itemdb_search(pl_sd->status.cart[i].nameid)) != NULL) { counter = counter + pl_sd->status.cart[i].amount; count++; if (count == 1) { - sprintf (output, + sprintf(output, "------ Cart items list of '%s' ------", pl_sd->status.name); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } if (pl_sd->status.cart[i].refine) - sprintf (output, "%d %s %+d (%s %+d, id: %d)", + sprintf(output, "%d %s %+d (%s %+d, id: %d)", pl_sd->status.cart[i].amount, item_data->name, pl_sd->status.cart[i].refine, @@ -7066,61 +7065,61 @@ atcommand_character_cart_list (const int fd, struct map_session_data *sd, pl_sd->status.cart[i].refine, pl_sd->status.cart[i].nameid); else - sprintf (output, "%d %s (%s, id: %d)", + sprintf(output, "%d %s (%s, id: %d)", pl_sd->status.cart[i].amount, item_data->name, item_data->jname, pl_sd->status.cart[i].nameid); - clif_displaymessage (fd, output); - memset (output, '\0', sizeof (output)); + clif_displaymessage(fd, output); + memset(output, '\0', sizeof(output)); counter2 = 0; for (j = 0; j < item_data->slot; j++) { if (pl_sd->status.cart[i].card[j]) { if ((item_temp = - itemdb_search (pl_sd->status. + itemdb_search(pl_sd->status. cart[i].card[j])) != NULL) { if (output[0] == '\0') - sprintf (outputtmp, + sprintf(outputtmp, " -> (card(s): #%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname); else - sprintf (outputtmp, "#%d %s (%s), ", + sprintf(outputtmp, "#%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname); - strcat (output, outputtmp); + strcat(output, outputtmp); } } } if (output[0] != '\0') { - output[strlen (output) - 2] = ')'; - output[strlen (output) - 1] = '\0'; - clif_displaymessage (fd, output); + output[strlen(output) - 2] = ')'; + output[strlen(output) - 1] = '\0'; + clif_displaymessage(fd, output); } } } if (count == 0) - clif_displaymessage (fd, + clif_displaymessage(fd, "No item found in the cart of this player."); else { - sprintf (output, "%d item(s) found in %d kind(s) of items.", + sprintf(output, "%d item(s) found in %d kind(s) of items.", counter, count); - clif_displaymessage (fd, output); + 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; } @@ -7133,15 +7132,15 @@ atcommand_character_cart_list (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_killer (const int fd, struct map_session_data *sd, +atcommand_killer(const int fd, struct map_session_data *sd, const char *command, const char *message) { sd->special_state.killer = !sd->special_state.killer; if (sd->special_state.killer) - clif_displaymessage (fd, "You be a killa..."); + clif_displaymessage(fd, "You be a killa..."); else - clif_displaymessage (fd, "You gonna be own3d..."); + clif_displaymessage(fd, "You gonna be own3d..."); return 0; } @@ -7152,15 +7151,15 @@ atcommand_killer (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_killable (const int fd, struct map_session_data *sd, +atcommand_killable(const int fd, struct map_session_data *sd, const char *command, const char *message) { sd->special_state.killable = !sd->special_state.killable; if (sd->special_state.killable) - clif_displaymessage (fd, "You gonna be own3d..."); + clif_displaymessage(fd, "You gonna be own3d..."); else - clif_displaymessage (fd, "You be a killa..."); + clif_displaymessage(fd, "You be a killa..."); return 0; } @@ -7171,7 +7170,7 @@ atcommand_killable (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_charkillable (const int fd, struct map_session_data *sd, +atcommand_charkillable(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd = NULL; @@ -7179,15 +7178,15 @@ atcommand_charkillable (const int fd, struct map_session_data *sd, if (!message || !*message) return -1; - if ((pl_sd = map_nick2sd ((char *) message)) == NULL) + if ((pl_sd = map_nick2sd((char *) message)) == NULL) return -1; pl_sd->special_state.killable = !pl_sd->special_state.killable; if (pl_sd->special_state.killable) - clif_displaymessage (fd, "The player is now killable"); + clif_displaymessage(fd, "The player is now killable"); else - clif_displaymessage (fd, "The player is no longer killable"); + clif_displaymessage(fd, "The player is no longer killable"); return 0; } @@ -7198,11 +7197,11 @@ atcommand_charkillable (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_skillon (const int fd, struct map_session_data *sd, +atcommand_skillon(const int fd, struct map_session_data *sd, const char *command, const char *message) { map[sd->bl.m].flag.noskill = 0; - clif_displaymessage (fd, "Map skills are on."); + clif_displaymessage(fd, "Map skills are on."); return 0; } @@ -7212,11 +7211,11 @@ atcommand_skillon (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_skilloff (const int fd, struct map_session_data *sd, +atcommand_skilloff(const int fd, struct map_session_data *sd, const char *command, const char *message) { map[sd->bl.m].flag.noskill = 1; - clif_displaymessage (fd, "Map skills are off."); + clif_displaymessage(fd, "Map skills are off."); return 0; } @@ -7227,11 +7226,11 @@ atcommand_skilloff (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_npcmove (const int fd, struct map_session_data *sd, +atcommand_npcmove(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; - int x = 0, y = 0; + int x = 0, y = 0; struct npc_data *nd = 0; if (sd == NULL) @@ -7240,19 +7239,19 @@ atcommand_npcmove (const int fd, struct map_session_data *sd, if (!message || !*message) return -1; - memset (character, '\0', sizeof character); + memset(character, '\0', sizeof character); - if (sscanf (message, "%d %d %99[^\n]", &x, &y, character) < 3) + if (sscanf(message, "%d %d %99[^\n]", &x, &y, character) < 3) return -1; - nd = npc_name2id (character); + nd = npc_name2id(character); if (nd == NULL) return -1; - npc_enable (character, 0); + npc_enable(character, 0); nd->bl.x = x; nd->bl.y = y; - npc_enable (character, 1); + npc_enable(character, 1); return 0; } @@ -7264,28 +7263,28 @@ atcommand_npcmove (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_addwarp (const int fd, struct map_session_data *sd, +atcommand_addwarp(const int fd, struct map_session_data *sd, const char *command, const char *message) { char w1[64], w3[64], w4[64]; char map[30], output[200]; - int x, y, ret; + int x, y, ret; if (!message || !*message) return -1; - if (sscanf (message, "%99s %d %d[^\n]", map, &x, &y) < 3) + if (sscanf(message, "%99s %d %d[^\n]", map, &x, &y) < 3) return -1; - sprintf (w1, "%s,%d,%d", sd->mapname, sd->bl.x, sd->bl.y); - sprintf (w3, "%s%d%d%d%d", map, sd->bl.x, sd->bl.y, x, y); - sprintf (w4, "1,1,%s.gat,%d,%d", map, x, y); + sprintf(w1, "%s,%d,%d", sd->mapname, sd->bl.x, sd->bl.y); + sprintf(w3, "%s%d%d%d%d", map, sd->bl.x, sd->bl.y, x, y); + sprintf(w4, "1,1,%s.gat,%d,%d", map, x, y); - ret = npc_parse_warp (w1, "warp", w3, w4); + ret = npc_parse_warp(w1, "warp", w3, w4); - sprintf (output, "New warp NPC => %s", w3); + sprintf(output, "New warp NPC => %s", w3); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); return ret; } @@ -7297,7 +7296,7 @@ atcommand_addwarp (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_follow (const int fd, struct map_session_data *sd, +atcommand_follow(const int fd, struct map_session_data *sd, const char *command, const char *message) { #if 0 @@ -7305,8 +7304,8 @@ atcommand_follow (const int fd, struct map_session_data *sd, if (!message || !*message) return -1; - if ((pl_sd = map_nick2sd ((char *) message)) != NULL) - pc_follow (sd, pl_sd->bl.id); + if ((pl_sd = map_nick2sd((char *) message)) != NULL) + pc_follow(sd, pl_sd->bl.id); else return 1; #endif @@ -7315,7 +7314,7 @@ atcommand_follow (const int fd, struct map_session_data *sd, * Command disabled - it's incompatible with the TMW * client. */ - clif_displaymessage (fd, "@follow command not available"); + clif_displaymessage(fd, "@follow command not available"); return 0; @@ -7328,25 +7327,25 @@ atcommand_follow (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_chareffect (const int fd, struct map_session_data *sd, +atcommand_chareffect(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd = NULL; char target[255]; - int type = 0; + int type = 0; if (!message || !*message - || sscanf (message, "%d %s", &type, target) != 2) + || sscanf(message, "%d %s", &type, target) != 2) { - clif_displaymessage (fd, "usage: @chareffect <type+> <target>."); + clif_displaymessage(fd, "usage: @chareffect <type+> <target>."); return -1; } - if ((pl_sd = map_nick2sd ((char *) target)) == NULL) + if ((pl_sd = map_nick2sd((char *) target)) == NULL) return -1; - clif_specialeffect (&pl_sd->bl, type, 0); - clif_displaymessage (fd, "Your Effect Has Changed."); // Your effect has changed. + clif_specialeffect(&pl_sd->bl, type, 0); + clif_displaymessage(fd, "Your Effect Has Changed."); // Your effect has changed. return 0; } @@ -7358,17 +7357,17 @@ atcommand_chareffect (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_dropall (const int fd, struct map_session_data *sd, +atcommand_dropall(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) { if (sd->status.inventory[i].equip != 0) - pc_unequipitem (sd, i, 0); - pc_dropitem (sd, i, sd->status.inventory[i].amount); + pc_unequipitem(sd, i, 0); + pc_dropitem(sd, i, sd->status.inventory[i].amount); } } return 0; @@ -7382,28 +7381,28 @@ atcommand_dropall (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_chardropall (const int fd, struct map_session_data *sd, +atcommand_chardropall(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i; + int i; struct map_session_data *pl_sd = NULL; if (!message || !*message) return -1; - if ((pl_sd = map_nick2sd ((char *) message)) == NULL) + if ((pl_sd = map_nick2sd((char *) message)) == NULL) return -1; for (i = 0; i < MAX_INVENTORY; i++) { if (pl_sd->status.inventory[i].amount) { if (pl_sd->status.inventory[i].equip != 0) - pc_unequipitem (pl_sd, i, 0); - pc_dropitem (pl_sd, i, pl_sd->status.inventory[i].amount); + pc_unequipitem(pl_sd, i, 0); + pc_dropitem(pl_sd, i, pl_sd->status.inventory[i].amount); } } - clif_displaymessage (pl_sd->fd, "Ever play 52 card pickup?"); - clif_displaymessage (fd, "It is done"); + clif_displaymessage(pl_sd->fd, "Ever play 52 card pickup?"); + clif_displaymessage(fd, "It is done"); //clif_displaymessage(fd, "It is offical.. your a jerk"); return 0; @@ -7417,21 +7416,21 @@ atcommand_chardropall (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_storeall (const int fd, struct map_session_data *sd, +atcommand_storeall(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i; - nullpo_retr (-1, sd); + int i; + nullpo_retr(-1, sd); if (!sd->state.storage_open) { //Open storage. - switch (storage_storageopen (sd)) + switch (storage_storageopen(sd)) { case 2: //Try again - clif_displaymessage (fd, "run this command again.."); + clif_displaymessage(fd, "run this command again.."); return 0; case 1: //Failure - clif_displaymessage (fd, + clif_displaymessage(fd, "You can't open the storage currently."); return 1; } @@ -7441,13 +7440,13 @@ atcommand_storeall (const int fd, struct map_session_data *sd, if (sd->status.inventory[i].amount) { if (sd->status.inventory[i].equip != 0) - pc_unequipitem (sd, i, 0); - storage_storageadd (sd, i, sd->status.inventory[i].amount); + pc_unequipitem(sd, i, 0); + storage_storageadd(sd, i, sd->status.inventory[i].amount); } } - storage_storageclose (sd); + storage_storageclose(sd); - clif_displaymessage (fd, "It is done"); + clif_displaymessage(fd, "It is done"); return 0; } @@ -7458,22 +7457,22 @@ atcommand_storeall (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_charstoreall (const int fd, struct map_session_data *sd, +atcommand_charstoreall(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i; + int i; struct map_session_data *pl_sd = NULL; if (!message || !*message) return -1; - if ((pl_sd = map_nick2sd ((char *) message)) == NULL) + if ((pl_sd = map_nick2sd((char *) message)) == NULL) return -1; - if (storage_storageopen (pl_sd) == 1) + if (storage_storageopen(pl_sd) == 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Had to open the characters storage window..."); - clif_displaymessage (fd, "run this command again.."); + clif_displaymessage(fd, "run this command again.."); return 0; } for (i = 0; i < MAX_INVENTORY; i++) @@ -7481,19 +7480,19 @@ atcommand_charstoreall (const int fd, struct map_session_data *sd, if (pl_sd->status.inventory[i].amount) { if (pl_sd->status.inventory[i].equip != 0) - pc_unequipitem (pl_sd, i, 0); - storage_storageadd (pl_sd, i, sd->status.inventory[i].amount); + pc_unequipitem(pl_sd, i, 0); + storage_storageadd(pl_sd, i, sd->status.inventory[i].amount); } } - storage_storageclose (pl_sd); + storage_storageclose(pl_sd); - clif_displaymessage (pl_sd->fd, + clif_displaymessage(pl_sd->fd, "Everything you own has been put away for safe keeping."); - clif_displaymessage (pl_sd->fd, + clif_displaymessage(pl_sd->fd, "go to the nearest kafka to retrieve it.."); - clif_displaymessage (pl_sd->fd, " -- the management"); + clif_displaymessage(pl_sd->fd, " -- the management"); - clif_displaymessage (fd, "It is done"); + clif_displaymessage(fd, "It is done"); return 0; } @@ -7505,22 +7504,22 @@ atcommand_charstoreall (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_skillid (const int fd, struct map_session_data *sd, +atcommand_skillid(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int skillen = 0, idx = 0; + int skillen = 0, idx = 0; if (!message || !*message) return -1; - skillen = strlen (message); + skillen = strlen(message); while (skill_names[idx].id != 0) { - if ((strncasecmp (skill_names[idx].name, message, skillen) == 0) || - (strncasecmp (skill_names[idx].desc, message, skillen) == 0)) + if ((strncasecmp(skill_names[idx].name, message, skillen) == 0) || + (strncasecmp(skill_names[idx].desc, message, skillen) == 0)) { char output[255]; - sprintf (output, "skill %d: %s", skill_names[idx].id, + sprintf(output, "skill %d: %s", skill_names[idx].id, skill_names[idx].desc); - clif_displaymessage (fd, output); + clif_displaymessage(fd, output); } idx++; } @@ -7534,34 +7533,34 @@ atcommand_skillid (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_useskill (const int fd, struct map_session_data *sd, +atcommand_useskill(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd = NULL; - int skillnum; - int skilllv; - int inf; + int skillnum; + int skilllv; + int inf; char target[255]; if (!message || !*message) return -1; - if (sscanf (message, "%d %d %s", &skillnum, &skilllv, target) != 3) + if (sscanf(message, "%d %d %s", &skillnum, &skilllv, target) != 3) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Usage: @useskill <skillnum> <skillv> <target>"); return -1; } - if ((pl_sd = map_nick2sd (target)) == NULL) + if ((pl_sd = map_nick2sd(target)) == NULL) { return -1; } - inf = skill_get_inf (skillnum); + inf = skill_get_inf(skillnum); if ((inf == 2) || (inf == 1)) - skill_use_pos (sd, pl_sd->bl.x, pl_sd->bl.y, skillnum, skilllv); + skill_use_pos(sd, pl_sd->bl.x, pl_sd->bl.y, skillnum, skilllv); else - skill_use_id (sd, pl_sd->bl.id, skillnum, skilllv); + skill_use_id(sd, pl_sd->bl.id, skillnum, skilllv); return 0; } @@ -7571,17 +7570,17 @@ atcommand_useskill (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_rain (const int fd, struct map_session_data *sd, +atcommand_rain(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int effno = 0; + int effno = 0; effno = 161; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (effno < 0 || map[sd->bl.m].flag.rain) return -1; map[sd->bl.m].flag.rain = 1; - clif_specialeffect (&sd->bl, effno, 2); + clif_specialeffect(&sd->bl, effno, 2); return 0; } @@ -7590,17 +7589,17 @@ atcommand_rain (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_snow (const int fd, struct map_session_data *sd, +atcommand_snow(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int effno = 0; + int effno = 0; effno = 162; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (effno < 0 || map[sd->bl.m].flag.snow) return -1; map[sd->bl.m].flag.snow = 1; - clif_specialeffect (&sd->bl, effno, 2); + clif_specialeffect(&sd->bl, effno, 2); return 0; } @@ -7609,17 +7608,17 @@ atcommand_snow (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_sakura (const int fd, struct map_session_data *sd, +atcommand_sakura(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int effno = 0; + int effno = 0; effno = 163; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (effno < 0 || map[sd->bl.m].flag.sakura) return -1; map[sd->bl.m].flag.sakura = 1; - clif_specialeffect (&sd->bl, effno, 2); + clif_specialeffect(&sd->bl, effno, 2); return 0; } @@ -7628,17 +7627,17 @@ atcommand_sakura (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_fog (const int fd, struct map_session_data *sd, +atcommand_fog(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int effno = 0; + int effno = 0; effno = 233; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (effno < 0 || map[sd->bl.m].flag.fog) return -1; map[sd->bl.m].flag.fog = 1; - clif_specialeffect (&sd->bl, effno, 2); + clif_specialeffect(&sd->bl, effno, 2); return 0; } @@ -7648,17 +7647,17 @@ atcommand_fog (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_leaves (const int fd, struct map_session_data *sd, +atcommand_leaves(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int effno = 0; + int effno = 0; effno = 333; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (effno < 0 || map[sd->bl.m].flag.leaves) return -1; map[sd->bl.m].flag.leaves = 1; - clif_specialeffect (&sd->bl, effno, 2); + clif_specialeffect(&sd->bl, effno, 2); return 0; } @@ -7666,42 +7665,42 @@ atcommand_leaves (const int fd, struct map_session_data *sd, * *------------------------------------------ */ -int atcommand_summon (const int fd, struct map_session_data *sd, +int atcommand_summon(const int fd, struct map_session_data *sd, const char *command, const char *message) { char name[100]; - int mob_id = 0; - int x = 0; - int y = 0; - int id = 0; + int mob_id = 0; + int x = 0; + int y = 0; + int id = 0; struct mob_data *md; - unsigned int tick = gettick (); + unsigned int tick = gettick(); - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (!message || !*message) return -1; - if (sscanf (message, "%99[^\n]", name) < 1) + if (sscanf(message, "%99[^\n]", name) < 1) return -1; - if ((mob_id = atoi (name)) == 0) - mob_id = mobdb_searchname (name); + if ((mob_id = atoi(name)) == 0) + mob_id = mobdb_searchname(name); if (mob_id == 0) return -1; - x = sd->bl.x + (MRAND (10) - 5); - y = sd->bl.y + (MRAND (10) - 5); + x = sd->bl.x + (MRAND(10) - 5); + y = sd->bl.y + (MRAND(10) - 5); - id = mob_once_spawn (sd, "this", x, y, "--ja--", mob_id, 1, ""); - if ((md = (struct mob_data *) map_id2bl (id))) + id = mob_once_spawn(sd, "this", x, y, "--ja--", mob_id, 1, ""); + if ((md = (struct mob_data *) map_id2bl(id))) { md->master_id = sd->bl.id; md->state.special_mob_ai = 1; md->mode = mob_db[md->mob_class].mode | 0x04; - md->deletetimer = add_timer (tick + 60000, mob_timer_delete, id, 0); - clif_misceffect (&md->bl, 344); + md->deletetimer = add_timer(tick + 60000, mob_timer_delete, id, 0); + clif_misceffect(&md->bl, 344); } - clif_skill_poseffect (&sd->bl, AM_CALLHOMUN, 1, x, y, tick); + clif_skill_poseffect(&sd->bl, AM_CALLHOMUN, 1, x, y, tick); return 0; } @@ -7716,27 +7715,27 @@ int atcommand_summon (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_adjcmdlvl (const int fd, struct map_session_data *sd, +atcommand_adjcmdlvl(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int i, newlev; + int i, newlev; char cmd[100]; - if (!message || !*message || sscanf (message, "%d %s", &newlev, cmd) != 2) + if (!message || !*message || sscanf(message, "%d %s", &newlev, cmd) != 2) { - clif_displaymessage (fd, "usage: @adjcmdlvl <lvl> <command>."); + clif_displaymessage(fd, "usage: @adjcmdlvl <lvl> <command>."); return -1; } for (i = 0; atcommand_info[i].type != AtCommand_None; i++) - if (strcasecmp (cmd, atcommand_info[i].command + 1) == 0) + if (strcasecmp(cmd, atcommand_info[i].command + 1) == 0) { atcommand_info[i].level = newlev; - clif_displaymessage (fd, "@command level changed."); + clif_displaymessage(fd, "@command level changed."); return 0; } - clif_displaymessage (fd, "@command not found."); + clif_displaymessage(fd, "@command not found."); return -1; } @@ -7750,24 +7749,24 @@ atcommand_adjcmdlvl (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_adjgmlvl (const int fd, struct map_session_data *sd, +atcommand_adjgmlvl(const int fd, struct map_session_data *sd, const char *command, const char *message) { - int newlev; + int newlev; char user[100]; struct map_session_data *pl_sd; if (!message || !*message - || sscanf (message, "%d %s", &newlev, user) != 2) + || sscanf(message, "%d %s", &newlev, user) != 2) { - clif_displaymessage (fd, "usage: @adjgmlvl <lvl> <user>."); + clif_displaymessage(fd, "usage: @adjgmlvl <lvl> <user>."); return -1; } - if ((pl_sd = map_nick2sd ((char *) user)) == NULL) + if ((pl_sd = map_nick2sd((char *) user)) == NULL) return -1; - pc_set_gm_level (pl_sd->status.account_id, newlev); + pc_set_gm_level(pl_sd->status.account_id, newlev); return 0; } @@ -7782,16 +7781,16 @@ atcommand_adjgmlvl (const int fd, struct map_session_data *sd, *------------------------------------------ */ int -atcommand_trade (const int fd, struct map_session_data *sd, +atcommand_trade(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd = NULL; if (!message || !*message) return -1; - if ((pl_sd = map_nick2sd ((char *) message)) != NULL) + if ((pl_sd = map_nick2sd((char *) message)) != NULL) { - trade_traderequest (sd, pl_sd->bl.id); + trade_traderequest(sd, pl_sd->bl.id); return 0; } return -1; @@ -7801,22 +7800,22 @@ atcommand_trade (const int fd, struct map_session_data *sd, * @unmute [Valaris] *=========================== */ -int atcommand_unmute (const int fd, struct map_session_data *sd, +int atcommand_unmute(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd = NULL; if (!message || !*message) return -1; - if ((pl_sd = map_nick2sd ((char *) message)) != NULL) + if ((pl_sd = map_nick2sd((char *) message)) != NULL) { if (pl_sd->sc_data[SC_NOCHAT].timer != -1) { - skill_status_change_end (&pl_sd->bl, SC_NOCHAT, -1); - clif_displaymessage (sd->fd, "Player unmuted"); + skill_status_change_end(&pl_sd->bl, SC_NOCHAT, -1); + clif_displaymessage(sd->fd, "Player unmuted"); } else - clif_displaymessage (sd->fd, "Player is not muted"); + clif_displaymessage(sd->fd, "Player is not muted"); } return 0; @@ -7830,79 +7829,79 @@ static const char *magic_skill_names[magic_skills_nr] = { "magic", "life", "war", "transmute", "nature", "astral" }; int -atcommand_magic_info (const int fd, struct map_session_data *sd, +atcommand_magic_info(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; char buf[200]; 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, "Usage: @magicinfo <char_name>"); + clif_displaymessage(fd, "Usage: @magicinfo <char_name>"); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - int i; + int i; - sprintf (buf, "`%s' has the following magic skills:", character); - clif_displaymessage (fd, buf); + sprintf(buf, "`%s' has the following magic skills:", character); + clif_displaymessage(fd, buf); for (i = 0; i < magic_skills_nr; i++) { - sprintf (buf, "%d in %s", pl_sd->status.skill[i + magic_base].lv, + sprintf(buf, "%d in %s", pl_sd->status.skill[i + magic_base].lv, magic_skill_names[i]); if (pl_sd->status.skill[i + magic_base].id == i + magic_base) - clif_displaymessage (fd, buf); + clif_displaymessage(fd, buf); } return 0; } else - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } -static void set_skill (struct map_session_data *sd, int i, int level) +static void set_skill(struct map_session_data *sd, int i, int level) { sd->status.skill[i].id = level ? i : 0; sd->status.skill[i].lv = level; } int -atcommand_set_magic (const int fd, struct map_session_data *sd, +atcommand_set_magic(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; char magic_type[20]; - int skill_index = -1; // 0: all - int value; + int skill_index = -1; // 0: all + int value; struct map_session_data *pl_sd; - memset (character, '\0', sizeof (character)); + memset(character, '\0', sizeof(character)); if (!message || !*message - || sscanf (message, "%19s %i %99[^\n]", magic_type, &value, + || sscanf(message, "%19s %i %99[^\n]", magic_type, &value, character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Usage: @setmagic <school> <value> <char-name>, where <school> is either `magic', one of the school names, or `all'."); return -1; } - if (!strcasecmp ("all", magic_type)) + if (!strcasecmp("all", magic_type)) skill_index = 0; else { - int i; + int i; for (i = 0; i < magic_skills_nr; i++) { - if (!strcasecmp (magic_skill_names[i], magic_type)) + if (!strcasecmp(magic_skill_names[i], magic_type)) { skill_index = i + magic_base; break; @@ -7912,109 +7911,109 @@ atcommand_set_magic (const int fd, struct map_session_data *sd, if (skill_index == -1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Incorrect school of magic. Use `magic', `nature', `life', `war', `transmute', `ether', or `all'."); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - int i; + int i; if (skill_index == 0) for (i = 0; i < magic_skills_nr; i++) - set_skill (pl_sd, i + magic_base, value); + set_skill(pl_sd, i + magic_base, value); else - set_skill (pl_sd, skill_index, value); + set_skill(pl_sd, skill_index, value); - clif_skillinfoblock (pl_sd); + clif_skillinfoblock(pl_sd); return 0; } else - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } int -atcommand_log (const int fd, struct map_session_data *sd, +atcommand_log(const int fd, struct map_session_data *sd, const char *command, const char *message) { return 0; // only used for (implicit) logging } int -atcommand_tee (const int fd, struct map_session_data *sd, +atcommand_tee(const int fd, struct map_session_data *sd, const char *command, const char *message) { - char *data = (char *)malloc (strlen (message) + 28); - strcpy (data, sd->status.name); - strcat (data, " : "); - strcat (data, message); - clif_message (&sd->bl, data); + char *data = (char *)malloc(strlen(message) + 28); + strcpy(data, sd->status.name); + strcat(data, " : "); + strcat(data, message); + clif_message(&sd->bl, data); return 0; } int -atcommand_invisible (const int fd, struct map_session_data *sd, +atcommand_invisible(const int fd, struct map_session_data *sd, const char *command, const char *message) { - pc_invisibility (sd, 1); + pc_invisibility(sd, 1); return 0; } int -atcommand_visible (const int fd, struct map_session_data *sd, +atcommand_visible(const int fd, struct map_session_data *sd, const char *command, const char *message) { - pc_invisibility (sd, 0); + pc_invisibility(sd, 0); return 0; } static -int atcommand_jump_iterate (const int fd, struct map_session_data *sd, +int atcommand_jump_iterate(const int fd, struct map_session_data *sd, const char *command, const char *message, - struct map_session_data *(*get_start) (void), - struct map_session_data *(*get_next) (struct + struct map_session_data *(*get_start)(void), + struct map_session_data *(*get_next)(struct map_session_data * current)) { char output[200]; struct map_session_data *pl_sd; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - pl_sd = (struct map_session_data *) map_id2bl (sd->followtarget); + pl_sd = (struct map_session_data *) map_id2bl(sd->followtarget); if (pl_sd) - pl_sd = get_next (pl_sd); + pl_sd = get_next(pl_sd); if (!pl_sd) - pl_sd = get_start (); + pl_sd = get_start(); if (pl_sd == sd) { - pl_sd = get_next (pl_sd); + pl_sd = get_next(pl_sd); if (!pl_sd) - pl_sd = get_start (); + pl_sd = get_start(); } 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, map[pl_sd->bl.m].name, pl_sd->bl.x, pl_sd->bl.y, 3); - sprintf (output, "Jump to %s", pl_sd->status.name); - clif_displaymessage (fd, output); + pc_setpos(sd, map[pl_sd->bl.m].name, pl_sd->bl.x, pl_sd->bl.y, 3); + sprintf(output, "Jump to %s", pl_sd->status.name); + clif_displaymessage(fd, output); sd->followtarget = pl_sd->bl.id; @@ -8022,174 +8021,174 @@ int atcommand_jump_iterate (const int fd, struct map_session_data *sd, } int -atcommand_iterate_forward_over_players (const int fd, +atcommand_iterate_forward_over_players(const int fd, struct map_session_data *sd, const char *command, const char *message) { - return atcommand_jump_iterate (fd, sd, command, message, + return atcommand_jump_iterate(fd, sd, command, message, map_get_first_session, map_get_next_session); } int -atcommand_iterate_backwards_over_players (const int fd, +atcommand_iterate_backwards_over_players(const int fd, struct map_session_data *sd, const char *command, const char *message) { - return atcommand_jump_iterate (fd, sd, command, message, + return atcommand_jump_iterate(fd, sd, command, message, map_get_last_session, map_get_prev_session); } -int atcommand_wgm (const int fd, struct map_session_data *sd, +int atcommand_wgm(const int fd, struct map_session_data *sd, const char *command, const char *message) { if (tmw_CheckChatSpam(sd, message)) return 0; - tmw_GmHackMsg ("%s: %s", sd->status.name, message); - if (!pc_isGM (sd)) - clif_displaymessage (fd, "Message sent."); + tmw_GmHackMsg("%s: %s", sd->status.name, message); + if (!pc_isGM(sd)) + clif_displaymessage(fd, "Message sent."); return 0; } -int atcommand_skillpool_info (const int fd, struct map_session_data *sd, +int atcommand_skillpool_info(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; struct map_session_data *pl_sd; - if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1) + if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) { - clif_displaymessage (fd, "Usage: @sp-info <char_name>"); + clif_displaymessage(fd, "Usage: @sp-info <char_name>"); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { char buf[200]; - int pool_skills[MAX_SKILL_POOL]; - int pool_skills_nr = skill_pool (pl_sd, pool_skills); - int i; + int pool_skills[MAX_SKILL_POOL]; + int pool_skills_nr = skill_pool(pl_sd, pool_skills); + int i; - sprintf (buf, "Active skills %d out of %d for %s:", pool_skills_nr, - skill_pool_max (pl_sd), character); - clif_displaymessage (fd, buf); + sprintf(buf, "Active skills %d out of %d for %s:", pool_skills_nr, + skill_pool_max(pl_sd), character); + clif_displaymessage(fd, buf); for (i = 0; i < pool_skills_nr; ++i) { - sprintf (buf, " - %s [%d]: power %d", skill_name (pool_skills[i]), - pool_skills[i], skill_power (pl_sd, pool_skills[i])); - clif_displaymessage (fd, buf); + sprintf(buf, " - %s [%d]: power %d", skill_name(pool_skills[i]), + pool_skills[i], skill_power(pl_sd, pool_skills[i])); + clif_displaymessage(fd, buf); } - sprintf (buf, "Learned skills out of %d for %s:", + sprintf(buf, "Learned skills out of %d for %s:", skill_pool_skills_size, character); - clif_displaymessage (fd, buf); + clif_displaymessage(fd, buf); for (i = 0; i < skill_pool_skills_size; ++i) { - const char *name = skill_name (skill_pool_skills[i]); - int lvl = pl_sd->status.skill[skill_pool_skills[i]].lv; + const char *name = skill_name(skill_pool_skills[i]); + int lvl = pl_sd->status.skill[skill_pool_skills[i]].lv; if (lvl) { - sprintf (buf, " - %s [%d]: lvl %d", name, + sprintf(buf, " - %s [%d]: lvl %d", name, skill_pool_skills[i], lvl); - clif_displaymessage (fd, buf); + clif_displaymessage(fd, buf); } } } else - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return 0; } -int atcommand_skillpool_focus (const int fd, struct map_session_data *sd, +int atcommand_skillpool_focus(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; - int skill; + int skill; struct map_session_data *pl_sd; if (!message || !*message - || sscanf (message, "%d %99[^\n]", &skill, character) < 1) + || sscanf(message, "%d %99[^\n]", &skill, character) < 1) { - clif_displaymessage (fd, "Usage: @sp-focus <skill-nr> <char_name>"); + clif_displaymessage(fd, "Usage: @sp-focus <skill-nr> <char_name>"); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (skill_pool_activate (pl_sd, skill)) - clif_displaymessage (fd, "Activation failed."); + if (skill_pool_activate(pl_sd, skill)) + clif_displaymessage(fd, "Activation failed."); else - clif_displaymessage (fd, "Activation successful."); + clif_displaymessage(fd, "Activation successful."); } else - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return 0; } -int atcommand_skillpool_unfocus (const int fd, struct map_session_data *sd, +int atcommand_skillpool_unfocus(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; - int skill; + int skill; struct map_session_data *pl_sd; if (!message || !*message - || sscanf (message, "%d %99[^\n]", &skill, character) < 1) + || sscanf(message, "%d %99[^\n]", &skill, character) < 1) { - clif_displaymessage (fd, "Usage: @sp-unfocus <skill-nr> <char_name>"); + clif_displaymessage(fd, "Usage: @sp-unfocus <skill-nr> <char_name>"); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - if (skill_pool_deactivate (pl_sd, skill)) - clif_displaymessage (fd, "Deactivation failed."); + if (skill_pool_deactivate(pl_sd, skill)) + clif_displaymessage(fd, "Deactivation failed."); else - clif_displaymessage (fd, "Deactivation successful."); + clif_displaymessage(fd, "Deactivation successful."); } else - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return 0; } -int atcommand_skill_learn (const int fd, struct map_session_data *sd, +int atcommand_skill_learn(const int fd, struct map_session_data *sd, const char *command, const char *message) { char character[100]; - int skill, level; + int skill, level; struct map_session_data *pl_sd; if (!message || !*message - || sscanf (message, "%d %d %99[^\n]", &skill, &level, character) < 1) + || sscanf(message, "%d %d %99[^\n]", &skill, &level, character) < 1) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Usage: @skill-learn <skill-nr> <level> <char_name>"); return -1; } - if ((pl_sd = map_nick2sd (character)) != NULL) + if ((pl_sd = map_nick2sd(character)) != NULL) { - set_skill (pl_sd, skill, level); - clif_skillinfoblock (pl_sd); + set_skill(pl_sd, skill, level); + clif_skillinfoblock(pl_sd); } else - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return 0; } -int atcommand_ipcheck (const int fd, struct map_session_data *sd, +int atcommand_ipcheck(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; @@ -8197,26 +8196,26 @@ int atcommand_ipcheck (const int fd, struct map_session_data *sd, char output[200]; char character[25]; int i; - socklen_t sa_len = sizeof (struct sockaddr); + socklen_t sa_len = sizeof(struct sockaddr); unsigned long ip; memset(character, '\0', sizeof(character)); - if (sscanf (message, "%24[^\n]", character) < 1) + if (sscanf(message, "%24[^\n]", character) < 1) { - clif_displaymessage (fd, "Usage: @ipcheck <char name>"); + clif_displaymessage(fd, "Usage: @ipcheck <char name>"); return -1; } - if ((pl_sd = map_nick2sd (character)) == NULL) + if ((pl_sd = map_nick2sd(character)) == NULL) { - clif_displaymessage (fd, "Character not found."); + clif_displaymessage(fd, "Character not found."); return -1; } - if (getpeername (pl_sd->fd, (struct sockaddr *)&sai, &sa_len)) + if (getpeername(pl_sd->fd, (struct sockaddr *)&sai, &sa_len)) { - clif_displaymessage (fd, + clif_displaymessage(fd, "Guru Meditation Error: getpeername() failed"); return -1; } @@ -8231,22 +8230,22 @@ int atcommand_ipcheck (const int fd, struct map_session_data *sd, if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) { - if (getpeername (pl_sd->fd, (struct sockaddr *)&sai, &sa_len)) + if (getpeername(pl_sd->fd, (struct sockaddr *)&sai, &sa_len)) continue; // Is checking GM levels really needed here? if (ip == sai.sin_addr.s_addr) { - snprintf (output, sizeof(output), + snprintf(output, sizeof(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); } } } - clif_displaymessage (fd, "End of list"); + clif_displaymessage(fd, "End of list"); return 0; } @@ -8254,20 +8253,20 @@ int atcommand_doomspot(const int fd, struct map_session_data *sd, const char *command, const char *message) { struct map_session_data *pl_sd; - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth && i != fd && sd->bl.m == pl_sd->bl.m && sd->bl.x == pl_sd->bl.x && sd->bl.y == pl_sd->bl.y - && pc_isGM (sd) >= pc_isGM (pl_sd)) + && pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can doom only lower or same gm level - pc_damage (NULL, pl_sd, pl_sd->status.hp + 1); - clif_displaymessage (pl_sd->fd, "The holy messenger has given judgement."); + pc_damage(NULL, pl_sd, pl_sd->status.hp + 1); + clif_displaymessage(pl_sd->fd, "The holy messenger has given judgement."); } } - clif_displaymessage (fd, "Judgement was made."); + clif_displaymessage(fd, "Judgement was made."); return 0; } diff --git a/src/map/atcommand.hpp b/src/map/atcommand.hpp index b052fc6..d22b71a 100644 --- a/src/map/atcommand.hpp +++ b/src/map/atcommand.hpp @@ -190,29 +190,29 @@ typedef struct AtCommandInfo { AtCommandType type; const char *command; - int level; - int (*proc) (const int, struct map_session_data *, + int level; + int(*proc)(const int, struct map_session_data *, const char *command, const char *message); } AtCommandInfo; -AtCommandType is_atcommand (const int fd, struct map_session_data *sd, +AtCommandType is_atcommand(const int fd, struct map_session_data *sd, const char *message, int gmlvl); -AtCommandType atcommand (const int level, const char *message, +AtCommandType atcommand(const int level, const char *message, AtCommandInfo * info); -int get_atcommand_level (const AtCommandType type); +int get_atcommand_level(const AtCommandType type); -int atcommand_item (const int fd, struct map_session_data *sd, const char *command, const char *message); // [Valaris] -int atcommand_warp (const int fd, struct map_session_data *sd, const char *command, const char *message); // [Yor] -int atcommand_spawn (const int fd, struct map_session_data *sd, const char *command, const char *message); // [Valaris] -int atcommand_goto (const int fd, struct map_session_data *sd, const char *command, const char *message); // [Yor] -int atcommand_recall (const int fd, struct map_session_data *sd, const char *command, const char *message); // [Yor] +int atcommand_item(const int fd, struct map_session_data *sd, const char *command, const char *message); // [Valaris] +int atcommand_warp(const int fd, struct map_session_data *sd, const char *command, const char *message); // [Yor] +int atcommand_spawn(const int fd, struct map_session_data *sd, const char *command, const char *message); // [Valaris] +int atcommand_goto(const int fd, struct map_session_data *sd, const char *command, const char *message); // [Yor] +int atcommand_recall(const int fd, struct map_session_data *sd, const char *command, const char *message); // [Yor] -int atcommand_config_read (const char *cfgName); +int atcommand_config_read(const char *cfgName); __attribute__((format(printf, 2, 3))) -void log_atcommand (struct map_session_data *sd, const char *fmt, ...); +void log_atcommand(struct map_session_data *sd, const char *fmt, ...); __attribute__((format(printf, 1, 2))) -void gm_log (const char *fmt, ...); +void gm_log(const char *fmt, ...); #endif diff --git a/src/map/battle.cpp b/src/map/battle.cpp index 2d3ff9a..03c522e 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -22,7 +22,7 @@ #include "memwatch.hpp" #endif -int attr_fix_table[4][10][10]; +int attr_fix_table[4][10][10]; struct Battle_Config battle_config; @@ -31,12 +31,12 @@ struct Battle_Config battle_config; * 戻りは整数で0以上 *------------------------------------------ */ -static int distance (int x0, int y0, int x1, int y1) +static int distance(int x0, int y0, int x1, int y1) { - int dx, dy; + int dx, dy; - dx = abs (x0 - x1); - dy = abs (y0 - y1); + dx = abs(x0 - x1); + dy = abs(y0 - y1); return dx > dy ? dx : dy; } @@ -45,15 +45,15 @@ static int distance (int x0, int y0, int x1, int y1) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_counttargeted (struct block_list *bl, struct block_list *src, +int battle_counttargeted(struct block_list *bl, struct block_list *src, int target_lv) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) - return pc_counttargeted ((struct map_session_data *) bl, src, + return pc_counttargeted((struct map_session_data *) bl, src, target_lv); else if (bl->type == BL_MOB) - return mob_counttargeted ((struct mob_data *) bl, src, target_lv); + return mob_counttargeted((struct mob_data *) bl, src, target_lv); return 0; } @@ -62,9 +62,9 @@ int battle_counttargeted (struct block_list *bl, struct block_list *src, * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_class (struct block_list *bl) +int battle_get_class(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return ((struct mob_data *) bl)->mob_class; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -78,9 +78,9 @@ int battle_get_class (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_dir (struct block_list *bl) +int battle_get_dir(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return ((struct mob_data *) bl)->dir; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -94,9 +94,9 @@ int battle_get_dir (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_lv (struct block_list *bl) +int battle_get_lv(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return ((struct mob_data *) bl)->stats[MOB_LV]; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -110,9 +110,9 @@ int battle_get_lv (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_range (struct block_list *bl) +int battle_get_range(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return mob_db[((struct mob_data *) bl)->mob_class].range; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -126,9 +126,9 @@ int battle_get_range (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_hp (struct block_list *bl) +int battle_get_hp(struct block_list *bl) { - nullpo_retr (1, bl); + nullpo_retr(1, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return ((struct mob_data *) bl)->hp; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -142,15 +142,15 @@ int battle_get_hp (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_max_hp (struct block_list *bl) +int battle_get_max_hp(struct block_list *bl) { - nullpo_retr (1, bl); + nullpo_retr(1, bl); if (bl->type == BL_PC && ((struct map_session_data *) bl)) return ((struct map_session_data *) bl)->status.max_hp; else { - struct status_change *sc_data = battle_get_sc_data (bl); - int max_hp = 1; + struct status_change *sc_data = battle_get_sc_data(bl); + int max_hp = 1; if (bl->type == BL_MOB && ((struct mob_data *) bl)) { max_hp = ((struct mob_data *) bl)->stats[MOB_MAX_HP]; @@ -185,13 +185,13 @@ int battle_get_max_hp (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_str (struct block_list *bl) +int battle_get_str(struct block_list *bl) { - int str = 0; + int str = 0; struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && ((struct mob_data *) bl)) str = ((struct mob_data *) bl)->stats[MOB_STR]; else if (bl->type == BL_PC && ((struct map_session_data *) bl)) @@ -204,8 +204,8 @@ int battle_get_str (struct block_list *bl) str += 4; if (sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC) { // ブレッシング - int race = battle_get_race (bl); - if (battle_check_undead (race, battle_get_elem_type (bl)) + int race = battle_get_race(bl); + if (battle_check_undead(race, battle_get_elem_type(bl)) || race == 6) str >>= 1; // 悪 魔/不死 else @@ -225,13 +225,13 @@ int battle_get_str (struct block_list *bl) *------------------------------------------ */ -int battle_get_agi (struct block_list *bl) +int battle_get_agi(struct block_list *bl) { - int agi = 0; + int agi = 0; struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && (struct mob_data *) bl) agi = ((struct mob_data *) bl)->stats[MOB_AGI]; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -264,13 +264,13 @@ int battle_get_agi (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_vit (struct block_list *bl) +int battle_get_vit(struct block_list *bl) { - int vit = 0; + int vit = 0; struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && (struct mob_data *) bl) vit = ((struct mob_data *) bl)->stats[MOB_VIT]; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -293,13 +293,13 @@ int battle_get_vit (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_int (struct block_list *bl) +int battle_get_int(struct block_list *bl) { - int int_ = 0; + int int_ = 0; struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && (struct mob_data *) bl) int_ = ((struct mob_data *) bl)->stats[MOB_INT]; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -309,8 +309,8 @@ int battle_get_int (struct block_list *bl) { if (sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC) { // ブレッシング - int race = battle_get_race (bl); - if (battle_check_undead (race, battle_get_elem_type (bl)) + int race = battle_get_race(bl); + if (battle_check_undead(race, battle_get_elem_type(bl)) || race == 6) int_ >>= 1; // 悪 魔/不死 else @@ -331,13 +331,13 @@ int battle_get_int (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_dex (struct block_list *bl) +int battle_get_dex(struct block_list *bl) { - int dex = 0; + int dex = 0; struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && (struct mob_data *) bl) dex = ((struct mob_data *) bl)->stats[MOB_DEX]; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -351,8 +351,8 @@ int battle_get_dex (struct block_list *bl) if (sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC) { // ブレッシング - int race = battle_get_race (bl); - if (battle_check_undead (race, battle_get_elem_type (bl)) + int race = battle_get_race(bl); + if (battle_check_undead(race, battle_get_elem_type(bl)) || race == 6) dex >>= 1; // 悪 魔/不死 else @@ -374,13 +374,13 @@ int battle_get_dex (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_luk (struct block_list *bl) +int battle_get_luk(struct block_list *bl) { - int luk = 0; + int luk = 0; struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && (struct mob_data *) bl) luk = ((struct mob_data *) bl)->stats[MOB_LUK]; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -405,17 +405,17 @@ int battle_get_luk (struct block_list *bl) * 戻りは整数で1以上 *------------------------------------------ */ -int battle_get_flee (struct block_list *bl) +int battle_get_flee(struct block_list *bl) { - int flee = 1; + int flee = 1; struct status_change *sc_data; - nullpo_retr (1, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(1, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) flee = ((struct map_session_data *) bl)->flee; else - flee = battle_get_agi (bl) + battle_get_lv (bl); + flee = battle_get_agi(bl) + battle_get_lv(bl); if (sc_data) { @@ -430,9 +430,9 @@ int battle_get_flee (struct block_list *bl) if (sc_data[SC_SPIDERWEB].timer != -1 && bl->type != BL_PC) //スパイダーウェブ flee -= flee * 50 / 100; - if (battle_is_unarmed (bl)) - flee += (skill_power_bl (bl, TMW_BRAWLING) >> 3); // +25 for 200 - flee += skill_power_bl (bl, TMW_SPEED) >> 3; + if (battle_is_unarmed(bl)) + flee += (skill_power_bl(bl, TMW_BRAWLING) >> 3); // +25 for 200 + flee += skill_power_bl(bl, TMW_SPEED) >> 3; } if (flee < 1) flee = 1; @@ -444,17 +444,17 @@ int battle_get_flee (struct block_list *bl) * 戻りは整数で1以上 *------------------------------------------ */ -int battle_get_hit (struct block_list *bl) +int battle_get_hit(struct block_list *bl) { - int hit = 1; + int hit = 1; struct status_change *sc_data; - nullpo_retr (1, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(1, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) hit = ((struct map_session_data *) bl)->hit; else - hit = battle_get_dex (bl) + battle_get_lv (bl); + hit = battle_get_dex(bl) + battle_get_lv(bl); if (sc_data) { @@ -470,8 +470,8 @@ int battle_get_hit (struct block_list *bl) if (sc_data[SC_CONCENTRATION].timer != -1 && bl->type != BL_PC) //コンセントレーション hit += (hit * (10 * (sc_data[SC_CONCENTRATION].val1))) / 100; - if (battle_is_unarmed (bl)) - hit += (skill_power_bl (bl, TMW_BRAWLING) >> 4); // +12 for 200 + if (battle_is_unarmed(bl)) + hit += (skill_power_bl(bl, TMW_BRAWLING) >> 4); // +12 for 200 } if (hit < 1) hit = 1; @@ -483,22 +483,22 @@ int battle_get_hit (struct block_list *bl) * 戻りは整数で1以上 *------------------------------------------ */ -int battle_get_flee2 (struct block_list *bl) +int battle_get_flee2(struct block_list *bl) { - int flee2 = 1; + int flee2 = 1; struct status_change *sc_data; - nullpo_retr (1, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(1, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) { - flee2 = battle_get_luk (bl) + 10; + flee2 = battle_get_luk(bl) + 10; flee2 += ((struct map_session_data *) bl)->flee2 - (((struct map_session_data *) bl)->paramc[5] + 10); } else - flee2 = battle_get_luk (bl) + 1; + flee2 = battle_get_luk(bl) + 1; if (sc_data) { @@ -506,9 +506,9 @@ int battle_get_flee2 (struct block_list *bl) flee2 += (sc_data[SC_WHISTLE].val1 + sc_data[SC_WHISTLE].val2 + (sc_data[SC_WHISTLE].val3 & 0xffff)) * 10; - if (battle_is_unarmed (bl)) - flee2 += (skill_power_bl (bl, TMW_BRAWLING) >> 3); // +25 for 200 - flee2 += skill_power_bl (bl, TMW_SPEED) >> 3; + if (battle_is_unarmed(bl)) + flee2 += (skill_power_bl(bl, TMW_BRAWLING) >> 3); // +25 for 200 + flee2 += skill_power_bl(bl, TMW_SPEED) >> 3; } if (flee2 < 1) flee2 = 1; @@ -521,22 +521,22 @@ int battle_get_flee2 (struct block_list *bl) *------------------------------------------ */ static -int battle_get_critical (struct block_list *bl) +int battle_get_critical(struct block_list *bl) { - int critical = 1; + int critical = 1; struct status_change *sc_data; - nullpo_retr (1, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(1, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) { - critical = battle_get_luk (bl) * 2 + 10; + critical = battle_get_luk(bl) * 2 + 10; critical += ((struct map_session_data *) bl)->critical - ((((struct map_session_data *) bl)->paramc[5] * 3) + 10); } else - critical = battle_get_luk (bl) * 3 + 1; + critical = battle_get_luk(bl) * 3 + 1; if (sc_data) { @@ -559,19 +559,19 @@ int battle_get_critical (struct block_list *bl) * 戻りは整数で1以上 *------------------------------------------ */ -int battle_get_baseatk (struct block_list *bl) +int battle_get_baseatk(struct block_list *bl) { struct status_change *sc_data; - int batk = 1; + int batk = 1; - nullpo_retr (1, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(1, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) batk = ((struct map_session_data *) bl)->base_atk; //設定されているbase_atk else { //それ以外なら - int str, dstr; - str = battle_get_str (bl); //STR + int str, dstr; + str = battle_get_str(bl); //STR dstr = str / 10; batk = dstr * dstr + str; //base_atkを計算する } @@ -594,13 +594,13 @@ int battle_get_baseatk (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_atk (struct block_list *bl) +int battle_get_atk(struct block_list *bl) { struct status_change *sc_data; - int atk = 0; + int atk = 0; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) atk = ((struct map_session_data *) bl)->watk; else if (bl->type == BL_MOB && (struct mob_data *) bl) @@ -626,12 +626,12 @@ int battle_get_atk (struct block_list *bl) *------------------------------------------ */ static -int battle_get_atk_ (struct block_list *bl) +int battle_get_atk_(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC && (struct map_session_data *) bl) { - int atk = ((struct map_session_data *) bl)->watk_; + int atk = ((struct map_session_data *) bl)->watk_; if (((struct map_session_data *) bl)->sc_data[SC_CURSE].timer != -1) atk -= atk * 25 / 100; @@ -646,15 +646,15 @@ int battle_get_atk_ (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_atk2 (struct block_list *bl) +int battle_get_atk2(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC && (struct map_session_data *) bl) return ((struct map_session_data *) bl)->watk2; else { - struct status_change *sc_data = battle_get_sc_data (bl); - int atk2 = 0; + struct status_change *sc_data = battle_get_sc_data(bl); + int atk2 = 0; if (bl->type == BL_MOB && (struct mob_data *) bl) atk2 = ((struct mob_data *) bl)->stats[MOB_ATK2]; if (sc_data) @@ -668,7 +668,7 @@ int battle_get_atk2 (struct block_list *bl) if (sc_data[SC_DRUMBATTLE].timer != -1) atk2 += sc_data[SC_DRUMBATTLE].val2; if (sc_data[SC_NIBELUNGEN].timer != -1 - && (battle_get_element (bl) / 10) >= 8) + && (battle_get_element(bl) / 10) >= 8) atk2 += sc_data[SC_NIBELUNGEN].val2; if (sc_data[SC_STRIPWEAPON].timer != -1) atk2 = atk2 * 90 / 100; @@ -689,9 +689,9 @@ int battle_get_atk2 (struct block_list *bl) *------------------------------------------ */ static -int battle_get_atk_2 (struct block_list *bl) +int battle_get_atk_2(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) return ((struct map_session_data *) bl)->watk_2; else @@ -704,14 +704,14 @@ int battle_get_atk_2 (struct block_list *bl) *------------------------------------------ */ static -int battle_get_matk1 (struct block_list *bl) +int battle_get_matk1(struct block_list *bl) { struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB) { - int matk, int_ = battle_get_int (bl); + int matk, int_ = battle_get_int(bl); matk = int_ + (int_ / 5) * (int_ / 5); if (sc_data) @@ -731,13 +731,13 @@ int battle_get_matk1 (struct block_list *bl) *------------------------------------------ */ static -int battle_get_matk2 (struct block_list *bl) +int battle_get_matk2(struct block_list *bl) { - struct status_change *sc_data = battle_get_sc_data (bl); - nullpo_retr (0, bl); + struct status_change *sc_data = battle_get_sc_data(bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB) { - int matk, int_ = battle_get_int (bl); + int matk, int_ = battle_get_int(bl); matk = int_ + (int_ / 7) * (int_ / 7); if (sc_data) @@ -756,13 +756,13 @@ int battle_get_matk2 (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_def (struct block_list *bl) +int battle_get_def(struct block_list *bl) { struct status_change *sc_data; - int def = 0, skilltimer = -1, skillid = 0; + int def = 0, skilltimer = -1, skillid = 0; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) { def = ((struct map_session_data *) bl)->def; @@ -814,7 +814,7 @@ int battle_get_def (struct block_list *bl) //詠唱中は詠唱時減算率に基づいて減算 if (skilltimer != -1) { - int def_rate = skill_get_castdef (skillid); + int def_rate = skill_get_castdef(skillid); if (def_rate != 0) def = (def * (100 - def_rate)) / 100; } @@ -829,13 +829,13 @@ int battle_get_def (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_mdef (struct block_list *bl) +int battle_get_mdef(struct block_list *bl) { struct status_change *sc_data; - int mdef = 0; + int mdef = 0; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC && (struct map_session_data *) bl) mdef = ((struct map_session_data *) bl)->mdef; else if (bl->type == BL_MOB && (struct mob_data *) bl) @@ -873,13 +873,13 @@ int battle_get_mdef (struct block_list *bl) * 戻りは整数で1以上 *------------------------------------------ */ -int battle_get_def2 (struct block_list *bl) +int battle_get_def2(struct block_list *bl) { struct status_change *sc_data; - int def2 = 1; + int def2 = 1; - nullpo_retr (1, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(1, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_PC) def2 = ((struct map_session_data *) bl)->def2; else if (bl->type == BL_MOB) @@ -907,12 +907,12 @@ int battle_get_def2 (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ -int battle_get_mdef2 (struct block_list *bl) +int battle_get_mdef2(struct block_list *bl) { - int mdef2 = 0; - struct status_change *sc_data = battle_get_sc_data (bl); + int mdef2 = 0; + struct status_change *sc_data = battle_get_sc_data(bl); - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB) mdef2 = ((struct mob_data *) bl)->stats[MOB_INT] + @@ -937,15 +937,15 @@ int battle_get_mdef2 (struct block_list *bl) * Speedは小さいほうが移動速度が速い *------------------------------------------ */ -int battle_get_speed (struct block_list *bl) +int battle_get_speed(struct block_list *bl) { - nullpo_retr (1000, bl); + nullpo_retr(1000, bl); if (bl->type == BL_PC && (struct map_session_data *) bl) return ((struct map_session_data *) bl)->speed; else { - struct status_change *sc_data = battle_get_sc_data (bl); - int speed = 1000; + struct status_change *sc_data = battle_get_sc_data(bl); + int speed = 1000; if (bl->type == BL_MOB && (struct mob_data *) bl) speed = ((struct mob_data *) bl)->stats[MOB_SPEED]; @@ -996,15 +996,15 @@ int battle_get_speed (struct block_list *bl) * aDelayは小さいほうが攻撃速度が速い *------------------------------------------ */ -int battle_get_adelay (struct block_list *bl) +int battle_get_adelay(struct block_list *bl) { - nullpo_retr (4000, bl); + nullpo_retr(4000, bl); if (bl->type == BL_PC && (struct map_session_data *) bl) return (((struct map_session_data *) bl)->aspd << 1); else { - struct status_change *sc_data = battle_get_sc_data (bl); - int adelay = 4000, aspd_rate = 100, i; + struct status_change *sc_data = battle_get_sc_data(bl); + int adelay = 4000, aspd_rate = 100, i; if (bl->type == BL_MOB && (struct mob_data *) bl) adelay = ((struct mob_data *) bl)->stats[MOB_ADELAY]; @@ -1070,15 +1070,15 @@ int battle_get_adelay (struct block_list *bl) return 4000; } -int battle_get_amotion (struct block_list *bl) +int battle_get_amotion(struct block_list *bl) { - nullpo_retr (2000, bl); + nullpo_retr(2000, bl); if (bl->type == BL_PC && (struct map_session_data *) bl) return ((struct map_session_data *) bl)->amotion; else { - struct status_change *sc_data = battle_get_sc_data (bl); - int amotion = 2000, aspd_rate = 100, i; + struct status_change *sc_data = battle_get_sc_data(bl); + int amotion = 2000, aspd_rate = 100, i; if (bl->type == BL_MOB && (struct mob_data *) bl) amotion = mob_db[((struct mob_data *) bl)->mob_class].amotion; @@ -1133,13 +1133,13 @@ int battle_get_amotion (struct block_list *bl) return 2000; } -int battle_get_dmotion (struct block_list *bl) +int battle_get_dmotion(struct block_list *bl) { - int ret; + int ret; struct status_change *sc_data; - nullpo_retr (0, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(0, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && (struct mob_data *) bl) { ret = mob_db[((struct mob_data *) bl)->mob_class].dmotion; @@ -1163,13 +1163,13 @@ int battle_get_dmotion (struct block_list *bl) return ret; } -int battle_get_element (struct block_list *bl) +int battle_get_element(struct block_list *bl) { - int ret = 20; + int ret = 20; struct status_change *sc_data; - nullpo_retr (ret, bl); - sc_data = battle_get_sc_data (bl); + nullpo_retr(ret, bl); + sc_data = battle_get_sc_data(bl); if (bl->type == BL_MOB && (struct mob_data *) bl) // 10の位＝Lv*2、１の位＝属性 ret = ((struct mob_data *) bl)->def_ele; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1188,12 +1188,12 @@ int battle_get_element (struct block_list *bl) return ret; } -int battle_get_attack_element (struct block_list *bl) +int battle_get_attack_element(struct block_list *bl) { - int ret = 0; - struct status_change *sc_data = battle_get_sc_data (bl); + int ret = 0; + struct status_change *sc_data = battle_get_sc_data(bl); - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) ret = 0; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1218,12 +1218,12 @@ int battle_get_attack_element (struct block_list *bl) return ret; } -int battle_get_attack_element2 (struct block_list *bl) +int battle_get_attack_element2(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC && (struct map_session_data *) bl) { - int ret = ((struct map_session_data *) bl)->atk_ele_; + int ret = ((struct map_session_data *) bl)->atk_ele_; struct status_change *sc_data = ((struct map_session_data *) bl)->sc_data; @@ -1247,9 +1247,9 @@ int battle_get_attack_element2 (struct block_list *bl) return 0; } -int battle_get_party_id (struct block_list *bl) +int battle_get_party_id(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC && (struct map_session_data *) bl) return ((struct map_session_data *) bl)->status.party_id; else if (bl->type == BL_MOB && (struct mob_data *) bl) @@ -1265,9 +1265,9 @@ int battle_get_party_id (struct block_list *bl) return 0; } -int battle_get_race (struct block_list *bl) +int battle_get_race(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return mob_db[((struct mob_data *) bl)->mob_class].race; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1276,9 +1276,9 @@ int battle_get_race (struct block_list *bl) return 0; } -int battle_get_size (struct block_list *bl) +int battle_get_size(struct block_list *bl) { - nullpo_retr (1, bl); + nullpo_retr(1, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return mob_db[((struct mob_data *) bl)->mob_class].size; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1287,25 +1287,25 @@ int battle_get_size (struct block_list *bl) return 1; } -int battle_get_mode (struct block_list *bl) +int battle_get_mode(struct block_list *bl) { - nullpo_retr (0x01, bl); + nullpo_retr(0x01, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return mob_db[((struct mob_data *) bl)->mob_class].mode; else return 0x01; // とりあえず動くということで1 } -int battle_get_mexp (struct block_list *bl) +int battle_get_mexp(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) { const struct mob_data *mob = (struct mob_data *) bl; const int retval = (mob_db[mob->mob_class].mexp * - (int) (mob->stats[MOB_XP_BONUS])) >> MOB_XP_BONUS_SHIFT; - fprintf (stderr, "Modifier of %x: -> %d\n", mob->stats[MOB_XP_BONUS], + (int)(mob->stats[MOB_XP_BONUS])) >> MOB_XP_BONUS_SHIFT; + fprintf(stderr, "Modifier of %x: -> %d\n", mob->stats[MOB_XP_BONUS], retval); return retval; } @@ -1313,32 +1313,32 @@ int battle_get_mexp (struct block_list *bl) return 0; } -int battle_get_stat (int stat_id /* SP_VIT or similar */ , +int battle_get_stat(int stat_id /* SP_VIT or similar */ , struct block_list *bl) { switch (stat_id) { case SP_STR: - return battle_get_str (bl); + return battle_get_str(bl); case SP_AGI: - return battle_get_agi (bl); + return battle_get_agi(bl); case SP_DEX: - return battle_get_dex (bl); + return battle_get_dex(bl); case SP_VIT: - return battle_get_vit (bl); + return battle_get_vit(bl); case SP_INT: - return battle_get_int (bl); + return battle_get_int(bl); case SP_LUK: - return battle_get_luk (bl); + return battle_get_luk(bl); default: return 0; } } // StatusChange系の所得 -struct status_change *battle_get_sc_data (struct block_list *bl) +struct status_change *battle_get_sc_data(struct block_list *bl) { - nullpo_retr (NULL, bl); + nullpo_retr(NULL, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return ((struct mob_data *) bl)->sc_data; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1346,9 +1346,9 @@ struct status_change *battle_get_sc_data (struct block_list *bl) return NULL; } -short *battle_get_sc_count (struct block_list *bl) +short *battle_get_sc_count(struct block_list *bl) { - nullpo_retr (NULL, bl); + nullpo_retr(NULL, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return &((struct mob_data *) bl)->sc_count; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1356,9 +1356,9 @@ short *battle_get_sc_count (struct block_list *bl) return NULL; } -short *battle_get_opt1 (struct block_list *bl) +short *battle_get_opt1(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return &((struct mob_data *) bl)->opt1; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1368,9 +1368,9 @@ short *battle_get_opt1 (struct block_list *bl) return 0; } -short *battle_get_opt2 (struct block_list *bl) +short *battle_get_opt2(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return &((struct mob_data *) bl)->opt2; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1380,9 +1380,9 @@ short *battle_get_opt2 (struct block_list *bl) return 0; } -short *battle_get_opt3 (struct block_list *bl) +short *battle_get_opt3(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return &((struct mob_data *) bl)->opt3; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1392,9 +1392,9 @@ short *battle_get_opt3 (struct block_list *bl) return 0; } -short *battle_get_option (struct block_list *bl) +short *battle_get_option(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB && (struct mob_data *) bl) return &((struct mob_data *) bl)->option; else if (bl->type == BL_PC && (struct map_session_data *) bl) @@ -1410,45 +1410,45 @@ short *battle_get_option (struct block_list *bl) struct battle_delay_damage_ { struct block_list *src, *target; - int damage; - int flag; + int damage; + int flag; }; static -void battle_delay_damage_sub (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void battle_delay_damage_sub(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct battle_delay_damage_ *dat = (struct battle_delay_damage_ *) data; - if (dat && map_id2bl (id) == dat->src && dat->target->prev != NULL) - battle_damage (dat->src, dat->target, dat->damage, dat->flag); - free (dat); + if (dat && map_id2bl(id) == dat->src && dat->target->prev != NULL) + battle_damage(dat->src, dat->target, dat->damage, dat->flag); + free(dat); } -int battle_delay_damage (unsigned int tick, struct block_list *src, +int battle_delay_damage(unsigned int tick, struct block_list *src, struct block_list *target, int damage, int flag) { struct battle_delay_damage_ *dat; - CREATE (dat, struct battle_delay_damage_, 1); + CREATE(dat, struct battle_delay_damage_, 1); - nullpo_retr (0, src); - nullpo_retr (0, target); + nullpo_retr(0, src); + nullpo_retr(0, target); dat->src = src; dat->target = target; dat->damage = damage; dat->flag = flag; - add_timer (tick, battle_delay_damage_sub, src->id, (int) dat); + add_timer(tick, battle_delay_damage_sub, src->id, (int) dat); return 0; } // 実際にHPを操作 -int battle_damage (struct block_list *bl, struct block_list *target, +int battle_damage(struct block_list *bl, struct block_list *target, int damage, int flag) { struct map_session_data *sd = NULL; - struct status_change *sc_data = battle_get_sc_data (target); + struct status_change *sc_data = battle_get_sc_data(target); short *sc_count; - int i; + int i; - nullpo_retr (0, target); //blはNULLで呼ばれることがあるので他でチェック + nullpo_retr(0, target); //blはNULLで呼ばれることがあるので他でチェック if (damage == 0) return 0; @@ -1466,26 +1466,26 @@ int battle_damage (struct block_list *bl, struct block_list *target, } if (damage < 0) - return battle_heal (bl, target, -damage, 0, flag); + return battle_heal(bl, target, -damage, 0, flag); - if (!flag && (sc_count = battle_get_sc_count (target)) != NULL + if (!flag && (sc_count = battle_get_sc_count(target)) != NULL && *sc_count > 0) { // 凍結、石化、睡眠を消去 if (sc_data[SC_FREEZE].timer != -1) - skill_status_change_end (target, SC_FREEZE, -1); + skill_status_change_end(target, SC_FREEZE, -1); if (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0) - skill_status_change_end (target, SC_STONE, -1); + skill_status_change_end(target, SC_STONE, -1); if (sc_data[SC_SLEEP].timer != -1) - skill_status_change_end (target, SC_SLEEP, -1); + skill_status_change_end(target, SC_SLEEP, -1); } if (target->type == BL_MOB) { // MOB struct mob_data *md = (struct mob_data *) target; if (md && md->skilltimer != -1 && md->state.skillcastcancel) // 詠唱妨害 - skill_castcancel (target, 0); - return mob_damage (bl, md, damage, 0); + skill_castcancel(target, 0); + return mob_damage(bl, md, damage, 0); } else if (target->type == BL_PC) { // PC @@ -1495,18 +1495,18 @@ int battle_damage (struct block_list *bl, struct block_list *target, if (tsd && tsd->sc_data && tsd->sc_data[SC_DEVOTION].val1) { // ディボーションをかけられている struct map_session_data *md = - map_id2sd (tsd->sc_data[SC_DEVOTION].val1); - if (md && skill_devotion3 (&md->bl, target->id)) + map_id2sd(tsd->sc_data[SC_DEVOTION].val1); + if (md && skill_devotion3(&md->bl, target->id)) { - skill_devotion (md, target->id); + skill_devotion(md, target->id); } else if (md && bl) for (i = 0; i < 5; i++) if (md->dev.val1[i] == target->id) { - clif_damage (bl, &md->bl, gettick (), 0, 0, + clif_damage(bl, &md->bl, gettick(), 0, 0, damage, 0, 0, 0); - pc_damage (&md->bl, md, damage); + pc_damage(&md->bl, md, damage); return 0; } @@ -1518,58 +1518,58 @@ int battle_damage (struct block_list *bl, struct block_list *target, if (!tsd->special_state.no_castcancel && tsd->state.skillcastcancel && !tsd->special_state.no_castcancel2) - skill_castcancel (target, 0); + skill_castcancel(target, 0); } - return pc_damage (bl, tsd, damage); + return pc_damage(bl, tsd, damage); } else if (target->type == BL_SKILL) - return skill_unit_ondamaged ((struct skill_unit *) target, bl, damage, - gettick ()); + return skill_unit_ondamaged((struct skill_unit *) target, bl, damage, + gettick()); return 0; } -int battle_heal (struct block_list *bl, struct block_list *target, int hp, +int battle_heal(struct block_list *bl, struct block_list *target, int hp, int sp, int flag) { - nullpo_retr (0, target); //blはNULLで呼ばれることがあるので他でチェック + nullpo_retr(0, target); //blはNULLで呼ばれることがあるので他でチェック if (target->type == BL_PC - && pc_isdead ((struct map_session_data *) target)) + && pc_isdead((struct map_session_data *) target)) return 0; if (hp == 0 && sp == 0) return 0; if (hp < 0) - return battle_damage (bl, target, -hp, flag); + return battle_damage(bl, target, -hp, flag); if (target->type == BL_MOB) - return mob_heal ((struct mob_data *) target, hp); + return mob_heal((struct mob_data *) target, hp); else if (target->type == BL_PC) - return pc_heal ((struct map_session_data *) target, hp, sp); + return pc_heal((struct map_session_data *) target, hp, sp); return 0; } // 攻撃停止 -int battle_stopattack (struct block_list *bl) +int battle_stopattack(struct block_list *bl) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB) - return mob_stopattack ((struct mob_data *) bl); + return mob_stopattack((struct mob_data *) bl); else if (bl->type == BL_PC) - return pc_stopattack ((struct map_session_data *) bl); + return pc_stopattack((struct map_session_data *) bl); return 0; } // 移動停止 -int battle_stopwalking (struct block_list *bl, int type) +int battle_stopwalking(struct block_list *bl, int type) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB) - return mob_stop_walking ((struct mob_data *) bl, type); + return mob_stop_walking((struct mob_data *) bl, type); else if (bl->type == BL_PC) - return pc_stop_walking ((struct map_session_data *) bl, type); + return pc_stop_walking((struct map_session_data *) bl, type); return 0; } @@ -1577,16 +1577,15 @@ int battle_stopwalking (struct block_list *bl, int type) * ダメージの属性修正 *------------------------------------------ */ -int battle_attr_fix (int damage, int atk_elem, int def_elem) +int battle_attr_fix(int damage, int atk_elem, int def_elem) { - int def_type = def_elem % 10, def_lv = def_elem / 10 / 2; + int def_type = def_elem % 10, def_lv = def_elem / 10 / 2; if (atk_elem < 0 || atk_elem > 9 || def_type < 0 || def_type > 9 || def_lv < 1 || def_lv > 4) { // 属 性値がおかしいのでとりあえずそのまま返す if (battle_config.error_log) - printf - ("battle_attr_fix: unknown attr type: atk=%d def_type=%d def_lv=%d\n", + printf("battle_attr_fix: unknown attr type: atk=%d def_type=%d def_lv=%d\n", atk_elem, def_type, def_lv); return damage; } @@ -1598,7 +1597,7 @@ int battle_attr_fix (int damage, int atk_elem, int def_elem) * ダメージ最終計算 *------------------------------------------ */ -int battle_calc_damage (struct block_list *src, struct block_list *bl, +int battle_calc_damage(struct block_list *src, struct block_list *bl, int damage, int div_, int skill_num, int skill_lv, int flag) { @@ -1606,18 +1605,18 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, struct mob_data *md = NULL; struct status_change *sc_data, *sc; short *sc_count; - int class_; + int class_; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - class_ = battle_get_class (bl); + class_ = battle_get_class(bl); if (bl->type == BL_MOB) md = (struct mob_data *) bl; else sd = (struct map_session_data *) bl; - sc_data = battle_get_sc_data (bl); - sc_count = battle_get_sc_count (bl); + sc_data = battle_get_sc_data(bl); + sc_count = battle_get_sc_count(bl); if (sc_count != NULL && *sc_count > 0) { @@ -1630,8 +1629,8 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, struct skill_unit *unit = (struct skill_unit *) sc_data[SC_SAFETYWALL].val2; if (unit && unit->alive && (--unit->group->val2) <= 0) - skill_delunit (unit); - skill_unit_move (bl, gettick (), 1); // 重ね掛けチェック + skill_delunit(unit); + skill_unit_move(bl, gettick(), 1); // 重ね掛けチェック damage = 0; } if (sc_data[SC_PNEUMA].timer != -1 && damage > 0 && flag & BF_WEAPON @@ -1651,31 +1650,31 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, if (sc_data[SC_AETERNA].timer != -1 && damage > 0) { // レックスエーテルナ damage <<= 1; - skill_status_change_end (bl, SC_AETERNA, -1); + skill_status_change_end(bl, SC_AETERNA, -1); } //属性場のダメージ増加 if (sc_data[SC_VOLCANO].timer != -1) { // ボルケーノ - if (flag & BF_SKILL && skill_get_pl (skill_num) == 3) + if (flag & BF_SKILL && skill_get_pl(skill_num) == 3) damage += damage * sc_data[SC_VOLCANO].val4 / 100; - else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 3)) + else if (!(flag & BF_SKILL) && (battle_get_attack_element(bl) == 3)) damage += damage * sc_data[SC_VOLCANO].val4 / 100; } if (sc_data[SC_VIOLENTGALE].timer != -1) { // バイオレントゲイル - if (flag & BF_SKILL && skill_get_pl (skill_num) == 4) + if (flag & BF_SKILL && skill_get_pl(skill_num) == 4) damage += damage * sc_data[SC_VIOLENTGALE].val4 / 100; - else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 4)) + else if (!(flag & BF_SKILL) && (battle_get_attack_element(bl) == 4)) damage += damage * sc_data[SC_VIOLENTGALE].val4 / 100; } if (sc_data[SC_DELUGE].timer != -1) { // デリュージ - if (flag & BF_SKILL && skill_get_pl (skill_num) == 1) + if (flag & BF_SKILL && skill_get_pl(skill_num) == 1) damage += damage * sc_data[SC_DELUGE].val4 / 100; - else if (!(flag & BF_SKILL) && (battle_get_attack_element (bl) == 1)) + else if (!(flag & BF_SKILL) && (battle_get_attack_element(bl) == 1)) damage += damage * sc_data[SC_DELUGE].val4 / 100; } @@ -1686,15 +1685,15 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, { if (sd->status.sp > 0) { - int per = sd->status.sp * 5 / (sd->status.max_sp + 1); + int per = sd->status.sp * 5 / (sd->status.max_sp + 1); sd->status.sp -= sd->status.sp * (per * 5 + 10) / 1000; if (sd->status.sp < 0) sd->status.sp = 0; damage -= damage * ((per + 1) * 6) / 100; - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); } if (sd->status.sp <= 0) - skill_status_change_end (bl, SC_ENERGYCOAT, -1); + skill_status_change_end(bl, SC_ENERGYCOAT, -1); } else damage -= damage * (sc_data[SC_ENERGYCOAT].val1 * 6) / 100; @@ -1713,7 +1712,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, } if ((--sc->val3) <= 0 || (sc->val2 <= 0) || skill_num == AL_HOLYLIGHT) - skill_status_change_end (bl, SC_KYRIE, -1); + skill_status_change_end(bl, SC_KYRIE, -1); } if (sc_data[SC_BASILICA].timer != -1 && damage > 0) @@ -1731,15 +1730,15 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, if (sc_data[SC_AUTOGUARD].timer != -1 && damage > 0 && flag & BF_WEAPON) { - if (MRAND (100) < sc_data[SC_AUTOGUARD].val2) + if (MRAND(100) < sc_data[SC_AUTOGUARD].val2) { damage = 0; - clif_skill_nodamage (bl, bl, CR_AUTOGUARD, + clif_skill_nodamage(bl, bl, CR_AUTOGUARD, sc_data[SC_AUTOGUARD].val1, 1); if (sd) - sd->canmove_tick = gettick () + 300; + sd->canmove_tick = gettick() + 300; else if (md) - md->canmove_tick = gettick () + 300; + md->canmove_tick = gettick() + 300; } } // -- moonsoul (chance to block attacks with new Lord Knight skill parrying) @@ -1747,10 +1746,10 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, if (sc_data[SC_PARRYING].timer != -1 && damage > 0 && flag & BF_WEAPON) { - if (MRAND (100) < sc_data[SC_PARRYING].val2) + if (MRAND(100) < sc_data[SC_PARRYING].val2) { damage = 0; - clif_skill_nodamage (bl, bl, LK_PARRYING, + clif_skill_nodamage(bl, bl, LK_PARRYING, sc_data[SC_PARRYING].val1, 1); } } @@ -1763,16 +1762,16 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, || 3)) || src->type == BL_MOB)) { - if (MRAND (100) < (10 + 5 * sc_data[SC_REJECTSWORD].val1)) + if (MRAND(100) < (10 + 5 * sc_data[SC_REJECTSWORD].val1)) { //反射確率は10+5*Lv damage = damage * 50 / 100; - battle_damage (bl, src, damage, 0); + battle_damage(bl, src, damage, 0); //ダメージを与えたのは良いんだが、ここからどうして表示するんだかわかんねぇ //エフェクトもこれでいいのかわかんねぇ - clif_skill_nodamage (bl, bl, ST_REJECTSWORD, + clif_skill_nodamage(bl, bl, ST_REJECTSWORD, sc_data[SC_REJECTSWORD].val1, 1); if ((--sc_data[SC_REJECTSWORD].val2) <= 0) - skill_status_change_end (bl, SC_REJECTSWORD, -1); + skill_status_change_end(bl, SC_REJECTSWORD, -1); } } } @@ -1789,7 +1788,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, } if (md != NULL && md->hp > 0 && damage > 0) // 反撃などのMOBスキル判定 - mobskill_event (md, flag); + mobskill_event(md, flag); return damage; } @@ -1799,24 +1798,24 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, *------------------------------------------ */ static -int battle_addmastery (struct map_session_data *sd, struct block_list *target, +int battle_addmastery(struct map_session_data *sd, struct block_list *target, int dmg, int type) { - int damage, skill; - int race = battle_get_race (target); - int weapon; + int damage, skill; + int race = battle_get_race(target); + int weapon; damage = 0; - nullpo_retr (0, sd); + nullpo_retr(0, sd); // デーモンベイン(+3 〜 +30) vs 不死 or 悪魔 (死人は含めない？) - if ((skill = pc_checkskill (sd, AL_DEMONBANE)) > 0 - && (battle_check_undead (race, battle_get_elem_type (target)) + if ((skill = pc_checkskill(sd, AL_DEMONBANE)) > 0 + && (battle_check_undead(race, battle_get_elem_type(target)) || race == 6)) damage += (skill * 3); // ビーストベイン(+4 〜 +40) vs 動物 or 昆虫 - if ((skill = pc_checkskill (sd, HT_BEASTBANE)) > 0 + if ((skill = pc_checkskill(sd, HT_BEASTBANE)) > 0 && (race == 2 || race == 4)) damage += (skill * 4); @@ -1830,7 +1829,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x02: // 1HS { // 剣修練(+4 〜 +40) 片手剣 短剣含む - if ((skill = pc_checkskill (sd, SM_SWORD)) > 0) + if ((skill = pc_checkskill(sd, SM_SWORD)) > 0) { damage += (skill * 4); } @@ -1839,7 +1838,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x03: // 2HS { // 両手剣修練(+4 〜 +40) 両手剣 - if ((skill = pc_checkskill (sd, SM_TWOHAND)) > 0) + if ((skill = pc_checkskill(sd, SM_TWOHAND)) > 0) { damage += (skill * 4); } @@ -1848,9 +1847,9 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x04: // 1HL { // 槍修練(+4 〜 +40,+5 〜 +50) 槍 - if ((skill = pc_checkskill (sd, KN_SPEARMASTERY)) > 0) + if ((skill = pc_checkskill(sd, KN_SPEARMASTERY)) > 0) { - if (!pc_isriding (sd)) + if (!pc_isriding(sd)) damage += (skill * 4); // ペコに乗ってない else damage += (skill * 5); // ペコに乗ってる @@ -1860,9 +1859,9 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x05: // 2HL { // 槍修練(+4 〜 +40,+5 〜 +50) 槍 - if ((skill = pc_checkskill (sd, KN_SPEARMASTERY)) > 0) + if ((skill = pc_checkskill(sd, KN_SPEARMASTERY)) > 0) { - if (!pc_isriding (sd)) + if (!pc_isriding(sd)) damage += (skill * 4); // ペコに乗ってない else damage += (skill * 5); // ペコに乗ってる @@ -1871,7 +1870,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } case 0x06: // 片手斧 { - if ((skill = pc_checkskill (sd, AM_AXEMASTERY)) > 0) + if ((skill = pc_checkskill(sd, AM_AXEMASTERY)) > 0) { damage += (skill * 3); } @@ -1879,7 +1878,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } case 0x07: // Axe by Tato { - if ((skill = pc_checkskill (sd, AM_AXEMASTERY)) > 0) + if ((skill = pc_checkskill(sd, AM_AXEMASTERY)) > 0) { damage += (skill * 3); } @@ -1888,7 +1887,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x08: // メイス { // メイス修練(+3 〜 +30) メイス - if ((skill = pc_checkskill (sd, PR_MACEMASTERY)) > 0) + if ((skill = pc_checkskill(sd, PR_MACEMASTERY)) > 0) { damage += (skill * 3); } @@ -1904,7 +1903,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x0c: // Knuckles { // 鉄拳(+3 〜 +30) 素手,ナックル - if ((skill = pc_checkskill (sd, MO_IRONHAND)) > 0) + if ((skill = pc_checkskill(sd, MO_IRONHAND)) > 0) { damage += (skill * 3); } @@ -1913,7 +1912,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x0d: // Musical Instrument { // 楽器の練習(+3 〜 +30) 楽器 - if ((skill = pc_checkskill (sd, BA_MUSICALLESSON)) > 0) + if ((skill = pc_checkskill(sd, BA_MUSICALLESSON)) > 0) { damage += (skill * 3); } @@ -1922,7 +1921,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x0e: // Dance Mastery { // Dance Lesson Skill Effect(+3 damage for every lvl = +30) 鞭 - if ((skill = pc_checkskill (sd, DC_DANCINGLESSON)) > 0) + if ((skill = pc_checkskill(sd, DC_DANCINGLESSON)) > 0) { damage += (skill * 3); } @@ -1931,7 +1930,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x0f: // Book { // Advance Book Skill Effect(+3 damage for every lvl = +30) { - if ((skill = pc_checkskill (sd, SA_ADVANCEDBOOK)) > 0) + if ((skill = pc_checkskill(sd, SA_ADVANCEDBOOK)) > 0) { damage += (skill * 3); } @@ -1940,7 +1939,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, case 0x10: // Katars { // カタール修練(+3 〜 +30) カタール - if ((skill = pc_checkskill (sd, AS_KATAR)) > 0) + if ((skill = pc_checkskill(sd, AS_KATAR)) > 0) { //ソニックブロー時は別処理（1撃に付き1/8適応) damage += (skill * 3); @@ -1952,23 +1951,23 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, return (damage); } -static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, +static struct Damage battle_calc_mob_weapon_attack(struct block_list *src, struct block_list *target, int skill_num, int skill_lv, int wflag) { struct map_session_data *tsd = NULL; struct mob_data *md = (struct mob_data *) src, *tmd = NULL; - int hitrate, flee, cri = 0, atkmin, atkmax; - int luk, target_count = 1; - int def1 = battle_get_def (target); - int def2 = battle_get_def2 (target); - int t_vit = battle_get_vit (target); + int hitrate, flee, cri = 0, atkmin, atkmax; + int luk, target_count = 1; + int def1 = battle_get_def(target); + int def2 = battle_get_def2(target); + int t_vit = battle_get_vit(target); struct Damage wd; - int damage, damage2 = 0, type, div_, blewcount = - skill_get_blewcount (skill_num, skill_lv); - int flag, skill, ac_flag = 0, dmg_lv = 0; - int t_mode = 0, t_race = 0, t_size = 1, s_race = 0, s_ele = 0; + int damage, damage2 = 0, type, div_, blewcount = + skill_get_blewcount(skill_num, skill_lv); + int flag, skill, ac_flag = 0, dmg_lv = 0; + int t_mode = 0, t_race = 0, t_size = 1, s_race = 0, s_ele = 0; struct status_change *sc_data, *t_sc_data; short *sc_count; short *option, *opt1, *opt2; @@ -1976,28 +1975,28 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, //return前の処理があるので情報出力部のみ変更 if (src == NULL || target == NULL || md == NULL) { - nullpo_info (NLP_MARK); - memset (&wd, 0, sizeof (wd)); + nullpo_info(NLP_MARK); + memset(&wd, 0, sizeof(wd)); return wd; } - s_race = battle_get_race (src); - s_ele = battle_get_attack_element (src); - sc_data = battle_get_sc_data (src); - sc_count = battle_get_sc_count (src); - option = battle_get_option (src); - opt1 = battle_get_opt1 (src); - opt2 = battle_get_opt2 (src); + s_race = battle_get_race(src); + s_ele = battle_get_attack_element(src); + sc_data = battle_get_sc_data(src); + sc_count = battle_get_sc_count(src); + option = battle_get_option(src); + opt1 = battle_get_opt1(src); + opt2 = battle_get_opt2(src); // ターゲット if (target->type == BL_PC) tsd = (struct map_session_data *) target; else if (target->type == BL_MOB) tmd = (struct mob_data *) target; - t_race = battle_get_race (target); - t_size = battle_get_size (target); - t_mode = battle_get_mode (target); - t_sc_data = battle_get_sc_data (target); + t_race = battle_get_race(target); + t_size = battle_get_size(target); + t_mode = battle_get_mode(target); + t_sc_data = battle_get_sc_data(target); if ((skill_num == 0 || (target->type == BL_PC && battle_config.pc_auto_counter_type & 2) @@ -2008,17 +2007,17 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (skill_num != CR_GRANDCROSS && t_sc_data && t_sc_data[SC_AUTOCOUNTER].timer != -1) { - int dir = map_calc_dir (src, target->x, target->y), t_dir = - battle_get_dir (target); - int dist = distance (src->x, src->y, target->x, target->y); - if (dist <= 0 || map_check_dir (dir, t_dir)) + int dir = map_calc_dir(src, target->x, target->y), t_dir = + battle_get_dir(target); + int dist = distance(src->x, src->y, target->x, target->y); + if (dist <= 0 || map_check_dir(dir, t_dir)) { - memset (&wd, 0, sizeof (wd)); + memset(&wd, 0, sizeof(wd)); t_sc_data[SC_AUTOCOUNTER].val3 = 0; t_sc_data[SC_AUTOCOUNTER].val4 = 1; if (sc_data && sc_data[SC_AUTOCOUNTER].timer == -1) { - int range = battle_get_range (target); + int range = battle_get_range(target); if ((target->type == BL_PC && ((struct map_session_data *) target)-> status.weapon != 11 && dist <= range + 1) @@ -2035,11 +2034,11 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, flag = BF_SHORT | BF_WEAPON | BF_NORMAL; // 攻撃の種類の設定 // 回避率計算、回避判定は後で - flee = battle_get_flee (target); + flee = battle_get_flee(target); if (battle_config.agi_penaly_type > 0 || battle_config.vit_penaly_type > 0) target_count += - battle_counttargeted (target, src, + battle_counttargeted(target, src, battle_config.agi_penaly_count_lv); if (battle_config.agi_penaly_type > 0) { @@ -2061,26 +2060,26 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, flee = 1; } } - hitrate = battle_get_hit (src) - flee + 80; + hitrate = battle_get_hit(src) - flee + 80; type = 0; // normal div_ = 1; // single attack - luk = battle_get_luk (src); + luk = battle_get_luk(src); if (battle_config.enemy_str) - damage = battle_get_baseatk (src); + damage = battle_get_baseatk(src); else damage = 0; if (skill_num == HW_MAGICCRASHER) { /* マジッククラッシャーはMATKで殴る */ - atkmin = battle_get_matk1 (src); - atkmax = battle_get_matk2 (src); + atkmin = battle_get_matk1(src); + atkmax = battle_get_matk2(src); } else { - atkmin = battle_get_atk (src); - atkmax = battle_get_atk2 (src); + atkmin = battle_get_atk(src); + atkmax = battle_get_atk2(src); } if (mob_db[md->mob_class].range > 3) flag = (flag & ~BF_RANGEMASK) | BF_LONG; @@ -2093,8 +2092,8 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, atkmin = atkmax; } - cri = battle_get_critical (src); - cri -= battle_get_luk (target) * 3; + cri = battle_get_critical(src); + cri -= battle_get_luk(target) * 3; if (battle_config.enemy_critical_rate != 100) { cri = cri * battle_config.enemy_critical_rate / 100; @@ -2118,7 +2117,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (tsd && tsd->critical_def) cri = cri * (100 - tsd->critical_def) / 100; - if ((skill_num == 0 || skill_num == KN_AUTOCOUNTER) && skill_lv >= 0 && battle_config.enemy_critical && (MRAND (1000)) < cri) // 判定（スキルの場合は無視） + if ((skill_num == 0 || skill_num == KN_AUTOCOUNTER) && skill_lv >= 0 && battle_config.enemy_critical && (MRAND(1000)) < cri) // 判定（スキルの場合は無視） // 敵の判定 { damage += atkmax; @@ -2126,10 +2125,10 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, } else { - int vitbonusmax; + int vitbonusmax; if (atkmax > atkmin) - damage += atkmin + MRAND ((atkmax - atkmin + 1)); + damage += atkmin + MRAND((atkmax - atkmin + 1)); else damage += atkmin; // スキル修正１（攻撃力倍化系） @@ -2151,8 +2150,8 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (skill_num > 0) { - int i; - if ((i = skill_get_pl (skill_num)) > 0) + int i; + if ((i = skill_get_pl(skill_num)) > 0) s_ele = i; flag = (flag & ~BF_SKILLMASK) | BF_SKILL; @@ -2235,11 +2234,11 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, break; // 以下MOB case NPC_COMBOATTACK: // 多段攻撃 - div_ = skill_get_num (skill_num, skill_lv); + div_ = skill_get_num(skill_num, skill_lv); damage *= div_; break; case NPC_RANDOMATTACK: // ランダムATK攻撃 - damage = damage * (MPRAND (50, 150)) / 100; + damage = damage * (MPRAND(50, 150)) / 100; break; // 属性攻撃（適当） case NPC_WATERATTACK: @@ -2334,7 +2333,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, break; case CH_CHAINCRUSH: // 連柱崩撃 damage = damage * (100 + 20 * skill_lv) / 100; - div_ = skill_get_num (skill_num, skill_lv); + div_ = skill_get_num(skill_num, skill_lv); break; case CH_PALMSTRIKE: // 猛虎硬派山 damage = damage * (50 + 100 * skill_lv) / 100; @@ -2343,9 +2342,9 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, damage = damage * (100 + 50 * skill_lv) / 100; //増加量が分からないので適当に div_ = 5; if (tsd) - tsd->canmove_tick = gettick () + 1000; + tsd->canmove_tick = gettick() + 1000; else if (tmd) - tmd->canmove_tick = gettick () + 1000; + tmd->canmove_tick = gettick() + 1000; break; case LK_HEADCRUSH: /* ヘッドクラッシュ */ damage = damage * (100 + 20 * skill_lv) / 100; @@ -2376,9 +2375,9 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != KN_AUTOCOUNTER && def1 < 1000000) { //DEF, VIT無視 - int t_def; + int t_def; target_count = - 1 + battle_counttargeted (target, src, + 1 + battle_counttargeted(target, src, battle_config.vit_penaly_count_lv); if (battle_config.vit_penaly_type > 0) { @@ -2432,9 +2431,9 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, } } t_def = def2 * 8 / 10; - if (battle_check_undead (s_race, battle_get_elem_type (src)) + if (battle_check_undead(s_race, battle_get_elem_type(src)) || s_race == 6) - if (tsd && (skill = pc_checkskill (tsd, AL_DP)) > 0) + if (tsd && (skill = pc_checkskill(tsd, AL_DP)) > 0) t_def += skill * 3; vitbonusmax = (t_vit / 20) * (t_vit / 20) - 1; @@ -2443,13 +2442,13 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, damage = damage - (def1 * battle_config.monster_defense_type) - t_def - - ((vitbonusmax < 1) ? 0 : MRAND ((vitbonusmax + 1))); + ((vitbonusmax < 1) ? 0 : MRAND((vitbonusmax + 1))); } else { damage = damage * (100 - def1) / 100 - t_def - - ((vitbonusmax < 1) ? 0 : MRAND ((vitbonusmax + 1))); + ((vitbonusmax < 1) ? 0 : MRAND((vitbonusmax + 1))); } } } @@ -2467,7 +2466,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, t_sc_data[SC_STAN].timer != -1 || // スタンは必中 t_sc_data[SC_FREEZE].timer != -1 || (t_sc_data[SC_STONE].timer != -1 && t_sc_data[SC_STONE].val2 == 0)))) // 凍結は必中 hitrate = 1000000; - if (type == 0 && MRAND (100) >= hitrate) + if (type == 0 && MRAND(100) >= hitrate) { damage = damage2 = 0; dmg_lv = ATK_FLEE; @@ -2479,7 +2478,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (tsd) { - int cardfix = 100, i; + int cardfix = 100, i; cardfix = cardfix * (100 - tsd->subele[s_ele]) / 100; // 属 性によるダメージ耐性 cardfix = cardfix * (100 - tsd->subrace[s_race]) / 100; // 種族によるダメージ耐性 if (mob_db[md->mob_class].mode & 0x20) @@ -2502,7 +2501,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, } if (t_sc_data) { - int cardfix = 100; + int cardfix = 100; if (t_sc_data[SC_DEFENDER].timer != -1 && flag & BF_LONG) cardfix = cardfix * (100 - t_sc_data[SC_DEFENDER].val2) / 100; if (cardfix != 100) @@ -2520,11 +2519,11 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, damage = 0; // 属 性の適用 - if (!((battle_config.mob_ghostring_fix == 1) && (battle_get_element (target) == 8) && (target->type == BL_PC))) // [MouseJstr] + if (!((battle_config.mob_ghostring_fix == 1) && (battle_get_element(target) == 8) && (target->type == BL_PC))) // [MouseJstr] if (skill_num != 0 || s_ele != 0 || !battle_config.mob_attack_attr_none) damage = - battle_attr_fix (damage, s_ele, battle_get_element (target)); + battle_attr_fix(damage, s_ele, battle_get_element(target)); if (sc_data && sc_data[SC_AURABLADE].timer != -1) /* オーラブレード 必中 */ damage += sc_data[SC_AURABLADE].val1 * 10; @@ -2535,17 +2534,17 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (skill_num == TF_POISON) { damage = - battle_attr_fix (damage + 15 * skill_lv, s_ele, - battle_get_element (target)); + battle_attr_fix(damage + 15 * skill_lv, s_ele, + battle_get_element(target)); } if (skill_num == MC_CARTREVOLUTION) { - damage = battle_attr_fix (damage, 0, battle_get_element (target)); + damage = battle_attr_fix(damage, 0, battle_get_element(target)); } // 完全回避の判定 if (skill_num == 0 && skill_lv >= 0 && tsd != NULL - && MRAND (1000) < battle_get_flee2 (target)) + && MRAND(1000) < battle_get_flee2(target)) { damage = 0; type = 0x0b; @@ -2555,7 +2554,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (battle_config.enemy_perfect_flee) { if (skill_num == 0 && skill_lv >= 0 && tmd != NULL - && MRAND (1000) < battle_get_flee2 (target)) + && MRAND(1000) < battle_get_flee2(target)) { damage = 0; type = 0x0b; @@ -2572,24 +2571,24 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (skill_num != CR_GRANDCROSS) damage = - battle_calc_damage (src, target, damage, div_, skill_num, + battle_calc_damage(src, target, damage, div_, skill_num, skill_lv, flag); wd.damage = damage; wd.damage2 = 0; wd.type = type; wd.div_ = div_; - wd.amotion = battle_get_amotion (src); + wd.amotion = battle_get_amotion(src); if (skill_num == KN_AUTOCOUNTER) wd.amotion >>= 1; - wd.dmotion = battle_get_dmotion (target); + wd.dmotion = battle_get_dmotion(target); wd.blewcount = blewcount; wd.flag = flag; wd.dmg_lv = dmg_lv; return wd; } -int battle_is_unarmed (struct block_list *bl) +int battle_is_unarmed(struct block_list *bl) { if (!bl) return 0; @@ -2609,7 +2608,7 @@ int battle_is_unarmed (struct block_list *bl) * PCの武器による攻撃 *------------------------------------------------------------------------- */ -static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, +static struct Damage battle_calc_pc_weapon_attack(struct block_list *src, struct block_list *target, int skill_num, int skill_lv, int wflag) @@ -2617,42 +2616,42 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, struct map_session_data *sd = (struct map_session_data *) src, *tsd = NULL; struct mob_data *tmd = NULL; - int hitrate, flee, cri = 0, atkmin, atkmax; - int dex, luk, target_count = 1; - int def1 = battle_get_def (target); - int def2 = battle_get_def2 (target); - int t_vit = battle_get_vit (target); + int hitrate, flee, cri = 0, atkmin, atkmax; + int dex, luk, target_count = 1; + int def1 = battle_get_def(target); + int def2 = battle_get_def2(target); + int t_vit = battle_get_vit(target); struct Damage wd; - int damage, damage2, damage3 = 0, damage4 = 0, type, div_, blewcount = - skill_get_blewcount (skill_num, skill_lv); - int flag, skill, dmg_lv = 0; - int t_mode = 0, t_race = 0, t_size = 1, s_race = 7, s_ele = 0; + int damage, damage2, damage3 = 0, damage4 = 0, type, div_, blewcount = + skill_get_blewcount(skill_num, skill_lv); + int flag, skill, dmg_lv = 0; + int t_mode = 0, t_race = 0, t_size = 1, s_race = 7, s_ele = 0; struct status_change *sc_data, *t_sc_data; short *sc_count; short *option, *opt1, *opt2; - int atkmax_ = 0, atkmin_ = 0, s_ele_; //二刀流用 - int watk, watk_, cardfix, t_ele; - int da = 0, i, t_class, ac_flag = 0; - int idef_flag = 0, idef_flag_ = 0; - int target_distance; + int atkmax_ = 0, atkmin_ = 0, s_ele_; //二刀流用 + int watk, watk_, cardfix, t_ele; + int da = 0, i, t_class, ac_flag = 0; + int idef_flag = 0, idef_flag_ = 0; + int target_distance; //return前の処理があるので情報出力部のみ変更 if (src == NULL || target == NULL || sd == NULL) { - nullpo_info (NLP_MARK); - memset (&wd, 0, sizeof (wd)); + nullpo_info(NLP_MARK); + memset(&wd, 0, sizeof(wd)); return wd; } // アタッカー - s_race = battle_get_race (src); //種族 - s_ele = battle_get_attack_element (src); //属性 - s_ele_ = battle_get_attack_element2 (src); //左手属性 - sc_data = battle_get_sc_data (src); //ステータス異常 - sc_count = battle_get_sc_count (src); //ステータス異常の数 - option = battle_get_option (src); //鷹とかペコとかカートとか - opt1 = battle_get_opt1 (src); //石化、凍結、スタン、睡眠、暗闇 - opt2 = battle_get_opt2 (src); //毒、呪い、沈黙、暗闇？ + s_race = battle_get_race(src); //種族 + s_ele = battle_get_attack_element(src); //属性 + s_ele_ = battle_get_attack_element2(src); //左手属性 + sc_data = battle_get_sc_data(src); //ステータス異常 + sc_count = battle_get_sc_count(src); //ステータス異常の数 + option = battle_get_option(src); //鷹とかペコとかカートとか + opt1 = battle_get_opt1(src); //石化、凍結、スタン、睡眠、暗闇 + opt2 = battle_get_opt2(src); //毒、呪い、沈黙、暗闇？ if (skill_num != CR_GRANDCROSS) //グランドクロスでないなら sd->state.attack_type = BF_WEAPON; //攻撃タイプは武器攻撃 @@ -2662,11 +2661,11 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, tsd = (struct map_session_data *) target; //tsdに代入(tmdはNULL) else if (target->type == BL_MOB) //対象がMobなら tmd = (struct mob_data *) target; //tmdに代入(tsdはNULL) - t_race = battle_get_race (target); //対象の種族 - t_ele = battle_get_elem_type (target); //対象の属性 - t_size = battle_get_size (target); //対象のサイズ - t_mode = battle_get_mode (target); //対象のMode - t_sc_data = battle_get_sc_data (target); //対象のステータス異常 + t_race = battle_get_race(target); //対象の種族 + t_ele = battle_get_elem_type(target); //対象の属性 + t_size = battle_get_size(target); //対象のサイズ + t_mode = battle_get_mode(target); //対象のMode + t_sc_data = battle_get_sc_data(target); //対象のステータス異常 //オートカウンター処理ここから if ((skill_num == 0 @@ -2678,17 +2677,17 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (skill_num != CR_GRANDCROSS && t_sc_data && t_sc_data[SC_AUTOCOUNTER].timer != -1) { //グランドクロスでなく、対象がオートカウンター状態の場合 - int dir = map_calc_dir (src, target->x, target->y), t_dir = - battle_get_dir (target); - int dist = distance (src->x, src->y, target->x, target->y); - if (dist <= 0 || map_check_dir (dir, t_dir)) + int dir = map_calc_dir(src, target->x, target->y), t_dir = + battle_get_dir(target); + int dist = distance(src->x, src->y, target->x, target->y); + if (dist <= 0 || map_check_dir(dir, t_dir)) { //対象との距離が0以下、または対象の正面？ - memset (&wd, 0, sizeof (wd)); + memset(&wd, 0, sizeof(wd)); t_sc_data[SC_AUTOCOUNTER].val3 = 0; t_sc_data[SC_AUTOCOUNTER].val4 = 1; if (sc_data && sc_data[SC_AUTOCOUNTER].timer == -1) { //自分がオートカウンター状態 - int range = battle_get_range (target); + int range = battle_get_range(target); if ((target->type == BL_PC && ((struct map_session_data *) target)->status.weapon != 11 && dist <= range + 1) || //対象がPCで武器が弓矢でなく射程内 (target->type == BL_MOB && range <= 3 && dist <= range + 1)) //または対象がMobで射程が3以下で射程内 t_sc_data[SC_AUTOCOUNTER].val3 = src->id; @@ -2704,9 +2703,9 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, flag = BF_SHORT | BF_WEAPON | BF_NORMAL; // 攻撃の種類の設定 // 回避率計算、回避判定は後で - flee = battle_get_flee (target); + flee = battle_get_flee(target); if (battle_config.agi_penaly_type > 0 || battle_config.vit_penaly_type > 0) //AGI、VITペナルティ設定が有効 - target_count += battle_counttargeted (target, src, battle_config.agi_penaly_count_lv); //対象の数を算出 + target_count += battle_counttargeted(target, src, battle_config.agi_penaly_count_lv); //対象の数を算出 if (battle_config.agi_penaly_type > 0) { if (target_count >= battle_config.agi_penaly_count) @@ -2727,34 +2726,34 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, flee = 1; //回避率は最低でも1 } } - hitrate = battle_get_hit (src) - flee + 80; //命中率計算 + hitrate = battle_get_hit(src) - flee + 80; //命中率計算 { // [fate] Reduce hit chance by distance - int dx = abs (src->x - target->x); - int dy = abs (src->y - target->y); - int malus_dist; + int dx = abs(src->x - target->x); + int dy = abs(src->y - target->y); + int malus_dist; - target_distance = MAX (dx, dy); + target_distance = MAX(dx, dy); malus_dist = - MAX (0, target_distance - (skill_power (sd, AC_OWL) / 75)); + MAX(0, target_distance - (skill_power(sd, AC_OWL) / 75)); hitrate -= (malus_dist * (malus_dist + 1)); } - dex = battle_get_dex (src); //DEX - luk = battle_get_luk (src); //LUK - watk = battle_get_atk (src); //ATK - watk_ = battle_get_atk_ (src); //ATK左手 + dex = battle_get_dex(src); //DEX + luk = battle_get_luk(src); //LUK + watk = battle_get_atk(src); //ATK + watk_ = battle_get_atk_(src); //ATK左手 type = 0; // normal div_ = 1; // single attack if (skill_num == HW_MAGICCRASHER) { /* マジッククラッシャーはMATKで殴る */ - damage = damage2 = battle_get_matk1 (src); //damega,damega2初登場、base_atkの取得 + damage = damage2 = battle_get_matk1(src); //damega,damega2初登場、base_atkの取得 } else { - damage = damage2 = battle_get_baseatk (&sd->bl); //damega,damega2初登場、base_atkの取得 + damage = damage2 = battle_get_baseatk(&sd->bl); //damega,damega2初登場、base_atkの取得 } if (sd->attackrange > 2) { // [fate] ranged weapon? @@ -2793,7 +2792,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, // ペコ騎乗していて、槍で攻撃した場合は中型のサイズ修正を100にする // ウェポンパーフェクション,ドレイクC if (((sd->special_state.no_sizefix) - || (pc_isriding (sd) + || (pc_isriding(sd) && (sd->status.weapon == 4 || sd->status.weapon == 5) && t_size == 1) || skill_num == MO_EXTREMITYFIST)) { //ペコ騎乗していて、槍で中型を攻撃 @@ -2829,38 +2828,38 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (sd->weapontype1 == 0x01) { if (skill_num == 0 && skill_lv >= 0 - && (skill = pc_checkskill (sd, TF_DOUBLE)) > 0) - da = (MRAND (100) < (skill * 5)) ? 1 : 0; + && (skill = pc_checkskill(sd, TF_DOUBLE)) > 0) + da = (MRAND(100) < (skill * 5)) ? 1 : 0; } //三段掌 if (skill_num == 0 && skill_lv >= 0 - && (skill = pc_checkskill (sd, MO_TRIPLEATTACK)) > 0 + && (skill = pc_checkskill(sd, MO_TRIPLEATTACK)) > 0 && sd->status.weapon <= 16 && !sd->state.arrow_atk) { - da = (MRAND (100) < (30 - skill)) ? 2 : 0; + da = (MRAND(100) < (30 - skill)) ? 2 : 0; } if (sd->double_rate > 0 && da == 0 && skill_num == 0 && skill_lv >= 0) - da = (MRAND (100) < sd->double_rate) ? 1 : 0; + da = (MRAND(100) < sd->double_rate) ? 1 : 0; // 過剰精錬ボーナス if (sd->overrefine > 0) - damage += MPRAND (1, sd->overrefine); + damage += MPRAND(1, sd->overrefine); if (sd->overrefine_ > 0) - damage2 += MPRAND (1, sd->overrefine_); + damage2 += MPRAND(1, sd->overrefine_); if (da == 0) { //ダブルアタックが発動していない // クリティカル計算 - cri = battle_get_critical (src); + cri = battle_get_critical(src); if (sd->state.arrow_atk) cri += sd->arrow_cri; if (sd->status.weapon == 16) // カタールの場合、クリティカルを倍に cri <<= 1; - cri -= battle_get_luk (target) * 3; + cri -= battle_get_luk(target) * 3; if (t_sc_data != NULL && t_sc_data[SC_SLEEP].timer != -1) // 睡眠中はクリティカルが倍に cri <<= 1; if (ac_flag) @@ -2874,7 +2873,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, cri <<= 1; } - if (skill_num == SN_SHARPSHOOTING && MRAND (100) < 50) + if (skill_num == SN_SHARPSHOOTING && MRAND(100) < 50) cri = 1000; } @@ -2882,7 +2881,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, cri = cri * (100 - tsd->critical_def) / 100; if (da == 0 && (skill_num == 0 || skill_num == KN_AUTOCOUNTER || skill_num == SN_SHARPSHOOTING) && skill_lv >= 0 && //ダブルアタックが発動していない - (MRAND (1000)) < cri) // 判定（スキルの場合は無視） + (MRAND(1000)) < cri) // 判定（スキルの場合は無視） { damage += atkmax; damage2 += atkmax_; @@ -2895,47 +2894,47 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage += sd->arrow_atk; type = 0x0a; -/* if(def1 < 1000000) { - if(sd->def_ratio_atk_ele & (1<<t_ele) || sd->def_ratio_atk_race & (1<<t_race)) { - damage = (damage * (def1 + def2))/100; - idef_flag = 1; - } - if(sd->def_ratio_atk_ele_ & (1<<t_ele) || sd->def_ratio_atk_race_ & (1<<t_race)) { - damage2 = (damage2 * (def1 + def2))/100; - idef_flag_ = 1; - } - if(t_mode & 0x20) { - if(!idef_flag && sd->def_ratio_atk_race & (1<<10)) { - damage = (damage * (def1 + def2))/100; - idef_flag = 1; - } - if(!idef_flag_ && sd->def_ratio_atk_race_ & (1<<10)) { - damage2 = (damage2 * (def1 + def2))/100; - idef_flag_ = 1; - } - } - else { - if(!idef_flag && sd->def_ratio_atk_race & (1<<11)) { - damage = (damage * (def1 + def2))/100; - idef_flag = 1; - } - if(!idef_flag_ && sd->def_ratio_atk_race_ & (1<<11)) { - damage2 = (damage2 * (def1 + def2))/100; - idef_flag_ = 1; - } - } - }*/ +/* if (def1 < 1000000) { + if (sd->def_ratio_atk_ele & (1<<t_ele) || sd->def_ratio_atk_race & (1<<t_race)) { + damage = (damage * (def1 + def2))/100; + idef_flag = 1; + } + if (sd->def_ratio_atk_ele_ & (1<<t_ele) || sd->def_ratio_atk_race_ & (1<<t_race)) { + damage2 = (damage2 * (def1 + def2))/100; + idef_flag_ = 1; + } + if (t_mode & 0x20) { + if (!idef_flag && sd->def_ratio_atk_race & (1<<10)) { + damage = (damage * (def1 + def2))/100; + idef_flag = 1; + } + if (!idef_flag_ && sd->def_ratio_atk_race_ & (1<<10)) { + damage2 = (damage2 * (def1 + def2))/100; + idef_flag_ = 1; + } + } + else { + if (!idef_flag && sd->def_ratio_atk_race & (1<<11)) { + damage = (damage * (def1 + def2))/100; + idef_flag = 1; + } + if (!idef_flag_ && sd->def_ratio_atk_race_ & (1<<11)) { + damage2 = (damage2 * (def1 + def2))/100; + idef_flag_ = 1; + } + } + }*/ } else { - int vitbonusmax; + int vitbonusmax; if (atkmax > atkmin) - damage += atkmin + MRAND ((atkmax - atkmin + 1)); + damage += atkmin + MRAND((atkmax - atkmin + 1)); else damage += atkmin; if (atkmax_ > atkmin_) - damage2 += atkmin_ + MRAND ((atkmax_ - atkmin_ + 1)); + damage2 += atkmin_ + MRAND((atkmax_ - atkmin_ + 1)); else damage2 += atkmin_; if (sd->atk_rate != 100) @@ -2947,7 +2946,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (sd->state.arrow_atk) { if (sd->arrow_atk > 0) - damage += MRAND ((sd->arrow_atk + 1)); + damage += MRAND((sd->arrow_atk + 1)); hitrate += sd->arrow_hit; } @@ -3021,8 +3020,8 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (skill_num > 0) { - int i; - if ((i = skill_get_pl (skill_num)) > 0) + int i; + if ((i = skill_get_pl(skill_num)) > 0) s_ele = s_ele_ = i; flag = (flag & ~BF_SKILLMASK) | BF_SKILL; @@ -3046,7 +3045,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case AC_DOUBLE: // ダブルストレイフィング if (!sd->state.arrow_atk && sd->arrow_atk > 0) { - int arr = MRAND ((sd->arrow_atk + 1)); + int arr = MRAND((sd->arrow_atk + 1)); damage += arr; damage2 += arr; } @@ -3064,7 +3063,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case AC_SHOWER: // アローシャワー if (!sd->state.arrow_atk && sd->arrow_atk > 0) { - int arr = MRAND ((sd->arrow_atk + 1)); + int arr = MRAND((sd->arrow_atk + 1)); damage += arr; damage2 += arr; } @@ -3081,7 +3080,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case AC_CHARGEARROW: // チャージアロー if (!sd->state.arrow_atk && sd->arrow_atk > 0) { - int arr = MRAND ((sd->arrow_atk + 1)); + int arr = MRAND((sd->arrow_atk + 1)); damage += arr; damage2 += arr; } @@ -3170,12 +3169,12 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, { damage = (damage * - (150 + pc_checkskill (sd, BS_WEAPONRESEARCH) + + (150 + pc_checkskill(sd, BS_WEAPONRESEARCH) + (sd->cart_weight * 100 / sd->cart_max_weight))) / 100; damage2 = (damage2 * - (150 + pc_checkskill (sd, BS_WEAPONRESEARCH) + + (150 + pc_checkskill(sd, BS_WEAPONRESEARCH) + (sd->cart_weight * 100 / sd->cart_max_weight))) / 100; } @@ -3187,13 +3186,13 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, break; // 以下MOB case NPC_COMBOATTACK: // 多段攻撃 - div_ = skill_get_num (skill_num, skill_lv); + div_ = skill_get_num(skill_num, skill_lv); damage *= div_; damage2 *= div_; break; case NPC_RANDOMATTACK: // ランダムATK攻撃 - damage = damage * (MPRAND (50, 150)) / 100; - damage2 = damage2 * (MPRAND (50, 150)) / 100; + damage = damage * (MPRAND(50, 150)) / 100; + damage2 = damage2 * (MPRAND(50, 150)) / 100; break; // 属性攻撃（適当） case NPC_WATERATTACK: @@ -3310,7 +3309,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage2 * (8 + ((sd->status.sp) / 10)) + 250 + (skill_lv * 150); sd->status.sp = 0; - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); hitrate = 1000000; s_ele = 0; s_ele_ = 0; @@ -3327,7 +3326,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case BA_MUSICALSTRIKE: // ミュージカルストライク if (!sd->state.arrow_atk && sd->arrow_atk > 0) { - int arr = MRAND ((sd->arrow_atk + 1)); + int arr = MRAND((sd->arrow_atk + 1)); damage += arr; damage2 += arr; } @@ -3344,7 +3343,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case DC_THROWARROW: // 矢撃ち if (!sd->state.arrow_atk && sd->arrow_atk > 0) { - int arr = MRAND ((sd->arrow_atk + 1)); + int arr = MRAND((sd->arrow_atk + 1)); damage += arr; damage2 += arr; } @@ -3365,7 +3364,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case CH_CHAINCRUSH: // 連柱崩撃 damage = damage * (100 + 20 * skill_lv) / 100; damage2 = damage2 * (100 + 20 * skill_lv) / 100; - div_ = skill_get_num (skill_num, skill_lv); + div_ = skill_get_num(skill_num, skill_lv); break; case CH_PALMSTRIKE: // 猛虎硬派山 damage = damage * (50 + 100 * skill_lv) / 100; @@ -3376,9 +3375,9 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage2 = damage2 * (100 + 50 * skill_lv) / 100; //増加量が分からないので適当に div_ = 5; if (tsd) - tsd->canmove_tick = gettick () + 1000; + tsd->canmove_tick = gettick() + 1000; else if (tmd) - tmd->canmove_tick = gettick () + 1000; + tmd->canmove_tick = gettick() + 1000; break; case LK_HEADCRUSH: /* ヘッドクラッシュ */ damage = damage * (100 + 20 * skill_lv) / 100; @@ -3404,19 +3403,19 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case AS_SPLASHER: /* ベナムスプラッシャー */ damage = damage * (200 + 20 * skill_lv + - 20 * pc_checkskill (sd, + 20 * pc_checkskill(sd, AS_POISONREACT)) / 100; damage2 = damage2 * (200 + 20 * skill_lv + - 20 * pc_checkskill (sd, + 20 * pc_checkskill(sd, AS_POISONREACT)) / 100; break; case PA_SACRIFICE: if (sd) { - int hp, mhp, damage3; - hp = battle_get_hp (src); - mhp = battle_get_max_hp (src); + int hp, mhp, damage3; + hp = battle_get_hp(src); + mhp = battle_get_max_hp(src); damage3 = mhp * ((skill_lv / 2) + (50 / 100)) / 100; damage = (((skill_lv * 15) + 90) / 100) * damage3 / 100; @@ -3427,19 +3426,19 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case ASC_BREAKER: // -- moonsoul (special damage for ASC_BREAKER skill) if (sd) { - int damage3; - int mdef1 = battle_get_mdef (target); - int mdef2 = battle_get_mdef2 (target); - int imdef_flag = 0; + int damage3; + int mdef1 = battle_get_mdef(target); + int mdef2 = battle_get_mdef2(target); + int imdef_flag = 0; damage = ((damage * 5) + - (skill_lv * battle_get_int (src) * 5) + - MRAND (500) + 500) / 2; + (skill_lv * battle_get_int(src) * 5) + + MRAND(500) + 500) / 2; damage2 = ((damage2 * 5) + - (skill_lv * battle_get_int (src) * 5) + - MRAND (500) + 500) / 2; + (skill_lv * battle_get_int(src) * 5) + + MRAND(500) + 500) / 2; damage3 = damage; hitrate = 1000000; @@ -3477,8 +3476,8 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage3 = 1; damage3 = - battle_attr_fix (damage2, s_ele_, - battle_get_element (target)); + battle_attr_fix(damage2, s_ele_, + battle_get_element(target)); } break; } @@ -3489,7 +3488,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, div_ = 255; //三段掌用に… damage = damage * (100 + - 20 * pc_checkskill (sd, MO_TRIPLEATTACK)) / 100; + 20 * pc_checkskill(sd, MO_TRIPLEATTACK)) / 100; } if (skill_num != NPC_CRITICALSLASH) @@ -3499,9 +3498,9 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != KN_AUTOCOUNTER && def1 < 1000000) { //DEF, VIT無視 - int t_def; + int t_def; target_count = - 1 + battle_counttargeted (target, src, + 1 + battle_counttargeted(target, src, battle_config.vit_penaly_count_lv); if (battle_config.vit_penaly_type > 0) { @@ -3586,14 +3585,14 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, (def1 * battle_config.player_defense_type) - t_def - ((vitbonusmax < - 1) ? 0 : MRAND ((vitbonusmax + 1))); + 1) ? 0 : MRAND((vitbonusmax + 1))); } else { damage = damage * (100 - def1) / 100 - t_def - ((vitbonusmax < - 1) ? 0 : MRAND ((vitbonusmax + 1))); + 1) ? 0 : MRAND((vitbonusmax + 1))); } } if (!idef_flag_) @@ -3605,14 +3604,14 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, (def1 * battle_config.player_defense_type) - t_def - ((vitbonusmax < - 1) ? 0 : MRAND ((vitbonusmax + 1))); + 1) ? 0 : MRAND((vitbonusmax + 1))); } else { damage2 = damage2 * (100 - def1) / 100 - t_def - ((vitbonusmax < - 1) ? 0 : MRAND ((vitbonusmax + 1))); + 1) ? 0 : MRAND((vitbonusmax + 1))); } } } @@ -3621,20 +3620,20 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, // 精錬ダメージの追加 if (skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST) { //DEF, VIT無視 - damage += battle_get_atk2 (src); - damage2 += battle_get_atk_2 (src); + damage += battle_get_atk2(src); + damage2 += battle_get_atk_2(src); } if (skill_num == CR_SHIELDBOOMERANG) { if (sd->equip_index[8] >= 0) { - int index = sd->equip_index[8]; + int index = sd->equip_index[8]; if (sd->inventory_data[index] && sd->inventory_data[index]->type == 5) { damage += sd->inventory_data[index]->weight / 10; damage += - sd->status.inventory[index].refine * pc_getrefinebonus (0, + sd->status.inventory[index].refine * pc_getrefinebonus(0, 1); } } @@ -3643,15 +3642,15 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, { /* スパイラルピアース */ if (sd->equip_index[9] >= 0) { //重量で追加ダメージらしいのでシールドブーメランを参考に追加 - int index = sd->equip_index[9]; + int index = sd->equip_index[9]; if (sd->inventory_data[index] && sd->inventory_data[index]->type == 4) { damage += - (int) (double) (sd->inventory_data[index]->weight * + (int)(double)(sd->inventory_data[index]->weight * (0.8 * skill_lv * 4 / 10)); damage += - sd->status.inventory[index].refine * pc_getrefinebonus (0, + sd->status.inventory[index].refine * pc_getrefinebonus(0, 1); } } @@ -3668,13 +3667,13 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != CR_GRANDCROSS) { //修練ダメージ無視 - damage = battle_addmastery (sd, target, damage, 0); - damage2 = battle_addmastery (sd, target, damage2, 1); + damage = battle_addmastery(sd, target, damage, 0); + damage2 = battle_addmastery(sd, target, damage2, 1); } if (sd->perfect_hit > 0) { - if (MRAND (100) < sd->perfect_hit) + if (MRAND(100) < sd->perfect_hit) hitrate = 1000000; } @@ -3685,7 +3684,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, t_sc_data[SC_STAN].timer != -1 || // スタンは必中 t_sc_data[SC_FREEZE].timer != -1 || (t_sc_data[SC_STONE].timer != -1 && t_sc_data[SC_STONE].val2 == 0)))) // 凍結は必中 hitrate = 1000000; - if (type == 0 && MRAND (100) >= hitrate) + if (type == 0 && MRAND(100) >= hitrate) { damage = damage2 = 0; dmg_lv = ATK_FLEE; @@ -3695,7 +3694,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, dmg_lv = ATK_DEF; } // スキル修正３（武器研究） - if ((skill = pc_checkskill (sd, BS_WEAPONRESEARCH)) > 0) + if ((skill = pc_checkskill(sd, BS_WEAPONRESEARCH)) > 0) { damage += skill * 2; damage2 += skill * 2; @@ -3703,7 +3702,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, //Advanced Katar Research by zanetheinsane if (sd->weapontype1 == 0x10 || sd->weapontype2 == 0x10) { - if ((skill = pc_checkskill (sd, ASC_KATAR)) > 0) + if ((skill = pc_checkskill(sd, ASC_KATAR)) > 0) { damage += (damage * ((skill * 2) + 10)) / 100; } @@ -3759,7 +3758,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, cardfix = cardfix * (100 + sd->addrace[11] + sd->arrow_addrace[11]) / 100; //ボス以外モンスターに追加ダメージ(弓矢による追加あり) } //特定Class用補正処理(少女の日記→ボンゴン用？) - t_class = battle_get_class (target); + t_class = battle_get_class(target); for (i = 0; i < sd->add_damage_class_count; i++) { if (sd->add_damage_classid[i] == t_class) @@ -3807,7 +3806,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, cardfix = 100; cardfix = cardfix * (100 - tsd->subrace[s_race]) / 100; // 種族によるダメージ耐性 cardfix = cardfix * (100 - tsd->subele[s_ele]) / 100; // 属性によるダメージ耐性 - if (battle_get_mode (src) & 0x20) + if (battle_get_mode(src) & 0x20) cardfix = cardfix * (100 - tsd->subrace[10]) / 100; //ボスからの攻撃はダメージ減少 else cardfix = cardfix * (100 - tsd->subrace[11]) / 100; //ボス以外からの攻撃はダメージ減少 @@ -3862,8 +3861,8 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage2 = 0; // 属 性の適用 - damage = battle_attr_fix (damage, s_ele, battle_get_element (target)); - damage2 = battle_attr_fix (damage2, s_ele_, battle_get_element (target)); + damage = battle_attr_fix(damage, s_ele, battle_get_element(target)); + damage2 = battle_attr_fix(damage2, s_ele_, battle_get_element(target)); // 星のかけら、気球の適用 damage += sd->star; @@ -3897,14 +3896,14 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, // 右手、左手修練の適用 if (sd->status.weapon > 16) { // 二刀流か? - int dmg = damage, dmg2 = damage2; + int dmg = damage, dmg2 = damage2; // 右手修練(60% 〜 100%) 右手全般 - skill = pc_checkskill (sd, AS_RIGHT); + skill = pc_checkskill(sd, AS_RIGHT); damage = damage * (50 + (skill * 10)) / 100; if (dmg > 0 && damage < 1) damage = 1; // 左手修練(40% 〜 80%) 左手全般 - skill = pc_checkskill (sd, AS_LEFT); + skill = pc_checkskill(sd, AS_LEFT); damage2 = damage2 * (30 + (skill * 10)) / 100; if (dmg2 > 0 && damage2 < 1) damage2 = 1; @@ -3923,7 +3922,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (sd->status.weapon == 16) { // カタール追撃ダメージ - skill = pc_checkskill (sd, TF_DOUBLE); + skill = pc_checkskill(sd, TF_DOUBLE); damage2 = damage * (1 + (skill * 2)) / 100; if (damage > 0 && damage2 < 1) damage2 = 1; @@ -3933,17 +3932,17 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (skill_num == TF_POISON) { damage = - battle_attr_fix (damage + 15 * skill_lv, s_ele, - battle_get_element (target)); + battle_attr_fix(damage + 15 * skill_lv, s_ele, + battle_get_element(target)); } if (skill_num == MC_CARTREVOLUTION) { - damage = battle_attr_fix (damage, 0, battle_get_element (target)); + damage = battle_attr_fix(damage, 0, battle_get_element(target)); } // 完全回避の判定 if (skill_num == 0 && skill_lv >= 0 && tsd != NULL && div_ < 255 - && MRAND (1000) < battle_get_flee2 (target)) + && MRAND(1000) < battle_get_flee2(target)) { damage = damage2 = 0; type = 0x0b; @@ -3954,7 +3953,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (battle_config.enemy_perfect_flee) { if (skill_num == 0 && skill_lv >= 0 && tmd != NULL && div_ < 255 - && MRAND (1000) < battle_get_flee2 (target)) + && MRAND(1000) < battle_get_flee2(target)) { damage = damage2 = 0; type = 0x0b; @@ -3980,17 +3979,17 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, { if (damage2 < 1) // ダメージ最終修正 damage = - battle_calc_damage (src, target, damage, div_, skill_num, + battle_calc_damage(src, target, damage, div_, skill_num, skill_lv, flag); else if (damage < 1) // 右手がミス？ damage2 = - battle_calc_damage (src, target, damage2, div_, skill_num, + battle_calc_damage(src, target, damage2, div_, skill_num, skill_lv, flag); else { // 両 手/カタールの場合はちょっと計算ややこしい - int d1 = damage + damage2, d2 = damage2; + int d1 = damage + damage2, d2 = damage2; damage = - battle_calc_damage (src, target, damage + damage2, div_, + battle_calc_damage(src, target, damage + damage2, div_, skill_num, skill_lv, flag); damage2 = (d2 * 100 / d1) * damage / 100; if (damage > 1 && damage2 < 1) @@ -4003,7 +4002,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (src->type == BL_PC && sd->random_attack_increase_add > 0 && sd->random_attack_increase_per > 0 && skill_num == 0) { - if (MRAND (100) < sd->random_attack_increase_per) + if (MRAND(100) < sd->random_attack_increase_per) { if (damage > 0) damage *= sd->random_attack_increase_add / 100; @@ -4024,10 +4023,10 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, wd.damage2 = damage2; wd.type = type; wd.div_ = div_; - wd.amotion = battle_get_amotion (src); + wd.amotion = battle_get_amotion(src); if (skill_num == KN_AUTOCOUNTER) wd.amotion >>= 1; - wd.dmotion = battle_get_dmotion (target); + wd.dmotion = battle_get_dmotion(target); wd.blewcount = blewcount; wd.flag = flag; wd.dmg_lv = dmg_lv; @@ -4039,7 +4038,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, * 武器ダメージ計算 *------------------------------------------ */ -struct Damage battle_calc_weapon_attack (struct block_list *src, +struct Damage battle_calc_weapon_attack(struct block_list *src, struct block_list *target, int skill_num, int skill_lv, int wflag) @@ -4049,18 +4048,18 @@ struct Damage battle_calc_weapon_attack (struct block_list *src, //return前の処理があるので情報出力部のみ変更 if (src == NULL || target == NULL) { - nullpo_info (NLP_MARK); - memset (&wd, 0, sizeof (wd)); + nullpo_info(NLP_MARK); + memset(&wd, 0, sizeof(wd)); return wd; } else if (src->type == BL_PC) - wd = battle_calc_pc_weapon_attack (src, target, skill_num, skill_lv, wflag); // weapon breaking [Valaris] + wd = battle_calc_pc_weapon_attack(src, target, skill_num, skill_lv, wflag); // weapon breaking [Valaris] else if (src->type == BL_MOB) - wd = battle_calc_mob_weapon_attack (src, target, skill_num, skill_lv, + wd = battle_calc_mob_weapon_attack(src, target, skill_num, skill_lv, wflag); else - memset (&wd, 0, sizeof (wd)); + memset(&wd, 0, sizeof(wd)); if (battle_config.equipment_breaking && src->type == BL_PC && (wd.damage > 0 || wd.damage2 > 0)) @@ -4068,25 +4067,25 @@ struct Damage battle_calc_weapon_attack (struct block_list *src, struct map_session_data *sd = (struct map_session_data *) src; if (sd->status.weapon && sd->status.weapon != 11) { - int breakrate = 1; + int breakrate = 1; if (target->type == BL_PC && sd->sc_data[SC_MELTDOWN].timer != -1) { breakrate += 100 * sd->sc_data[SC_MELTDOWN].val1; - if (MRAND (10000) < + if (MRAND(10000) < breakrate * battle_config.equipment_break_rate / 100 || breakrate >= 10000) - pc_breakweapon ((struct map_session_data *) target); + pc_breakweapon((struct map_session_data *) target); } if (sd->sc_data[SC_OVERTHRUST].timer != -1) breakrate += 20 * sd->sc_data[SC_OVERTHRUST].val1; if (wd.type == 0x0a) breakrate *= 2; - if (MRAND (10000) < + if (MRAND(10000) < breakrate * battle_config.equipment_break_rate / 100 || breakrate >= 10000) { - pc_breakweapon (sd); - memset (&wd, 0, sizeof (wd)); + pc_breakweapon(sd); + memset(&wd, 0, sizeof(wd)); } } } @@ -4094,7 +4093,7 @@ struct Damage battle_calc_weapon_attack (struct block_list *src, if (battle_config.equipment_breaking && target->type == BL_PC && (wd.damage > 0 || wd.damage2 > 0)) { - int breakrate = 1; + int breakrate = 1; if (src->type == BL_PC && ((struct map_session_data *) src)-> sc_data[SC_MELTDOWN].timer != -1) @@ -4103,11 +4102,11 @@ struct Damage battle_calc_weapon_attack (struct block_list *src, ((struct map_session_data *) src)->sc_data[SC_MELTDOWN].val1; if (wd.type == 0x0a) breakrate *= 2; - if (MRAND (10000) < + if (MRAND(10000) < breakrate * battle_config.equipment_break_rate / 100 || breakrate >= 10000) { - pc_breakarmor ((struct map_session_data *) target); + pc_breakarmor((struct map_session_data *) target); } } @@ -4118,18 +4117,18 @@ struct Damage battle_calc_weapon_attack (struct block_list *src, * 魔法ダメージ計算 *------------------------------------------ */ -struct Damage battle_calc_magic_attack (struct block_list *bl, +struct Damage battle_calc_magic_attack(struct block_list *bl, struct block_list *target, int skill_num, int skill_lv, int flag) { - int mdef1 = battle_get_mdef (target); - int mdef2 = battle_get_mdef2 (target); - int matk1, matk2, damage = 0, div_ = 1, blewcount = - skill_get_blewcount (skill_num, skill_lv), rdamage = 0; + int mdef1 = battle_get_mdef(target); + int mdef2 = battle_get_mdef2(target); + int matk1, matk2, damage = 0, div_ = 1, blewcount = + skill_get_blewcount(skill_num, skill_lv), rdamage = 0; struct Damage md; - int aflag; - int normalmagic_flag = 1; - int ele = 0, race = 7, t_ele = 0, t_race = 7, t_mode = + int aflag; + int normalmagic_flag = 1; + int ele = 0, race = 7, t_ele = 0, t_race = 7, t_mode = 0, cardfix, t_class, i; struct map_session_data *sd = NULL, *tsd = NULL; struct mob_data *tmd = NULL; @@ -4137,18 +4136,18 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, //return前の処理があるので情報出力部のみ変更 if (bl == NULL || target == NULL) { - nullpo_info (NLP_MARK); - memset (&md, 0, sizeof (md)); + nullpo_info(NLP_MARK); + memset(&md, 0, sizeof(md)); return md; } - matk1 = battle_get_matk1 (bl); - matk2 = battle_get_matk2 (bl); - ele = skill_get_pl (skill_num); - race = battle_get_race (bl); - t_ele = battle_get_elem_type (target); - t_race = battle_get_race (target); - t_mode = battle_get_mode (target); + matk1 = battle_get_matk1(bl); + matk2 = battle_get_matk2(bl); + ele = skill_get_pl(skill_num); + race = battle_get_race(bl); + t_ele = battle_get_elem_type(target); + t_race = battle_get_race(target); + t_mode = battle_get_mode(target); #define MATK_FIX( a,b ) { matk1=matk1*(a)/(b); matk2=matk2*(a)/(b); } @@ -4156,7 +4155,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, { sd->state.attack_type = BF_MAGIC; if (sd->matk_rate != 100) - MATK_FIX (sd->matk_rate, 100); + MATK_FIX(sd->matk_rate, 100); sd->state.arrow_atk = 0; } if (target->type == BL_PC) @@ -4173,7 +4172,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, // ヒールor聖体 case AL_HEAL: case PR_BENEDICTIO: - damage = skill_calc_heal (bl, skill_lv) / 2; + damage = skill_calc_heal(bl, skill_lv) / 2; normalmagic_flag = 0; break; case PR_ASPERSIO: /* アスペルシオ */ @@ -4188,39 +4187,38 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, case ALL_RESURRECTION: case PR_TURNUNDEAD: // 攻撃リザレクションとターンアンデッド if (target->type != BL_PC - && battle_check_undead (t_race, t_ele)) + && battle_check_undead(t_race, t_ele)) { - int hp, mhp, thres; - hp = battle_get_hp (target); - mhp = battle_get_max_hp (target); - thres = (skill_lv * 20) + battle_get_luk (bl) + - battle_get_int (bl) + battle_get_lv (bl) + + int hp, mhp, thres; + hp = battle_get_hp(target); + mhp = battle_get_max_hp(target); + thres = (skill_lv * 20) + battle_get_luk(bl) + + battle_get_int(bl) + battle_get_lv(bl) + ((200 - hp * 200 / mhp)); if (thres > 700) thres = 700; // if(battle_config.battle_log) // printf("ターンアンデッド！ 確率%d ‰(千分率)\n", thres); - if (MRAND (1000) < thres && !(t_mode & 0x20)) // 成功 + if (MRAND(1000) < thres && !(t_mode & 0x20)) // 成功 damage = hp; else // 失敗 damage = - battle_get_lv (bl) + battle_get_int (bl) + + battle_get_lv(bl) + battle_get_int(bl) + skill_lv * 10; } normalmagic_flag = 0; break; case MG_NAPALMBEAT: // ナパームビート（分散計算込み） - MATK_FIX (70 + skill_lv * 10, 100); + MATK_FIX(70 + skill_lv * 10, 100); if (flag > 0) { - MATK_FIX (1, flag); + MATK_FIX(1, flag); } else { if (battle_config.error_log) - printf - ("battle_calc_magic_attack(): napam enemy count=0 !\n"); + printf("battle_calc_magic_attack(): napam enemy count=0 !\n"); } break; case MG_FIREBALL: // ファイヤーボール @@ -4229,73 +4227,72 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, if (flag > 2) matk1 = matk2 = 0; else - MATK_FIX ((95 + skill_lv * 5) * drate[flag], 10000); + MATK_FIX((95 + skill_lv * 5) * drate[flag], 10000); } break; case MG_FIREWALL: // ファイヤーウォール /* - if( (t_ele!=3 && !battle_check_undead(t_race,t_ele)) || target->type==BL_PC ) //PCは火属性でも飛ぶ？そもそもダメージ受ける？ - blewcount |= 0x10000; - else - blewcount = 0; + if ((t_ele!=3 && !battle_check_undead(t_race,t_ele)) || target->type==BL_PC ) //PCは火属性でも飛ぶ？そもそもダメージ受ける？ + blewcount |= 0x10000; + else + blewcount = 0; */ - if ((t_ele == 3 || battle_check_undead (t_race, t_ele)) + if ((t_ele == 3 || battle_check_undead(t_race, t_ele)) && target->type != BL_PC) blewcount = 0; else blewcount |= 0x10000; - MATK_FIX (1, 2); + MATK_FIX(1, 2); break; case MG_THUNDERSTORM: // サンダーストーム - MATK_FIX (80, 100); + MATK_FIX(80, 100); break; case MG_FROSTDIVER: // フロストダイバ - MATK_FIX (100 + skill_lv * 10, 100); + MATK_FIX(100 + skill_lv * 10, 100); break; case WZ_FROSTNOVA: // フロストダイバ - MATK_FIX (((100 + skill_lv * 10) * (2 / 3)), 100); + MATK_FIX(((100 + skill_lv * 10) * (2 / 3)), 100); break; case WZ_FIREPILLAR: // ファイヤーピラー if (mdef1 < 1000000) mdef1 = mdef2 = 0; // MDEF無視 - MATK_FIX (1, 5); + MATK_FIX(1, 5); matk1 += 50; matk2 += 50; break; case WZ_SIGHTRASHER: - MATK_FIX (100 + skill_lv * 20, 100); + MATK_FIX(100 + skill_lv * 20, 100); break; case WZ_METEOR: case WZ_JUPITEL: // ユピテルサンダー break; case WZ_VERMILION: // ロードオブバーミリオン - MATK_FIX (skill_lv * 20 + 80, 100); + MATK_FIX(skill_lv * 20 + 80, 100); break; case WZ_WATERBALL: // ウォーターボール matk1 += skill_lv * 30; matk2 += skill_lv * 30; break; case WZ_STORMGUST: // ストームガスト - MATK_FIX (skill_lv * 40 + 100, 100); + MATK_FIX(skill_lv * 40 + 100, 100); blewcount |= 0x10000; break; case AL_HOLYLIGHT: // ホーリーライト - MATK_FIX (125, 100); + MATK_FIX(125, 100); break; case AL_RUWACH: - MATK_FIX (145, 100); + MATK_FIX(145, 100); break; case HW_NAPALMVULCAN: // ナパームビート（分散計算込み） - MATK_FIX (70 + skill_lv * 10, 100); + MATK_FIX(70 + skill_lv * 10, 100); if (flag > 0) { - MATK_FIX (1, flag); + MATK_FIX(1, flag); } else { if (battle_config.error_log) - printf - ("battle_calc_magic_attack(): napalmvulcan enemy count=0 !\n"); + printf("battle_calc_magic_attack(): napalmvulcan enemy count=0 !\n"); } break; } @@ -4303,9 +4300,9 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, if (normalmagic_flag) { // 一般魔法ダメージ計算 - int imdef_flag = 0; + int imdef_flag = 0; if (matk1 > matk2) - damage = matk2 + MRAND ((matk1 - matk2 + 1)); + damage = matk2 + MRAND((matk1 - matk2 + 1)); else damage = matk2; if (sd) @@ -4351,7 +4348,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, cardfix = cardfix * (100 + sd->magic_addrace[10]) / 100; else cardfix = cardfix * (100 + sd->magic_addrace[11]) / 100; - t_class = battle_get_class (target); + t_class = battle_get_class(target); for (i = 0; i < sd->add_magic_damage_class_count; i++) { if (sd->add_magic_damage_classid[i] == t_class) @@ -4366,12 +4363,12 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, if (tsd) { - int s_class = battle_get_class (bl); + int s_class = battle_get_class(bl); cardfix = 100; cardfix = cardfix * (100 - tsd->subele[ele]) / 100; // 属 性によるダメージ耐性 cardfix = cardfix * (100 - tsd->subrace[race]) / 100; // 種族によるダメージ耐性 cardfix = cardfix * (100 - tsd->magic_subrace[race]) / 100; - if (battle_get_mode (bl) & 0x20) + if (battle_get_mode(bl) & 0x20) cardfix = cardfix * (100 - tsd->magic_subrace[10]) / 100; else cardfix = cardfix * (100 - tsd->magic_subrace[11]) / 100; @@ -4389,21 +4386,21 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, if (damage < 0) damage = 0; - damage = battle_attr_fix (damage, ele, battle_get_element (target)); // 属 性修正 + damage = battle_attr_fix(damage, ele, battle_get_element(target)); // 属 性修正 if (skill_num == CR_GRANDCROSS) { // グランドクロス struct Damage wd; - wd = battle_calc_weapon_attack (bl, target, skill_num, skill_lv, + wd = battle_calc_weapon_attack(bl, target, skill_num, skill_lv, flag); damage = (damage + wd.damage) * (100 + 40 * skill_lv) / 100; if (battle_config.gx_dupele) - damage = battle_attr_fix (damage, ele, battle_get_element (target)); //属性2回かかる + damage = battle_attr_fix(damage, ele, battle_get_element(target)); //属性2回かかる if (bl == target) damage = damage / 2; //反動は半分 } - div_ = skill_get_num (skill_num, skill_lv); + div_ = skill_get_num(skill_num, skill_lv); if (div_ > 1 && skill_num != WZ_VERMILION) damage *= div_; @@ -4424,7 +4421,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, damage = 0; // 黄 金蟲カード（魔法ダメージ０） } - damage = battle_calc_damage (bl, target, damage, div_, skill_num, skill_lv, aflag); // 最終修正 + damage = battle_calc_damage(bl, target, damage, div_, skill_num, skill_lv, aflag); // 最終修正 /* magic_damage_return by [AppleGirl] and [Valaris] */ if (target->type == BL_PC && tsd && tsd->magic_damage_return > 0) @@ -4432,15 +4429,15 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, rdamage += damage * tsd->magic_damage_return / 100; if (rdamage < 1) rdamage = 1; - clif_damage (target, bl, gettick (), 0, 0, rdamage, 0, 0, 0); - battle_damage (target, bl, rdamage, 0); + clif_damage(target, bl, gettick(), 0, 0, rdamage, 0, 0, 0); + battle_damage(target, bl, rdamage, 0); } /* end magic_damage_return */ md.damage = damage; md.div_ = div_; - md.amotion = battle_get_amotion (bl); - md.dmotion = battle_get_dmotion (target); + md.amotion = battle_get_amotion(bl); + md.dmotion = battle_get_dmotion(target); md.damage2 = 0; md.type = 0; md.blewcount = blewcount; @@ -4453,27 +4450,27 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, * その他ダメージ計算 *------------------------------------------ */ -struct Damage battle_calc_misc_attack (struct block_list *bl, +struct Damage battle_calc_misc_attack(struct block_list *bl, struct block_list *target, int skill_num, int skill_lv, int flag) { - int int_ = battle_get_int (bl); + int int_ = battle_get_int(bl); // int luk=battle_get_luk(bl); - int dex = battle_get_dex (bl); - int skill, ele, race, cardfix; + int dex = battle_get_dex(bl); + int skill, ele, race, cardfix; struct map_session_data *sd = NULL, *tsd = NULL; - int damage = 0, div_ = 1, blewcount = - skill_get_blewcount (skill_num, skill_lv); + int damage = 0, div_ = 1, blewcount = + skill_get_blewcount(skill_num, skill_lv); struct Damage md; - int damagefix = 1; + int damagefix = 1; - int aflag = BF_MISC | BF_LONG | BF_SKILL; + int aflag = BF_MISC | BF_LONG | BF_SKILL; //return前の処理があるので情報出力部のみ変更 if (bl == NULL || target == NULL) { - nullpo_info (NLP_MARK); - memset (&md, 0, sizeof (md)); + nullpo_info(NLP_MARK); + memset(&md, 0, sizeof(md)); return md; } @@ -4502,7 +4499,7 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, break; case HT_BLITZBEAT: // ブリッツビート - if (sd == NULL || (skill = pc_checkskill (sd, HT_STEELCROW)) <= 0) + if (sd == NULL || (skill = pc_checkskill(sd, HT_STEELCROW)) <= 0) skill = 0; damage = (dex / 10 + int_ / 2 + skill * 3 + 40) * 2; if (flag > 1) @@ -4516,11 +4513,11 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, case BA_DISSONANCE: // 不協和音 damage = - (skill_lv) * 20 + pc_checkskill (sd, BA_MUSICALLESSON) * 3; + (skill_lv) * 20 + pc_checkskill(sd, BA_MUSICALLESSON) * 3; break; case NPC_SELFDESTRUCTION: // 自爆 - damage = battle_get_hp (bl) - (bl == target ? 1 : 0); + damage = battle_get_hp(bl) - (bl == target ? 1 : 0); damagefix = 0; break; @@ -4531,9 +4528,9 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, case NPC_DARKBREATH: { - struct status_change *sc_data = battle_get_sc_data (target); - int hitrate = - battle_get_hit (bl) - battle_get_flee (target) + 80; + struct status_change *sc_data = battle_get_sc_data(target); + int hitrate = + battle_get_hit(bl) - battle_get_flee(target) + 80; hitrate = ((hitrate > 95) ? 95 : ((hitrate < 5) ? 5 : hitrate)); if (sc_data && (sc_data[SC_SLEEP].timer != -1 @@ -4542,24 +4539,24 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, || (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0))) hitrate = 1000000; - if (MRAND (100) < hitrate) + if (MRAND(100) < hitrate) { - damage = 500 + (skill_lv - 1) * 1000 + MRAND (1000); + damage = 500 + (skill_lv - 1) * 1000 + MRAND(1000); if (damage > 9999) damage = 9999; } } break; case SN_FALCONASSAULT: /* ファルコンアサルト */ - skill = pc_checkskill (sd, HT_BLITZBEAT); + skill = pc_checkskill(sd, HT_BLITZBEAT); damage = (100 + 50 * skill_lv + (dex / 10 + int_ / 2 + skill * 3 + 40) * 2); break; } - ele = skill_get_pl (skill_num); - race = battle_get_race (bl); + ele = skill_get_pl(skill_num); + race = battle_get_race(bl); if (damagefix) { @@ -4576,27 +4573,27 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, } if (damage < 0) damage = 0; - damage = battle_attr_fix (damage, ele, battle_get_element (target)); // 属性修正 + damage = battle_attr_fix(damage, ele, battle_get_element(target)); // 属性修正 } - div_ = skill_get_num (skill_num, skill_lv); + div_ = skill_get_num(skill_num, skill_lv); if (div_ > 1) damage *= div_; if (damage > 0 && (damage < div_ - || (battle_get_def (target) >= 1000000 - && battle_get_mdef (target) >= 1000000))) + || (battle_get_def(target) >= 1000000 + && battle_get_mdef(target) >= 1000000))) { damage = div_; } - damage = battle_calc_damage (bl, target, damage, div_, skill_num, skill_lv, aflag); // 最終修正 + damage = battle_calc_damage(bl, target, damage, div_, skill_num, skill_lv, aflag); // 最終修正 md.damage = damage; md.div_ = div_; - md.amotion = battle_get_amotion (bl); - md.dmotion = battle_get_dmotion (target); + md.amotion = battle_get_amotion(bl); + md.dmotion = battle_get_dmotion(target); md.damage2 = 0; md.type = 0; md.blewcount = blewcount; @@ -4609,28 +4606,28 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, * ダメージ計算一括処理用 *------------------------------------------ */ -struct Damage battle_calc_attack (int attack_type, +struct Damage battle_calc_attack(int attack_type, struct block_list *bl, struct block_list *target, int skill_num, int skill_lv, int flag) { struct Damage d; - memset (&d, 0, sizeof (d)); + memset(&d, 0, sizeof(d)); switch (attack_type) { case BF_WEAPON: - return battle_calc_weapon_attack (bl, target, skill_num, skill_lv, + return battle_calc_weapon_attack(bl, target, skill_num, skill_lv, flag); case BF_MAGIC: - return battle_calc_magic_attack (bl, target, skill_num, skill_lv, + return battle_calc_magic_attack(bl, target, skill_num, skill_lv, flag); case BF_MISC: - return battle_calc_misc_attack (bl, target, skill_num, skill_lv, + return battle_calc_misc_attack(bl, target, skill_num, skill_lv, flag); default: if (battle_config.error_log) - printf ("battle_calc_attack: unknwon attack type ! %d\n", + printf("battle_calc_attack: unknwon attack type ! %d\n", attack_type); break; } @@ -4641,47 +4638,47 @@ struct Damage battle_calc_attack (int attack_type, * 通常攻撃処理まとめ *------------------------------------------ */ -int battle_weapon_attack (struct block_list *src, struct block_list *target, +int battle_weapon_attack(struct block_list *src, struct block_list *target, unsigned int tick, int flag) { struct map_session_data *sd = NULL; - struct status_change *sc_data = battle_get_sc_data (src), *t_sc_data = - battle_get_sc_data (target); + struct status_change *sc_data = battle_get_sc_data(src), *t_sc_data = + battle_get_sc_data(target); short *opt1; - int race = 7, ele = 0; - int damage, rdamage = 0; + int race = 7, ele = 0; + int damage, rdamage = 0; struct Damage wd; - nullpo_retr (0, src); - nullpo_retr (0, target); + nullpo_retr(0, src); + nullpo_retr(0, target); if (src->type == BL_PC) sd = (struct map_session_data *) src; if (src->prev == NULL || target->prev == NULL) return 0; - if (src->type == BL_PC && pc_isdead (sd)) + if (src->type == BL_PC && pc_isdead(sd)) return 0; if (target->type == BL_PC - && pc_isdead ((struct map_session_data *) target)) + && pc_isdead((struct map_session_data *) target)) return 0; - opt1 = battle_get_opt1 (src); + opt1 = battle_get_opt1(src); if (opt1 && *opt1 > 0) { - battle_stopattack (src); + battle_stopattack(src); return 0; } if (sc_data && sc_data[SC_BLADESTOP].timer != -1) { - battle_stopattack (src); + battle_stopattack(src); return 0; } - race = battle_get_race (target); - ele = battle_get_elem_type (target); - if (battle_check_target (src, target, BCT_ENEMY) > 0 && - battle_check_range (src, target, 0)) + race = battle_get_race(target); + ele = battle_get_elem_type(target); + if (battle_check_target(src, target, BCT_ENEMY) > 0 && + battle_check_range(src, target, 0)) { // 攻撃対象となりうるので攻撃 if (sd && sd->status.weapon == 11) @@ -4689,11 +4686,11 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, if (sd->equip_index[10] >= 0) { if (battle_config.arrow_decrement) - pc_delitem (sd, sd->equip_index[10], 1, 0); + pc_delitem(sd, sd->equip_index[10], 1, 0); } else { - clif_arrow_fail (sd, 0); + clif_arrow_fail(sd, 0); return 0; } } @@ -4701,16 +4698,16 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, { if (sd && battle_config.pc_attack_direction_change) sd->dir = sd->head_dir = - map_calc_dir (src, target->x, target->y); + map_calc_dir(src, target->x, target->y); else if (src->type == BL_MOB && battle_config.monster_attack_direction_change) ((struct mob_data *) src)->dir = - map_calc_dir (src, target->x, target->y); - wd = battle_calc_weapon_attack (src, target, KN_AUTOCOUNTER, + map_calc_dir(src, target->x, target->y); + wd = battle_calc_weapon_attack(src, target, KN_AUTOCOUNTER, flag & 0xff, 0); } else - wd = battle_calc_weapon_attack (src, target, 0, 0, 0); + wd = battle_calc_weapon_attack(src, target, 0, 0, 0); // significantly increase injuries for hasted characters if (wd.damage > 0 && (t_sc_data[SC_HASTE].timer != -1)) @@ -4721,12 +4718,12 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, if (wd.damage > 0 && t_sc_data[SC_PHYS_SHIELD].timer != -1 && target->type == BL_PC) { - int reduction = t_sc_data[SC_PHYS_SHIELD].val1; + int reduction = t_sc_data[SC_PHYS_SHIELD].val1; if (reduction > wd.damage) reduction = wd.damage; wd.damage -= reduction; - MAP_LOG_PC (((struct map_session_data *) target), + MAP_LOG_PC(((struct map_session_data *) target), "MAGIC-ABSORB-DMG %d", reduction); } @@ -4771,50 +4768,50 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, } if (rdamage > 0) - clif_damage (src, src, tick, wd.amotion, 0, rdamage, 1, 4, 0); + clif_damage(src, src, tick, wd.amotion, 0, rdamage, 1, 4, 0); } if (wd.div_ == 255 && sd) { //三段掌 - int delay = - 1000 - 4 * battle_get_agi (src) - 2 * battle_get_dex (src); - int skilllv; - if (wd.damage + wd.damage2 < battle_get_hp (target)) + int delay = + 1000 - 4 * battle_get_agi(src) - 2 * battle_get_dex(src); + int skilllv; + if (wd.damage + wd.damage2 < battle_get_hp(target)) { - if ((skilllv = pc_checkskill (sd, MO_CHAINCOMBO)) > 0) + if ((skilllv = pc_checkskill(sd, MO_CHAINCOMBO)) > 0) delay += 300 * battle_config.combo_delay_rate / 100; //追加ディレイをconfにより調整 - skill_status_change_start (src, SC_COMBO, MO_TRIPLEATTACK, + skill_status_change_start(src, SC_COMBO, MO_TRIPLEATTACK, skilllv, 0, 0, delay, 0); } sd->attackabletime = sd->canmove_tick = tick + delay; - clif_combo_delay (src, delay); - clif_skill_damage (src, target, tick, wd.amotion, wd.dmotion, + clif_combo_delay(src, delay); + clif_skill_damage(src, target, tick, wd.amotion, wd.dmotion, wd.damage, 3, MO_TRIPLEATTACK, - pc_checkskill (sd, MO_TRIPLEATTACK), -1); + pc_checkskill(sd, MO_TRIPLEATTACK), -1); } else { - clif_damage (src, target, tick, wd.amotion, wd.dmotion, + clif_damage(src, target, tick, wd.amotion, wd.dmotion, wd.damage, wd.div_, wd.type, wd.damage2); //二刀流左手とカタール追撃のミス表示(無理やり〜) if (sd && sd->status.weapon >= 16 && wd.damage2 == 0) - clif_damage (src, target, tick + 10, wd.amotion, wd.dmotion, + clif_damage(src, target, tick + 10, wd.amotion, wd.dmotion, 0, 1, 0, 0); } if (sd && sd->splash_range > 0 && (wd.damage > 0 || wd.damage2 > 0)) - skill_castend_damage_id (src, target, 0, -1, tick, 0); - map_freeblock_lock (); + skill_castend_damage_id(src, target, 0, -1, tick, 0); + map_freeblock_lock(); if (src->type == BL_PC) { - int weapon_index = sd->equip_index[9]; - int weapon = 0; + int weapon_index = sd->equip_index[9]; + int weapon = 0; if (sd->inventory_data[weapon_index] && sd->status.inventory[weapon_index].equip & 0x2) weapon = sd->inventory_data[weapon_index]->nameid; - MAP_LOG ("PC%d %d:%d,%d WPNDMG %s%d %d FOR %d WPN %d", + MAP_LOG("PC%d %d:%d,%d WPNDMG %s%d %d FOR %d WPN %d", sd->status.char_id, src->m, src->x, src->y, (target->type == BL_PC) ? "PC" : "MOB", (target->type == @@ -4828,7 +4825,7 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, if (target->type == BL_PC) { struct map_session_data *sd2 = (struct map_session_data *) target; - MAP_LOG ("PC%d %d:%d,%d WPNINJURY %s%d %d FOR %d", + MAP_LOG("PC%d %d:%d,%d WPNINJURY %s%d %d FOR %d", sd2->status.char_id, target->m, target->x, target->y, (src->type == BL_PC) ? "PC" : "MOB", (src->type == @@ -4839,47 +4836,47 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, wd.damage + wd.damage2); } - battle_damage (src, target, (wd.damage + wd.damage2), 0); + battle_damage(src, target, (wd.damage + wd.damage2), 0); if (target->prev != NULL && (target->type != BL_PC || (target->type == BL_PC - && !pc_isdead ((struct map_session_data *) target)))) + && !pc_isdead((struct map_session_data *) target)))) { if (wd.damage > 0 || wd.damage2 > 0) { - skill_additional_effect (src, target, 0, 0, BF_WEAPON, tick); + skill_additional_effect(src, target, 0, 0, BF_WEAPON, tick); if (sd) { if (sd->weapon_coma_ele[ele] > 0 - && MRAND (10000) < sd->weapon_coma_ele[ele]) - battle_damage (src, target, - battle_get_max_hp (target), 1); + && MRAND(10000) < sd->weapon_coma_ele[ele]) + battle_damage(src, target, + battle_get_max_hp(target), 1); if (sd->weapon_coma_race[race] > 0 - && MRAND (10000) < sd->weapon_coma_race[race]) - battle_damage (src, target, - battle_get_max_hp (target), 1); - if (battle_get_mode (target) & 0x20) + && MRAND(10000) < sd->weapon_coma_race[race]) + battle_damage(src, target, + battle_get_max_hp(target), 1); + if (battle_get_mode(target) & 0x20) { if (sd->weapon_coma_race[10] > 0 - && MRAND (10000) < sd->weapon_coma_race[10]) - battle_damage (src, target, - battle_get_max_hp (target), 1); + && MRAND(10000) < sd->weapon_coma_race[10]) + battle_damage(src, target, + battle_get_max_hp(target), 1); } else { if (sd->weapon_coma_race[11] > 0 - && MRAND (10000) < sd->weapon_coma_race[11]) - battle_damage (src, target, - battle_get_max_hp (target), 1); + && MRAND(10000) < sd->weapon_coma_race[11]) + battle_damage(src, target, + battle_get_max_hp(target), 1); } } } } if (sc_data && sc_data[SC_AUTOSPELL].timer != -1 - && MRAND (100) < sc_data[SC_AUTOSPELL].val4) + && MRAND(100) < sc_data[SC_AUTOSPELL].val4) { - int skilllv = sc_data[SC_AUTOSPELL].val3, i, f = 0; - i = MRAND (100); + int skilllv = sc_data[SC_AUTOSPELL].val3, i, f = 0; + i = MRAND(100); if (i >= 50) skilllv -= 2; else if (i >= 15) @@ -4888,22 +4885,22 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, skilllv = 1; if (sd) { - int sp = skill_get_sp (sc_data[SC_AUTOSPELL].val2, + int sp = skill_get_sp(sc_data[SC_AUTOSPELL].val2, skilllv) * 2 / 3; if (sd->status.sp >= sp) { - if ((i = skill_get_inf (sc_data[SC_AUTOSPELL].val2) == 2) + if ((i = skill_get_inf(sc_data[SC_AUTOSPELL].val2) == 2) || i == 32) - f = skill_castend_pos2 (src, target->x, target->y, + f = skill_castend_pos2(src, target->x, target->y, sc_data[SC_AUTOSPELL].val2, skilllv, tick, flag); else { - switch (skill_get_nk (sc_data[SC_AUTOSPELL].val2)) + switch (skill_get_nk(sc_data[SC_AUTOSPELL].val2)) { case 0: case 2: - f = skill_castend_damage_id (src, target, + f = skill_castend_damage_id(src, target, sc_data [SC_AUTOSPELL].val2, skilllv, tick, @@ -4914,14 +4911,14 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, || (sc_data[SC_AUTOSPELL].val2 == ALL_RESURRECTION && target->type != BL_PC)) - && battle_check_undead (race, ele)) - f = skill_castend_damage_id (src, target, + && battle_check_undead(race, ele)) + f = skill_castend_damage_id(src, target, sc_data [SC_AUTOSPELL].val2, skilllv, tick, flag); else - f = skill_castend_nodamage_id (src, + f = skill_castend_nodamage_id(src, target, sc_data [SC_AUTOSPELL].val2, @@ -4932,23 +4929,23 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, } } if (!f) - pc_heal (sd, 0, -sp); + pc_heal(sd, 0, -sp); } } else { - if ((i = skill_get_inf (sc_data[SC_AUTOSPELL].val2) == 2) + if ((i = skill_get_inf(sc_data[SC_AUTOSPELL].val2) == 2) || i == 32) - skill_castend_pos2 (src, target->x, target->y, + skill_castend_pos2(src, target->x, target->y, sc_data[SC_AUTOSPELL].val2, skilllv, tick, flag); else { - switch (skill_get_nk (sc_data[SC_AUTOSPELL].val2)) + switch (skill_get_nk(sc_data[SC_AUTOSPELL].val2)) { case 0: case 2: - skill_castend_damage_id (src, target, + skill_castend_damage_id(src, target, sc_data [SC_AUTOSPELL].val2, skilllv, tick, flag); @@ -4958,13 +4955,13 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, || (sc_data[SC_AUTOSPELL].val2 == ALL_RESURRECTION && target->type != BL_PC)) - && battle_check_undead (race, ele)) - skill_castend_damage_id (src, target, + && battle_check_undead(race, ele)) + skill_castend_damage_id(src, target, sc_data [SC_AUTOSPELL].val2, skilllv, tick, flag); else - skill_castend_nodamage_id (src, target, + skill_castend_nodamage_id(src, target, sc_data [SC_AUTOSPELL].val2, skilllv, tick, @@ -4977,31 +4974,31 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, if (sd) { if (sd->autospell_id > 0 && sd->autospell_lv > 0 - && MRAND (100) < sd->autospell_rate) + && MRAND(100) < sd->autospell_rate) { - int skilllv = sd->autospell_lv, i, f = 0, sp; - i = MRAND (100); + int skilllv = sd->autospell_lv, i, f = 0, sp; + i = MRAND(100); if (i >= 50) skilllv -= 2; else if (i >= 15) skilllv--; if (skilllv < 1) skilllv = 1; - sp = skill_get_sp (sd->autospell_id, skilllv) * 2 / 3; + sp = skill_get_sp(sd->autospell_id, skilllv) * 2 / 3; if (sd->status.sp >= sp) { - if ((i = skill_get_inf (sd->autospell_id) == 2) + if ((i = skill_get_inf(sd->autospell_id) == 2) || i == 32) - f = skill_castend_pos2 (src, target->x, target->y, + f = skill_castend_pos2(src, target->x, target->y, sd->autospell_id, skilllv, tick, flag); else { - switch (skill_get_nk (sd->autospell_id)) + switch (skill_get_nk(sd->autospell_id)) { case 0: case 2: - f = skill_castend_damage_id (src, target, + f = skill_castend_damage_id(src, target, sd->autospell_id, skilllv, tick, flag); @@ -5010,13 +5007,13 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, if ((sd->autospell_id == AL_HEAL || (sd->autospell_id == ALL_RESURRECTION && target->type != BL_PC)) - && battle_check_undead (race, ele)) - f = skill_castend_damage_id (src, target, + && battle_check_undead(race, ele)) + f = skill_castend_damage_id(src, target, sd->autospell_id, skilllv, tick, flag); else - f = skill_castend_nodamage_id (src, + f = skill_castend_nodamage_id(src, target, sd->autospell_id, skilllv, @@ -5026,69 +5023,69 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, } } if (!f) - pc_heal (sd, 0, -sp); + pc_heal(sd, 0, -sp); } } if (wd.flag & BF_WEAPON && src != target && (wd.damage > 0 || wd.damage2 > 0)) { - int hp = 0, sp = 0; + int hp = 0, sp = 0; if (sd->hp_drain_rate && wd.damage > 0 - && MRAND (100) < sd->hp_drain_rate) + && MRAND(100) < sd->hp_drain_rate) { hp += (wd.damage * sd->hp_drain_per) / 100; } if (sd->hp_drain_rate_ && wd.damage2 > 0 - && MRAND (100) < sd->hp_drain_rate_) + && MRAND(100) < sd->hp_drain_rate_) { hp += (wd.damage2 * sd->hp_drain_per_) / 100; } if (sd->sp_drain_rate && wd.damage > 0 - && MRAND (100) < sd->sp_drain_rate) + && MRAND(100) < sd->sp_drain_rate) { sp += (wd.damage * sd->sp_drain_per) / 100; } if (sd->sp_drain_rate_ && wd.damage2 > 0 - && MRAND (100) < sd->sp_drain_rate_) + && MRAND(100) < sd->sp_drain_rate_) { sp += (wd.damage2 * sd->sp_drain_per_) / 100; } if (hp || sp) - pc_heal (sd, hp, sp); + pc_heal(sd, hp, sp); } } if (rdamage > 0) - battle_damage (target, src, rdamage, 0); + battle_damage(target, src, rdamage, 0); if (t_sc_data && t_sc_data[SC_AUTOCOUNTER].timer != -1 && t_sc_data[SC_AUTOCOUNTER].val4 > 0) { if (t_sc_data[SC_AUTOCOUNTER].val3 == src->id) - battle_weapon_attack (target, src, tick, + battle_weapon_attack(target, src, tick, 0x8000 | t_sc_data[SC_AUTOCOUNTER].val1); - skill_status_change_end (target, SC_AUTOCOUNTER, -1); + skill_status_change_end(target, SC_AUTOCOUNTER, -1); } if (t_sc_data && t_sc_data[SC_BLADESTOP_WAIT].timer != -1) { - int lv = t_sc_data[SC_BLADESTOP_WAIT].val1; - skill_status_change_end (target, SC_BLADESTOP_WAIT, -1); - skill_status_change_start (src, SC_BLADESTOP, lv, 1, (int) src, + int lv = t_sc_data[SC_BLADESTOP_WAIT].val1; + skill_status_change_end(target, SC_BLADESTOP_WAIT, -1); + skill_status_change_start(src, SC_BLADESTOP, lv, 1, (int) src, (int) target, - skill_get_time2 (MO_BLADESTOP, lv), 0); - skill_status_change_start (target, SC_BLADESTOP, lv, 2, + skill_get_time2(MO_BLADESTOP, lv), 0); + skill_status_change_start(target, SC_BLADESTOP, lv, 2, (int) target, (int) src, - skill_get_time2 (MO_BLADESTOP, lv), 0); + skill_get_time2(MO_BLADESTOP, lv), 0); } if (t_sc_data && t_sc_data[SC_SPLASHER].timer != -1) //殴ったので対象のベナムスプラッシャー状態を解除 - skill_status_change_end (target, SC_SPLASHER, -1); + skill_status_change_end(target, SC_SPLASHER, -1); - map_freeblock_unlock (); + map_freeblock_unlock(); } return wd.dmg_lv; } -int battle_check_undead (int race, int element) +int battle_check_undead(int race, int element) { if (battle_config.undead_detect_type == 0) { @@ -5111,24 +5108,24 @@ int battle_check_undead (int race, int element) /*========================================== * 敵味方判定(1=肯定,0=否定,-1=エラー) * flag&0xf0000 = 0x00000:敵じゃないか判定（ret:1＝敵ではない） - * = 0x10000:パーティー判定（ret:1=パーティーメンバ) - * = 0x20000:全て(ret:1=敵味方両方) - * = 0x40000:敵か判定(ret:1=敵) - * = 0x50000:パーティーじゃないか判定(ret:1=パーティでない) + * = 0x10000:パーティー判定（ret:1=パーティーメンバ) + * = 0x20000:全て(ret:1=敵味方両方) + * = 0x40000:敵か判定(ret:1=敵) + * = 0x50000:パーティーじゃないか判定(ret:1=パーティでない) *------------------------------------------ */ -int battle_check_target (struct block_list *src, struct block_list *target, +int battle_check_target(struct block_list *src, struct block_list *target, int flag) { - int s_p, t_p; + int s_p, t_p; struct block_list *ss = src; - nullpo_retr (0, src); - nullpo_retr (0, target); + nullpo_retr(0, src); + nullpo_retr(0, target); if (flag & 0x40000) { // 反転フラグ - int ret = battle_check_target (src, target, flag & 0x30000); + int ret = battle_check_target(src, target, flag & 0x30000); if (ret != -1) return !ret; return -1; @@ -5164,16 +5161,16 @@ int battle_check_target (struct block_list *src, struct block_list *target, // スキルユニットの場合、親を求める if (src->type == BL_SKILL) { - int inf2 = - skill_get_inf2 (((struct skill_unit *) src)->group->skill_id); + int inf2 = + skill_get_inf2(((struct skill_unit *) src)->group->skill_id); if ((ss = - map_id2bl (((struct skill_unit *) src)->group->src_id)) == NULL) + map_id2bl(((struct skill_unit *) src)->group->src_id)) == NULL) return -1; if (ss->prev == NULL) return -1; - if (inf2 & 0x80 && (map[src->m].flag.pvp || pc_iskiller ((struct map_session_data *) src, (struct map_session_data *) target)) && // [MouseJstr] + if (inf2 & 0x80 && (map[src->m].flag.pvp || pc_iskiller((struct map_session_data *) src, (struct map_session_data *) target)) && // [MouseJstr] !(target->type == BL_PC - && pc_isinvisible ((struct map_session_data *) target))) + && pc_isinvisible((struct map_session_data *) target))) return 0; if (ss == target) { @@ -5210,7 +5207,7 @@ int battle_check_target (struct block_list *src, struct block_list *target, } } } - if ((ss = map_id2bl (md->master_id)) == NULL) + if ((ss = map_id2bl(md->master_id)) == NULL) return -1; } } @@ -5219,20 +5216,20 @@ int battle_check_target (struct block_list *src, struct block_list *target, return 1; if (target->type == BL_PC - && pc_isinvisible ((struct map_session_data *) target)) + && pc_isinvisible((struct map_session_data *) target)) return -1; if (src->prev == NULL || // 死んでるならエラー - (src->type == BL_PC && pc_isdead ((struct map_session_data *) src))) + (src->type == BL_PC && pc_isdead((struct map_session_data *) src))) return -1; if ((ss->type == BL_PC && target->type == BL_MOB) || (ss->type == BL_MOB && target->type == BL_PC)) return 0; // PCvsMOBなら否定 - s_p = battle_get_party_id (ss); + s_p = battle_get_party_id(ss); - t_p = battle_get_party_id (target); + t_p = battle_get_party_id(target); if (flag & 0x10000) { @@ -5251,7 +5248,7 @@ int battle_check_target (struct block_list *src, struct block_list *target, if (src->type == BL_SKILL) su = (struct skill_unit *) src; if (map[ss->m].flag.pvp - || pc_iskiller ((struct map_session_data *) ss, + || pc_iskiller((struct map_session_data *) ss, (struct map_session_data *) target)) { // [MouseJstr] if (su && su->group->target_flag == BCT_NOENEMY) @@ -5275,19 +5272,19 @@ int battle_check_target (struct block_list *src, struct block_list *target, * 射程判定 *------------------------------------------ */ -int battle_check_range (struct block_list *src, struct block_list *bl, +int battle_check_range(struct block_list *src, struct block_list *bl, int range) { - int dx, dy; + int dx, dy; struct walkpath_data wpd; - int arange; + int arange; - nullpo_retr (0, src); - nullpo_retr (0, bl); + nullpo_retr(0, src); + nullpo_retr(0, bl); - dx = abs (bl->x - src->x); - dy = abs (bl->y - src->y); + dx = abs(bl->x - src->x); + dy = abs(bl->y - src->y); arange = ((dx > dy) ? dx : dy); if (src->m != bl->m) // 違うマップ @@ -5306,13 +5303,13 @@ int battle_check_range (struct block_list *src, struct block_list *bl, wpd.path_len = 0; wpd.path_pos = 0; wpd.path_half = 0; - if (path_search (&wpd, src->m, src->x, src->y, bl->x, bl->y, 0x10001) != + if (path_search(&wpd, src->m, src->x, src->y, bl->x, bl->y, 0x10001) != -1) return 1; dx = (dx > 0) ? 1 : ((dx < 0) ? -1 : 0); dy = (dy > 0) ? 1 : ((dy < 0) ? -1 : 0); - return (path_search (&wpd, src->m, src->x + dx, src->y + dy, + return (path_search(&wpd, src->m, src->x + dx, src->y + dy, bl->x - dx, bl->y - dy, 0x10001) != -1) ? 1 : 0; } @@ -5323,23 +5320,23 @@ int battle_check_range (struct block_list *src, struct block_list *bl, */ int battle_config_switch (const char *str) { - if (strcasecmp (str, "on") == 0 || strcasecmp (str, "yes") == 0 - || strcasecmp (str, "oui") == 0 || strcasecmp (str, "ja") == 0 - || strcasecmp (str, "si") == 0) + if (strcasecmp(str, "on") == 0 || strcasecmp(str, "yes") == 0 + || strcasecmp(str, "oui") == 0 || strcasecmp(str, "ja") == 0 + || strcasecmp(str, "si") == 0) return 1; - if (strcasecmp (str, "off") == 0 || strcasecmp (str, "no") == 0 - || strcasecmp (str, "non") == 0 || strcasecmp (str, "nein") == 0) + if (strcasecmp(str, "off") == 0 || strcasecmp(str, "no") == 0 + || strcasecmp(str, "non") == 0 || strcasecmp(str, "nein") == 0) return 0; - return atoi (str); + return atoi(str); } /*========================================== * 設定ファイルを読み込む *------------------------------------------ */ -int battle_config_read (const char *cfgName) +int battle_config_read(const char *cfgName) { - int i; + int i; char line[1024], w1[1024], w2[1024]; FILE *fp; static int count = 0; @@ -5545,13 +5542,13 @@ int battle_config_read (const char *cfgName) battle_config.mob_splash_radius = -1; } - fp = fopen_ (cfgName, "r"); + fp = fopen_(cfgName, "r"); if (fp == NULL) { - printf ("file not found: %s\n", cfgName); + printf("file not found: %s\n", cfgName); return 1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { const struct { @@ -5980,16 +5977,16 @@ int battle_config_read (const char *cfgName) if (line[0] == '/' && line[1] == '/') continue; - if (sscanf (line, "%[^:]:%s", w1, w2) != 2) + if (sscanf(line, "%[^:]:%s", w1, w2) != 2) continue; - for (i = 0; i < sizeof (data) / (sizeof (data[0])); i++) - if (strcasecmp (w1, data[i].str) == 0) + for (i = 0; i < sizeof(data) / (sizeof(data[0])); i++) + if (strcasecmp(w1, data[i].str) == 0) *data[i].val = battle_config_switch (w2); - if (strcasecmp (w1, "import") == 0) - battle_config_read (w2); + if (strcasecmp(w1, "import") == 0) + battle_config_read(w2); } - fclose_ (fp); + fclose_(fp); if (--count == 0) { diff --git a/src/map/battle.hpp b/src/map/battle.hpp index 22cc0a3..b907f17 100644 --- a/src/map/battle.hpp +++ b/src/map/battle.hpp @@ -5,12 +5,12 @@ // ダメージ struct Damage { - int damage, damage2; - int type, div_; - int amotion, dmotion; - int blewcount; - int flag; - int dmg_lv; //囲まれ減算計算用 0:スキル攻撃 ATK_LUCKY,ATK_FLEE,ATK_DEF + int damage, damage2; + int type, div_; + int amotion, dmotion; + int blewcount; + int flag; + int dmg_lv; //囲まれ減算計算用 0:スキル攻撃 ATK_LUCKY,ATK_FLEE,ATK_DEF }; // 属性表（読み込みはpc.c、battle_attr_fixで使用） @@ -22,27 +22,27 @@ struct block_list; // ダメージ計算 -struct Damage battle_calc_attack (int attack_type, +struct Damage battle_calc_attack(int attack_type, struct block_list *bl, struct block_list *target, int skill_num, int skill_lv, int flag); -struct Damage battle_calc_weapon_attack (struct block_list *bl, +struct Damage battle_calc_weapon_attack(struct block_list *bl, struct block_list *target, int skill_num, int skill_lv, int flag); -struct Damage battle_calc_magic_attack (struct block_list *bl, +struct Damage battle_calc_magic_attack(struct block_list *bl, struct block_list *target, int skill_num, int skill_lv, int flag); -struct Damage battle_calc_misc_attack (struct block_list *bl, +struct Damage battle_calc_misc_attack(struct block_list *bl, struct block_list *target, int skill_num, int skill_lv, int flag); // 属性修正計算 -int battle_attr_fix (int damage, int atk_elem, int def_elem); +int battle_attr_fix(int damage, int atk_elem, int def_elem); // ダメージ最終計算 -int battle_calc_damage (struct block_list *src, struct block_list *bl, +int battle_calc_damage(struct block_list *src, struct block_list *bl, int damage, int div_, int skill_num, int skill_lv, int flag); enum @@ -60,70 +60,70 @@ enum }; // 実際にHPを増減 -int battle_delay_damage (unsigned int tick, struct block_list *src, +int battle_delay_damage(unsigned int tick, struct block_list *src, struct block_list *target, int damage, int flag); -int battle_damage (struct block_list *bl, struct block_list *target, +int battle_damage(struct block_list *bl, struct block_list *target, int damage, int flag); -int battle_heal (struct block_list *bl, struct block_list *target, int hp, +int battle_heal(struct block_list *bl, struct block_list *target, int hp, int sp, int flag); // 攻撃や移動を止める -int battle_stopattack (struct block_list *bl); -int battle_stopwalking (struct block_list *bl, int type); +int battle_stopattack(struct block_list *bl); +int battle_stopwalking(struct block_list *bl, int type); // 通常攻撃処理まとめ -int battle_weapon_attack (struct block_list *bl, struct block_list *target, +int battle_weapon_attack(struct block_list *bl, struct block_list *target, unsigned int tick, int flag); // 各種パラメータを得る -int battle_counttargeted (struct block_list *bl, struct block_list *src, +int battle_counttargeted(struct block_list *bl, struct block_list *src, int target_lv); -int battle_is_unarmed (struct block_list *bl); -int battle_get_class (struct block_list *bl); -int battle_get_dir (struct block_list *bl); -int battle_get_lv (struct block_list *bl); -int battle_get_range (struct block_list *bl); -int battle_get_hp (struct block_list *bl); -int battle_get_max_hp (struct block_list *bl); -int battle_get_str (struct block_list *bl); -int battle_get_agi (struct block_list *bl); -int battle_get_vit (struct block_list *bl); -int battle_get_int (struct block_list *bl); -int battle_get_dex (struct block_list *bl); -int battle_get_luk (struct block_list *bl); -int battle_get_hit (struct block_list *bl); -int battle_get_flee (struct block_list *bl); -int battle_get_def (struct block_list *bl); -int battle_get_mdef (struct block_list *bl); -int battle_get_flee2 (struct block_list *bl); -int battle_get_def2 (struct block_list *bl); -int battle_get_mdef2 (struct block_list *bl); -int battle_get_baseatk (struct block_list *bl); -int battle_get_atk (struct block_list *bl); -int battle_get_atk2 (struct block_list *bl); -int battle_get_speed (struct block_list *bl); -int battle_get_adelay (struct block_list *bl); -int battle_get_amotion (struct block_list *bl); -int battle_get_dmotion (struct block_list *bl); -int battle_get_element (struct block_list *bl); -int battle_get_attack_element (struct block_list *bl); -int battle_get_attack_element2 (struct block_list *bl); //左手武器属性取得 -#define battle_get_elem_type(bl) (battle_get_element(bl)%10) -#define battle_get_elem_level(bl) (battle_get_element(bl)/10/2) -int battle_get_party_id (struct block_list *bl); -int battle_get_race (struct block_list *bl); -int battle_get_size (struct block_list *bl); -int battle_get_mode (struct block_list *bl); -int battle_get_mexp (struct block_list *bl); -int battle_get_stat (int stat_id /* SP_VIT or similar */ , +int battle_is_unarmed(struct block_list *bl); +int battle_get_class(struct block_list *bl); +int battle_get_dir(struct block_list *bl); +int battle_get_lv(struct block_list *bl); +int battle_get_range(struct block_list *bl); +int battle_get_hp(struct block_list *bl); +int battle_get_max_hp(struct block_list *bl); +int battle_get_str(struct block_list *bl); +int battle_get_agi(struct block_list *bl); +int battle_get_vit(struct block_list *bl); +int battle_get_int(struct block_list *bl); +int battle_get_dex(struct block_list *bl); +int battle_get_luk(struct block_list *bl); +int battle_get_hit(struct block_list *bl); +int battle_get_flee(struct block_list *bl); +int battle_get_def(struct block_list *bl); +int battle_get_mdef(struct block_list *bl); +int battle_get_flee2(struct block_list *bl); +int battle_get_def2(struct block_list *bl); +int battle_get_mdef2(struct block_list *bl); +int battle_get_baseatk(struct block_list *bl); +int battle_get_atk(struct block_list *bl); +int battle_get_atk2(struct block_list *bl); +int battle_get_speed(struct block_list *bl); +int battle_get_adelay(struct block_list *bl); +int battle_get_amotion(struct block_list *bl); +int battle_get_dmotion(struct block_list *bl); +int battle_get_element(struct block_list *bl); +int battle_get_attack_element(struct block_list *bl); +int battle_get_attack_element2(struct block_list *bl); //左手武器属性取得 +#define battle_get_elem_type(bl) (battle_get_element(bl)%10) +#define battle_get_elem_level(bl) (battle_get_element(bl)/10/2) +int battle_get_party_id(struct block_list *bl); +int battle_get_race(struct block_list *bl); +int battle_get_size(struct block_list *bl); +int battle_get_mode(struct block_list *bl); +int battle_get_mexp(struct block_list *bl); +int battle_get_stat(int stat_id /* SP_VIT or similar */ , struct block_list *bl); -struct status_change *battle_get_sc_data (struct block_list *bl); -short *battle_get_sc_count (struct block_list *bl); -short *battle_get_opt1 (struct block_list *bl); -short *battle_get_opt2 (struct block_list *bl); -short *battle_get_opt3 (struct block_list *bl); -short *battle_get_option (struct block_list *bl); +struct status_change *battle_get_sc_data(struct block_list *bl); +short *battle_get_sc_count(struct block_list *bl); +short *battle_get_opt1(struct block_list *bl); +short *battle_get_opt2(struct block_list *bl); +short *battle_get_opt3(struct block_list *bl); +short *battle_get_option(struct block_list *bl); enum { @@ -135,213 +135,213 @@ enum BCT_NOONE = 0x60000, }; -int battle_check_undead (int race, int element); -int battle_check_target (struct block_list *src, struct block_list *target, +int battle_check_undead(int race, int element); +int battle_check_target(struct block_list *src, struct block_list *target, int flag); -int battle_check_range (struct block_list *src, struct block_list *bl, +int battle_check_range(struct block_list *src, struct block_list *bl, int range); // 設定 -int battle_config_switch (const char *str); // [Valaris] +int battle_config_switch (const char *str); // [Valaris] extern struct Battle_Config { - int warp_point_debug; - int enemy_critical; - int enemy_critical_rate; - int enemy_str; - int enemy_perfect_flee; - int cast_rate, delay_rate, delay_dependon_dex; - int sdelay_attack_enable; - int left_cardfix_to_right; - int pc_skill_add_range; - int skill_out_range_consume; - int mob_skill_add_range; - int pc_damage_delay; - int pc_damage_delay_rate; - int defnotenemy; - int random_monster_checklv; - int attr_recover; - int flooritem_lifetime; - int item_auto_get; - int item_first_get_time; - int item_second_get_time; - int item_third_get_time; - int mvp_item_first_get_time; - int mvp_item_second_get_time; - int mvp_item_third_get_time; - int item_rate, base_exp_rate, job_exp_rate; // removed item rate, depreciated - int drop_rate0item; - int death_penalty_type; - int death_penalty_base, death_penalty_job; - int pvp_exp; // [MouseJstr] - int gtb_pvp_only; // [MouseJstr] - int zeny_penalty; - int restart_hp_rate; - int restart_sp_rate; - int mvp_item_rate, mvp_exp_rate; - int mvp_hp_rate; - int monster_hp_rate; - int monster_max_aspd; - int atc_gmonly; - int atc_spawn_quantity_limit; - int gm_allskill; - int gm_allskill_addabra; - int gm_allequip; - int gm_skilluncond; - int skillfree; - int skillup_limit; - int wp_rate; - int pp_rate; - int monster_active_enable; - int monster_damage_delay_rate; - int monster_loot_type; - int mob_skill_use; - int mob_count_rate; - int quest_skill_learn; - int quest_skill_reset; - int basic_skill_check; - int pc_invincible_time; - int skill_min_damage; - int finger_offensive_type; - int heal_exp; - int resurrection_exp; - int shop_exp; - int combo_delay_rate; - int item_check; - int wedding_modifydisplay; - int natural_healhp_interval; - int natural_healsp_interval; - int natural_heal_skill_interval; - int natural_heal_weight_rate; - int item_name_override_grffile; - int arrow_decrement; - int max_aspd; - int max_hp; - int max_sp; - int max_lv; - int max_parameter; - int max_cart_weight; - int pc_skill_log; - int mob_skill_log; - int battle_log; - int save_log; - int error_log; - int etc_log; - int save_clothcolor; - int undead_detect_type; - int pc_auto_counter_type; - int monster_auto_counter_type; - int agi_penaly_type; - int agi_penaly_count; - int agi_penaly_num; - int vit_penaly_type; - int vit_penaly_count; - int vit_penaly_num; - int player_defense_type; - int monster_defense_type; - int magic_defense_type; - int pc_skill_reiteration; - int monster_skill_reiteration; - int pc_skill_nofootset; - int monster_skill_nofootset; - int pc_cloak_check_type; - int monster_cloak_check_type; - int mob_changetarget_byskill; - int pc_attack_direction_change; - int monster_attack_direction_change; - int pc_undead_nofreeze; - int pc_land_skill_limit; - int monster_land_skill_limit; - int party_skill_penaly; - int monster_class_change_full_recover; - int produce_item_name_input; - int produce_potion_name_input; - int making_arrow_name_input; - int holywater_name_input; - int display_delay_skill_fail; - int chat_warpportal; - int mob_warpportal; - int dead_branch_active; - int show_steal_in_same_party; - int enable_upper_class; - int mob_attack_attr_none; - int mob_ghostring_fix; - int pc_attack_attr_none; - int item_rate_common, item_rate_card, item_rate_equip, item_rate_heal, item_rate_use; // Added by RoVeRT, Additional Heal and Usable item rate by Val - int item_drop_common_min, item_drop_common_max; // Added by TyrNemesis^ - int item_drop_card_min, item_drop_card_max; - int item_drop_equip_min, item_drop_equip_max; - int item_drop_mvp_min, item_drop_mvp_max; // End Addition - int item_drop_heal_min, item_drop_heal_max; // Added by Valatris - int item_drop_use_min, item_drop_use_max; //End + int warp_point_debug; + int enemy_critical; + int enemy_critical_rate; + int enemy_str; + int enemy_perfect_flee; + int cast_rate, delay_rate, delay_dependon_dex; + int sdelay_attack_enable; + int left_cardfix_to_right; + int pc_skill_add_range; + int skill_out_range_consume; + int mob_skill_add_range; + int pc_damage_delay; + int pc_damage_delay_rate; + int defnotenemy; + int random_monster_checklv; + int attr_recover; + int flooritem_lifetime; + int item_auto_get; + int item_first_get_time; + int item_second_get_time; + int item_third_get_time; + int mvp_item_first_get_time; + int mvp_item_second_get_time; + int mvp_item_third_get_time; + int item_rate, base_exp_rate, job_exp_rate; // removed item rate, depreciated + int drop_rate0item; + int death_penalty_type; + int death_penalty_base, death_penalty_job; + int pvp_exp; // [MouseJstr] + int gtb_pvp_only; // [MouseJstr] + int zeny_penalty; + int restart_hp_rate; + int restart_sp_rate; + int mvp_item_rate, mvp_exp_rate; + int mvp_hp_rate; + int monster_hp_rate; + int monster_max_aspd; + int atc_gmonly; + int atc_spawn_quantity_limit; + int gm_allskill; + int gm_allskill_addabra; + int gm_allequip; + int gm_skilluncond; + int skillfree; + int skillup_limit; + int wp_rate; + int pp_rate; + int monster_active_enable; + int monster_damage_delay_rate; + int monster_loot_type; + int mob_skill_use; + int mob_count_rate; + int quest_skill_learn; + int quest_skill_reset; + int basic_skill_check; + int pc_invincible_time; + int skill_min_damage; + int finger_offensive_type; + int heal_exp; + int resurrection_exp; + int shop_exp; + int combo_delay_rate; + int item_check; + int wedding_modifydisplay; + int natural_healhp_interval; + int natural_healsp_interval; + int natural_heal_skill_interval; + int natural_heal_weight_rate; + int item_name_override_grffile; + int arrow_decrement; + int max_aspd; + int max_hp; + int max_sp; + int max_lv; + int max_parameter; + int max_cart_weight; + int pc_skill_log; + int mob_skill_log; + int battle_log; + int save_log; + int error_log; + int etc_log; + int save_clothcolor; + int undead_detect_type; + int pc_auto_counter_type; + int monster_auto_counter_type; + int agi_penaly_type; + int agi_penaly_count; + int agi_penaly_num; + int vit_penaly_type; + int vit_penaly_count; + int vit_penaly_num; + int player_defense_type; + int monster_defense_type; + int magic_defense_type; + int pc_skill_reiteration; + int monster_skill_reiteration; + int pc_skill_nofootset; + int monster_skill_nofootset; + int pc_cloak_check_type; + int monster_cloak_check_type; + int mob_changetarget_byskill; + int pc_attack_direction_change; + int monster_attack_direction_change; + int pc_undead_nofreeze; + int pc_land_skill_limit; + int monster_land_skill_limit; + int party_skill_penaly; + int monster_class_change_full_recover; + int produce_item_name_input; + int produce_potion_name_input; + int making_arrow_name_input; + int holywater_name_input; + int display_delay_skill_fail; + int chat_warpportal; + int mob_warpportal; + int dead_branch_active; + int show_steal_in_same_party; + int enable_upper_class; + int mob_attack_attr_none; + int mob_ghostring_fix; + int pc_attack_attr_none; + int item_rate_common, item_rate_card, item_rate_equip, item_rate_heal, item_rate_use; // Added by RoVeRT, Additional Heal and Usable item rate by Val + int item_drop_common_min, item_drop_common_max; // Added by TyrNemesis^ + int item_drop_card_min, item_drop_card_max; + int item_drop_equip_min, item_drop_equip_max; + int item_drop_mvp_min, item_drop_mvp_max; // End Addition + int item_drop_heal_min, item_drop_heal_max; // Added by Valatris + int item_drop_use_min, item_drop_use_max; //End - int prevent_logout; // Added by RoVeRT + int prevent_logout; // Added by RoVeRT - int alchemist_summon_reward; // [Valaris] - int maximum_level; - int drops_by_luk; - int monsters_ignore_gm; - int equipment_breaking; - int equipment_break_rate; - int multi_level_up; - int pk_mode; - int show_mob_hp; // end additions [Valaris] + int alchemist_summon_reward; // [Valaris] + int maximum_level; + int drops_by_luk; + int monsters_ignore_gm; + int equipment_breaking; + int equipment_break_rate; + int multi_level_up; + int pk_mode; + int show_mob_hp; // end additions [Valaris] - int agi_penaly_count_lv; - int vit_penaly_count_lv; + int agi_penaly_count_lv; + int vit_penaly_count_lv; - int gx_allhit; - int gx_cardfix; - int gx_dupele; - int gx_disptype; - int player_skill_partner_check; - int hide_GM_session; - int unit_movement_type; - int invite_request_check; - int skill_removetrap_type; - int disp_experience; - int riding_weight; - int backstab_bow_penalty; + int gx_allhit; + int gx_cardfix; + int gx_dupele; + int gx_disptype; + int player_skill_partner_check; + int hide_GM_session; + int unit_movement_type; + int invite_request_check; + int skill_removetrap_type; + int disp_experience; + int riding_weight; + int backstab_bow_penalty; - int night_at_start; // added by [Yor] - int day_duration; // added by [Yor] - int night_duration; // added by [Yor] - int hack_info_GM_level; // added by [Yor] - int any_warp_GM_min_level; // added by [Yor] - int packet_ver_flag; // added by [Yor] - int muting_players; // added by [Apple] + int night_at_start; // added by [Yor] + int day_duration; // added by [Yor] + int night_duration; // added by [Yor] + int hack_info_GM_level; // added by [Yor] + int any_warp_GM_min_level; // added by [Yor] + int packet_ver_flag; // added by [Yor] + int muting_players; // added by [Apple] - int min_hair_style; // added by [MouseJstr] - int max_hair_style; // added by [MouseJstr] - int min_hair_color; // added by [MouseJstr] - int max_hair_color; // added by [MouseJstr] - int min_cloth_color; // added by [MouseJstr] - int max_cloth_color; // added by [MouseJstr] + int min_hair_style; // added by [MouseJstr] + int max_hair_style; // added by [MouseJstr] + int min_hair_color; // added by [MouseJstr] + int max_hair_color; // added by [MouseJstr] + int min_cloth_color; // added by [MouseJstr] + int max_cloth_color; // added by [MouseJstr] - int castrate_dex_scale; // added by [MouseJstr] - int area_size; // added by [MouseJstr] + int castrate_dex_scale; // added by [MouseJstr] + int area_size; // added by [MouseJstr] - int chat_lame_penalty; - int chat_spam_threshold; - int chat_spam_flood; - int chat_spam_ban; - int chat_spam_warn; - int chat_maxline; + int chat_lame_penalty; + int chat_spam_threshold; + int chat_spam_flood; + int chat_spam_ban; + int chat_spam_warn; + int chat_maxline; - int packet_spam_threshold; - int packet_spam_flood; - int packet_spam_kick; + int packet_spam_threshold; + int packet_spam_flood; + int packet_spam_kick; - int mask_ip_gms; + int mask_ip_gms; - int drop_pickup_safety_zone; // [Fate] Max. distance to an object dropped by a kill by self in which dropsteal protection works - int itemheal_regeneration_factor; // [Fate] itemheal speed factor + int drop_pickup_safety_zone; // [Fate] Max. distance to an object dropped by a kill by self in which dropsteal protection works + int itemheal_regeneration_factor; // [Fate] itemheal speed factor - int mob_splash_radius; + int mob_splash_radius; } battle_config; -int battle_config_read (const char *cfgName); +int battle_config_read(const char *cfgName); #endif diff --git a/src/map/chat.cpp b/src/map/chat.cpp index cb274f8..9078ea0 100644 --- a/src/map/chat.cpp +++ b/src/map/chat.cpp @@ -15,48 +15,48 @@ #include "memwatch.hpp" #endif -int chat_triggerevent (struct chat_data *cd); +int chat_triggerevent(struct chat_data *cd); /*========================================== * チャットルーム作成 *------------------------------------------ */ -int chat_createchat (struct map_session_data *sd, int limit, int pub, +int chat_createchat(struct map_session_data *sd, int limit, int pub, const char *pass, const char *title, int titlelen) { struct chat_data *cd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); CREATE(cd, struct chat_data, 1); cd->limit = limit; cd->pub = pub; cd->users = 1; - memcpy (cd->pass, pass, 8); - if (titlelen >= sizeof (cd->title) - 1) - titlelen = sizeof (cd->title) - 1; - memcpy (cd->title, title, titlelen); + memcpy(cd->pass, pass, 8); + if (titlelen >= sizeof(cd->title) - 1) + titlelen = sizeof(cd->title) - 1; + memcpy(cd->title, title, titlelen); cd->title[titlelen] = 0; - cd->owner = (struct block_list **) (&cd->usersd[0]); + cd->owner = (struct block_list **)(&cd->usersd[0]); cd->usersd[0] = sd; cd->bl.m = sd->bl.m; cd->bl.x = sd->bl.x; cd->bl.y = sd->bl.y; cd->bl.type = BL_CHAT; - cd->bl.id = map_addobject (&cd->bl); + cd->bl.id = map_addobject(&cd->bl); if (cd->bl.id == 0) { - clif_createchat (sd, 1); - free (cd); + clif_createchat(sd, 1); + free(cd); return 0; } - pc_setchatid (sd, cd->bl.id); + pc_setchatid(sd, cd->bl.id); - clif_createchat (sd, 0); - clif_dispchat (cd, 0); + clif_createchat(sd, 0); + clif_dispchat(cd, 0); return 0; } @@ -65,37 +65,37 @@ int chat_createchat (struct map_session_data *sd, int limit, int pub, * 既存チャットルームに参加 *------------------------------------------ */ -int chat_joinchat (struct map_session_data *sd, int chatid, const char *pass) +int chat_joinchat(struct map_session_data *sd, int chatid, const char *pass) { struct chat_data *cd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - cd = (struct chat_data *) map_id2bl (chatid); + cd = (struct chat_data *) map_id2bl(chatid); if (cd == NULL) return 1; if (cd->bl.m != sd->bl.m || cd->limit <= cd->users) { - clif_joinchatfail (sd, 0); + clif_joinchatfail(sd, 0); return 0; } - if (cd->pub == 0 && strncmp (pass, cd->pass, 8)) + if (cd->pub == 0 && strncmp(pass, cd->pass, 8)) { - clif_joinchatfail (sd, 1); + clif_joinchatfail(sd, 1); return 0; } cd->usersd[cd->users] = sd; cd->users++; - pc_setchatid (sd, cd->bl.id); + pc_setchatid(sd, cd->bl.id); - clif_joinchatok (sd, cd); // 新たに参加した人には全員のリスト - clif_addchat (cd, sd); // 既に中に居た人には追加した人の報告 - clif_dispchat (cd, 0); // 周囲の人には人数変化報告 + clif_joinchatok(sd, cd); // 新たに参加した人には全員のリスト + clif_addchat(cd, sd); // 既に中に居た人には追加した人の報告 + clif_dispchat(cd, 0); // 周囲の人には人数変化報告 - chat_triggerevent (cd); // イベント + chat_triggerevent(cd); // イベント return 0; } @@ -104,14 +104,14 @@ int chat_joinchat (struct map_session_data *sd, int chatid, const char *pass) * チャットルームから抜ける *------------------------------------------ */ -int chat_leavechat (struct map_session_data *sd) +int chat_leavechat(struct map_session_data *sd) { struct chat_data *cd; - int i, leavechar; + int i, leavechar; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + cd = (struct chat_data *) map_id2bl(sd->chatID); if (cd == NULL) return 1; @@ -129,21 +129,21 @@ int chat_leavechat (struct map_session_data *sd) if (leavechar == 0 && cd->users > 1 && (*cd->owner)->type == BL_PC) { // 所有者だった&他に人が居る&PCのチャット - clif_changechatowner (cd, cd->usersd[1]); - clif_clearchat (cd, 0); + clif_changechatowner(cd, cd->usersd[1]); + clif_clearchat(cd, 0); } // 抜けるPCにも送るのでusersを減らす前に実行 - clif_leavechat (cd, sd); + clif_leavechat(cd, sd); cd->users--; - pc_setchatid (sd, 0); + pc_setchatid(sd, 0); if (cd->users == 0 && (*cd->owner)->type == BL_PC) { // 全員居なくなった&PCのチャットなので消す - clif_clearchat (cd, 0); - map_delobject (cd->bl.id, BL_CHAT); // freeまでしてくれる + clif_clearchat(cd, 0); + map_delobject(cd->bl.id, BL_CHAT); // freeまでしてくれる } else { @@ -155,7 +155,7 @@ int chat_leavechat (struct map_session_data *sd) cd->bl.x = cd->usersd[0]->bl.x; cd->bl.y = cd->usersd[0]->bl.y; } - clif_dispchat (cd, 0); + clif_dispchat(cd, 0); } return 0; @@ -165,21 +165,21 @@ int chat_leavechat (struct map_session_data *sd) * チャットルームの持ち主を譲る *------------------------------------------ */ -int chat_changechatowner (struct map_session_data *sd, const char *nextownername) +int chat_changechatowner(struct map_session_data *sd, const char *nextownername) { struct chat_data *cd; struct map_session_data *tmp_sd; - int i, nextowner; + int i, nextowner; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + cd = (struct chat_data *) map_id2bl(sd->chatID); if (cd == NULL || (struct block_list *) sd != (*cd->owner)) return 1; for (i = 1, nextowner = -1; i < cd->users; i++) { - if (strcmp (cd->usersd[i]->status.name, nextownername) == 0) + if (strcmp(cd->usersd[i]->status.name, nextownername) == 0) { nextowner = i; break; @@ -188,9 +188,9 @@ int chat_changechatowner (struct map_session_data *sd, const char *nextownername if (nextowner < 0) // そんな人は居ない return -1; - clif_changechatowner (cd, cd->usersd[nextowner]); + clif_changechatowner(cd, cd->usersd[nextowner]); // 一旦消す - clif_clearchat (cd, 0); + clif_clearchat(cd, 0); // userlistの順番変更 (0が所有者なので) if ((tmp_sd = cd->usersd[0]) == NULL) @@ -203,7 +203,7 @@ int chat_changechatowner (struct map_session_data *sd, const char *nextownername cd->bl.y = cd->usersd[0]->bl.y; // 再度表示 - clif_dispchat (cd, 0); + clif_dispchat(cd, 0); return 0; } @@ -212,27 +212,27 @@ int chat_changechatowner (struct map_session_data *sd, const char *nextownername * チャットの状態(タイトル等)を変更 *------------------------------------------ */ -int chat_changechatstatus (struct map_session_data *sd, int limit, int pub, +int chat_changechatstatus(struct map_session_data *sd, int limit, int pub, const char *pass, const char *title, int titlelen) { struct chat_data *cd; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + cd = (struct chat_data *) map_id2bl(sd->chatID); if (cd == NULL || (struct block_list *) sd != (*cd->owner)) return 1; cd->limit = limit; cd->pub = pub; - memcpy (cd->pass, pass, 8); - if (titlelen >= sizeof (cd->title) - 1) - titlelen = sizeof (cd->title) - 1; - memcpy (cd->title, title, titlelen); + memcpy(cd->pass, pass, 8); + if (titlelen >= sizeof(cd->title) - 1) + titlelen = sizeof(cd->title) - 1; + memcpy(cd->title, title, titlelen); cd->title[titlelen] = 0; - clif_changechatstatus (cd); - clif_dispchat (cd, 0); + clif_changechatstatus(cd); + clif_dispchat(cd, 0); return 0; } @@ -241,20 +241,20 @@ int chat_changechatstatus (struct map_session_data *sd, int limit, int pub, * チャットルームから蹴り出す *------------------------------------------ */ -int chat_kickchat (struct map_session_data *sd, const char *kickusername) +int chat_kickchat(struct map_session_data *sd, const char *kickusername) { struct chat_data *cd; - int i, kickuser; + int i, kickuser; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - cd = (struct chat_data *) map_id2bl (sd->chatID); + cd = (struct chat_data *) map_id2bl(sd->chatID); if (cd == NULL || (struct block_list *) sd != (*cd->owner)) return 1; for (i = 0, kickuser = -1; i < cd->users; i++) { - if (strcmp (cd->usersd[i]->status.name, kickusername) == 0) + if (strcmp(cd->usersd[i]->status.name, kickusername) == 0) { kickuser = i; break; @@ -263,7 +263,7 @@ int chat_kickchat (struct map_session_data *sd, const char *kickusername) if (kickuser < 0) // そんな人は居ない return -1; - chat_leavechat (cd->usersd[kickuser]); + chat_leavechat(cd->usersd[kickuser]); return 0; } @@ -272,24 +272,24 @@ int chat_kickchat (struct map_session_data *sd, const char *kickusername) * npcチャットルーム作成 *------------------------------------------ */ -int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, +int chat_createnpcchat(struct npc_data *nd, int limit, int pub, int trigger, const char *title, int titlelen, const char *ev) { struct chat_data *cd; - nullpo_retr (1, nd); + nullpo_retr(1, nd); - CREATE (cd, struct chat_data, 1); + CREATE(cd, struct chat_data, 1); cd->limit = cd->trigger = limit; if (trigger > 0) cd->trigger = trigger; cd->pub = pub; cd->users = 0; - memcpy (cd->pass, "", 8); - if (titlelen >= sizeof (cd->title) - 1) - titlelen = sizeof (cd->title) - 1; - memcpy (cd->title, title, titlelen); + memcpy(cd->pass, "", 8); + if (titlelen >= sizeof(cd->title) - 1) + titlelen = sizeof(cd->title) - 1; + memcpy(cd->title, title, titlelen); cd->title[titlelen] = 0; cd->bl.m = nd->bl.m; @@ -298,17 +298,17 @@ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, cd->bl.type = BL_CHAT; cd->owner_ = (struct block_list *) nd; cd->owner = &cd->owner_; - memcpy (cd->npc_event, ev, sizeof (cd->npc_event)); + memcpy(cd->npc_event, ev, sizeof(cd->npc_event)); - cd->bl.id = map_addobject (&cd->bl); + cd->bl.id = map_addobject(&cd->bl); if (cd->bl.id == 0) { - free (cd); + free(cd); return 0; } nd->chat_id = cd->bl.id; - clif_dispchat (cd, 0); + clif_dispchat(cd, 0); return 0; } @@ -317,16 +317,16 @@ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, * npcチャットルーム削除 *------------------------------------------ */ -int chat_deletenpcchat (struct npc_data *nd) +int chat_deletenpcchat(struct npc_data *nd) { struct chat_data *cd; - nullpo_retr (0, nd); - nullpo_retr (0, cd = (struct chat_data *) map_id2bl (nd->chat_id)); + nullpo_retr(0, nd); + nullpo_retr(0, cd = (struct chat_data *) map_id2bl(nd->chat_id)); - chat_npckickall (cd); - clif_clearchat (cd, 0); - map_delobject (cd->bl.id, BL_CHAT); // freeまでしてくれる + chat_npckickall(cd); + clif_clearchat(cd, 0); + map_delobject(cd->bl.id, BL_CHAT); // freeまでしてくれる nd->chat_id = 0; return 0; @@ -336,12 +336,12 @@ int chat_deletenpcchat (struct npc_data *nd) * 規定人数以上でイベントが定義されてるなら実行 *------------------------------------------ */ -int chat_triggerevent (struct chat_data *cd) +int chat_triggerevent(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); if (cd->users >= cd->trigger && cd->npc_event[0]) - npc_event_do (cd->npc_event); + npc_event_do(cd->npc_event); return 0; } @@ -349,12 +349,12 @@ int chat_triggerevent (struct chat_data *cd) * イベントの有効化 *------------------------------------------ */ -int chat_enableevent (struct chat_data *cd) +int chat_enableevent(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); cd->trigger &= 0x7f; - chat_triggerevent (cd); + chat_triggerevent(cd); return 0; } @@ -362,9 +362,9 @@ int chat_enableevent (struct chat_data *cd) * イベントの無効化 *------------------------------------------ */ -int chat_disableevent (struct chat_data *cd) +int chat_disableevent(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); cd->trigger |= 0x80; return 0; @@ -374,13 +374,13 @@ int chat_disableevent (struct chat_data *cd) * チャットルームから全員蹴り出す *------------------------------------------ */ -int chat_npckickall (struct chat_data *cd) +int chat_npckickall(struct chat_data *cd) { - nullpo_retr (0, cd); + nullpo_retr(0, cd); while (cd->users > 0) { - chat_leavechat (cd->usersd[cd->users - 1]); + chat_leavechat(cd->usersd[cd->users - 1]); } return 0; } @@ -389,7 +389,7 @@ int chat_npckickall (struct chat_data *cd) * 終了 *------------------------------------------ */ -int do_final_chat (void) +int do_final_chat(void) { return 0; } diff --git a/src/map/chat.hpp b/src/map/chat.hpp index fca9217..5ffff36 100644 --- a/src/map/chat.hpp +++ b/src/map/chat.hpp @@ -4,22 +4,22 @@ #include "map.hpp" -int chat_createchat (struct map_session_data *, int, int, const char *, const char *, +int chat_createchat(struct map_session_data *, int, int, const char *, const char *, int); -int chat_joinchat (struct map_session_data *, int, const char *); -int chat_leavechat (struct map_session_data *); -int chat_changechatowner (struct map_session_data *, const char *); -int chat_changechatstatus (struct map_session_data *, int, int, const char *, +int chat_joinchat(struct map_session_data *, int, const char *); +int chat_leavechat(struct map_session_data *); +int chat_changechatowner(struct map_session_data *, const char *); +int chat_changechatstatus(struct map_session_data *, int, int, const char *, const char *, int); -int chat_kickchat (struct map_session_data *, const char *); +int chat_kickchat(struct map_session_data *, const char *); -int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, +int chat_createnpcchat(struct npc_data *nd, int limit, int pub, int trigger, const char *title, int titlelen, const char *ev); -int chat_deletenpcchat (struct npc_data *nd); -int chat_enableevent (struct chat_data *cd); -int chat_disableevent (struct chat_data *cd); -int chat_npckickall (struct chat_data *cd); +int chat_deletenpcchat(struct npc_data *nd); +int chat_enableevent(struct chat_data *cd); +int chat_disableevent(struct chat_data *cd); +int chat_npckickall(struct chat_data *cd); -int do_final_chat (void); +int do_final_chat(void); #endif diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp index ca4f9ff..af5e1e1 100644 --- a/src/map/chrif.cpp +++ b/src/map/chrif.cpp @@ -36,8 +36,8 @@ static const int packet_len_table[0x20] = { -1, -1, 10, 6, 11, -1, 0, 0, // 2b10-2b17 }; -int char_fd; -int srvinfo; +int char_fd; +int srvinfo; static char char_ip_str[16]; static int char_ip; static int char_port = 6121; @@ -49,9 +49,9 @@ static int chrif_state; * *------------------------------------------ */ -void chrif_setuserid (char *id) +void chrif_setuserid(char *id) { - strncpy (userid, id, sizeof(userid)-1); + strncpy(userid, id, sizeof(userid)-1); userid[sizeof(userid)-1] = '\0'; } @@ -59,13 +59,13 @@ void chrif_setuserid (char *id) * *------------------------------------------ */ -void chrif_setpasswd (char *pwd) +void chrif_setpasswd(char *pwd) { - strncpy (passwd, pwd, sizeof(passwd)-1); + strncpy(passwd, pwd, sizeof(passwd)-1); passwd[sizeof(passwd)-1] = '\0'; } -char *chrif_getpasswd (void) +char *chrif_getpasswd(void) { return passwd; } @@ -74,18 +74,18 @@ char *chrif_getpasswd (void) * *------------------------------------------ */ -void chrif_setip (char *ip) +void chrif_setip(char *ip) { - strncpy (char_ip_str, ip, sizeof(char_ip_str)-1); + strncpy(char_ip_str, ip, sizeof(char_ip_str)-1); char_ip_str[sizeof(char_ip_str)-1] = '\0'; - char_ip = inet_addr (char_ip_str); + char_ip = inet_addr(char_ip_str); } /*========================================== * *------------------------------------------ */ -void chrif_setport (int port) +void chrif_setport(int port) { char_port = port; } @@ -94,7 +94,7 @@ void chrif_setport (int port) * *------------------------------------------ */ -int chrif_isconnect (void) +int chrif_isconnect(void) { return chrif_state == 2; } @@ -103,25 +103,25 @@ int chrif_isconnect (void) * *------------------------------------------ */ -int chrif_save (struct map_session_data *sd) +int chrif_save(struct map_session_data *sd) { - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (char_fd < 0) return -1; - pc_makesavestatus (sd); + pc_makesavestatus(sd); - WFIFOW (char_fd, 0) = 0x2b01; - WFIFOW (char_fd, 2) = sizeof (sd->status) + 12; - WFIFOL (char_fd, 4) = sd->bl.id; - WFIFOL (char_fd, 8) = sd->char_id; - memcpy (WFIFOP (char_fd, 12), &sd->status, sizeof (sd->status)); - WFIFOSET (char_fd, WFIFOW (char_fd, 2)); + WFIFOW(char_fd, 0) = 0x2b01; + WFIFOW(char_fd, 2) = sizeof(sd->status) + 12; + WFIFOL(char_fd, 4) = sd->bl.id; + WFIFOL(char_fd, 8) = sd->char_id; + memcpy(WFIFOP(char_fd, 12), &sd->status, sizeof(sd->status)); + WFIFOSET(char_fd, WFIFOW(char_fd, 2)); //For data sync if (sd->state.storage_open) - storage_storage_save (sd->status.account_id, 0); + storage_storage_save(sd->status.account_id, 0); return 0; } @@ -131,15 +131,15 @@ int chrif_save (struct map_session_data *sd) *------------------------------------------ */ static -int chrif_connect (int fd) +int chrif_connect(int fd) { - WFIFOW (fd, 0) = 0x2af8; - memcpy (WFIFOP (fd, 2), userid, 24); - memcpy (WFIFOP (fd, 26), passwd, 24); - WFIFOL (fd, 50) = 0; - WFIFOL (fd, 54) = clif_getip ().s_addr; - WFIFOW (fd, 58) = clif_getport (); // [Valaris] thanks to fov - WFIFOSET (fd, 60); + WFIFOW(fd, 0) = 0x2af8; + memcpy(WFIFOP(fd, 2), userid, 24); + memcpy(WFIFOP(fd, 26), passwd, 24); + WFIFOL(fd, 50) = 0; + WFIFOL(fd, 54) = clif_getip().s_addr; + WFIFOW(fd, 58) = clif_getport(); // [Valaris] thanks to fov + WFIFOSET(fd, 60); return 0; } @@ -149,18 +149,18 @@ int chrif_connect (int fd) *------------------------------------------ */ static -int chrif_sendmap (int fd) +int chrif_sendmap(int fd) { - int i; + int i; - WFIFOW (fd, 0) = 0x2afa; + WFIFOW(fd, 0) = 0x2afa; for (i = 0; i < map_num; i++) if (map[i].alias[0] != '\0') // [MouseJstr] map aliasing - memcpy (WFIFOP (fd, 4 + i * 16), map[i].alias, 16); + memcpy(WFIFOP(fd, 4 + i * 16), map[i].alias, 16); else - memcpy (WFIFOP (fd, 4 + i * 16), map[i].name, 16); - WFIFOW (fd, 2) = 4 + i * 16; - WFIFOSET (fd, WFIFOW (fd, 2)); + memcpy(WFIFOP(fd, 4 + i * 16), map[i].name, 16); + WFIFOW(fd, 2) = 4 + i * 16; + WFIFOSET(fd, WFIFOW(fd, 2)); return 0; } @@ -170,24 +170,24 @@ int chrif_sendmap (int fd) *------------------------------------------ */ static -int chrif_recvmap (int fd) +int chrif_recvmap(int fd) { - int i, j, port; + int i, j, port; if (chrif_state < 2) // まだ準備中 return -1; struct in_addr ip; - ip.s_addr = RFIFOL (fd, 4); - port = RFIFOW (fd, 8); - for (i = 10, j = 0; i < RFIFOW (fd, 2); i += 16, j++) + ip.s_addr = RFIFOL(fd, 4); + port = RFIFOW(fd, 8); + for (i = 10, j = 0; i < RFIFOW(fd, 2); i += 16, j++) { - map_setipport ((const char *)RFIFOP (fd, i), ip, port); + map_setipport((const char *)RFIFOP(fd, i), ip, port); // if (battle_config.etc_log) // printf("recv map %d %s\n", j, RFIFOP(fd,i)); } if (battle_config.etc_log) - printf ("recv map on %s:%d (%d maps)\n", ip2str(ip), port, j); + printf("recv map on %s:%d (%d maps)\n", ip2str(ip), port, j); return 0; } @@ -196,12 +196,12 @@ int chrif_recvmap (int fd) * マップ鯖間移動のためのデータ準備要求 *------------------------------------------ */ -int chrif_changemapserver (struct map_session_data *sd, char *name, int x, +int chrif_changemapserver(struct map_session_data *sd, char *name, int x, int y, struct in_addr ip, short port) { - int i, s_ip; + int i, s_ip; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); s_ip = 0; for (i = 0; i < fd_max; i++) @@ -211,19 +211,19 @@ int chrif_changemapserver (struct map_session_data *sd, char *name, int x, break; } - WFIFOW (char_fd, 0) = 0x2b05; - WFIFOL (char_fd, 2) = sd->bl.id; - WFIFOL (char_fd, 6) = sd->login_id1; - WFIFOL (char_fd, 10) = sd->login_id2; - WFIFOL (char_fd, 14) = sd->status.char_id; - memcpy (WFIFOP (char_fd, 18), name, 16); - WFIFOW (char_fd, 34) = x; - WFIFOW (char_fd, 36) = y; - WFIFOL (char_fd, 38) = ip.s_addr; - WFIFOL (char_fd, 42) = port; - WFIFOB (char_fd, 44) = sd->status.sex; - WFIFOL (char_fd, 45) = s_ip; - WFIFOSET (char_fd, 49); + WFIFOW(char_fd, 0) = 0x2b05; + WFIFOL(char_fd, 2) = sd->bl.id; + WFIFOL(char_fd, 6) = sd->login_id1; + WFIFOL(char_fd, 10) = sd->login_id2; + WFIFOL(char_fd, 14) = sd->status.char_id; + memcpy(WFIFOP(char_fd, 18), name, 16); + WFIFOW(char_fd, 34) = x; + WFIFOW(char_fd, 36) = y; + WFIFOL(char_fd, 38) = ip.s_addr; + WFIFOL(char_fd, 42) = port; + WFIFOB(char_fd, 44) = sd->status.sex; + WFIFOL(char_fd, 45) = s_ip; + WFIFOSET(char_fd, 49); return 0; } @@ -233,22 +233,22 @@ int chrif_changemapserver (struct map_session_data *sd, char *name, int x, *------------------------------------------ */ static -int chrif_changemapserverack (int fd) +int chrif_changemapserverack(int fd) { - struct map_session_data *sd = map_id2sd (RFIFOL (fd, 2)); + struct map_session_data *sd = map_id2sd(RFIFOL(fd, 2)); - if (sd == NULL || sd->status.char_id != RFIFOL (fd, 14)) + if (sd == NULL || sd->status.char_id != RFIFOL(fd, 14)) return -1; - if (RFIFOL (fd, 6) == 1) + if (RFIFOL(fd, 6) == 1) { if (battle_config.error_log) - printf ("map server change failed.\n"); - pc_authfail (sd->fd); + printf("map server change failed.\n"); + pc_authfail(sd->fd); return 0; } - clif_changemapserver (sd, (const char *)RFIFOP (fd, 18), RFIFOW (fd, 34), - RFIFOW (fd, 36), in_addr{RFIFOL (fd, 38)}, RFIFOW (fd, 42)); + clif_changemapserver(sd, (const char *)RFIFOP(fd, 18), RFIFOW(fd, 34), + RFIFOW(fd, 36), in_addr{RFIFOL(fd, 38)}, RFIFOW(fd, 42)); return 0; } @@ -258,22 +258,22 @@ int chrif_changemapserverack (int fd) *------------------------------------------ */ static -int chrif_connectack (int fd) +int chrif_connectack(int fd) { - if (RFIFOB (fd, 2)) + if (RFIFOB(fd, 2)) { - printf ("Connected to char-server failed %d.\n", RFIFOB (fd, 2)); - exit (1); + printf("Connected to char-server failed %d.\n", RFIFOB(fd, 2)); + exit(1); } - printf ("Connected to char-server (connection #%d).\n", fd); + printf("Connected to char-server (connection #%d).\n", fd); chrif_state = 1; - chrif_sendmap (fd); + chrif_sendmap(fd); - printf ("chrif: OnCharIfInit event done. (%d events)\n", - npc_event_doall ("OnCharIfInit")); - printf ("chrif: OnInterIfInit event done. (%d events)\n", - npc_event_doall ("OnInterIfInit")); + printf("chrif: OnCharIfInit event done. (%d events)\n", + npc_event_doall("OnCharIfInit")); + printf("chrif: OnInterIfInit event done. (%d events)\n", + npc_event_doall("OnInterIfInit")); // <Agit> Run Event [AgitInit] // printf("NPC_Event:[OnAgitInit] do (%d) events (Agit Initialize).\n", npc_event_doall("OnAgitInit")); @@ -286,16 +286,16 @@ int chrif_connectack (int fd) *------------------------------------------ */ static -int chrif_sendmapack (int fd) +int chrif_sendmapack(int fd) { - if (RFIFOB (fd, 2)) + if (RFIFOB(fd, 2)) { - printf ("chrif : send map list to char server failed %d\n", - RFIFOB (fd, 2)); - exit (1); + printf("chrif : send map list to char server failed %d\n", + RFIFOB(fd, 2)); + exit(1); } - memcpy (wisp_server_name, RFIFOP (fd, 3), 24); + memcpy(wisp_server_name, RFIFOP(fd, 3), 24); chrif_state = 2; @@ -306,11 +306,11 @@ int chrif_sendmapack (int fd) * *------------------------------------------ */ -int chrif_authreq (struct map_session_data *sd) +int chrif_authreq(struct map_session_data *sd) { - int i; + int i; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (!sd || !char_fd || !sd->bl.id || !sd->login_id1) return -1; @@ -318,13 +318,13 @@ int chrif_authreq (struct map_session_data *sd) for (i = 0; i < fd_max; i++) if (session[i] && session[i]->session_data == sd) { - WFIFOW (char_fd, 0) = 0x2afc; - WFIFOL (char_fd, 2) = sd->bl.id; - WFIFOL (char_fd, 6) = sd->char_id; - WFIFOL (char_fd, 10) = sd->login_id1; - WFIFOL (char_fd, 14) = sd->login_id2; - WFIFOL (char_fd, 18) = session[i]->client_addr.sin_addr.s_addr; - WFIFOSET (char_fd, 22); + WFIFOW(char_fd, 0) = 0x2afc; + WFIFOL(char_fd, 2) = sd->bl.id; + WFIFOL(char_fd, 6) = sd->char_id; + WFIFOL(char_fd, 10) = sd->login_id1; + WFIFOL(char_fd, 14) = sd->login_id2; + WFIFOL(char_fd, 18) = session[i]->client_addr.sin_addr.s_addr; + WFIFOSET(char_fd, 22); break; } @@ -335,11 +335,11 @@ int chrif_authreq (struct map_session_data *sd) * *------------------------------------------ */ -int chrif_charselectreq (struct map_session_data *sd) +int chrif_charselectreq(struct map_session_data *sd) { - int i, s_ip; + int i, s_ip; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (!sd || !char_fd || !sd->bl.id || !sd->login_id1) return -1; @@ -352,12 +352,12 @@ int chrif_charselectreq (struct map_session_data *sd) break; } - WFIFOW (char_fd, 0) = 0x2b02; - WFIFOL (char_fd, 2) = sd->bl.id; - WFIFOL (char_fd, 6) = sd->login_id1; - WFIFOL (char_fd, 10) = sd->login_id2; - WFIFOL (char_fd, 14) = s_ip; - WFIFOSET (char_fd, 18); + WFIFOW(char_fd, 0) = 0x2b02; + WFIFOL(char_fd, 2) = sd->bl.id; + WFIFOL(char_fd, 6) = sd->login_id1; + WFIFOL(char_fd, 10) = sd->login_id2; + WFIFOL(char_fd, 14) = s_ip; + WFIFOSET(char_fd, 18); return 0; } @@ -366,14 +366,14 @@ int chrif_charselectreq (struct map_session_data *sd) * キャラ名問い合わせ *------------------------------------------ */ -int chrif_searchcharid (int char_id) +int chrif_searchcharid(int char_id) { if (!char_id) return -1; - WFIFOW (char_fd, 0) = 0x2b08; - WFIFOL (char_fd, 2) = char_id; - WFIFOSET (char_fd, 6); + WFIFOW(char_fd, 0) = 0x2b08; + WFIFOL(char_fd, 2) = char_id; + WFIFOSET(char_fd, 6); return 0; } @@ -382,16 +382,16 @@ int chrif_searchcharid (int char_id) * GMに変化要求 *------------------------------------------ */ -int chrif_changegm (int id, const char *pass, int len) +int chrif_changegm(int id, const char *pass, int len) { if (battle_config.etc_log) - printf ("chrif_changegm: account: %d, password: '%s'.\n", id, pass); + printf("chrif_changegm: account: %d, password: '%s'.\n", id, pass); - WFIFOW (char_fd, 0) = 0x2b0a; - WFIFOW (char_fd, 2) = len + 8; - WFIFOL (char_fd, 4) = id; - memcpy (WFIFOP (char_fd, 8), pass, len); - WFIFOSET (char_fd, len + 8); + WFIFOW(char_fd, 0) = 0x2b0a; + WFIFOW(char_fd, 2) = len + 8; + WFIFOL(char_fd, 4) = id; + memcpy(WFIFOP(char_fd, 8), pass, len); + WFIFOSET(char_fd, len + 8); return 0; } @@ -400,19 +400,18 @@ int chrif_changegm (int id, const char *pass, int len) * Change Email *------------------------------------------ */ -int chrif_changeemail (int id, const char *actual_email, +int chrif_changeemail(int id, const char *actual_email, const char *new_email) { if (battle_config.etc_log) - printf - ("chrif_changeemail: account: %d, actual_email: '%s', new_email: '%s'.\n", + printf("chrif_changeemail: account: %d, actual_email: '%s', new_email: '%s'.\n", id, actual_email, new_email); - WFIFOW (char_fd, 0) = 0x2b0c; - WFIFOL (char_fd, 2) = id; - memcpy (WFIFOP (char_fd, 6), actual_email, 40); - memcpy (WFIFOP (char_fd, 46), new_email, 40); - WFIFOSET (char_fd, 86); + WFIFOW(char_fd, 0) = 0x2b0c; + WFIFOL(char_fd, 2) = id; + memcpy(WFIFOP(char_fd, 6), actual_email, 40); + memcpy(WFIFOP(char_fd, 46), new_email, 40); + WFIFOSET(char_fd, 86); return 0; } @@ -428,25 +427,25 @@ int chrif_changeemail (int id, const char *actual_email, * 5: changesex *------------------------------------------ */ -int chrif_char_ask_name (int id, char *character_name, short operation_type, +int chrif_char_ask_name(int id, char *character_name, short operation_type, int year, int month, int day, int hour, int minute, int second) { - WFIFOW (char_fd, 0) = 0x2b0e; - WFIFOL (char_fd, 2) = id; // account_id of who ask (for answer) -1 if nobody - memcpy (WFIFOP (char_fd, 6), character_name, 24); - WFIFOW (char_fd, 30) = operation_type; // type of operation + WFIFOW(char_fd, 0) = 0x2b0e; + WFIFOL(char_fd, 2) = id; // account_id of who ask (for answer) -1 if nobody + memcpy(WFIFOP(char_fd, 6), character_name, 24); + WFIFOW(char_fd, 30) = operation_type; // type of operation if (operation_type == 2) { - WFIFOW (char_fd, 32) = year; - WFIFOW (char_fd, 34) = month; - WFIFOW (char_fd, 36) = day; - WFIFOW (char_fd, 38) = hour; - WFIFOW (char_fd, 40) = minute; - WFIFOW (char_fd, 42) = second; + WFIFOW(char_fd, 32) = year; + WFIFOW(char_fd, 34) = month; + WFIFOW(char_fd, 36) = day; + WFIFOW(char_fd, 38) = hour; + WFIFOW(char_fd, 40) = minute; + WFIFOW(char_fd, 42) = second; } - printf ("chrif : sended 0x2b0e\n"); - WFIFOSET (char_fd, 44); + printf("chrif : sended 0x2b0e\n"); + WFIFOSET(char_fd, 44); return 0; } @@ -468,126 +467,126 @@ int chrif_char_ask_name (int id, char *character_name, short operation_type, *------------------------------------------ */ static -int chrif_char_ask_name_answer (int fd) +int chrif_char_ask_name_answer(int fd) { - int acc; + int acc; struct map_session_data *sd; char output[256]; char player_name[24]; - acc = RFIFOL (fd, 2); // account_id of who has asked (-1 if nobody) - memcpy (player_name, RFIFOP (fd, 6), sizeof (player_name)); - player_name[sizeof (player_name) - 1] = '\0'; + acc = RFIFOL(fd, 2); // account_id of who has asked (-1 if nobody) + memcpy(player_name, RFIFOP(fd, 6), sizeof(player_name)); + player_name[sizeof(player_name) - 1] = '\0'; - sd = map_id2sd (acc); + sd = map_id2sd(acc); if (acc >= 0 && sd != NULL) { - if (RFIFOW (fd, 32) == 1) // player not found - sprintf (output, "The player '%s' doesn't exist.", player_name); + if (RFIFOW(fd, 32) == 1) // player not found + sprintf(output, "The player '%s' doesn't exist.", player_name); else { - switch (RFIFOW (fd, 30)) + switch (RFIFOW(fd, 30)) { case 1: // block - switch (RFIFOW (fd, 32)) + switch (RFIFOW(fd, 32)) { case 0: // login-server resquest done - sprintf (output, + sprintf(output, "Login-server has been asked to block the player '%s'.", player_name); break; //case 1: // player not found case 2: // gm level too low - sprintf (output, + sprintf(output, "Your GM level don't authorise you to block the player '%s'.", player_name); break; case 3: // login-server offline - sprintf (output, + sprintf(output, "Login-server is offline. Impossible to block the the player '%s'.", player_name); break; } break; case 2: // ban - switch (RFIFOW (fd, 32)) + switch (RFIFOW(fd, 32)) { case 0: // login-server resquest done - sprintf (output, + sprintf(output, "Login-server has been asked to ban the player '%s'.", player_name); break; //case 1: // player not found case 2: // gm level too low - sprintf (output, + sprintf(output, "Your GM level don't authorise you to ban the player '%s'.", player_name); break; case 3: // login-server offline - sprintf (output, + sprintf(output, "Login-server is offline. Impossible to ban the the player '%s'.", player_name); break; } break; case 3: // unblock - switch (RFIFOW (fd, 32)) + switch (RFIFOW(fd, 32)) { case 0: // login-server resquest done - sprintf (output, + sprintf(output, "Login-server has been asked to unblock the player '%s'.", player_name); break; //case 1: // player not found case 2: // gm level too low - sprintf (output, + sprintf(output, "Your GM level don't authorise you to unblock the player '%s'.", player_name); break; case 3: // login-server offline - sprintf (output, + sprintf(output, "Login-server is offline. Impossible to unblock the the player '%s'.", player_name); break; } break; case 4: // unban - switch (RFIFOW (fd, 32)) + switch (RFIFOW(fd, 32)) { case 0: // login-server resquest done - sprintf (output, + sprintf(output, "Login-server has been asked to unban the player '%s'.", player_name); break; //case 1: // player not found case 2: // gm level too low - sprintf (output, + sprintf(output, "Your GM level don't authorise you to unban the player '%s'.", player_name); break; case 3: // login-server offline - sprintf (output, + sprintf(output, "Login-server is offline. Impossible to unban the the player '%s'.", player_name); break; } break; case 5: // changesex - switch (RFIFOW (fd, 32)) + switch (RFIFOW(fd, 32)) { case 0: // login-server resquest done - sprintf (output, + sprintf(output, "Login-server has been asked to change the sex of the player '%s'.", player_name); break; //case 1: // player not found case 2: // gm level too low - sprintf (output, + sprintf(output, "Your GM level don't authorise you to change the sex of the player '%s'.", player_name); break; case 3: // login-server offline - sprintf (output, + sprintf(output, "Login-server is offline. Impossible to change the sex of the the player '%s'.", player_name); break; @@ -597,40 +596,40 @@ int chrif_char_ask_name_answer (int fd) } if (output[0] != '\0') { - output[sizeof (output) - 1] = '\0'; - clif_displaymessage (sd->fd, output); + output[sizeof(output) - 1] = '\0'; + clif_displaymessage(sd->fd, output); } } else - printf ("chrif_char_ask_name_answer failed - player not online.\n"); + printf("chrif_char_ask_name_answer failed - player not online.\n"); return 0; } /*========================================== - * End of GM change (@GM) (modified by Yor) + * End of GM change(@GM) (modified by Yor) *------------------------------------------ */ static -int chrif_changedgm (int fd) +int chrif_changedgm(int fd) { - int acc, level; + int acc, level; struct map_session_data *sd = NULL; - acc = RFIFOL (fd, 2); - level = RFIFOL (fd, 6); + acc = RFIFOL(fd, 2); + level = RFIFOL(fd, 6); - sd = map_id2sd (acc); + sd = map_id2sd(acc); if (battle_config.etc_log) - printf ("chrif_changedgm: account: %d, GM level 0 -> %d.\n", acc, + printf("chrif_changedgm: account: %d, GM level 0 -> %d.\n", acc, level); if (sd != NULL) { if (level > 0) - clif_displaymessage (sd->fd, "GM modification success."); + clif_displaymessage(sd->fd, "GM modification success."); else - clif_displaymessage (sd->fd, "Failure of GM modification."); + clif_displaymessage(sd->fd, "Failure of GM modification."); } return 0; @@ -641,22 +640,22 @@ int chrif_changedgm (int fd) *------------------------------------------ */ static -int chrif_changedsex (int fd) +int chrif_changedsex(int fd) { - int acc, sex, i; + int acc, sex, i; struct map_session_data *sd; struct pc_base_job s_class; - acc = RFIFOL (fd, 2); - sex = RFIFOL (fd, 6); + acc = RFIFOL(fd, 2); + sex = RFIFOL(fd, 6); if (battle_config.etc_log) - printf ("chrif_changedsex %d.\n", acc); - sd = map_id2sd (acc); + printf("chrif_changedsex %d.\n", acc); + sd = map_id2sd(acc); if (acc > 0) { if (sd != NULL && sd->status.sex != sex) { - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); if (sd->status.sex == 0) { sd->status.sex = 1; @@ -672,7 +671,7 @@ int chrif_changedsex (int fd) { if (sd->status.inventory[i].nameid && sd->status.inventory[i].equip) - pc_unequipitem ((struct map_session_data *) sd, i, 0); + pc_unequipitem((struct map_session_data *) sd, i, 0); } // reset skill of some job if (s_class.job == 19 || s_class.job == 4020 @@ -680,7 +679,7 @@ int chrif_changedsex (int fd) || s_class.job == 4021 || s_class.job == 4043) { - clif_updatestatus (sd, SP_SKILLPOINT); + clif_updatestatus(sd, SP_SKILLPOINT); // change job if necessary if (s_class.job == 20 || s_class.job == 4021 || s_class.job == 4043) @@ -690,19 +689,19 @@ int chrif_changedsex (int fd) sd->status.pc_class += 1; } // save character - chrif_save (sd); + chrif_save(sd); sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters // do same modify in login-server for the account, but no in char-server (it ask again login_id1 to login, and don't remember it) - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your sex has been changed (need disconexion by the server)..."); - clif_setwaitclose (sd->fd); // forced to disconnect for the change + clif_setwaitclose(sd->fd); // forced to disconnect for the change } } else { if (sd != NULL) { - printf ("chrif_changedsex failed.\n"); + printf("chrif_changedsex failed.\n"); } } @@ -713,10 +712,10 @@ int chrif_changedsex (int fd) * アカウント変数保存要求 *------------------------------------------ */ -int chrif_saveaccountreg2 (struct map_session_data *sd) +int chrif_saveaccountreg2(struct map_session_data *sd) { - int p, j; - nullpo_retr (-1, sd); + int p, j; + nullpo_retr(-1, sd); p = 8; for (j = 0; j < sd->status.account_reg2_num; j++) @@ -724,15 +723,15 @@ int chrif_saveaccountreg2 (struct map_session_data *sd) struct global_reg *reg = &sd->status.account_reg2[j]; if (reg->str[0] && reg->value != 0) { - memcpy (WFIFOP (char_fd, p), reg->str, 32); - WFIFOL (char_fd, p + 32) = reg->value; + memcpy(WFIFOP(char_fd, p), reg->str, 32); + WFIFOL(char_fd, p + 32) = reg->value; p += 36; } } - WFIFOW (char_fd, 0) = 0x2b10; - WFIFOW (char_fd, 2) = p; - WFIFOL (char_fd, 4) = sd->bl.id; - WFIFOSET (char_fd, p); + WFIFOW(char_fd, 0) = 0x2b10; + WFIFOW(char_fd, 2) = p; + WFIFOL(char_fd, 4) = sd->bl.id; + WFIFOSET(char_fd, p); return 0; } @@ -742,19 +741,19 @@ int chrif_saveaccountreg2 (struct map_session_data *sd) *------------------------------------------ */ static -int chrif_accountreg2 (int fd) +int chrif_accountreg2(int fd) { - int j, p; + int j, p; struct map_session_data *sd; - if ((sd = map_id2sd (RFIFOL (fd, 4))) == NULL) + if ((sd = map_id2sd(RFIFOL(fd, 4))) == NULL) return 1; - for (p = 8, j = 0; p < RFIFOW (fd, 2) && j < ACCOUNT_REG2_NUM; + for (p = 8, j = 0; p < RFIFOW(fd, 2) && j < ACCOUNT_REG2_NUM; p += 36, j++) { - memcpy (sd->status.account_reg2[j].str, RFIFOP (fd, p), 32); - sd->status.account_reg2[j].value = RFIFOL (fd, p + 32); + memcpy(sd->status.account_reg2[j].str, RFIFOP(fd, p), 32); + sd->status.account_reg2[j].value = RFIFOL(fd, p + 32); } sd->status.account_reg2_num = j; // printf("chrif: accountreg2\n"); @@ -769,14 +768,14 @@ int chrif_accountreg2 (int fd) *------------------------------------------ */ static -int chrif_divorce (int char_id, int partner_id) +int chrif_divorce(int char_id, int partner_id) { struct map_session_data *sd = NULL; if (!char_id || !partner_id) return 0; - sd = map_nick2sd (map_charid2nick (char_id)); + sd = map_nick2sd(map_charid2nick(char_id)); if (sd && sd->status.partner_id == partner_id) { sd->status.partner_id = 0; @@ -784,11 +783,11 @@ int chrif_divorce (int char_id, int partner_id) if (sd->npc_flags.divorce) { sd->npc_flags.divorce = 0; - map_scriptcont (sd, sd->npc_id); + map_scriptcont(sd, sd->npc_id); } } - nullpo_retr (0, sd = map_nick2sd (map_charid2nick (partner_id))); + nullpo_retr(0, sd = map_nick2sd(map_charid2nick(partner_id))); if (sd->status.partner_id == char_id) sd->status.partner_id = 0; @@ -800,14 +799,14 @@ int chrif_divorce (int char_id, int partner_id) * Needed to divorce when partner is not connected to map server *------------------------------------- */ -int chrif_send_divorce (int char_id) +int chrif_send_divorce(int char_id) { if (char_fd < 0) return -1; - WFIFOW (char_fd, 0) = 0x2b16; - WFIFOL (char_fd, 2) = char_id; - WFIFOSET (char_fd, 6); + WFIFOW(char_fd, 0) = 0x2b16; + WFIFOL(char_fd, 2) = char_id; + WFIFOSET(char_fd, 6); return 0; } @@ -816,29 +815,29 @@ int chrif_send_divorce (int char_id) *------------------------------------------ */ static -int chrif_accountdeletion (int fd) +int chrif_accountdeletion(int fd) { - int acc; + int acc; struct map_session_data *sd; - acc = RFIFOL (fd, 2); + acc = RFIFOL(fd, 2); if (battle_config.etc_log) - printf ("chrif_accountdeletion %d.\n", acc); - sd = map_id2sd (acc); + printf("chrif_accountdeletion %d.\n", acc); + sd = map_id2sd(acc); if (acc > 0) { if (sd != NULL) { sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has been deleted (disconnection)..."); - clif_setwaitclose (sd->fd); // forced to disconnect for the change + clif_setwaitclose(sd->fd); // forced to disconnect for the change } } else { if (sd != NULL) - printf ("chrif_accountdeletion failed - player not online.\n"); + printf("chrif_accountdeletion failed - player not online.\n"); } return 0; @@ -849,87 +848,87 @@ int chrif_accountdeletion (int fd) *------------------------------------------ */ static -int chrif_accountban (int fd) +int chrif_accountban(int fd) { - int acc; + int acc; struct map_session_data *sd; - acc = RFIFOL (fd, 2); + acc = RFIFOL(fd, 2); if (battle_config.etc_log) - printf ("chrif_accountban %d.\n", acc); - sd = map_id2sd (acc); + printf("chrif_accountban %d.\n", acc); + sd = map_id2sd(acc); if (acc > 0) { if (sd != NULL) { sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters - if (RFIFOB (fd, 6) == 0) + if (RFIFOB(fd, 6) == 0) { // 0: change of statut, 1: ban - switch (RFIFOL (fd, 7)) + switch (RFIFOL(fd, 7)) { // status or final date of a banishment case 1: // 0 = Unregistered ID - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has 'Unregistered'."); break; case 2: // 1 = Incorrect Password - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has an 'Incorrect Password'..."); break; case 3: // 2 = This ID is expired - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has expired."); break; case 4: // 3 = Rejected from Server - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has been rejected from server."); break; case 5: // 4 = You have been blocked by the GM Team - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has been blocked by the GM Team."); break; case 6: // 5 = Your Game's EXE file is not the latest version - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your Game's EXE file is not the latest version."); break; case 7: // 6 = Your are Prohibited to log in until %s - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has been prohibited to log in."); break; case 8: // 7 = Server is jammed due to over populated - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Server is jammed due to over populated."); break; case 9: // 8 = No MSG (actually, all states after 9 except 99 are No MSG, use only this) - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has not more authorised."); break; case 100: // 99 = This ID has been totally erased - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has been totally erased."); break; default: - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Your account has not more authorised."); break; } } - else if (RFIFOB (fd, 6) == 1) + else if (RFIFOB(fd, 6) == 1) { // 0: change of statut, 1: ban time_t timestamp; char tmpstr[2048]; - timestamp = (time_t) RFIFOL (fd, 7); // status or final date of a banishment - strcpy (tmpstr, "Your account has been banished until "); - strftime (tmpstr + strlen (tmpstr), 24, "%d-%m-%Y %H:%M:%S", - gmtime (×tamp)); - clif_displaymessage (sd->fd, tmpstr); + timestamp = (time_t) RFIFOL(fd, 7); // status or final date of a banishment + strcpy(tmpstr, "Your account has been banished until "); + strftime(tmpstr + strlen(tmpstr), 24, "%d-%m-%Y %H:%M:%S", + gmtime(×tamp)); + clif_displaymessage(sd->fd, tmpstr); } - clif_setwaitclose (sd->fd); // forced to disconnect for the change + clif_setwaitclose(sd->fd); // forced to disconnect for the change } } else { if (sd != NULL) - printf ("chrif_accountban failed - player not online.\n"); + printf("chrif_accountban failed - player not online.\n"); } return 0; @@ -940,10 +939,10 @@ int chrif_accountban (int fd) *------------------------------------------ */ static -int chrif_recvgmaccounts (int fd) +int chrif_recvgmaccounts(int fd) { - printf ("From login-server: receiving of %d GM accounts information.\n", - pc_read_gm_account (fd)); + printf("From login-server: receiving of %d GM accounts information.\n", + pc_read_gm_account(fd)); return 0; } @@ -952,11 +951,11 @@ int chrif_recvgmaccounts (int fd) * Request to reload GM accounts and their levels: send to char-server by [Yor] *------------------------------------------ */ -int chrif_reloadGMdb (void) +int chrif_reloadGMdb(void) { - WFIFOW (char_fd, 0) = 0x2af7; - WFIFOSET (char_fd, 2); + WFIFOW(char_fd, 0) = 0x2af7; + WFIFOSET(char_fd, 2); return 0; } @@ -965,20 +964,20 @@ int chrif_reloadGMdb (void) * Send rates and motd to char server [Wizputer] *------------------------------------------ */ -int chrif_ragsrvinfo (int base_rate, int job_rate, int drop_rate) +int chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) { char buf[256]; FILE *fp; - int i; + int i; - WFIFOW (char_fd, 0) = 0x2b16; - WFIFOW (char_fd, 2) = base_rate; - WFIFOW (char_fd, 4) = job_rate; - WFIFOW (char_fd, 6) = drop_rate; + WFIFOW(char_fd, 0) = 0x2b16; + WFIFOW(char_fd, 2) = base_rate; + WFIFOW(char_fd, 4) = job_rate; + WFIFOW(char_fd, 6) = drop_rate; - if ((fp = fopen_ (motd_txt, "r")) != NULL) + if ((fp = fopen_(motd_txt, "r")) != NULL) { - if (fgets (buf, 250, fp) != NULL) + if (fgets(buf, 250, fp) != NULL) { for (i = 0; buf[i]; i++) { @@ -988,17 +987,17 @@ int chrif_ragsrvinfo (int base_rate, int job_rate, int drop_rate) break; } } - WFIFOW (char_fd, 8) = sizeof (buf) + 10; - memcpy (WFIFOP (char_fd, 10), buf, sizeof (buf)); + WFIFOW(char_fd, 8) = sizeof(buf) + 10; + memcpy(WFIFOP(char_fd, 10), buf, sizeof(buf)); } - fclose_ (fp); + fclose_(fp); } else { - WFIFOW (char_fd, 8) = sizeof (buf) + 10; - memcpy (WFIFOP (char_fd, 10), buf, sizeof (buf)); + WFIFOW(char_fd, 8) = sizeof(buf) + 10; + memcpy(WFIFOP(char_fd, 10), buf, sizeof(buf)); } - WFIFOSET (char_fd, WFIFOW (char_fd, 8)); + WFIFOSET(char_fd, WFIFOW(char_fd, 8)); return 0; } @@ -1008,14 +1007,14 @@ int chrif_ragsrvinfo (int base_rate, int job_rate, int drop_rate) *----------------------------------------- */ -int chrif_char_offline (struct map_session_data *sd) +int chrif_char_offline(struct map_session_data *sd) { if (char_fd < 0) return -1; - WFIFOW (char_fd, 0) = 0x2b17; - WFIFOL (char_fd, 2) = sd->status.char_id; - WFIFOSET (char_fd, 6); + WFIFOW(char_fd, 0) = 0x2b17; + WFIFOL(char_fd, 2) = sd->status.char_id; + WFIFOSET(char_fd, 6); return 0; } @@ -1025,7 +1024,7 @@ int chrif_char_offline (struct map_session_data *sd) *---------------------------------------- */ -static void ladmin_itemfrob_fix_item (int source, int dest, struct item *item) +static void ladmin_itemfrob_fix_item(int source, int dest, struct item *item) { if (item && item->nameid == source) { @@ -1035,7 +1034,7 @@ static void ladmin_itemfrob_fix_item (int source, int dest, struct item *item) } static -void ladmin_itemfrob_c2 (struct block_list *bl, int source_id, int dest_id) +void ladmin_itemfrob_c2(struct block_list *bl, int source_id, int dest_id) { #define IFIX(v) if (v == source_id) {v = dest_id; } #define FIX(item) ladmin_itemfrob_fix_item(source_id, dest_id, &item) @@ -1048,22 +1047,22 @@ void ladmin_itemfrob_c2 (struct block_list *bl, int source_id, int dest_id) case BL_PC: { struct map_session_data *pc = (struct map_session_data *) bl; - struct storage *stor = account2storage2 (pc->status.account_id); - int j; + struct storage *stor = account2storage2(pc->status.account_id); + int j; for (j = 0; j < MAX_INVENTORY; j++) - IFIX (pc->status.inventory[j].nameid); + IFIX(pc->status.inventory[j].nameid); for (j = 0; j < MAX_CART; j++) - IFIX (pc->status.cart[j].nameid); - IFIX (pc->status.weapon); - IFIX (pc->status.shield); - IFIX (pc->status.head_top); - IFIX (pc->status.head_mid); - IFIX (pc->status.head_bottom); + IFIX(pc->status.cart[j].nameid); + IFIX(pc->status.weapon); + IFIX(pc->status.shield); + IFIX(pc->status.head_top); + IFIX(pc->status.head_mid); + IFIX(pc->status.head_bottom); if (stor) for (j = 0; j < stor->storage_amount; j++) - FIX (stor->storage_[j]); + FIX(stor->storage_[j]); for (j = 0; j < MAX_INVENTORY; j++) { @@ -1072,7 +1071,7 @@ void ladmin_itemfrob_c2 (struct block_list *bl, int source_id, int dest_id) { item->nameid = dest_id; if (item->equip) - pc_unequipitem (pc, j, 0); + pc_unequipitem(pc, j, 0); item->nameid = dest_id; } } @@ -1083,16 +1082,16 @@ void ladmin_itemfrob_c2 (struct block_list *bl, int source_id, int dest_id) case BL_MOB: { struct mob_data *mob = (struct mob_data *) bl; - int i; + int i; for (i = 0; i < mob->lootitem_count; i++) - FIX (mob->lootitem[i]); + FIX(mob->lootitem[i]); break; } case BL_ITEM: { struct flooritem_data *item = (struct flooritem_data *) bl; - FIX (item->item_data); + FIX(item->item_data); break; } } @@ -1101,28 +1100,28 @@ void ladmin_itemfrob_c2 (struct block_list *bl, int source_id, int dest_id) } static -void ladmin_itemfrob_c (struct block_list *bl, va_list va_args) +void ladmin_itemfrob_c(struct block_list *bl, va_list va_args) { - int source_id = va_arg (va_args, int); - int dest_id = va_arg (va_args, int); - ladmin_itemfrob_c2 (bl, source_id, dest_id); + int source_id = va_arg(va_args, int); + int dest_id = va_arg(va_args, int); + ladmin_itemfrob_c2(bl, source_id, dest_id); } static -void ladmin_itemfrob (int fd) +void ladmin_itemfrob(int fd) { - int source_id = RFIFOL (fd, 2); - int dest_id = RFIFOL (fd, 6); - struct block_list *bl = (struct block_list *) map_get_first_session (); + int source_id = RFIFOL(fd, 2); + int dest_id = RFIFOL(fd, 6); + struct block_list *bl = (struct block_list *) map_get_first_session(); // flooritems - map_foreachobject (ladmin_itemfrob_c, 0 /* any object */ , source_id, + map_foreachobject(ladmin_itemfrob_c, 0 /* any object */ , source_id, dest_id); // player characters (and, hopefully, mobs) while (bl->next) { - ladmin_itemfrob_c2 (bl, source_id, dest_id); + ladmin_itemfrob_c2(bl, source_id, dest_id); bl = bl->next; } } @@ -1132,9 +1131,9 @@ void ladmin_itemfrob (int fd) *------------------------------------------ */ static -void chrif_parse (int fd) +void chrif_parse(int fd) { - int packet_len, cmd; + int packet_len, cmd; // only char-server can have an access to here. // so, if it isn't the char-server, we disconnect the session (fd != char_fd). @@ -1142,27 +1141,26 @@ void chrif_parse (int fd) { if (fd == char_fd) { - printf - ("Map-server can't connect to char-server (connection #%d).\n", + printf("Map-server can't connect to char-server (connection #%d).\n", fd); char_fd = -1; } - close (fd); - delete_session (fd); + close(fd); + delete_session(fd); return; } - while (RFIFOREST (fd) >= 2) + while (RFIFOREST(fd) >= 2) { - cmd = RFIFOW (fd, 0); + cmd = RFIFOW(fd, 0); if (cmd < 0x2af8 || cmd >= 0x2af8 + - (sizeof (packet_len_table) / sizeof (packet_len_table[0])) + (sizeof(packet_len_table) / sizeof(packet_len_table[0])) || packet_len_table[cmd - 0x2af8] == 0) { - int r = intif_parse (fd); // intifに渡す + int r = intif_parse(fd); // intifに渡す if (r == 1) continue; // intifで処理した @@ -1175,80 +1173,80 @@ void chrif_parse (int fd) packet_len = packet_len_table[cmd - 0x2af8]; if (packet_len == -1) { - if (RFIFOREST (fd) < 4) + if (RFIFOREST(fd) < 4) return; - packet_len = RFIFOW (fd, 2); + packet_len = RFIFOW(fd, 2); } - if (RFIFOREST (fd) < packet_len) + if (RFIFOREST(fd) < packet_len) return; switch (cmd) { case 0x2af9: - chrif_connectack (fd); + chrif_connectack(fd); break; case 0x2afa: - ladmin_itemfrob (fd); + ladmin_itemfrob(fd); break; case 0x2afb: - chrif_sendmapack (fd); + chrif_sendmapack(fd); break; case 0x2afd: - pc_authok (RFIFOL (fd, 4), RFIFOL (fd, 8), - (time_t) RFIFOL (fd, 12), RFIFOW (fd, 16), - (struct mmo_charstatus *) RFIFOP (fd, 18)); + pc_authok(RFIFOL(fd, 4), RFIFOL(fd, 8), + (time_t) RFIFOL(fd, 12), RFIFOW(fd, 16), + (struct mmo_charstatus *) RFIFOP(fd, 18)); break; case 0x2afe: - pc_authfail (RFIFOL (fd, 2)); + pc_authfail(RFIFOL(fd, 2)); break; case 0x2b00: - map_setusers (RFIFOL (fd, 2)); + map_setusers(RFIFOL(fd, 2)); break; case 0x2b03: - clif_charselectok (RFIFOL (fd, 2)); + clif_charselectok(RFIFOL(fd, 2)); break; case 0x2b04: - chrif_recvmap (fd); + chrif_recvmap(fd); break; case 0x2b06: - chrif_changemapserverack (fd); + chrif_changemapserverack(fd); break; case 0x2b09: - map_addchariddb (RFIFOL (fd, 2), (const char *)RFIFOP (fd, 6)); + map_addchariddb(RFIFOL(fd, 2), (const char *)RFIFOP(fd, 6)); break; case 0x2b0b: - chrif_changedgm (fd); + chrif_changedgm(fd); break; case 0x2b0d: - chrif_changedsex (fd); + chrif_changedsex(fd); break; case 0x2b0f: - chrif_char_ask_name_answer (fd); + chrif_char_ask_name_answer(fd); break; case 0x2b11: - chrif_accountreg2 (fd); + chrif_accountreg2(fd); break; case 0x2b12: - chrif_divorce (RFIFOL (fd, 2), RFIFOL (fd, 6)); + chrif_divorce(RFIFOL(fd, 2), RFIFOL(fd, 6)); break; case 0x2b13: - chrif_accountdeletion (fd); + chrif_accountdeletion(fd); break; case 0x2b14: - chrif_accountban (fd); + chrif_accountban(fd); break; case 0x2b15: - chrif_recvgmaccounts (fd); + chrif_recvgmaccounts(fd); break; default: if (battle_config.error_log) - printf ("chrif_parse : unknown packet %d %d\n", fd, - RFIFOW (fd, 0)); + printf("chrif_parse : unknown packet %d %d\n", fd, + RFIFOW(fd, 0)); session[fd]->eof = 1; return; } - RFIFOSKIP (fd, packet_len); + RFIFOSKIP(fd, packet_len); } } @@ -1258,29 +1256,29 @@ void chrif_parse (int fd) *------------------------------------------ */ static -void send_users_tochar (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void send_users_tochar(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - int users = 0, i; + int users = 0, i; struct map_session_data *sd; if (char_fd <= 0 || session[char_fd] == NULL) return; - WFIFOW (char_fd, 0) = 0x2aff; + WFIFOW(char_fd, 0) = 0x2aff; for (i = 0; i < fd_max; i++) { if (session[i] && (sd = (struct map_session_data *)session[i]->session_data) && sd->state.auth && !((battle_config.hide_GM_session || sd->state.shroud_active - || (sd->status.option & OPTION_HIDE)) && pc_isGM (sd))) + || (sd->status.option & OPTION_HIDE)) && pc_isGM(sd))) { - WFIFOL (char_fd, 6 + 4 * users) = sd->status.char_id; + WFIFOL(char_fd, 6 + 4 * users) = sd->status.char_id; users++; } } - WFIFOW (char_fd, 2) = 6 + 4 * users; - WFIFOW (char_fd, 4) = users; - WFIFOSET (char_fd, 6 + 4 * users); + WFIFOW(char_fd, 2) = 6 + 4 * users; + WFIFOW(char_fd, 4) = users; + WFIFOSET(char_fd, 6 + 4 * users); } /*========================================== @@ -1289,18 +1287,18 @@ void send_users_tochar (timer_id tid, tick_t tick, custom_id_t id, custom_data_t *------------------------------------------ */ static -void check_connect_char_server (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void check_connect_char_server(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { if (char_fd <= 0 || session[char_fd] == NULL) { - printf ("Attempt to connect to char-server...\n"); + printf("Attempt to connect to char-server...\n"); chrif_state = 0; - if ((char_fd = make_connection (char_ip, char_port)) < 0) + if ((char_fd = make_connection(char_ip, char_port)) < 0) return; session[char_fd]->func_parse = chrif_parse; - realloc_fifo (char_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK); + realloc_fifo(char_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK); - chrif_connect (char_fd); + chrif_connect(char_fd); } } @@ -1312,9 +1310,9 @@ int do_init_chrif (void) { // add_timer_func_list (check_connect_char_server, "check_connect_char_server"); // add_timer_func_list (send_users_tochar, "send_users_tochar"); - add_timer_interval (gettick () + 1000, check_connect_char_server, 0, 0, + add_timer_interval(gettick() + 1000, check_connect_char_server, 0, 0, 10 * 1000); - add_timer_interval (gettick () + 1000, send_users_tochar, 0, 0, 5 * 1000); + add_timer_interval(gettick() + 1000, send_users_tochar, 0, 0, 5 * 1000); return 0; } diff --git a/src/map/chrif.hpp b/src/map/chrif.hpp index 82bfe0d..93f3e00 100644 --- a/src/map/chrif.hpp +++ b/src/map/chrif.hpp @@ -2,35 +2,35 @@ #ifndef CHRIF_HPP #define CHRIF_HPP -void chrif_setuserid (char *); -void chrif_setpasswd (char *); -char *chrif_getpasswd (void); +void chrif_setuserid(char *); +void chrif_setpasswd(char *); +char *chrif_getpasswd(void); -void chrif_setip (char *); -void chrif_setport (int); +void chrif_setip(char *); +void chrif_setport(int); -int chrif_isconnect (void); +int chrif_isconnect(void); -int chrif_authreq (struct map_session_data *); -int chrif_save (struct map_session_data *); -int chrif_charselectreq (struct map_session_data *); +int chrif_authreq(struct map_session_data *); +int chrif_save(struct map_session_data *); +int chrif_charselectreq(struct map_session_data *); -int chrif_changemapserver (struct map_session_data *sd, char *name, int x, +int chrif_changemapserver(struct map_session_data *sd, char *name, int x, int y, struct in_addr ip, short port); -int chrif_searchcharid (int char_id); -int chrif_changegm (int id, const char *pass, int len); -int chrif_changeemail (int id, const char *actual_email, +int chrif_searchcharid(int char_id); +int chrif_changegm(int id, const char *pass, int len); +int chrif_changeemail(int id, const char *actual_email, const char *new_email); -int chrif_char_ask_name (int id, char *character_name, short operation_type, +int chrif_char_ask_name(int id, char *character_name, short operation_type, int year, int month, int day, int hour, int minute, int second); -int chrif_saveaccountreg2 (struct map_session_data *sd); -int chrif_reloadGMdb (void); -int chrif_ragsrvinfo (int base_rate, int job_rate, int drop_rate); -int chrif_char_offline (struct map_session_data *sd); -int chrif_send_divorce (int char_id); +int chrif_saveaccountreg2(struct map_session_data *sd); +int chrif_reloadGMdb(void); +int chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate); +int chrif_char_offline(struct map_session_data *sd); +int chrif_send_divorce(int char_id); -int do_init_chrif (void); +int do_init_chrif (void); #endif diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 860c677..9f287ae 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -1,6 +1,6 @@ // $Id: clif.c 164 2004-10-01 16:46:58Z $ -#define DUMP_UNKNOWN_PACKET 1 +#define DUMP_UNKNOWN_PACKET 1 #include <stdio.h> #include <ctype.h> @@ -118,33 +118,33 @@ enum SELF }; -#define WBUFPOS(p,pos,x,y) { unsigned char *__p = (p); __p+=(pos); __p[0] = (x)>>2; __p[1] = ((x)<<6) | (((y)>>4)&0x3f); __p[2] = (y)<<4; } -#define WBUFPOS2(p,pos,x0,y0,x1,y1) { unsigned char *__p = (p); __p+=(pos); __p[0] = (x0)>>2; __p[1] = ((x0)<<6) | (((y0)>>4)&0x3f); __p[2] = ((y0)<<4) | (((x1)>>6)&0x0f); __p[3]=((x1)<<2) | (((y1)>>8)&0x03); __p[4]=(y1); } +#define WBUFPOS(p,pos,x,y) { unsigned char *__p = (p); __p+= (pos); __p[0] = (x)>>2; __p[1] = ((x)<<6) | (((y)>>4)&0x3f); __p[2] = (y)<<4; } +#define WBUFPOS2(p,pos,x0,y0,x1,y1) { unsigned char *__p = (p); __p+= (pos); __p[0] = (x0)>>2; __p[1] = ((x0)<<6) | (((y0)>>4)&0x3f); __p[2] = ((y0)<<4) | (((x1)>>6)&0x0f); __p[3]= ((x1)<<2) | (((y1)>>8)&0x03); __p[4]= (y1); } -#define WFIFOPOS(fd,pos,x,y) { WBUFPOS (WFIFOP(fd,pos),0,x,y); } +#define WFIFOPOS(fd,pos,x,y) { WBUFPOS(WFIFOP(fd,pos),0,x,y); } #define WFIFOPOS2(fd,pos,x0,y0,x1,y1) { WBUFPOS2(WFIFOP(fd,pos),0,x0,y0,x1,y1); } static char map_ip_str[16]; static struct in_addr map_ip; static int map_port = 5121; -int map_fd; +int map_fd; char talkie_mes[80]; /*========================================== * map鯖のip設定 *------------------------------------------ */ -void clif_setip (const char *ip) +void clif_setip(const char *ip) { - memcpy (map_ip_str, ip, 16); - map_ip.s_addr = inet_addr (map_ip_str); + memcpy(map_ip_str, ip, 16); + map_ip.s_addr = inet_addr(map_ip_str); } /*========================================== * map鯖のport設定 *------------------------------------------ */ -void clif_setport (int port) +void clif_setport(int port) { map_port = port; } @@ -153,7 +153,7 @@ void clif_setport (int port) * map鯖のip読み出し *------------------------------------------ */ -struct in_addr clif_getip (void) +struct in_addr clif_getip(void) { return map_ip; } @@ -162,7 +162,7 @@ struct in_addr clif_getip (void) * map鯖のport読み出し *------------------------------------------ */ -int clif_getport (void) +int clif_getport(void) { return map_port; } @@ -171,16 +171,16 @@ int clif_getport (void) * *------------------------------------------ */ -int clif_countusers (void) +int clif_countusers(void) { - int users = 0, i; + int users = 0, i; struct map_session_data *sd; for (i = 0; i < fd_max; i++) { if (session[i] && (sd = (struct map_session_data *)session[i]->session_data) && sd && sd->state.auth && !(battle_config.hide_GM_session - && pc_isGM (sd))) + && pc_isGM(sd))) users++; } return users; @@ -190,24 +190,24 @@ int clif_countusers (void) * 全てのclientに対してfunc()実行 *------------------------------------------ */ -int clif_foreachclient (int (*func) (struct map_session_data *, va_list), ...) +int clif_foreachclient(int(*func)(struct map_session_data *, va_list), ...) { - int i; + int i; va_list ap; struct map_session_data *sd; - va_start (ap, func); + va_start(ap, func); for (i = 0; i < fd_max; i++) { if (session[i] && (sd = (struct map_session_data *)session[i]->session_data) && sd && sd->state.auth) - func (sd, ap); + func(sd, ap); } - va_end (ap); + va_end(ap); return 0; } -static int is_deaf (struct block_list *bl) +static int is_deaf(struct block_list *bl) { struct map_session_data *sd = (struct map_session_data *) bl; if (!bl || bl->type != BL_PC) @@ -215,10 +215,10 @@ static int is_deaf (struct block_list *bl) return sd->special_state.deaf; } -static void clif_emotion_towards (struct block_list *bl, +static void clif_emotion_towards(struct block_list *bl, struct block_list *target, int type); -static char *clif_validate_chat (struct map_session_data *sd, int type, +static char *clif_validate_chat(struct map_session_data *sd, int type, char **message, size_t *message_len); /*========================================== @@ -226,22 +226,22 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, *------------------------------------------ */ static -void clif_send_sub (struct block_list *bl, va_list ap) +void clif_send_sub(struct block_list *bl, va_list ap) { unsigned char *buf; - int len; + int len; struct block_list *src_bl; - int type; + int type; struct map_session_data *sd; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd = (struct map_session_data *) bl); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd = (struct map_session_data *) bl); - buf = va_arg (ap, unsigned char *); - len = va_arg (ap, int); - nullpo_retv (src_bl = va_arg (ap, struct block_list *)); - type = va_arg (ap, int); + buf = va_arg(ap, unsigned char *); + len = va_arg(ap, int); + nullpo_retv(src_bl = va_arg(ap, struct block_list *)); + type = va_arg(ap, int); switch (type) { @@ -251,11 +251,11 @@ void clif_send_sub (struct block_list *bl, va_list ap) break; case AREA_CHAT_WOC: - if (is_deaf (bl) + if (is_deaf(bl) && !(bl->type == BL_PC - && pc_isGM ((struct map_session_data *) src_bl))) + && pc_isGM((struct map_session_data *) src_bl))) { - clif_emotion_towards (src_bl, bl, EMOTE_IGNORED); + clif_emotion_towards(src_bl, bl, EMOTE_IGNORED); return; } /* fall through... */ @@ -273,21 +273,20 @@ void clif_send_sub (struct block_list *bl, va_list ap) if (session[sd->fd] != NULL) { - if (WFIFOP (sd->fd, 0) == buf) + if (WFIFOP(sd->fd, 0) == buf) { - printf ("WARNING: Invalid use of clif_send function\n"); - printf - (" Packet x%4x use a WFIFO of a player instead of to use a buffer.\n", - WBUFW (buf, 0)); - printf (" Please correct your code.\n"); + printf("WARNING: Invalid use of clif_send function\n"); + printf(" Packet x%4x use a WFIFO of a player instead of to use a buffer.\n", + WBUFW(buf, 0)); + printf(" Please correct your code.\n"); // don't send to not move the pointer of the packet for next sessions in the loop } else { - if (packet_len_table[RBUFW (buf, 0)]) + if (packet_len_table[RBUFW(buf, 0)]) { // packet must exist - memcpy (WFIFOP (sd->fd, 0), buf, len); - WFIFOSET (sd->fd, len); + memcpy(WFIFOP(sd->fd, 0), buf, len); + WFIFOSET(sd->fd, len); } } } @@ -298,17 +297,17 @@ void clif_send_sub (struct block_list *bl, va_list ap) *------------------------------------------ */ static -int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) +int clif_send(const uint8_t *buf, int len, struct block_list *bl, int type) { - int i; + int i; struct map_session_data *sd; struct chat_data *cd; struct party *p = NULL; - int x0 = 0, x1 = 0, y0 = 0, y1 = 0; + int x0 = 0, x1 = 0, y0 = 0, y1 = 0; if (type != ALL_CLIENT) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) { @@ -343,10 +342,10 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) if (session[i] && (sd = (struct map_session_data *)session[i]->session_data) != NULL && sd->state.auth) { - if (packet_len_table[RBUFW (buf, 0)]) + if (packet_len_table[RBUFW(buf, 0)]) { // packet must exist - memcpy (WFIFOP (i, 0), buf, len); - WFIFOSET (i, len); + memcpy(WFIFOP(i, 0), buf, len); + WFIFOSET(i, len); } } } @@ -357,10 +356,10 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) if (session[i] && (sd = (struct map_session_data *)session[i]->session_data) != NULL && sd->state.auth && sd->bl.m == bl->m) { - if (packet_len_table[RBUFW (buf, 0)]) + if (packet_len_table[RBUFW(buf, 0)]) { // packet must exist - memcpy (WFIFOP (i, 0), buf, len); - WFIFOSET (i, len); + memcpy(WFIFOP(i, 0), buf, len); + WFIFOSET(i, len); } } } @@ -369,12 +368,12 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) case AREA_WOS: case AREA_WOC: case AREA_WOSC: - map_foreachinarea (clif_send_sub, bl->m, bl->x - AREA_SIZE, + map_foreachinarea(clif_send_sub, bl->m, bl->x - AREA_SIZE, bl->y - AREA_SIZE, bl->x + AREA_SIZE, bl->y + AREA_SIZE, BL_PC, buf, len, bl, type); break; case AREA_CHAT_WOC: - map_foreachinarea (clif_send_sub, bl->m, bl->x - (AREA_SIZE), + map_foreachinarea(clif_send_sub, bl->m, bl->x - (AREA_SIZE), bl->y - (AREA_SIZE), bl->x + (AREA_SIZE), bl->y + (AREA_SIZE), BL_PC, buf, len, bl, @@ -386,7 +385,7 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) if (bl->type == BL_PC) { sd = (struct map_session_data *) bl; - cd = (struct chat_data *) map_id2bl (sd->chatID); + cd = (struct chat_data *) map_id2bl(sd->chatID); } else if (bl->type != BL_CHAT) break; @@ -397,10 +396,10 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) if (type == CHAT_WOS && cd->usersd[i] == (struct map_session_data *) bl) continue; - if (packet_len_table[RBUFW (buf, 0)]) + if (packet_len_table[RBUFW(buf, 0)]) { // packet must exist - memcpy (WFIFOP (cd->usersd[i]->fd, 0), buf, len); - WFIFOSET (cd->usersd[i]->fd, len); + memcpy(WFIFOP(cd->usersd[i]->fd, 0), buf, len); + WFIFOSET(cd->usersd[i]->fd, len); } } break; @@ -420,12 +419,12 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) sd = (struct map_session_data *) bl; if (sd->partyspy > 0) { - p = party_search (sd->partyspy); + p = party_search(sd->partyspy); } else { if (sd->status.party_id > 0) - p = party_search (sd->status.party_id); + p = party_search(sd->status.party_id); } } if (p) @@ -445,10 +444,10 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) (sd->bl.x < x0 || sd->bl.y < y0 || sd->bl.x > x1 || sd->bl.y > y1)) continue; - if (packet_len_table[RBUFW (buf, 0)]) + if (packet_len_table[RBUFW(buf, 0)]) { // packet must exist - memcpy (WFIFOP (sd->fd, 0), buf, len); - WFIFOSET (sd->fd, len); + memcpy(WFIFOP(sd->fd, 0), buf, len); + WFIFOSET(sd->fd, len); } } } @@ -459,10 +458,10 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) { if (sd->partyspy == p->party_id) { - if (packet_len_table[RBUFW (buf, 0)]) + if (packet_len_table[RBUFW(buf, 0)]) { // packet must exist - memcpy (WFIFOP (sd->fd, 0), buf, len); - WFIFOSET (sd->fd, len); + memcpy(WFIFOP(sd->fd, 0), buf, len); + WFIFOSET(sd->fd, len); } } } @@ -471,16 +470,16 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) break; case SELF: sd = (struct map_session_data *) bl; - if (packet_len_table[RBUFW (buf, 0)]) + if (packet_len_table[RBUFW(buf, 0)]) { // packet must exist - memcpy (WFIFOP (sd->fd, 0), buf, len); - WFIFOSET (sd->fd, len); + memcpy(WFIFOP(sd->fd, 0), buf, len); + WFIFOSET(sd->fd, len); } break; default: if (battle_config.error_log) - printf ("clif_send まだ作ってないよー\n"); + printf("clif_send まだ作ってないよー\n"); return -1; } @@ -494,11 +493,11 @@ int clif_send (const uint8_t *buf, int len, struct block_list *bl, int type) * *------------------------------------------ */ -int clif_authok (struct map_session_data *sd) +int clif_authok(struct map_session_data *sd) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (!sd) return 0; @@ -508,12 +507,12 @@ int clif_authok (struct map_session_data *sd) fd = sd->fd; - WFIFOW (fd, 0) = 0x73; - WFIFOL (fd, 2) = gettick (); - WFIFOPOS (fd, 6, sd->bl.x, sd->bl.y); - WFIFOB (fd, 9) = 5; - WFIFOB (fd, 10) = 5; - WFIFOSET (fd, packet_len_table[0x73]); + WFIFOW(fd, 0) = 0x73; + WFIFOL(fd, 2) = gettick(); + WFIFOPOS(fd, 6, sd->bl.x, sd->bl.y); + WFIFOB(fd, 9) = 5; + WFIFOB(fd, 10) = 5; + WFIFOSET(fd, packet_len_table[0x73]); return 0; } @@ -522,16 +521,16 @@ int clif_authok (struct map_session_data *sd) * *------------------------------------------ */ -int clif_authfail_fd (int fd, int type) +int clif_authfail_fd(int fd, int type) { if (!fd || !session[fd]) return 0; - WFIFOW (fd, 0) = 0x81; - WFIFOL (fd, 2) = type; - WFIFOSET (fd, packet_len_table[0x81]); + WFIFOW(fd, 0) = 0x81; + WFIFOL(fd, 2) = type; + WFIFOSET(fd, packet_len_table[0x81]); - clif_setwaitclose (fd); + clif_setwaitclose(fd); return 0; } @@ -540,21 +539,21 @@ int clif_authfail_fd (int fd, int type) * *------------------------------------------ */ -int clif_charselectok (int id) +int clif_charselectok(int id) { struct map_session_data *sd; - int fd; + int fd; - if ((sd = map_id2sd (id)) == NULL) + if ((sd = map_id2sd(id)) == NULL) return 1; if (!sd->fd) return 1; fd = sd->fd; - WFIFOW (fd, 0) = 0xb3; - WFIFOB (fd, 2) = 1; - WFIFOSET (fd, packet_len_table[0xb3]); + WFIFOW(fd, 0) = 0xb3; + WFIFOB(fd, 2) = 1; + WFIFOSET(fd, packet_len_table[0xb3]); return 0; } @@ -563,25 +562,25 @@ int clif_charselectok (int id) * *------------------------------------------ */ -static int clif_set009e (struct flooritem_data *fitem, uint8_t *buf) +static int clif_set009e(struct flooritem_data *fitem, uint8_t *buf) { - int view; + int view; - nullpo_retr (0, fitem); + nullpo_retr(0, fitem); //009e <ID>.l <name ID>.w <identify flag>.B <X>.w <Y>.w <subX>.B <subY>.B <amount>.w - WBUFW (buf, 0) = 0x9e; - WBUFL (buf, 2) = fitem->bl.id; - if ((view = itemdb_viewid (fitem->item_data.nameid)) > 0) - WBUFW (buf, 6) = view; + WBUFW(buf, 0) = 0x9e; + WBUFL(buf, 2) = fitem->bl.id; + if ((view = itemdb_viewid(fitem->item_data.nameid)) > 0) + WBUFW(buf, 6) = view; else - WBUFW (buf, 6) = fitem->item_data.nameid; - WBUFB (buf, 8) = fitem->item_data.identify; - WBUFW (buf, 9) = fitem->bl.x; - WBUFW (buf, 11) = fitem->bl.y; - WBUFB (buf, 13) = fitem->subx; - WBUFB (buf, 14) = fitem->suby; - WBUFW (buf, 15) = fitem->item_data.amount; + WBUFW(buf, 6) = fitem->item_data.nameid; + WBUFB(buf, 8) = fitem->item_data.identify; + WBUFW(buf, 9) = fitem->bl.x; + WBUFW(buf, 11) = fitem->bl.y; + WBUFB(buf, 13) = fitem->subx; + WBUFB(buf, 14) = fitem->suby; + WBUFW(buf, 15) = fitem->item_data.amount; return packet_len_table[0x9e]; } @@ -590,16 +589,16 @@ static int clif_set009e (struct flooritem_data *fitem, uint8_t *buf) * *------------------------------------------ */ -int clif_dropflooritem (struct flooritem_data *fitem) +int clif_dropflooritem(struct flooritem_data *fitem) { uint8_t buf[64]; - nullpo_retr (0, fitem); + nullpo_retr(0, fitem); if (fitem->item_data.nameid <= 0) return 0; - clif_set009e (fitem, buf); - clif_send (buf, packet_len_table[0x9e], &fitem->bl, AREA); + clif_set009e(fitem, buf); + clif_send(buf, packet_len_table[0x9e], &fitem->bl, AREA); return 0; } @@ -608,23 +607,23 @@ int clif_dropflooritem (struct flooritem_data *fitem) * *------------------------------------------ */ -int clif_clearflooritem (struct flooritem_data *fitem, int fd) +int clif_clearflooritem(struct flooritem_data *fitem, int fd) { unsigned char buf[16]; - nullpo_retr (0, fitem); + nullpo_retr(0, fitem); - WBUFW (buf, 0) = 0xa1; - WBUFL (buf, 2) = fitem->bl.id; + WBUFW(buf, 0) = 0xa1; + WBUFL(buf, 2) = fitem->bl.id; if (fd == 0) { - clif_send (buf, packet_len_table[0xa1], &fitem->bl, AREA); + clif_send(buf, packet_len_table[0xa1], &fitem->bl, AREA); } else { - memcpy (WFIFOP (fd, 0), buf, 6); - WFIFOSET (fd, packet_len_table[0xa1]); + memcpy(WFIFOP(fd, 0), buf, 6); + WFIFOSET(fd, packet_len_table[0xa1]); } return 0; @@ -634,45 +633,45 @@ int clif_clearflooritem (struct flooritem_data *fitem, int fd) * *------------------------------------------ */ -int clif_clearchar (struct block_list *bl, int type) +int clif_clearchar(struct block_list *bl, int type) { unsigned char buf[16]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x80; - WBUFL (buf, 2) = bl->id; + WBUFW(buf, 0) = 0x80; + WBUFL(buf, 2) = bl->id; if (type == 9) { - WBUFB (buf, 6) = 0; - clif_send (buf, packet_len_table[0x80], bl, AREA); + WBUFB(buf, 6) = 0; + clif_send(buf, packet_len_table[0x80], bl, AREA); } else { - WBUFB (buf, 6) = type; - clif_send (buf, packet_len_table[0x80], bl, + WBUFB(buf, 6) = type; + clif_send(buf, packet_len_table[0x80], bl, type == 1 ? AREA : AREA_WOS); } return 0; } -static void clif_clearchar_delay_sub (timer_id tid, tick_t tick, custom_id_t id, +static void clif_clearchar_delay_sub(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct block_list *bl = (struct block_list *) id; - clif_clearchar (bl, data); - map_freeblock (bl); + clif_clearchar(bl, data); + map_freeblock(bl); } -int clif_clearchar_delay (unsigned int tick, struct block_list *bl, int type) +int clif_clearchar_delay(unsigned int tick, struct block_list *bl, int type) { struct block_list *tmpbl; - CREATE (tmpbl, struct block_list, 1); + CREATE(tmpbl, struct block_list, 1); - memcpy (tmpbl, bl, sizeof (struct block_list)); - add_timer (tick, clif_clearchar_delay_sub, (custom_id_t) tmpbl, type); + memcpy(tmpbl, bl, sizeof(struct block_list)); + add_timer(tick, clif_clearchar_delay_sub, (custom_id_t) tmpbl, type); return 0; } @@ -681,15 +680,15 @@ int clif_clearchar_delay (unsigned int tick, struct block_list *bl, int type) * *------------------------------------------ */ -int clif_clearchar_id (int id, int type, int fd) +int clif_clearchar_id(int id, int type, int fd) { unsigned char buf[16]; - WBUFW (buf, 0) = 0x80; - WBUFL (buf, 2) = id; - WBUFB (buf, 6) = type; - memcpy (WFIFOP (fd, 0), buf, 7); - WFIFOSET (fd, packet_len_table[0x80]); + WBUFW(buf, 0) = 0x80; + WBUFL(buf, 2) = id; + WBUFB(buf, 6) = type; + memcpy(WFIFOP(fd, 0), buf, 7); + WFIFOSET(fd, packet_len_table[0x80]); return 0; } @@ -709,88 +708,88 @@ static int current_weapon(struct map_session_data *sd) * *------------------------------------------ */ -static int clif_set0078 (struct map_session_data *sd, unsigned char *buf) +static int clif_set0078(struct map_session_data *sd, unsigned char *buf) { - int level = 0; + int level = 0; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->disguise > 23 && sd->disguise < 4001) { // mob disguises [Valaris] - WBUFW (buf, 0) = 0x78; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = battle_get_speed (&sd->bl); - WBUFW (buf, 8) = sd->opt1; - WBUFW (buf, 10) = sd->opt2; - WBUFW (buf, 12) = sd->status.option; - WBUFW (buf, 14) = sd->disguise; - WBUFW (buf, 42) = 0; - WBUFB (buf, 44) = 0; - WBUFPOS (buf, 46, sd->bl.x, sd->bl.y); - WBUFB (buf, 48) |= sd->dir & 0x0f; - WBUFB (buf, 49) = 5; - WBUFB (buf, 50) = 5; - WBUFB (buf, 51) = 0; - WBUFW (buf, 52) = + WBUFW(buf, 0) = 0x78; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = battle_get_speed(&sd->bl); + WBUFW(buf, 8) = sd->opt1; + WBUFW(buf, 10) = sd->opt2; + WBUFW(buf, 12) = sd->status.option; + WBUFW(buf, 14) = sd->disguise; + WBUFW(buf, 42) = 0; + WBUFB(buf, 44) = 0; + WBUFPOS(buf, 46, sd->bl.x, sd->bl.y); + WBUFB(buf, 48) |= sd->dir & 0x0f; + WBUFB(buf, 49) = 5; + WBUFB(buf, 50) = 5; + WBUFB(buf, 51) = 0; + WBUFW(buf, 52) = ((level = - battle_get_lv (&sd->bl)) > + battle_get_lv(&sd->bl)) > battle_config.max_lv) ? battle_config.max_lv : level; return packet_len_table[0x78]; } - WBUFW (buf, 0) = 0x1d8; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = sd->speed; - WBUFW (buf, 8) = sd->opt1; - WBUFW (buf, 10) = sd->opt2; - WBUFW (buf, 12) = sd->status.option; - WBUFW (buf, 14) = sd->view_class; - WBUFW (buf, 16) = sd->status.hair; + WBUFW(buf, 0) = 0x1d8; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = sd->speed; + WBUFW(buf, 8) = sd->opt1; + WBUFW(buf, 10) = sd->opt2; + WBUFW(buf, 12) = sd->status.option; + WBUFW(buf, 14) = sd->view_class; + WBUFW(buf, 16) = sd->status.hair; if (sd->attack_spell_override) - WBUFB (buf, 18) = sd->attack_spell_look_override; + WBUFB(buf, 18) = sd->attack_spell_look_override; else { if (sd->equip_index[9] >= 0 && sd->inventory_data[sd->equip_index[9]] && sd->view_class != 22) { if (sd->inventory_data[sd->equip_index[9]]->view_id > 0) - WBUFW (buf, 18) = + WBUFW(buf, 18) = sd->inventory_data[sd->equip_index[9]]->view_id; else - WBUFW (buf, 18) = + WBUFW(buf, 18) = sd->status.inventory[sd->equip_index[9]].nameid; } else - WBUFW (buf, 18) = 0; + WBUFW(buf, 18) = 0; } if (sd->equip_index[8] >= 0 && sd->equip_index[8] != sd->equip_index[9] && sd->inventory_data[sd->equip_index[8]] && sd->view_class != 22) { if (sd->inventory_data[sd->equip_index[8]]->view_id > 0) - WBUFW (buf, 20) = sd->inventory_data[sd->equip_index[8]]->view_id; + WBUFW(buf, 20) = sd->inventory_data[sd->equip_index[8]]->view_id; else - WBUFW (buf, 20) = sd->status.inventory[sd->equip_index[8]].nameid; + WBUFW(buf, 20) = sd->status.inventory[sd->equip_index[8]].nameid; } else - WBUFW (buf, 20) = 0; - WBUFW (buf, 22) = sd->status.head_bottom; - WBUFW (buf, 24) = sd->status.head_top; - WBUFW (buf, 26) = sd->status.head_mid; - WBUFW (buf, 28) = sd->status.hair_color; - WBUFW (buf, 30) = sd->status.clothes_color; - WBUFW (buf, 32) = sd->head_dir; - WBUFL (buf, 34) = 0 /*guild_id*/; - WBUFW (buf, 38) = 0 /*guild_emblem_id*/; - WBUFW (buf, 40) = sd->status.manner; - WBUFW (buf, 42) = sd->opt3; - WBUFB (buf, 44) = sd->status.karma; - WBUFB (buf, 45) = sd->sex; - WBUFPOS (buf, 46, sd->bl.x, sd->bl.y); - WBUFB (buf, 48) |= sd->dir & 0x0f; - WBUFW (buf, 49) = (pc_isGM (sd) == 60 || pc_isGM (sd) == 99) ? 0x80 : 0; - WBUFB (buf, 51) = sd->state.dead_sit; - WBUFW (buf, 52) = 0; + WBUFW(buf, 20) = 0; + WBUFW(buf, 22) = sd->status.head_bottom; + WBUFW(buf, 24) = sd->status.head_top; + WBUFW(buf, 26) = sd->status.head_mid; + WBUFW(buf, 28) = sd->status.hair_color; + WBUFW(buf, 30) = sd->status.clothes_color; + WBUFW(buf, 32) = sd->head_dir; + WBUFL(buf, 34) = 0 /*guild_id*/; + WBUFW(buf, 38) = 0 /*guild_emblem_id*/; + WBUFW(buf, 40) = sd->status.manner; + WBUFW(buf, 42) = sd->opt3; + WBUFB(buf, 44) = sd->status.karma; + WBUFB(buf, 45) = sd->sex; + WBUFPOS(buf, 46, sd->bl.x, sd->bl.y); + WBUFB(buf, 48) |= sd->dir & 0x0f; + WBUFW(buf, 49) = (pc_isGM(sd) == 60 || pc_isGM(sd) == 99) ? 0x80 : 0; + WBUFB(buf, 51) = sd->state.dead_sit; + WBUFW(buf, 52) = 0; return packet_len_table[0x1d8]; } @@ -799,80 +798,80 @@ static int clif_set0078 (struct map_session_data *sd, unsigned char *buf) * *------------------------------------------ */ -static int clif_set007b (struct map_session_data *sd, unsigned char *buf) +static int clif_set007b(struct map_session_data *sd, unsigned char *buf) { - int level = 0; - nullpo_retr (0, sd); + int level = 0; + nullpo_retr(0, sd); if (sd->disguise > 23 && sd->disguise < 4001) { // mob disguises [Valaris] - WBUFW (buf, 0) = 0x7b; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = battle_get_speed (&sd->bl); - WBUFW (buf, 8) = sd->opt1; - WBUFW (buf, 10) = sd->opt2; - WBUFW (buf, 12) = sd->status.option; - WBUFW (buf, 14) = sd->disguise; - WBUFL (buf, 22) = gettick (); - WBUFW (buf, 46) = 0; - WBUFB (buf, 48) = 0; - WBUFPOS2 (buf, 50, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y); - WBUFB (buf, 55) = 0; - WBUFB (buf, 56) = 5; - WBUFB (buf, 57) = 5; - WBUFW (buf, 58) = + WBUFW(buf, 0) = 0x7b; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = battle_get_speed(&sd->bl); + WBUFW(buf, 8) = sd->opt1; + WBUFW(buf, 10) = sd->opt2; + WBUFW(buf, 12) = sd->status.option; + WBUFW(buf, 14) = sd->disguise; + WBUFL(buf, 22) = gettick(); + WBUFW(buf, 46) = 0; + WBUFB(buf, 48) = 0; + WBUFPOS2(buf, 50, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y); + WBUFB(buf, 55) = 0; + WBUFB(buf, 56) = 5; + WBUFB(buf, 57) = 5; + WBUFW(buf, 58) = ((level = - battle_get_lv (&sd->bl)) > + battle_get_lv(&sd->bl)) > battle_config.max_lv) ? battle_config.max_lv : level; return packet_len_table[0x7b]; } - WBUFW (buf, 0) = 0x1da; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = sd->speed; - WBUFW (buf, 8) = sd->opt1; - WBUFW (buf, 10) = sd->opt2; - WBUFW (buf, 12) = sd->status.option; - WBUFW (buf, 14) = sd->view_class; - WBUFW (buf, 16) = sd->status.hair; + WBUFW(buf, 0) = 0x1da; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = sd->speed; + WBUFW(buf, 8) = sd->opt1; + WBUFW(buf, 10) = sd->opt2; + WBUFW(buf, 12) = sd->status.option; + WBUFW(buf, 14) = sd->view_class; + WBUFW(buf, 16) = sd->status.hair; if (sd->equip_index[9] >= 0 && sd->inventory_data[sd->equip_index[9]] && sd->view_class != 22) { if (sd->inventory_data[sd->equip_index[9]]->view_id > 0) - WBUFW (buf, 18) = sd->inventory_data[sd->equip_index[9]]->view_id; + WBUFW(buf, 18) = sd->inventory_data[sd->equip_index[9]]->view_id; else - WBUFW (buf, 18) = sd->status.inventory[sd->equip_index[9]].nameid; + WBUFW(buf, 18) = sd->status.inventory[sd->equip_index[9]].nameid; } else - WBUFW (buf, 18) = 0; + WBUFW(buf, 18) = 0; if (sd->equip_index[8] >= 0 && sd->equip_index[8] != sd->equip_index[9] && sd->inventory_data[sd->equip_index[8]] && sd->view_class != 22) { if (sd->inventory_data[sd->equip_index[8]]->view_id > 0) - WBUFW (buf, 20) = sd->inventory_data[sd->equip_index[8]]->view_id; + WBUFW(buf, 20) = sd->inventory_data[sd->equip_index[8]]->view_id; else - WBUFW (buf, 20) = sd->status.inventory[sd->equip_index[8]].nameid; + WBUFW(buf, 20) = sd->status.inventory[sd->equip_index[8]].nameid; } else - WBUFW (buf, 20) = 0; - WBUFW (buf, 22) = sd->status.head_bottom; - WBUFL (buf, 24) = gettick (); - WBUFW (buf, 28) = sd->status.head_top; - WBUFW (buf, 30) = sd->status.head_mid; - WBUFW (buf, 32) = sd->status.hair_color; - WBUFW (buf, 34) = sd->status.clothes_color; - WBUFW (buf, 36) = sd->head_dir; - WBUFL (buf, 38) = 0/*guild_id*/; - WBUFW (buf, 42) = 0/*guild_emblem_id*/; - WBUFW (buf, 44) = sd->status.manner; - WBUFW (buf, 46) = sd->opt3; - WBUFB (buf, 48) = sd->status.karma; - WBUFB (buf, 49) = sd->sex; - WBUFPOS2 (buf, 50, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y); - WBUFW (buf, 55) = pc_isGM (sd) == 60 ? 0x80 : 0; - WBUFB (buf, 57) = 5; - WBUFW (buf, 58) = 0; + WBUFW(buf, 20) = 0; + WBUFW(buf, 22) = sd->status.head_bottom; + WBUFL(buf, 24) = gettick(); + WBUFW(buf, 28) = sd->status.head_top; + WBUFW(buf, 30) = sd->status.head_mid; + WBUFW(buf, 32) = sd->status.hair_color; + WBUFW(buf, 34) = sd->status.clothes_color; + WBUFW(buf, 36) = sd->head_dir; + WBUFL(buf, 38) = 0/*guild_id*/; + WBUFW(buf, 42) = 0/*guild_emblem_id*/; + WBUFW(buf, 44) = sd->status.manner; + WBUFW(buf, 46) = sd->opt3; + WBUFB(buf, 48) = sd->status.karma; + WBUFB(buf, 49) = sd->sex; + WBUFPOS2(buf, 50, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y); + WBUFW(buf, 55) = pc_isGM(sd) == 60 ? 0x80 : 0; + WBUFB(buf, 57) = 5; + WBUFW(buf, 58) = 0; return packet_len_table[0x1da]; } @@ -881,20 +880,20 @@ static int clif_set007b (struct map_session_data *sd, unsigned char *buf) * クラスチェンジ typeはMobの場合は1で他は0？ *------------------------------------------ */ -int clif_npc_class_change (struct block_list *bl, int npc_class, int type) +int clif_npc_class_change(struct block_list *bl, int npc_class, int type) { uint8_t buf[16]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (npc_class >= MAX_PC_CLASS) { - WBUFW (buf, 0) = 0x1b0; - WBUFL (buf, 2) = bl->id; - WBUFB (buf, 6) = type; - WBUFL (buf, 7) = npc_class; + WBUFW(buf, 0) = 0x1b0; + WBUFL(buf, 2) = bl->id; + WBUFB(buf, 6) = type; + WBUFL(buf, 7) = npc_class; - clif_send (buf, packet_len_table[0x1b0], bl, AREA); + clif_send(buf, packet_len_table[0x1b0], bl, AREA); } return 0; } @@ -903,41 +902,41 @@ int clif_npc_class_change (struct block_list *bl, int npc_class, int type) * *------------------------------------------ */ -int clif_mob_class_change (struct mob_data *md, int class_) +int clif_mob_class_change(struct mob_data *md, int class_) { uint8_t buf[16]; - int view = mob_get_viewclass (class_); + int view = mob_get_viewclass(class_); - nullpo_retr (0, md); + nullpo_retr(0, md); if (view >= MAX_PC_CLASS) { - WBUFW (buf, 0) = 0x1b0; - WBUFL (buf, 2) = md->bl.id; - WBUFB (buf, 6) = 1; - WBUFL (buf, 7) = view; + WBUFW(buf, 0) = 0x1b0; + WBUFL(buf, 2) = md->bl.id; + WBUFB(buf, 6) = 1; + WBUFL(buf, 7) = view; - clif_send (buf, packet_len_table[0x1b0], &md->bl, AREA); + clif_send(buf, packet_len_table[0x1b0], &md->bl, AREA); } return 0; } // mob equipment [Valaris] -int clif_mob_equip (struct mob_data *md, int nameid) +int clif_mob_equip(struct mob_data *md, int nameid) { unsigned char buf[16]; - nullpo_retr (0, md); + nullpo_retr(0, md); - memset (buf, 0, packet_len_table[0x1a4]); + memset(buf, 0, packet_len_table[0x1a4]); - WBUFW (buf, 0) = 0x1a4; - WBUFB (buf, 2) = 3; - WBUFL (buf, 3) = md->bl.id; - WBUFL (buf, 7) = nameid; + WBUFW(buf, 0) = 0x1a4; + WBUFB(buf, 2) = 3; + WBUFL(buf, 3) = md->bl.id; + WBUFL(buf, 7) = nameid; - clif_send (buf, packet_len_table[0x1a4], &md->bl, AREA); + clif_send(buf, packet_len_table[0x1a4], &md->bl, AREA); return 0; } @@ -946,44 +945,44 @@ int clif_mob_equip (struct mob_data *md, int nameid) * MOB表示1 *------------------------------------------ */ -static int clif_mob0078 (struct mob_data *md, unsigned char *buf) +static int clif_mob0078(struct mob_data *md, unsigned char *buf) { - int level; + int level; - memset (buf, 0, packet_len_table[0x78]); + memset(buf, 0, packet_len_table[0x78]); - nullpo_retr (0, md); + nullpo_retr(0, md); - WBUFW (buf, 0) = 0x78; - WBUFL (buf, 2) = md->bl.id; - WBUFW (buf, 6) = battle_get_speed (&md->bl); - WBUFW (buf, 8) = md->opt1; - WBUFW (buf, 10) = md->opt2; - WBUFW (buf, 12) = md->option; - WBUFW (buf, 14) = mob_get_viewclass (md->mob_class); - if ((mob_get_viewclass (md->mob_class) <= 23) - || (mob_get_viewclass (md->mob_class) == 812) - || (mob_get_viewclass (md->mob_class) >= 4001)) + WBUFW(buf, 0) = 0x78; + WBUFL(buf, 2) = md->bl.id; + WBUFW(buf, 6) = battle_get_speed(&md->bl); + WBUFW(buf, 8) = md->opt1; + WBUFW(buf, 10) = md->opt2; + WBUFW(buf, 12) = md->option; + WBUFW(buf, 14) = mob_get_viewclass(md->mob_class); + if ((mob_get_viewclass(md->mob_class) <= 23) + || (mob_get_viewclass(md->mob_class) == 812) + || (mob_get_viewclass(md->mob_class) >= 4001)) { - WBUFW (buf, 12) |= mob_db[md->mob_class].option; - WBUFW (buf, 16) = mob_get_hair (md->mob_class); - WBUFW (buf, 18) = mob_get_weapon (md->mob_class); - WBUFW (buf, 20) = mob_get_head_buttom (md->mob_class); - WBUFW (buf, 22) = mob_get_shield (md->mob_class); - WBUFW (buf, 24) = mob_get_head_top (md->mob_class); - WBUFW (buf, 26) = mob_get_head_mid (md->mob_class); - WBUFW (buf, 28) = mob_get_hair_color (md->mob_class); - WBUFW (buf, 30) = mob_get_clothes_color (md->mob_class); //Add for player monster dye - Valaris - WBUFB (buf, 45) = mob_get_sex (md->mob_class); + WBUFW(buf, 12) |= mob_db[md->mob_class].option; + WBUFW(buf, 16) = mob_get_hair(md->mob_class); + WBUFW(buf, 18) = mob_get_weapon(md->mob_class); + WBUFW(buf, 20) = mob_get_head_buttom(md->mob_class); + WBUFW(buf, 22) = mob_get_shield(md->mob_class); + WBUFW(buf, 24) = mob_get_head_top(md->mob_class); + WBUFW(buf, 26) = mob_get_head_mid(md->mob_class); + WBUFW(buf, 28) = mob_get_hair_color(md->mob_class); + WBUFW(buf, 30) = mob_get_clothes_color(md->mob_class); //Add for player monster dye - Valaris + WBUFB(buf, 45) = mob_get_sex(md->mob_class); } - WBUFPOS (buf, 46, md->bl.x, md->bl.y); - WBUFB (buf, 48) |= md->dir & 0x0f; - WBUFB (buf, 49) = 5; - WBUFB (buf, 50) = 5; - WBUFW (buf, 52) = + WBUFPOS(buf, 46, md->bl.x, md->bl.y); + WBUFB(buf, 48) |= md->dir & 0x0f; + WBUFB(buf, 49) = 5; + WBUFB(buf, 50) = 5; + WBUFW(buf, 52) = ((level = - battle_get_lv (&md->bl)) > + battle_get_lv(&md->bl)) > battle_config.max_lv) ? battle_config.max_lv : level; return packet_len_table[0x78]; @@ -993,45 +992,45 @@ static int clif_mob0078 (struct mob_data *md, unsigned char *buf) * MOB表示2 *------------------------------------------ */ -static int clif_mob007b (struct mob_data *md, unsigned char *buf) +static int clif_mob007b(struct mob_data *md, unsigned char *buf) { - int level; + int level; - memset (buf, 0, packet_len_table[0x7b]); + memset(buf, 0, packet_len_table[0x7b]); - nullpo_retr (0, md); + nullpo_retr(0, md); - WBUFW (buf, 0) = 0x7b; - WBUFL (buf, 2) = md->bl.id; - WBUFW (buf, 6) = battle_get_speed (&md->bl); - WBUFW (buf, 8) = md->opt1; - WBUFW (buf, 10) = md->opt2; - WBUFW (buf, 12) = md->option; - WBUFW (buf, 14) = mob_get_viewclass (md->mob_class); - if ((mob_get_viewclass (md->mob_class) < 24) - || (mob_get_viewclass (md->mob_class) > 4000)) + WBUFW(buf, 0) = 0x7b; + WBUFL(buf, 2) = md->bl.id; + WBUFW(buf, 6) = battle_get_speed(&md->bl); + WBUFW(buf, 8) = md->opt1; + WBUFW(buf, 10) = md->opt2; + WBUFW(buf, 12) = md->option; + WBUFW(buf, 14) = mob_get_viewclass(md->mob_class); + if ((mob_get_viewclass(md->mob_class) < 24) + || (mob_get_viewclass(md->mob_class) > 4000)) { - WBUFW (buf, 12) |= mob_db[md->mob_class].option; - WBUFW (buf, 16) = mob_get_hair (md->mob_class); - WBUFW (buf, 18) = mob_get_weapon (md->mob_class); - WBUFW (buf, 20) = mob_get_head_buttom (md->mob_class); - WBUFL (buf, 22) = gettick (); - WBUFW (buf, 26) = mob_get_shield (md->mob_class); - WBUFW (buf, 28) = mob_get_head_top (md->mob_class); - WBUFW (buf, 30) = mob_get_head_mid (md->mob_class); - WBUFW (buf, 32) = mob_get_hair_color (md->mob_class); - WBUFW (buf, 34) = mob_get_clothes_color (md->mob_class); //Add for player monster dye - Valaris - WBUFB (buf, 49) = mob_get_sex (md->mob_class); + WBUFW(buf, 12) |= mob_db[md->mob_class].option; + WBUFW(buf, 16) = mob_get_hair(md->mob_class); + WBUFW(buf, 18) = mob_get_weapon(md->mob_class); + WBUFW(buf, 20) = mob_get_head_buttom(md->mob_class); + WBUFL(buf, 22) = gettick(); + WBUFW(buf, 26) = mob_get_shield(md->mob_class); + WBUFW(buf, 28) = mob_get_head_top(md->mob_class); + WBUFW(buf, 30) = mob_get_head_mid(md->mob_class); + WBUFW(buf, 32) = mob_get_hair_color(md->mob_class); + WBUFW(buf, 34) = mob_get_clothes_color(md->mob_class); //Add for player monster dye - Valaris + WBUFB(buf, 49) = mob_get_sex(md->mob_class); } else - WBUFL (buf, 22) = gettick (); + WBUFL(buf, 22) = gettick(); - WBUFPOS2 (buf, 50, md->bl.x, md->bl.y, md->to_x, md->to_y); - WBUFB (buf, 56) = 5; - WBUFB (buf, 57) = 5; - WBUFW (buf, 58) = + WBUFPOS2(buf, 50, md->bl.x, md->bl.y, md->to_x, md->to_y); + WBUFB(buf, 56) = 5; + WBUFB(buf, 57) = 5; + WBUFW(buf, 58) = ((level = - battle_get_lv (&md->bl)) > + battle_get_lv(&md->bl)) > battle_config.max_lv) ? battle_config.max_lv : level; return packet_len_table[0x7b]; @@ -1041,20 +1040,20 @@ static int clif_mob007b (struct mob_data *md, unsigned char *buf) * *------------------------------------------ */ -static int clif_npc0078 (struct npc_data *nd, unsigned char *buf) +static int clif_npc0078(struct npc_data *nd, unsigned char *buf) { - nullpo_retr (0, nd); + nullpo_retr(0, nd); - memset (buf, 0, packet_len_table[0x78]); + memset(buf, 0, packet_len_table[0x78]); - WBUFW (buf, 0) = 0x78; - WBUFL (buf, 2) = nd->bl.id; - WBUFW (buf, 6) = nd->speed; - WBUFW (buf, 14) = nd->npc_class; - WBUFPOS (buf, 46, nd->bl.x, nd->bl.y); - WBUFB (buf, 48) |= nd->dir & 0x0f; - WBUFB (buf, 49) = 5; - WBUFB (buf, 50) = 5; + WBUFW(buf, 0) = 0x78; + WBUFL(buf, 2) = nd->bl.id; + WBUFW(buf, 6) = nd->speed; + WBUFW(buf, 14) = nd->npc_class; + WBUFPOS(buf, 46, nd->bl.x, nd->bl.y); + WBUFB(buf, 48) |= nd->dir & 0x0f; + WBUFB(buf, 49) = 5; + WBUFB(buf, 50) = 5; return packet_len_table[0x78]; } @@ -1063,13 +1062,13 @@ static int clif_npc0078 (struct npc_data *nd, unsigned char *buf) * *------------------------------------------ */ -static int clif_set01e1 (struct map_session_data *sd, unsigned char *buf) +static int clif_set01e1(struct map_session_data *sd, unsigned char *buf) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WBUFW (buf, 0) = 0x1e1; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = sd->spiritball; + WBUFW(buf, 0) = 0x1e1; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = sd->spiritball; return packet_len_table[0x1e1]; } @@ -1078,14 +1077,14 @@ static int clif_set01e1 (struct map_session_data *sd, unsigned char *buf) * *------------------------------------------ */ -static int clif_set0192 (int fd, int m, int x, int y, int type) +static int clif_set0192(int fd, int m, int x, int y, int type) { - WFIFOW (fd, 0) = 0x192; - WFIFOW (fd, 2) = x; - WFIFOW (fd, 4) = y; - WFIFOW (fd, 6) = type; - memcpy (WFIFOP (fd, 8), map[m].name, 16); - WFIFOSET (fd, packet_len_table[0x192]); + WFIFOW(fd, 0) = 0x192; + WFIFOW(fd, 2) = x; + WFIFOW(fd, 4) = y; + WFIFOW(fd, 6) = type; + memcpy(WFIFOP(fd, 8), map[m].name, 16); + WFIFOSET(fd, packet_len_table[0x192]); return 0; } @@ -1112,68 +1111,68 @@ static int equip_points[LOOK_LAST + 1] = { * *------------------------------------------ */ -int clif_spawnpc (struct map_session_data *sd) +int clif_spawnpc(struct map_session_data *sd) { unsigned char buf[128]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->disguise > 23 && sd->disguise < 4001) { // mob disguises [Valaris] - clif_clearchar (&sd->bl, 9); + clif_clearchar(&sd->bl, 9); - memset (buf, 0, packet_len_table[0x119]); + memset(buf, 0, packet_len_table[0x119]); - WBUFW (buf, 0) = 0x119; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = 0; - WBUFW (buf, 8) = 0; - WBUFW (buf, 10) = 0x40; - WBUFB (buf, 12) = 0; + WBUFW(buf, 0) = 0x119; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = 0; + WBUFW(buf, 8) = 0; + WBUFW(buf, 10) = 0x40; + WBUFB(buf, 12) = 0; - clif_send (buf, packet_len_table[0x119], &sd->bl, SELF); + clif_send(buf, packet_len_table[0x119], &sd->bl, SELF); - memset (buf, 0, packet_len_table[0x7c]); + memset(buf, 0, packet_len_table[0x7c]); - WBUFW (buf, 0) = 0x7c; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = sd->speed; - WBUFW (buf, 8) = sd->opt1; - WBUFW (buf, 10) = sd->opt2; - WBUFW (buf, 12) = sd->status.option; - WBUFW (buf, 20) = sd->disguise; - WBUFPOS (buf, 36, sd->bl.x, sd->bl.y); - clif_send (buf, packet_len_table[0x7c], &sd->bl, AREA); + WBUFW(buf, 0) = 0x7c; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = sd->speed; + WBUFW(buf, 8) = sd->opt1; + WBUFW(buf, 10) = sd->opt2; + WBUFW(buf, 12) = sd->status.option; + WBUFW(buf, 20) = sd->disguise; + WBUFPOS(buf, 36, sd->bl.x, sd->bl.y); + clif_send(buf, packet_len_table[0x7c], &sd->bl, AREA); } - clif_set0078 (sd, buf); + clif_set0078(sd, buf); - WBUFW (buf, 0) = 0x1d9; - WBUFW (buf, 51) = 0; - clif_send (buf, packet_len_table[0x1d9], &sd->bl, AREA_WOS); + WBUFW(buf, 0) = 0x1d9; + WBUFW(buf, 51) = 0; + clif_send(buf, packet_len_table[0x1d9], &sd->bl, AREA_WOS); if (sd->spiritball > 0) - clif_spiritball (sd); + clif_spiritball(sd); if (sd->status.pc_class == 13 || sd->status.pc_class == 21 || sd->status.pc_class == 4014 || sd->status.pc_class == 4022) - pc_setoption (sd, sd->status.option | 0x0020); // [Valaris] + pc_setoption(sd, sd->status.option | 0x0020); // [Valaris] - if ((pc_isriding (sd) && pc_checkskill (sd, KN_RIDING) > 0) + if ((pc_isriding(sd) && pc_checkskill(sd, KN_RIDING) > 0) && (sd->status.pc_class == 7 || sd->status.pc_class == 14 || sd->status.pc_class == 4008 || sd->status.pc_class == 4015)) - pc_setriding (sd); // update peco riders for people upgrading athena [Valaris] + pc_setriding(sd); // update peco riders for people upgrading athena [Valaris] if (map[sd->bl.m].flag.snow) - clif_specialeffect (&sd->bl, 162, 1); + clif_specialeffect(&sd->bl, 162, 1); if (map[sd->bl.m].flag.fog) - clif_specialeffect (&sd->bl, 233, 1); + clif_specialeffect(&sd->bl, 233, 1); if (map[sd->bl.m].flag.sakura) - clif_specialeffect (&sd->bl, 163, 1); + clif_specialeffect(&sd->bl, 163, 1); if (map[sd->bl.m].flag.leaves) - clif_specialeffect (&sd->bl, 333, 1); + clif_specialeffect(&sd->bl, 333, 1); if (map[sd->bl.m].flag.rain) - clif_specialeffect (&sd->bl, 161, 1); + clif_specialeffect(&sd->bl, 161, 1); // clif_changelook_accessories(&sd->bl, NULL); @@ -1184,66 +1183,66 @@ int clif_spawnpc (struct map_session_data *sd) * *------------------------------------------ */ -int clif_spawnnpc (struct npc_data *nd) +int clif_spawnnpc(struct npc_data *nd) { unsigned char buf[64]; - int len; + int len; - nullpo_retr (0, nd); + nullpo_retr(0, nd); if (nd->npc_class < 0 || nd->flag & 1 || nd->npc_class == INVISIBLE_CLASS) return 0; - memset (buf, 0, packet_len_table[0x7c]); + memset(buf, 0, packet_len_table[0x7c]); - WBUFW (buf, 0) = 0x7c; - WBUFL (buf, 2) = nd->bl.id; - WBUFW (buf, 6) = nd->speed; - WBUFW (buf, 20) = nd->npc_class; - WBUFPOS (buf, 36, nd->bl.x, nd->bl.y); + WBUFW(buf, 0) = 0x7c; + WBUFL(buf, 2) = nd->bl.id; + WBUFW(buf, 6) = nd->speed; + WBUFW(buf, 20) = nd->npc_class; + WBUFPOS(buf, 36, nd->bl.x, nd->bl.y); - clif_send (buf, packet_len_table[0x7c], &nd->bl, AREA); + clif_send(buf, packet_len_table[0x7c], &nd->bl, AREA); - len = clif_npc0078 (nd, buf); - clif_send (buf, len, &nd->bl, AREA); + len = clif_npc0078(nd, buf); + clif_send(buf, len, &nd->bl, AREA); return 0; } int -clif_spawn_fake_npc_for_player (struct map_session_data *sd, int fake_npc_id) +clif_spawn_fake_npc_for_player(struct map_session_data *sd, int fake_npc_id) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; if (!fd) return 0; - WFIFOW (fd, 0) = 0x7c; - WFIFOL (fd, 2) = fake_npc_id; - WFIFOW (fd, 6) = 0; - WFIFOW (fd, 8) = 0; - WFIFOW (fd, 10) = 0; - WFIFOW (fd, 12) = 0; - WFIFOW (fd, 20) = 127; - WFIFOPOS (fd, 36, sd->bl.x, sd->bl.y); - WFIFOSET (fd, packet_len_table[0x7c]); + WFIFOW(fd, 0) = 0x7c; + WFIFOL(fd, 2) = fake_npc_id; + WFIFOW(fd, 6) = 0; + WFIFOW(fd, 8) = 0; + WFIFOW(fd, 10) = 0; + WFIFOW(fd, 12) = 0; + WFIFOW(fd, 20) = 127; + WFIFOPOS(fd, 36, sd->bl.x, sd->bl.y); + WFIFOSET(fd, packet_len_table[0x7c]); - WFIFOW (fd, 0) = 0x78; - WFIFOL (fd, 2) = fake_npc_id; - WFIFOW (fd, 6) = 0; - WFIFOW (fd, 8) = 0; - WFIFOW (fd, 10) = 0; - WFIFOW (fd, 12) = 0; - WFIFOW (fd, 14) = 127; // identifies as NPC - WFIFOW (fd, 20) = 127; - WFIFOPOS (fd, 46, sd->bl.x, sd->bl.y); - WFIFOPOS (fd, 36, sd->bl.x, sd->bl.y); - WFIFOB (fd, 49) = 5; - WFIFOB (fd, 50) = 5; - WFIFOSET (fd, packet_len_table[0x78]); + WFIFOW(fd, 0) = 0x78; + WFIFOL(fd, 2) = fake_npc_id; + WFIFOW(fd, 6) = 0; + WFIFOW(fd, 8) = 0; + WFIFOW(fd, 10) = 0; + WFIFOW(fd, 12) = 0; + WFIFOW(fd, 14) = 127; // identifies as NPC + WFIFOW(fd, 20) = 127; + WFIFOPOS(fd, 46, sd->bl.x, sd->bl.y); + WFIFOPOS(fd, 36, sd->bl.x, sd->bl.y); + WFIFOB(fd, 49) = 5; + WFIFOB(fd, 50) = 5; + WFIFOSET(fd, packet_len_table[0x78]); return 0; } @@ -1252,33 +1251,33 @@ clif_spawn_fake_npc_for_player (struct map_session_data *sd, int fake_npc_id) * *------------------------------------------ */ -int clif_spawnmob (struct mob_data *md) +int clif_spawnmob(struct mob_data *md) { unsigned char buf[64]; - int len; + int len; - nullpo_retr (0, md); + nullpo_retr(0, md); - if (mob_get_viewclass (md->mob_class) > 23) + if (mob_get_viewclass(md->mob_class) > 23) { - memset (buf, 0, packet_len_table[0x7c]); + memset(buf, 0, packet_len_table[0x7c]); - WBUFW (buf, 0) = 0x7c; - WBUFL (buf, 2) = md->bl.id; - WBUFW (buf, 6) = md->stats[MOB_SPEED]; - WBUFW (buf, 8) = md->opt1; - WBUFW (buf, 10) = md->opt2; - WBUFW (buf, 12) = md->option; - WBUFW (buf, 20) = mob_get_viewclass (md->mob_class); - WBUFPOS (buf, 36, md->bl.x, md->bl.y); - clif_send (buf, packet_len_table[0x7c], &md->bl, AREA); + WBUFW(buf, 0) = 0x7c; + WBUFL(buf, 2) = md->bl.id; + WBUFW(buf, 6) = md->stats[MOB_SPEED]; + WBUFW(buf, 8) = md->opt1; + WBUFW(buf, 10) = md->opt2; + WBUFW(buf, 12) = md->option; + WBUFW(buf, 20) = mob_get_viewclass(md->mob_class); + WBUFPOS(buf, 36, md->bl.x, md->bl.y); + clif_send(buf, packet_len_table[0x7c], &md->bl, AREA); } - len = clif_mob0078 (md, buf); - clif_send (buf, len, &md->bl, AREA); + len = clif_mob0078(md, buf); + clif_send(buf, len, &md->bl, AREA); - if (mob_get_equip (md->mob_class) > 0) // mob equipment [Valaris] - clif_mob_equip (md, mob_get_equip (md->mob_class)); + if (mob_get_equip(md->mob_class) > 0) // mob equipment [Valaris] + clif_mob_equip(md, mob_get_equip(md->mob_class)); return 0; } @@ -1288,16 +1287,16 @@ int clif_spawnmob (struct mob_data *md) *------------------------------------------ */ static -int clif_servertick (struct map_session_data *sd) +int clif_servertick(struct map_session_data *sd) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x7f; - WFIFOL (fd, 2) = sd->server_tick; - WFIFOSET (fd, packet_len_table[0x7f]); + WFIFOW(fd, 0) = 0x7f; + WFIFOL(fd, 2) = sd->server_tick; + WFIFOSET(fd, packet_len_table[0x7f]); return 0; } @@ -1306,18 +1305,18 @@ int clif_servertick (struct map_session_data *sd) * *------------------------------------------ */ -int clif_walkok (struct map_session_data *sd) +int clif_walkok(struct map_session_data *sd) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x87; - WFIFOL (fd, 2) = gettick ();; - WFIFOPOS2 (fd, 6, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y); - WFIFOB (fd, 11) = 0; - WFIFOSET (fd, packet_len_table[0x87]); + WFIFOW(fd, 0) = 0x87; + WFIFOL(fd, 2) = gettick();; + WFIFOPOS2(fd, 6, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y); + WFIFOB(fd, 11) = 0; + WFIFOSET(fd, packet_len_table[0x87]); return 0; } @@ -1326,28 +1325,28 @@ int clif_walkok (struct map_session_data *sd) * *------------------------------------------ */ -int clif_movechar (struct map_session_data *sd) +int clif_movechar(struct map_session_data *sd) { - int fd; - int len; + int fd; + int len; unsigned char buf[256]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - len = clif_set007b (sd, buf); + len = clif_set007b(sd, buf); if (sd->disguise > 23 && sd->disguise < 4001) { - clif_send (buf, len, &sd->bl, AREA); + clif_send(buf, len, &sd->bl, AREA); return 0; } else - clif_send (buf, len, &sd->bl, AREA_WOS); + clif_send(buf, len, &sd->bl, AREA_WOS); if (battle_config.save_clothcolor == 1 && sd->status.clothes_color > 0) - clif_changelook (&sd->bl, LOOK_CLOTHES_COLOR, + clif_changelook(&sd->bl, LOOK_CLOTHES_COLOR, sd->status.clothes_color); return 0; @@ -1358,16 +1357,16 @@ int clif_movechar (struct map_session_data *sd) *------------------------------------------ */ static -void clif_quitsave (int fd, struct map_session_data *sd) +void clif_quitsave(int fd, struct map_session_data *sd) { - map_quit (sd); + map_quit(sd); } /*========================================== * *------------------------------------------ */ -static void clif_waitclose (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void clif_waitclose(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { if (session[id]) session[id]->eof = 1; @@ -1377,31 +1376,31 @@ static void clif_waitclose (timer_id tid, tick_t tick, custom_id_t id, custom_da * *------------------------------------------ */ -void clif_setwaitclose (int fd) +void clif_setwaitclose(int fd) { - add_timer (gettick () + 5000, clif_waitclose, fd, 0); + add_timer(gettick() + 5000, clif_waitclose, fd, 0); } /*========================================== * *------------------------------------------ */ -int clif_changemap (struct map_session_data *sd, const char *mapname, int x, int y) +int clif_changemap(struct map_session_data *sd, const char *mapname, int x, int y) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x91; - memcpy (WFIFOP (fd, 2), mapname, 16); - WFIFOW (fd, 18) = x; - WFIFOW (fd, 20) = y; - WFIFOSET (fd, packet_len_table[0x91]); + WFIFOW(fd, 0) = 0x91; + memcpy(WFIFOP(fd, 2), mapname, 16); + WFIFOW(fd, 18) = x; + WFIFOW(fd, 20) = y; + WFIFOSET(fd, packet_len_table[0x91]); if (sd->disguise > 23 && sd->disguise < 4001) // mob disguises [Valaris] - clif_spawnpc (sd); + clif_spawnpc(sd); return 0; } @@ -1410,21 +1409,21 @@ int clif_changemap (struct map_session_data *sd, const char *mapname, int x, int * *------------------------------------------ */ -int clif_changemapserver (struct map_session_data *sd, const char *mapname, int x, +int clif_changemapserver(struct map_session_data *sd, const char *mapname, int x, int y, struct in_addr ip, int port) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x92; - memcpy (WFIFOP (fd, 2), mapname, 16); - WFIFOW (fd, 18) = x; - WFIFOW (fd, 20) = y; - WFIFOL (fd, 22) = ip.s_addr; - WFIFOW (fd, 26) = port; - WFIFOSET (fd, packet_len_table[0x92]); + WFIFOW(fd, 0) = 0x92; + memcpy(WFIFOP(fd, 2), mapname, 16); + WFIFOW(fd, 18) = x; + WFIFOW(fd, 20) = y; + WFIFOL(fd, 22) = ip.s_addr; + WFIFOW(fd, 26) = port; + WFIFOSET(fd, packet_len_table[0x92]); return 0; } @@ -1433,18 +1432,18 @@ int clif_changemapserver (struct map_session_data *sd, const char *mapname, int * *------------------------------------------ */ -int clif_fixpos (struct block_list *bl) +int clif_fixpos(struct block_list *bl) { uint8_t buf[16]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x88; - WBUFL (buf, 2) = bl->id; - WBUFW (buf, 6) = bl->x; - WBUFW (buf, 8) = bl->y; + WBUFW(buf, 0) = 0x88; + WBUFL(buf, 2) = bl->id; + WBUFW(buf, 6) = bl->x; + WBUFW(buf, 8) = bl->y; - clif_send (buf, packet_len_table[0x88], bl, AREA); + clif_send(buf, packet_len_table[0x88], bl, AREA); return 0; } @@ -1453,16 +1452,16 @@ int clif_fixpos (struct block_list *bl) * *------------------------------------------ */ -int clif_npcbuysell (struct map_session_data *sd, int id) +int clif_npcbuysell(struct map_session_data *sd, int id) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xc4; - WFIFOL (fd, 2) = id; - WFIFOSET (fd, packet_len_table[0xc4]); + WFIFOW(fd, 0) = 0xc4; + WFIFOL(fd, 2) = id; + WFIFOSET(fd, packet_len_table[0xc4]); return 0; } @@ -1471,32 +1470,32 @@ int clif_npcbuysell (struct map_session_data *sd, int id) * *------------------------------------------ */ -int clif_buylist (struct map_session_data *sd, struct npc_data *nd) +int clif_buylist(struct map_session_data *sd, struct npc_data *nd) { struct item_data *id; - int fd, i, val; + int fd, i, val; - nullpo_retr (0, sd); - nullpo_retr (0, nd); + nullpo_retr(0, sd); + nullpo_retr(0, nd); fd = sd->fd; - WFIFOW (fd, 0) = 0xc6; + WFIFOW(fd, 0) = 0xc6; for (i = 0; nd->u.shop_item[i].nameid > 0; i++) { - id = itemdb_search (nd->u.shop_item[i].nameid); + id = itemdb_search(nd->u.shop_item[i].nameid); val = nd->u.shop_item[i].value; - WFIFOL (fd, 4 + i * 11) = val; + WFIFOL(fd, 4 + i * 11) = val; if (!id->flag.value_notdc) - val = pc_modifybuyvalue (sd, val); - WFIFOL (fd, 8 + i * 11) = val; - WFIFOB (fd, 12 + i * 11) = id->type; + val = pc_modifybuyvalue(sd, val); + WFIFOL(fd, 8 + i * 11) = val; + WFIFOB(fd, 12 + i * 11) = id->type; if (id->view_id > 0) - WFIFOW (fd, 13 + i * 11) = id->view_id; + WFIFOW(fd, 13 + i * 11) = id->view_id; else - WFIFOW (fd, 13 + i * 11) = nd->u.shop_item[i].nameid; + WFIFOW(fd, 13 + i * 11) = nd->u.shop_item[i].nameid; } - WFIFOW (fd, 2) = i * 11 + 4; - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 2) = i * 11 + 4; + WFIFOSET(fd, WFIFOW(fd, 2)); return 0; } @@ -1505,14 +1504,14 @@ int clif_buylist (struct map_session_data *sd, struct npc_data *nd) * *------------------------------------------ */ -int clif_selllist (struct map_session_data *sd) +int clif_selllist(struct map_session_data *sd) { - int fd, i, c = 0, val; + int fd, i, c = 0, val; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xc7; + WFIFOW(fd, 0) = 0xc7; for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].nameid > 0 && sd->inventory_data[i]) @@ -1520,16 +1519,16 @@ int clif_selllist (struct map_session_data *sd) val = sd->inventory_data[i]->value_sell; if (val < 0) continue; - WFIFOW (fd, 4 + c * 10) = i + 2; - WFIFOL (fd, 6 + c * 10) = val; + WFIFOW(fd, 4 + c * 10) = i + 2; + WFIFOL(fd, 6 + c * 10) = val; if (!sd->inventory_data[i]->flag.value_notoc) - val = pc_modifysellvalue (sd, val); - WFIFOL (fd, 10 + c * 10) = val; + val = pc_modifysellvalue(sd, val); + WFIFOL(fd, 10 + c * 10) = val; c++; } } - WFIFOW (fd, 2) = c * 10 + 4; - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 2) = c * 10 + 4; + WFIFOSET(fd, WFIFOW(fd, 2)); return 0; } @@ -1538,18 +1537,18 @@ int clif_selllist (struct map_session_data *sd) * *------------------------------------------ */ -int clif_scriptmes (struct map_session_data *sd, int npcid, const char *mes) +int clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xb4; - WFIFOW (fd, 2) = strlen (mes) + 9; - WFIFOL (fd, 4) = npcid; - strcpy ((char *)WFIFOP (fd, 8), mes); - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 0) = 0xb4; + WFIFOW(fd, 2) = strlen(mes) + 9; + WFIFOL(fd, 4) = npcid; + strcpy((char *)WFIFOP(fd, 8), mes); + WFIFOSET(fd, WFIFOW(fd, 2)); return 0; } @@ -1558,16 +1557,16 @@ int clif_scriptmes (struct map_session_data *sd, int npcid, const char *mes) * *------------------------------------------ */ -int clif_scriptnext (struct map_session_data *sd, int npcid) +int clif_scriptnext(struct map_session_data *sd, int npcid) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xb5; - WFIFOL (fd, 2) = npcid; - WFIFOSET (fd, packet_len_table[0xb5]); + WFIFOW(fd, 0) = 0xb5; + WFIFOL(fd, 2) = npcid; + WFIFOSET(fd, packet_len_table[0xb5]); return 0; } @@ -1576,16 +1575,16 @@ int clif_scriptnext (struct map_session_data *sd, int npcid) * *------------------------------------------ */ -int clif_scriptclose (struct map_session_data *sd, int npcid) +int clif_scriptclose(struct map_session_data *sd, int npcid) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xb6; - WFIFOL (fd, 2) = npcid; - WFIFOSET (fd, packet_len_table[0xb6]); + WFIFOW(fd, 0) = 0xb6; + WFIFOL(fd, 2) = npcid; + WFIFOSET(fd, packet_len_table[0xb6]); return 0; } @@ -1594,18 +1593,18 @@ int clif_scriptclose (struct map_session_data *sd, int npcid) * *------------------------------------------ */ -int clif_scriptmenu (struct map_session_data *sd, int npcid, const char *mes) +int clif_scriptmenu(struct map_session_data *sd, int npcid, const char *mes) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xb7; - WFIFOW (fd, 2) = strlen (mes) + 8; - WFIFOL (fd, 4) = npcid; - strcpy ((char *)WFIFOP (fd, 8), mes); - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 0) = 0xb7; + WFIFOW(fd, 2) = strlen(mes) + 8; + WFIFOL(fd, 4) = npcid; + strcpy((char *)WFIFOP(fd, 8), mes); + WFIFOSET(fd, WFIFOW(fd, 2)); return 0; } @@ -1614,16 +1613,16 @@ int clif_scriptmenu (struct map_session_data *sd, int npcid, const char *mes) * *------------------------------------------ */ -int clif_scriptinput (struct map_session_data *sd, int npcid) +int clif_scriptinput(struct map_session_data *sd, int npcid) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x142; - WFIFOL (fd, 2) = npcid; - WFIFOSET (fd, packet_len_table[0x142]); + WFIFOW(fd, 0) = 0x142; + WFIFOL(fd, 2) = npcid; + WFIFOSET(fd, packet_len_table[0x142]); return 0; } @@ -1632,16 +1631,16 @@ int clif_scriptinput (struct map_session_data *sd, int npcid) * *------------------------------------------ */ -int clif_scriptinputstr (struct map_session_data *sd, int npcid) +int clif_scriptinputstr(struct map_session_data *sd, int npcid) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x1d4; - WFIFOL (fd, 2) = npcid; - WFIFOSET (fd, packet_len_table[0x1d4]); + WFIFOW(fd, 0) = 0x1d4; + WFIFOL(fd, 2) = npcid; + WFIFOSET(fd, packet_len_table[0x1d4]); return 0; } @@ -1650,22 +1649,22 @@ int clif_scriptinputstr (struct map_session_data *sd, int npcid) * *------------------------------------------ */ -int clif_viewpoint (struct map_session_data *sd, int npc_id, int type, int x, +int clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x144; - WFIFOL (fd, 2) = npc_id; - WFIFOL (fd, 6) = type; - WFIFOL (fd, 10) = x; - WFIFOL (fd, 14) = y; - WFIFOB (fd, 18) = id; - WFIFOL (fd, 19) = color; - WFIFOSET (fd, packet_len_table[0x144]); + WFIFOW(fd, 0) = 0x144; + WFIFOL(fd, 2) = npc_id; + WFIFOL(fd, 6) = type; + WFIFOL(fd, 10) = x; + WFIFOL(fd, 14) = y; + WFIFOB(fd, 18) = id; + WFIFOL(fd, 19) = color; + WFIFOSET(fd, packet_len_table[0x144]); return 0; } @@ -1674,17 +1673,17 @@ int clif_viewpoint (struct map_session_data *sd, int npc_id, int type, int x, * *------------------------------------------ */ -int clif_cutin (struct map_session_data *sd, const char *image, int type) +int clif_cutin(struct map_session_data *sd, const char *image, int type) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x1b3; - memcpy (WFIFOP (fd, 2), image, 64); - WFIFOB (fd, 66) = type; - WFIFOSET (fd, packet_len_table[0x1b3]); + WFIFOW(fd, 0) = 0x1b3; + memcpy(WFIFOP(fd, 2), image, 64); + WFIFOB(fd, 66) = type; + WFIFOSET(fd, packet_len_table[0x1b3]); return 0; } @@ -1693,31 +1692,31 @@ int clif_cutin (struct map_session_data *sd, const char *image, int type) * *------------------------------------------ */ -int clif_additem (struct map_session_data *sd, int n, int amount, int fail) +int clif_additem(struct map_session_data *sd, int n, int amount, int fail) { - int fd, j; + int fd, j; unsigned char *buf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - buf = WFIFOP (fd, 0); + buf = WFIFOP(fd, 0); if (fail) { - WBUFW (buf, 0) = 0xa0; - WBUFW (buf, 2) = n + 2; - WBUFW (buf, 4) = amount; - WBUFW (buf, 6) = 0; - WBUFB (buf, 8) = 0; - WBUFB (buf, 9) = 0; - WBUFB (buf, 10) = 0; - WBUFW (buf, 11) = 0; - WBUFW (buf, 13) = 0; - WBUFW (buf, 15) = 0; - WBUFW (buf, 17) = 0; - WBUFW (buf, 19) = 0; - WBUFB (buf, 21) = 0; - WBUFB (buf, 22) = fail; + WBUFW(buf, 0) = 0xa0; + WBUFW(buf, 2) = n + 2; + WBUFW(buf, 4) = amount; + WBUFW(buf, 6) = 0; + WBUFB(buf, 8) = 0; + WBUFB(buf, 9) = 0; + WBUFB(buf, 10) = 0; + WBUFW(buf, 11) = 0; + WBUFW(buf, 13) = 0; + WBUFW(buf, 15) = 0; + WBUFW(buf, 17) = 0; + WBUFW(buf, 19) = 0; + WBUFB(buf, 21) = 0; + WBUFB(buf, 22) = fail; } else { @@ -1725,59 +1724,59 @@ int clif_additem (struct map_session_data *sd, int n, int amount, int fail) || sd->inventory_data[n] == NULL) return 1; - WBUFW (buf, 0) = 0xa0; - WBUFW (buf, 2) = n + 2; - WBUFW (buf, 4) = amount; + WBUFW(buf, 0) = 0xa0; + WBUFW(buf, 2) = n + 2; + WBUFW(buf, 4) = amount; if (sd->inventory_data[n]->view_id > 0) - WBUFW (buf, 6) = sd->inventory_data[n]->view_id; + WBUFW(buf, 6) = sd->inventory_data[n]->view_id; else - WBUFW (buf, 6) = sd->status.inventory[n].nameid; - WBUFB (buf, 8) = sd->status.inventory[n].identify; + WBUFW(buf, 6) = sd->status.inventory[n].nameid; + WBUFB(buf, 8) = sd->status.inventory[n].identify; if (sd->status.inventory[n].broken == 1) - WBUFB (buf, 9) = 1; // is weapon broken [Valaris] + WBUFB(buf, 9) = 1; // is weapon broken [Valaris] else - WBUFB (buf, 9) = sd->status.inventory[n].attribute; - WBUFB (buf, 10) = sd->status.inventory[n].refine; + WBUFB(buf, 9) = sd->status.inventory[n].attribute; + WBUFB(buf, 10) = sd->status.inventory[n].refine; if (sd->status.inventory[n].card[0] == 0x00ff || sd->status.inventory[n].card[0] == 0x00fe || sd->status.inventory[n].card[0] == (short) 0xff00) { - WBUFW (buf, 11) = sd->status.inventory[n].card[0]; - WBUFW (buf, 13) = sd->status.inventory[n].card[1]; - WBUFW (buf, 15) = sd->status.inventory[n].card[2]; - WBUFW (buf, 17) = sd->status.inventory[n].card[3]; + WBUFW(buf, 11) = sd->status.inventory[n].card[0]; + WBUFW(buf, 13) = sd->status.inventory[n].card[1]; + WBUFW(buf, 15) = sd->status.inventory[n].card[2]; + WBUFW(buf, 17) = sd->status.inventory[n].card[3]; } else { if (sd->status.inventory[n].card[0] > 0 - && (j = itemdb_viewid (sd->status.inventory[n].card[0])) > 0) - WBUFW (buf, 11) = j; + && (j = itemdb_viewid(sd->status.inventory[n].card[0])) > 0) + WBUFW(buf, 11) = j; else - WBUFW (buf, 11) = sd->status.inventory[n].card[0]; + WBUFW(buf, 11) = sd->status.inventory[n].card[0]; if (sd->status.inventory[n].card[1] > 0 - && (j = itemdb_viewid (sd->status.inventory[n].card[1])) > 0) - WBUFW (buf, 13) = j; + && (j = itemdb_viewid(sd->status.inventory[n].card[1])) > 0) + WBUFW(buf, 13) = j; else - WBUFW (buf, 13) = sd->status.inventory[n].card[1]; + WBUFW(buf, 13) = sd->status.inventory[n].card[1]; if (sd->status.inventory[n].card[2] > 0 - && (j = itemdb_viewid (sd->status.inventory[n].card[2])) > 0) - WBUFW (buf, 15) = j; + && (j = itemdb_viewid(sd->status.inventory[n].card[2])) > 0) + WBUFW(buf, 15) = j; else - WBUFW (buf, 15) = sd->status.inventory[n].card[2]; + WBUFW(buf, 15) = sd->status.inventory[n].card[2]; if (sd->status.inventory[n].card[3] > 0 - && (j = itemdb_viewid (sd->status.inventory[n].card[3])) > 0) - WBUFW (buf, 17) = j; + && (j = itemdb_viewid(sd->status.inventory[n].card[3])) > 0) + WBUFW(buf, 17) = j; else - WBUFW (buf, 17) = sd->status.inventory[n].card[3]; + WBUFW(buf, 17) = sd->status.inventory[n].card[3]; } - WBUFW (buf, 19) = pc_equippoint (sd, n); - WBUFB (buf, 21) = + WBUFW(buf, 19) = pc_equippoint(sd, n); + WBUFB(buf, 21) = (sd->inventory_data[n]->type == 7) ? 4 : sd->inventory_data[n]->type; - WBUFB (buf, 22) = fail; + WBUFB(buf, 22) = fail; } - WFIFOSET (fd, packet_len_table[0xa0]); + WFIFOSET(fd, packet_len_table[0xa0]); return 0; } @@ -1785,18 +1784,18 @@ int clif_additem (struct map_session_data *sd, int n, int amount, int fail) * *------------------------------------------ */ -int clif_delitem (struct map_session_data *sd, int n, int amount) +int clif_delitem(struct map_session_data *sd, int n, int amount) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xaf; - WFIFOW (fd, 2) = n + 2; - WFIFOW (fd, 4) = amount; + WFIFOW(fd, 0) = 0xaf; + WFIFOW(fd, 2) = n + 2; + WFIFOW(fd, 4) = amount; - WFIFOSET (fd, packet_len_table[0xaf]); + WFIFOSET(fd, packet_len_table[0xaf]); return 0; } @@ -1805,51 +1804,51 @@ int clif_delitem (struct map_session_data *sd, int n, int amount) * *------------------------------------------ */ -int clif_itemlist (struct map_session_data *sd) +int clif_itemlist(struct map_session_data *sd) { - int i, n, fd, arrow = -1; + int i, n, fd, arrow = -1; unsigned char *buf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - buf = WFIFOP (fd, 0); - WBUFW (buf, 0) = 0x1ee; + buf = WFIFOP(fd, 0); + WBUFW(buf, 0) = 0x1ee; for (i = 0, n = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].nameid <= 0 || sd->inventory_data[i] == NULL - || itemdb_isequip2 (sd->inventory_data[i])) + || itemdb_isequip2(sd->inventory_data[i])) continue; - WBUFW (buf, n * 18 + 4) = i + 2; + WBUFW(buf, n * 18 + 4) = i + 2; if (sd->inventory_data[i]->view_id > 0) - WBUFW (buf, n * 18 + 6) = sd->inventory_data[i]->view_id; + WBUFW(buf, n * 18 + 6) = sd->inventory_data[i]->view_id; else - WBUFW (buf, n * 18 + 6) = sd->status.inventory[i].nameid; - WBUFB (buf, n * 18 + 8) = sd->inventory_data[i]->type; - WBUFB (buf, n * 18 + 9) = sd->status.inventory[i].identify; - WBUFW (buf, n * 18 + 10) = sd->status.inventory[i].amount; + WBUFW(buf, n * 18 + 6) = sd->status.inventory[i].nameid; + WBUFB(buf, n * 18 + 8) = sd->inventory_data[i]->type; + WBUFB(buf, n * 18 + 9) = sd->status.inventory[i].identify; + WBUFW(buf, n * 18 + 10) = sd->status.inventory[i].amount; if (sd->inventory_data[i]->equip == 0x8000) { - WBUFW (buf, n * 18 + 12) = 0x8000; + WBUFW(buf, n * 18 + 12) = 0x8000; if (sd->status.inventory[i].equip) arrow = i; // ついでに矢装備チェック } else - WBUFW (buf, n * 18 + 12) = 0; - WBUFW (buf, n * 18 + 14) = sd->status.inventory[i].card[0]; - WBUFW (buf, n * 18 + 16) = sd->status.inventory[i].card[1]; - WBUFW (buf, n * 18 + 18) = sd->status.inventory[i].card[2]; - WBUFW (buf, n * 18 + 20) = sd->status.inventory[i].card[3]; + WBUFW(buf, n * 18 + 12) = 0; + WBUFW(buf, n * 18 + 14) = sd->status.inventory[i].card[0]; + WBUFW(buf, n * 18 + 16) = sd->status.inventory[i].card[1]; + WBUFW(buf, n * 18 + 18) = sd->status.inventory[i].card[2]; + WBUFW(buf, n * 18 + 20) = sd->status.inventory[i].card[3]; n++; } if (n) { - WBUFW (buf, 2) = 4 + n * 18; - WFIFOSET (fd, WFIFOW (fd, 2)); + WBUFW(buf, 2) = 4 + n * 18; + WFIFOSET(fd, WFIFOW(fd, 2)); } if (arrow >= 0) - clif_arrowequip (sd, arrow); + clif_arrowequip(sd, arrow); return 0; } @@ -1857,76 +1856,76 @@ int clif_itemlist (struct map_session_data *sd) * *------------------------------------------ */ -int clif_equiplist (struct map_session_data *sd) +int clif_equiplist(struct map_session_data *sd) { - int i, j, n, fd; + int i, j, n, fd; unsigned char *buf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - buf = WFIFOP (fd, 0); - WBUFW (buf, 0) = 0xa4; + buf = WFIFOP(fd, 0); + WBUFW(buf, 0) = 0xa4; for (i = 0, n = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].nameid <= 0 || sd->inventory_data[i] == NULL - || !itemdb_isequip2 (sd->inventory_data[i])) + || !itemdb_isequip2(sd->inventory_data[i])) continue; - WBUFW (buf, n * 20 + 4) = i + 2; + WBUFW(buf, n * 20 + 4) = i + 2; if (sd->inventory_data[i]->view_id > 0) - WBUFW (buf, n * 20 + 6) = sd->inventory_data[i]->view_id; + WBUFW(buf, n * 20 + 6) = sd->inventory_data[i]->view_id; else - WBUFW (buf, n * 20 + 6) = sd->status.inventory[i].nameid; - WBUFB (buf, n * 20 + 8) = + WBUFW(buf, n * 20 + 6) = sd->status.inventory[i].nameid; + WBUFB(buf, n * 20 + 8) = (sd->inventory_data[i]->type == 7) ? 4 : sd->inventory_data[i]->type; - WBUFB (buf, n * 20 + 9) = sd->status.inventory[i].identify; - WBUFW (buf, n * 20 + 10) = pc_equippoint (sd, i); - WBUFW (buf, n * 20 + 12) = sd->status.inventory[i].equip; + WBUFB(buf, n * 20 + 9) = sd->status.inventory[i].identify; + WBUFW(buf, n * 20 + 10) = pc_equippoint(sd, i); + WBUFW(buf, n * 20 + 12) = sd->status.inventory[i].equip; if (sd->status.inventory[i].broken == 1) - WBUFB (buf, n * 20 + 14) = 1; // is weapon broken [Valaris] + WBUFB(buf, n * 20 + 14) = 1; // is weapon broken [Valaris] else - WBUFB (buf, n * 20 + 14) = sd->status.inventory[i].attribute; - WBUFB (buf, n * 20 + 15) = sd->status.inventory[i].refine; + WBUFB(buf, n * 20 + 14) = sd->status.inventory[i].attribute; + WBUFB(buf, n * 20 + 15) = sd->status.inventory[i].refine; if (sd->status.inventory[i].card[0] == 0x00ff || sd->status.inventory[i].card[0] == 0x00fe || sd->status.inventory[i].card[0] == (short) 0xff00) { - WBUFW (buf, n * 20 + 16) = sd->status.inventory[i].card[0]; - WBUFW (buf, n * 20 + 18) = sd->status.inventory[i].card[1]; - WBUFW (buf, n * 20 + 20) = sd->status.inventory[i].card[2]; - WBUFW (buf, n * 20 + 22) = sd->status.inventory[i].card[3]; + WBUFW(buf, n * 20 + 16) = sd->status.inventory[i].card[0]; + WBUFW(buf, n * 20 + 18) = sd->status.inventory[i].card[1]; + WBUFW(buf, n * 20 + 20) = sd->status.inventory[i].card[2]; + WBUFW(buf, n * 20 + 22) = sd->status.inventory[i].card[3]; } else { if (sd->status.inventory[i].card[0] > 0 - && (j = itemdb_viewid (sd->status.inventory[i].card[0])) > 0) - WBUFW (buf, n * 20 + 16) = j; + && (j = itemdb_viewid(sd->status.inventory[i].card[0])) > 0) + WBUFW(buf, n * 20 + 16) = j; else - WBUFW (buf, n * 20 + 16) = sd->status.inventory[i].card[0]; + WBUFW(buf, n * 20 + 16) = sd->status.inventory[i].card[0]; if (sd->status.inventory[i].card[1] > 0 - && (j = itemdb_viewid (sd->status.inventory[i].card[1])) > 0) - WBUFW (buf, n * 20 + 18) = j; + && (j = itemdb_viewid(sd->status.inventory[i].card[1])) > 0) + WBUFW(buf, n * 20 + 18) = j; else - WBUFW (buf, n * 20 + 18) = sd->status.inventory[i].card[1]; + WBUFW(buf, n * 20 + 18) = sd->status.inventory[i].card[1]; if (sd->status.inventory[i].card[2] > 0 - && (j = itemdb_viewid (sd->status.inventory[i].card[2])) > 0) - WBUFW (buf, n * 20 + 20) = j; + && (j = itemdb_viewid(sd->status.inventory[i].card[2])) > 0) + WBUFW(buf, n * 20 + 20) = j; else - WBUFW (buf, n * 20 + 20) = sd->status.inventory[i].card[2]; + WBUFW(buf, n * 20 + 20) = sd->status.inventory[i].card[2]; if (sd->status.inventory[i].card[3] > 0 - && (j = itemdb_viewid (sd->status.inventory[i].card[3])) > 0) - WBUFW (buf, n * 20 + 22) = j; + && (j = itemdb_viewid(sd->status.inventory[i].card[3])) > 0) + WBUFW(buf, n * 20 + 22) = j; else - WBUFW (buf, n * 20 + 22) = sd->status.inventory[i].card[3]; + WBUFW(buf, n * 20 + 22) = sd->status.inventory[i].card[3]; } n++; } if (n) { - WBUFW (buf, 2) = 4 + n * 20; - WFIFOSET (fd, WFIFOW (fd, 2)); + WBUFW(buf, 2) = 4 + n * 20; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; } @@ -1935,45 +1934,45 @@ int clif_equiplist (struct map_session_data *sd) * カプラさんに預けてある消耗品&収集品リスト *------------------------------------------ */ -int clif_storageitemlist (struct map_session_data *sd, struct storage *stor) +int clif_storageitemlist(struct map_session_data *sd, struct storage *stor) { struct item_data *id; - int i, n, fd; + int i, n, fd; unsigned char *buf; - nullpo_retr (0, sd); - nullpo_retr (0, stor); + nullpo_retr(0, sd); + nullpo_retr(0, stor); fd = sd->fd; - buf = WFIFOP (fd, 0); - WBUFW (buf, 0) = 0x1f0; + buf = WFIFOP(fd, 0); + WBUFW(buf, 0) = 0x1f0; for (i = 0, n = 0; i < MAX_STORAGE; i++) { if (stor->storage_[i].nameid <= 0) continue; - nullpo_retr (0, id = itemdb_search (stor->storage_[i].nameid)); - if (itemdb_isequip2 (id)) + nullpo_retr(0, id = itemdb_search(stor->storage_[i].nameid)); + if (itemdb_isequip2(id)) continue; - WBUFW (buf, n * 18 + 4) = i + 1; + WBUFW(buf, n * 18 + 4) = i + 1; if (id->view_id > 0) - WBUFW (buf, n * 18 + 6) = id->view_id; + WBUFW(buf, n * 18 + 6) = id->view_id; else - WBUFW (buf, n * 18 + 6) = stor->storage_[i].nameid; - WBUFB (buf, n * 18 + 8) = id->type;; - WBUFB (buf, n * 18 + 9) = stor->storage_[i].identify; - WBUFW (buf, n * 18 + 10) = stor->storage_[i].amount; - WBUFW (buf, n * 18 + 12) = 0; - WBUFW (buf, n * 18 + 14) = stor->storage_[i].card[0]; - WBUFW (buf, n * 18 + 16) = stor->storage_[i].card[1]; - WBUFW (buf, n * 18 + 18) = stor->storage_[i].card[2]; - WBUFW (buf, n * 18 + 20) = stor->storage_[i].card[3]; + WBUFW(buf, n * 18 + 6) = stor->storage_[i].nameid; + WBUFB(buf, n * 18 + 8) = id->type;; + WBUFB(buf, n * 18 + 9) = stor->storage_[i].identify; + WBUFW(buf, n * 18 + 10) = stor->storage_[i].amount; + WBUFW(buf, n * 18 + 12) = 0; + WBUFW(buf, n * 18 + 14) = stor->storage_[i].card[0]; + WBUFW(buf, n * 18 + 16) = stor->storage_[i].card[1]; + WBUFW(buf, n * 18 + 18) = stor->storage_[i].card[2]; + WBUFW(buf, n * 18 + 20) = stor->storage_[i].card[3]; n++; } if (n) { - WBUFW (buf, 2) = 4 + n * 18; - WFIFOSET (fd, WFIFOW (fd, 2)); + WBUFW(buf, 2) = 4 + n * 18; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; } @@ -1982,77 +1981,77 @@ int clif_storageitemlist (struct map_session_data *sd, struct storage *stor) * カプラさんに預けてある装備リスト *------------------------------------------ */ -int clif_storageequiplist (struct map_session_data *sd, struct storage *stor) +int clif_storageequiplist(struct map_session_data *sd, struct storage *stor) { struct item_data *id; - int i, j, n, fd; + int i, j, n, fd; unsigned char *buf; - nullpo_retr (0, sd); - nullpo_retr (0, stor); + nullpo_retr(0, sd); + nullpo_retr(0, stor); fd = sd->fd; - buf = WFIFOP (fd, 0); - WBUFW (buf, 0) = 0xa6; + buf = WFIFOP(fd, 0); + WBUFW(buf, 0) = 0xa6; for (i = 0, n = 0; i < MAX_STORAGE; i++) { if (stor->storage_[i].nameid <= 0) continue; - nullpo_retr (0, id = itemdb_search (stor->storage_[i].nameid)); - if (!itemdb_isequip2 (id)) + nullpo_retr(0, id = itemdb_search(stor->storage_[i].nameid)); + if (!itemdb_isequip2(id)) continue; - WBUFW (buf, n * 20 + 4) = i + 1; + WBUFW(buf, n * 20 + 4) = i + 1; if (id->view_id > 0) - WBUFW (buf, n * 20 + 6) = id->view_id; + WBUFW(buf, n * 20 + 6) = id->view_id; else - WBUFW (buf, n * 20 + 6) = stor->storage_[i].nameid; - WBUFB (buf, n * 20 + 8) = id->type; - WBUFB (buf, n * 20 + 9) = stor->storage_[i].identify; - WBUFW (buf, n * 20 + 10) = id->equip; - WBUFW (buf, n * 20 + 12) = stor->storage_[i].equip; + WBUFW(buf, n * 20 + 6) = stor->storage_[i].nameid; + WBUFB(buf, n * 20 + 8) = id->type; + WBUFB(buf, n * 20 + 9) = stor->storage_[i].identify; + WBUFW(buf, n * 20 + 10) = id->equip; + WBUFW(buf, n * 20 + 12) = stor->storage_[i].equip; if (stor->storage_[i].broken == 1) - WBUFB (buf, n * 20 + 14) = 1; //is weapon broken [Valaris] + WBUFB(buf, n * 20 + 14) = 1; //is weapon broken [Valaris] else - WBUFB (buf, n * 20 + 14) = stor->storage_[i].attribute; - WBUFB (buf, n * 20 + 15) = stor->storage_[i].refine; + WBUFB(buf, n * 20 + 14) = stor->storage_[i].attribute; + WBUFB(buf, n * 20 + 15) = stor->storage_[i].refine; if (stor->storage_[i].card[0] == 0x00ff || stor->storage_[i].card[0] == 0x00fe || stor->storage_[i].card[0] == (short) 0xff00) { - WBUFW (buf, n * 20 + 16) = stor->storage_[i].card[0]; - WBUFW (buf, n * 20 + 18) = stor->storage_[i].card[1]; - WBUFW (buf, n * 20 + 20) = stor->storage_[i].card[2]; - WBUFW (buf, n * 20 + 22) = stor->storage_[i].card[3]; + WBUFW(buf, n * 20 + 16) = stor->storage_[i].card[0]; + WBUFW(buf, n * 20 + 18) = stor->storage_[i].card[1]; + WBUFW(buf, n * 20 + 20) = stor->storage_[i].card[2]; + WBUFW(buf, n * 20 + 22) = stor->storage_[i].card[3]; } else { if (stor->storage_[i].card[0] > 0 - && (j = itemdb_viewid (stor->storage_[i].card[0])) > 0) - WBUFW (buf, n * 20 + 16) = j; + && (j = itemdb_viewid(stor->storage_[i].card[0])) > 0) + WBUFW(buf, n * 20 + 16) = j; else - WBUFW (buf, n * 20 + 16) = stor->storage_[i].card[0]; + WBUFW(buf, n * 20 + 16) = stor->storage_[i].card[0]; if (stor->storage_[i].card[1] > 0 - && (j = itemdb_viewid (stor->storage_[i].card[1])) > 0) - WBUFW (buf, n * 20 + 18) = j; + && (j = itemdb_viewid(stor->storage_[i].card[1])) > 0) + WBUFW(buf, n * 20 + 18) = j; else - WBUFW (buf, n * 20 + 18) = stor->storage_[i].card[1]; + WBUFW(buf, n * 20 + 18) = stor->storage_[i].card[1]; if (stor->storage_[i].card[2] > 0 - && (j = itemdb_viewid (stor->storage_[i].card[2])) > 0) - WBUFW (buf, n * 20 + 20) = j; + && (j = itemdb_viewid(stor->storage_[i].card[2])) > 0) + WBUFW(buf, n * 20 + 20) = j; else - WBUFW (buf, n * 20 + 20) = stor->storage_[i].card[2]; + WBUFW(buf, n * 20 + 20) = stor->storage_[i].card[2]; if (stor->storage_[i].card[3] > 0 - && (j = itemdb_viewid (stor->storage_[i].card[3])) > 0) - WBUFW (buf, n * 20 + 22) = j; + && (j = itemdb_viewid(stor->storage_[i].card[3])) > 0) + WBUFW(buf, n * 20 + 22) = j; else - WBUFW (buf, n * 20 + 22) = stor->storage_[i].card[3]; + WBUFW(buf, n * 20 + 22) = stor->storage_[i].card[3]; } n++; } if (n) { - WBUFW (buf, 2) = 4 + n * 20; - WFIFOSET (fd, WFIFOW (fd, 2)); + WBUFW(buf, 2) = 4 + n * 20; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; } @@ -2062,121 +2061,121 @@ int clif_storageequiplist (struct map_session_data *sd, struct storage *stor) * 表示専用数字はこの中で計算して送る *------------------------------------------ */ -int clif_updatestatus (struct map_session_data *sd, int type) +int clif_updatestatus(struct map_session_data *sd, int type) { - int fd, len = 8; + int fd, len = 8; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xb0; - WFIFOW (fd, 2) = type; + WFIFOW(fd, 0) = 0xb0; + WFIFOW(fd, 2) = type; switch (type) { // 00b0 case SP_WEIGHT: - pc_checkweighticon (sd); - WFIFOW (fd, 0) = 0xb0; - WFIFOW (fd, 2) = type; - WFIFOL (fd, 4) = sd->weight; + pc_checkweighticon(sd); + WFIFOW(fd, 0) = 0xb0; + WFIFOW(fd, 2) = type; + WFIFOL(fd, 4) = sd->weight; break; case SP_MAXWEIGHT: - WFIFOL (fd, 4) = sd->max_weight; + WFIFOL(fd, 4) = sd->max_weight; break; case SP_SPEED: - WFIFOL (fd, 4) = sd->speed; + WFIFOL(fd, 4) = sd->speed; break; case SP_BASELEVEL: - WFIFOL (fd, 4) = sd->status.base_level; + WFIFOL(fd, 4) = sd->status.base_level; break; case SP_JOBLEVEL: - WFIFOL (fd, 4) = 0; + WFIFOL(fd, 4) = 0; break; case SP_MANNER: - WFIFOL (fd, 4) = sd->status.manner; - clif_changestatus (&sd->bl, SP_MANNER, sd->status.manner); + WFIFOL(fd, 4) = sd->status.manner; + clif_changestatus(&sd->bl, SP_MANNER, sd->status.manner); break; case SP_STATUSPOINT: - WFIFOL (fd, 4) = sd->status.status_point; + WFIFOL(fd, 4) = sd->status.status_point; break; case SP_SKILLPOINT: - WFIFOL (fd, 4) = sd->status.skill_point; + WFIFOL(fd, 4) = sd->status.skill_point; break; case SP_HIT: - WFIFOL (fd, 4) = sd->hit; + WFIFOL(fd, 4) = sd->hit; break; case SP_FLEE1: - WFIFOL (fd, 4) = sd->flee; + WFIFOL(fd, 4) = sd->flee; break; case SP_FLEE2: - WFIFOL (fd, 4) = sd->flee2 / 10; + WFIFOL(fd, 4) = sd->flee2 / 10; break; case SP_MAXHP: - WFIFOL (fd, 4) = sd->status.max_hp; + WFIFOL(fd, 4) = sd->status.max_hp; break; case SP_MAXSP: - WFIFOL (fd, 4) = sd->status.max_sp; + WFIFOL(fd, 4) = sd->status.max_sp; break; case SP_HP: - WFIFOL (fd, 4) = sd->status.hp; + WFIFOL(fd, 4) = sd->status.hp; break; case SP_SP: - WFIFOL (fd, 4) = sd->status.sp; + WFIFOL(fd, 4) = sd->status.sp; break; case SP_ASPD: - WFIFOL (fd, 4) = sd->aspd; + WFIFOL(fd, 4) = sd->aspd; break; case SP_ATK1: - WFIFOL (fd, 4) = sd->base_atk + sd->watk; + WFIFOL(fd, 4) = sd->base_atk + sd->watk; break; case SP_DEF1: - WFIFOL (fd, 4) = sd->def; + WFIFOL(fd, 4) = sd->def; break; case SP_MDEF1: - WFIFOL (fd, 4) = sd->mdef; + WFIFOL(fd, 4) = sd->mdef; break; case SP_ATK2: - WFIFOL (fd, 4) = sd->watk2; + WFIFOL(fd, 4) = sd->watk2; break; case SP_DEF2: - WFIFOL (fd, 4) = sd->def2; + WFIFOL(fd, 4) = sd->def2; break; case SP_MDEF2: - WFIFOL (fd, 4) = sd->mdef2; + WFIFOL(fd, 4) = sd->mdef2; break; case SP_CRITICAL: - WFIFOL (fd, 4) = sd->critical / 10; + WFIFOL(fd, 4) = sd->critical / 10; break; case SP_MATK1: - WFIFOL (fd, 4) = sd->matk1; + WFIFOL(fd, 4) = sd->matk1; break; case SP_MATK2: - WFIFOL (fd, 4) = sd->matk2; + WFIFOL(fd, 4) = sd->matk2; break; case SP_ZENY: - trade_verifyzeny (sd); - WFIFOW (fd, 0) = 0xb1; + trade_verifyzeny(sd); + WFIFOW(fd, 0) = 0xb1; if (sd->status.zeny < 0) sd->status.zeny = 0; - WFIFOL (fd, 4) = sd->status.zeny; + WFIFOL(fd, 4) = sd->status.zeny; break; case SP_BASEEXP: - WFIFOW (fd, 0) = 0xb1; - WFIFOL (fd, 4) = sd->status.base_exp; + WFIFOW(fd, 0) = 0xb1; + WFIFOL(fd, 4) = sd->status.base_exp; break; case SP_JOBEXP: - WFIFOW (fd, 0) = 0xb1; - WFIFOL (fd, 4) = sd->status.job_exp; + WFIFOW(fd, 0) = 0xb1; + WFIFOL(fd, 4) = sd->status.job_exp; break; case SP_NEXTBASEEXP: - WFIFOW (fd, 0) = 0xb1; - WFIFOL (fd, 4) = pc_nextbaseexp (sd); + WFIFOW(fd, 0) = 0xb1; + WFIFOL(fd, 4) = pc_nextbaseexp(sd); break; case SP_NEXTJOBEXP: - WFIFOW (fd, 0) = 0xb1; - WFIFOL (fd, 4) = pc_nextjobexp (sd); + WFIFOW(fd, 0) = 0xb1; + WFIFOL(fd, 4) = pc_nextjobexp(sd); break; // 00be 終了 @@ -2186,93 +2185,93 @@ int clif_updatestatus (struct map_session_data *sd, int type) case SP_UINT: case SP_UDEX: case SP_ULUK: - WFIFOW (fd, 0) = 0xbe; - WFIFOB (fd, 4) = - pc_need_status_point (sd, type - SP_USTR + SP_STR); + WFIFOW(fd, 0) = 0xbe; + WFIFOB(fd, 4) = + pc_need_status_point(sd, type - SP_USTR + SP_STR); len = 5; break; // 013a 終了 case SP_ATTACKRANGE: - WFIFOW (fd, 0) = 0x13a; - WFIFOW (fd, 2) = (sd->attack_spell_override) + WFIFOW(fd, 0) = 0x13a; + WFIFOW(fd, 2) = (sd->attack_spell_override) ? sd->attack_spell_range : sd->attackrange; len = 4; break; // 0141 終了 case SP_STR: - WFIFOW (fd, 0) = 0x141; - WFIFOL (fd, 2) = type; - WFIFOL (fd, 6) = sd->status.str; - WFIFOL (fd, 10) = sd->paramb[0] + sd->parame[0]; + WFIFOW(fd, 0) = 0x141; + WFIFOL(fd, 2) = type; + WFIFOL(fd, 6) = sd->status.str; + WFIFOL(fd, 10) = sd->paramb[0] + sd->parame[0]; len = 14; break; case SP_AGI: - WFIFOW (fd, 0) = 0x141; - WFIFOL (fd, 2) = type; - WFIFOL (fd, 6) = sd->status.agi; - WFIFOL (fd, 10) = sd->paramb[1] + sd->parame[1]; + WFIFOW(fd, 0) = 0x141; + WFIFOL(fd, 2) = type; + WFIFOL(fd, 6) = sd->status.agi; + WFIFOL(fd, 10) = sd->paramb[1] + sd->parame[1]; len = 14; break; case SP_VIT: - WFIFOW (fd, 0) = 0x141; - WFIFOL (fd, 2) = type; - WFIFOL (fd, 6) = sd->status.vit; - WFIFOL (fd, 10) = sd->paramb[2] + sd->parame[2]; + WFIFOW(fd, 0) = 0x141; + WFIFOL(fd, 2) = type; + WFIFOL(fd, 6) = sd->status.vit; + WFIFOL(fd, 10) = sd->paramb[2] + sd->parame[2]; len = 14; break; case SP_INT: - WFIFOW (fd, 0) = 0x141; - WFIFOL (fd, 2) = type; - WFIFOL (fd, 6) = sd->status.int_; - WFIFOL (fd, 10) = sd->paramb[3] + sd->parame[3]; + WFIFOW(fd, 0) = 0x141; + WFIFOL(fd, 2) = type; + WFIFOL(fd, 6) = sd->status.int_; + WFIFOL(fd, 10) = sd->paramb[3] + sd->parame[3]; len = 14; break; case SP_DEX: - WFIFOW (fd, 0) = 0x141; - WFIFOL (fd, 2) = type; - WFIFOL (fd, 6) = sd->status.dex; - WFIFOL (fd, 10) = sd->paramb[4] + sd->parame[4]; + WFIFOW(fd, 0) = 0x141; + WFIFOL(fd, 2) = type; + WFIFOL(fd, 6) = sd->status.dex; + WFIFOL(fd, 10) = sd->paramb[4] + sd->parame[4]; len = 14; break; case SP_LUK: - WFIFOW (fd, 0) = 0x141; - WFIFOL (fd, 2) = type; - WFIFOL (fd, 6) = sd->status.luk; - WFIFOL (fd, 10) = sd->paramb[5] + sd->parame[5]; + WFIFOW(fd, 0) = 0x141; + WFIFOL(fd, 2) = type; + WFIFOL(fd, 6) = sd->status.luk; + WFIFOL(fd, 10) = sd->paramb[5] + sd->parame[5]; len = 14; break; case SP_CARTINFO: - WFIFOW (fd, 0) = 0x121; - WFIFOW (fd, 2) = sd->cart_num; - WFIFOW (fd, 4) = sd->cart_max_num; - WFIFOL (fd, 6) = sd->cart_weight; - WFIFOL (fd, 10) = sd->cart_max_weight; + WFIFOW(fd, 0) = 0x121; + WFIFOW(fd, 2) = sd->cart_num; + WFIFOW(fd, 4) = sd->cart_max_num; + WFIFOL(fd, 6) = sd->cart_weight; + WFIFOL(fd, 10) = sd->cart_max_weight; len = 14; break; case SP_GM: - WFIFOL (fd, 4) = pc_isGM (sd); + WFIFOL(fd, 4) = pc_isGM(sd); break; default: if (battle_config.error_log) - printf ("clif_updatestatus : make %d routine\n", type); + printf("clif_updatestatus : make %d routine\n", type); return 1; } - WFIFOSET (fd, len); + WFIFOSET(fd, len); return 0; } -int clif_changestatus (struct block_list *bl, int type, int val) +int clif_changestatus(struct block_list *bl, int type, int val) { unsigned char buf[12]; struct map_session_data *sd = NULL; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) sd = (struct map_session_data *) bl; @@ -2280,20 +2279,20 @@ int clif_changestatus (struct block_list *bl, int type, int val) //printf("clif_changestatus id:%d type:%d val:%d\n",bl->id,type,val); if (sd) { - WBUFW (buf, 0) = 0x1ab; - WBUFL (buf, 2) = bl->id; - WBUFW (buf, 6) = type; + WBUFW(buf, 0) = 0x1ab; + WBUFL(buf, 2) = bl->id; + WBUFW(buf, 6) = type; switch (type) { case SP_MANNER: - WBUFL (buf, 8) = val; + WBUFL(buf, 8) = val; break; default: if (battle_config.error_log) - printf ("clif_changestatus : make %d routine\n", type); + printf("clif_changestatus : make %d routine\n", type); return 1; } - clif_send (buf, packet_len_table[0x1ab], bl, AREA_WOS); + clif_send(buf, packet_len_table[0x1ab], bl, AREA_WOS); } return 0; } @@ -2302,19 +2301,19 @@ int clif_changestatus (struct block_list *bl, int type, int val) * *------------------------------------------ */ -int clif_changelook (struct block_list *bl, int type, int val) +int clif_changelook(struct block_list *bl, int type, int val) { - return clif_changelook_towards (bl, type, val, NULL); + return clif_changelook_towards(bl, type, val, NULL); } -int clif_changelook_towards (struct block_list *bl, int type, int val, +int clif_changelook_towards(struct block_list *bl, int type, int val, struct map_session_data *dstsd) { unsigned char rbuf[32]; - unsigned char *buf = dstsd ? WFIFOP (dstsd->fd, 0) : rbuf; // pick target buffer or general-purpose one + unsigned char *buf = dstsd ? WFIFOP(dstsd->fd, 0) : rbuf; // pick target buffer or general-purpose one struct map_session_data *sd = NULL; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) sd = (struct map_session_data *) bl; @@ -2328,35 +2327,35 @@ int clif_changelook_towards (struct block_list *bl, int type, int val, if (sd && (type == LOOK_WEAPON || type == LOOK_SHIELD || type >= LOOK_SHOES)) { - WBUFW (buf, 0) = 0x1d7; - WBUFL (buf, 2) = bl->id; + WBUFW(buf, 0) = 0x1d7; + WBUFL(buf, 2) = bl->id; if (type >= LOOK_SHOES) { - int equip_point = equip_points[type]; + int equip_point = equip_points[type]; - WBUFB (buf, 6) = type; + WBUFB(buf, 6) = type; if (sd->equip_index[equip_point] >= 0 && sd->inventory_data[sd->equip_index[equip_point]]) { if (sd-> inventory_data[sd->equip_index[equip_point]]->view_id > 0) - WBUFW (buf, 7) = + WBUFW(buf, 7) = sd->inventory_data[sd-> equip_index[equip_point]]->view_id; else - WBUFW (buf, 7) = + WBUFW(buf, 7) = sd->status.inventory[sd-> equip_index[equip_point]].nameid; } else - WBUFW (buf, 7) = 0; - WBUFW (buf, 9) = 0; + WBUFW(buf, 7) = 0; + WBUFW(buf, 9) = 0; } else { - WBUFB (buf, 6) = 2; + WBUFB(buf, 6) = 2; if (sd->attack_spell_override) - WBUFW (buf, 7) = sd->attack_spell_look_override; + WBUFW(buf, 7) = sd->attack_spell_look_override; else { if (sd->equip_index[9] >= 0 @@ -2364,14 +2363,14 @@ int clif_changelook_towards (struct block_list *bl, int type, int val, && sd->view_class != 22) { if (sd->inventory_data[sd->equip_index[9]]->view_id > 0) - WBUFW (buf, 7) = + WBUFW(buf, 7) = sd->inventory_data[sd->equip_index[9]]->view_id; else - WBUFW (buf, 7) = + WBUFW(buf, 7) = sd->status.inventory[sd->equip_index[9]].nameid; } else - WBUFW (buf, 7) = 0; + WBUFW(buf, 7) = 0; } if (sd->equip_index[8] >= 0 && sd->equip_index[8] != sd->equip_index[9] @@ -2379,31 +2378,31 @@ int clif_changelook_towards (struct block_list *bl, int type, int val, && sd->view_class != 22) { if (sd->inventory_data[sd->equip_index[8]]->view_id > 0) - WBUFW (buf, 9) = + WBUFW(buf, 9) = sd->inventory_data[sd->equip_index[8]]->view_id; else - WBUFW (buf, 9) = + WBUFW(buf, 9) = sd->status.inventory[sd->equip_index[8]].nameid; } else - WBUFW (buf, 9) = 0; + WBUFW(buf, 9) = 0; } if (dstsd) - WFIFOSET (dstsd->fd, packet_len_table[0x1d7]); + WFIFOSET(dstsd->fd, packet_len_table[0x1d7]); else - clif_send (buf, packet_len_table[0x1d7], bl, AREA); + clif_send(buf, packet_len_table[0x1d7], bl, AREA); } else { - WBUFW (buf, 0) = 0x1d7; - WBUFL (buf, 2) = bl->id; - WBUFB (buf, 6) = type; - WBUFW (buf, 7) = val; - WBUFW (buf, 9) = 0; + WBUFW(buf, 0) = 0x1d7; + WBUFL(buf, 2) = bl->id; + WBUFB(buf, 6) = type; + WBUFW(buf, 7) = val; + WBUFW(buf, 9) = 0; if (dstsd) - WFIFOSET (dstsd->fd, packet_len_table[0x1d7]); + WFIFOSET(dstsd->fd, packet_len_table[0x1d7]); else - clif_send (buf, packet_len_table[0x1d7], bl, AREA); + clif_send(buf, packet_len_table[0x1d7], bl, AREA); } return 0; } @@ -2413,57 +2412,57 @@ int clif_changelook_towards (struct block_list *bl, int type, int val, *------------------------------------------ */ static -int clif_initialstatus (struct map_session_data *sd) +int clif_initialstatus(struct map_session_data *sd) { - int fd; + int fd; unsigned char *buf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - buf = WFIFOP (fd, 0); - - WBUFW (buf, 0) = 0xbd; - WBUFW (buf, 2) = sd->status.status_point; - WBUFB (buf, 4) = (sd->status.str > 255) ? 255 : sd->status.str; - WBUFB (buf, 5) = pc_need_status_point (sd, SP_STR); - WBUFB (buf, 6) = (sd->status.agi > 255) ? 255 : sd->status.agi; - WBUFB (buf, 7) = pc_need_status_point (sd, SP_AGI); - WBUFB (buf, 8) = (sd->status.vit > 255) ? 255 : sd->status.vit; - WBUFB (buf, 9) = pc_need_status_point (sd, SP_VIT); - WBUFB (buf, 10) = (sd->status.int_ > 255) ? 255 : sd->status.int_; - WBUFB (buf, 11) = pc_need_status_point (sd, SP_INT); - WBUFB (buf, 12) = (sd->status.dex > 255) ? 255 : sd->status.dex; - WBUFB (buf, 13) = pc_need_status_point (sd, SP_DEX); - WBUFB (buf, 14) = (sd->status.luk > 255) ? 255 : sd->status.luk; - WBUFB (buf, 15) = pc_need_status_point (sd, SP_LUK); - - WBUFW (buf, 16) = sd->base_atk + sd->watk; - WBUFW (buf, 18) = sd->watk2; //atk bonus - WBUFW (buf, 20) = sd->matk1; - WBUFW (buf, 22) = sd->matk2; - WBUFW (buf, 24) = sd->def; // def - WBUFW (buf, 26) = sd->def2; - WBUFW (buf, 28) = sd->mdef; // mdef - WBUFW (buf, 30) = sd->mdef2; - WBUFW (buf, 32) = sd->hit; - WBUFW (buf, 34) = sd->flee; - WBUFW (buf, 36) = sd->flee2 / 10; - WBUFW (buf, 38) = sd->critical / 10; - WBUFW (buf, 40) = sd->status.karma; - WBUFW (buf, 42) = sd->status.manner; - - WFIFOSET (fd, packet_len_table[0xbd]); - - clif_updatestatus (sd, SP_STR); - clif_updatestatus (sd, SP_AGI); - clif_updatestatus (sd, SP_VIT); - clif_updatestatus (sd, SP_INT); - clif_updatestatus (sd, SP_DEX); - clif_updatestatus (sd, SP_LUK); - - clif_updatestatus (sd, SP_ATTACKRANGE); - clif_updatestatus (sd, SP_ASPD); + buf = WFIFOP(fd, 0); + + WBUFW(buf, 0) = 0xbd; + WBUFW(buf, 2) = sd->status.status_point; + WBUFB(buf, 4) = (sd->status.str > 255) ? 255 : sd->status.str; + WBUFB(buf, 5) = pc_need_status_point(sd, SP_STR); + WBUFB(buf, 6) = (sd->status.agi > 255) ? 255 : sd->status.agi; + WBUFB(buf, 7) = pc_need_status_point(sd, SP_AGI); + WBUFB(buf, 8) = (sd->status.vit > 255) ? 255 : sd->status.vit; + WBUFB(buf, 9) = pc_need_status_point(sd, SP_VIT); + WBUFB(buf, 10) = (sd->status.int_ > 255) ? 255 : sd->status.int_; + WBUFB(buf, 11) = pc_need_status_point(sd, SP_INT); + WBUFB(buf, 12) = (sd->status.dex > 255) ? 255 : sd->status.dex; + WBUFB(buf, 13) = pc_need_status_point(sd, SP_DEX); + WBUFB(buf, 14) = (sd->status.luk > 255) ? 255 : sd->status.luk; + WBUFB(buf, 15) = pc_need_status_point(sd, SP_LUK); + + WBUFW(buf, 16) = sd->base_atk + sd->watk; + WBUFW(buf, 18) = sd->watk2; //atk bonus + WBUFW(buf, 20) = sd->matk1; + WBUFW(buf, 22) = sd->matk2; + WBUFW(buf, 24) = sd->def; // def + WBUFW(buf, 26) = sd->def2; + WBUFW(buf, 28) = sd->mdef; // mdef + WBUFW(buf, 30) = sd->mdef2; + WBUFW(buf, 32) = sd->hit; + WBUFW(buf, 34) = sd->flee; + WBUFW(buf, 36) = sd->flee2 / 10; + WBUFW(buf, 38) = sd->critical / 10; + WBUFW(buf, 40) = sd->status.karma; + WBUFW(buf, 42) = sd->status.manner; + + WFIFOSET(fd, packet_len_table[0xbd]); + + clif_updatestatus(sd, SP_STR); + clif_updatestatus(sd, SP_AGI); + clif_updatestatus(sd, SP_VIT); + clif_updatestatus(sd, SP_INT); + clif_updatestatus(sd, SP_DEX); + clif_updatestatus(sd, SP_LUK); + + clif_updatestatus(sd, SP_ATTACKRANGE); + clif_updatestatus(sd, SP_ASPD); return 0; } @@ -2472,20 +2471,20 @@ int clif_initialstatus (struct map_session_data *sd) *矢装備 *------------------------------------------ */ -int clif_arrowequip (struct map_session_data *sd, int val) +int clif_arrowequip(struct map_session_data *sd, int val) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->attacktarget && sd->attacktarget > 0) // [Valaris] sd->attacktarget = 0; fd = sd->fd; - WFIFOW (fd, 0) = 0x013c; - WFIFOW (fd, 2) = val + 2; //矢のアイテムID + WFIFOW(fd, 0) = 0x013c; + WFIFOW(fd, 2) = val + 2; //矢のアイテムID - WFIFOSET (fd, packet_len_table[0x013c]); + WFIFOSET(fd, packet_len_table[0x013c]); return 0; } @@ -2494,17 +2493,17 @@ int clif_arrowequip (struct map_session_data *sd, int val) * *------------------------------------------ */ -int clif_arrow_fail (struct map_session_data *sd, int type) +int clif_arrow_fail(struct map_session_data *sd, int type) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x013b; - WFIFOW (fd, 2) = type; + WFIFOW(fd, 0) = 0x013b; + WFIFOW(fd, 2) = type; - WFIFOSET (fd, packet_len_table[0x013b]); + WFIFOSET(fd, packet_len_table[0x013b]); return 0; } @@ -2513,18 +2512,18 @@ int clif_arrow_fail (struct map_session_data *sd, int type) * *------------------------------------------ */ -int clif_statusupack (struct map_session_data *sd, int type, int ok, int val) +int clif_statusupack(struct map_session_data *sd, int type, int ok, int val) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xbc; - WFIFOW (fd, 2) = type; - WFIFOB (fd, 4) = ok; - WFIFOB (fd, 5) = val; - WFIFOSET (fd, packet_len_table[0xbc]); + WFIFOW(fd, 0) = 0xbc; + WFIFOW(fd, 2) = type; + WFIFOB(fd, 4) = ok; + WFIFOB(fd, 5) = val; + WFIFOSET(fd, packet_len_table[0xbc]); return 0; } @@ -2533,18 +2532,18 @@ int clif_statusupack (struct map_session_data *sd, int type, int ok, int val) * *------------------------------------------ */ -int clif_equipitemack (struct map_session_data *sd, int n, int pos, int ok) +int clif_equipitemack(struct map_session_data *sd, int n, int pos, int ok) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xaa; - WFIFOW (fd, 2) = n + 2; - WFIFOW (fd, 4) = pos; - WFIFOB (fd, 6) = ok; - WFIFOSET (fd, packet_len_table[0xaa]); + WFIFOW(fd, 0) = 0xaa; + WFIFOW(fd, 2) = n + 2; + WFIFOW(fd, 4) = pos; + WFIFOB(fd, 6) = ok; + WFIFOSET(fd, packet_len_table[0xaa]); return 0; } @@ -2553,18 +2552,18 @@ int clif_equipitemack (struct map_session_data *sd, int n, int pos, int ok) * *------------------------------------------ */ -int clif_unequipitemack (struct map_session_data *sd, int n, int pos, int ok) +int clif_unequipitemack(struct map_session_data *sd, int n, int pos, int ok) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xac; - WFIFOW (fd, 2) = n + 2; - WFIFOW (fd, 4) = pos; - WFIFOB (fd, 6) = ok; - WFIFOSET (fd, packet_len_table[0xac]); + WFIFOW(fd, 0) = 0xac; + WFIFOW(fd, 2) = n + 2; + WFIFOW(fd, 4) = pos; + WFIFOB(fd, 6) = ok; + WFIFOSET(fd, packet_len_table[0xac]); return 0; } @@ -2573,17 +2572,17 @@ int clif_unequipitemack (struct map_session_data *sd, int n, int pos, int ok) * *------------------------------------------ */ -int clif_misceffect (struct block_list *bl, int type) +int clif_misceffect(struct block_list *bl, int type) { uint8_t buf[32]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x19b; - WBUFL (buf, 2) = bl->id; - WBUFL (buf, 6) = type; + WBUFW(buf, 0) = 0x19b; + WBUFL(buf, 2) = bl->id; + WBUFL(buf, 6) = type; - clif_send (buf, packet_len_table[0x19b], bl, AREA); + clif_send(buf, packet_len_table[0x19b], bl, AREA); return 0; } @@ -2592,52 +2591,52 @@ int clif_misceffect (struct block_list *bl, int type) * 表示オプション変更 *------------------------------------------ */ -int clif_changeoption (struct block_list *bl) +int clif_changeoption(struct block_list *bl) { uint8_t buf[32]; short option; struct status_change *sc_data; static const int omask[] = { 0x10, 0x20 }; static const int scnum[] = { SC_FALCON, SC_RIDING }; - int i; + int i; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - option = *battle_get_option (bl); - sc_data = battle_get_sc_data (bl); + option = *battle_get_option(bl); + sc_data = battle_get_sc_data(bl); - WBUFW (buf, 0) = 0x119; - WBUFL (buf, 2) = bl->id; - WBUFW (buf, 6) = *battle_get_opt1 (bl); - WBUFW (buf, 8) = *battle_get_opt2 (bl); - WBUFW (buf, 10) = option; - WBUFB (buf, 12) = 0; // ?? + WBUFW(buf, 0) = 0x119; + WBUFL(buf, 2) = bl->id; + WBUFW(buf, 6) = *battle_get_opt1(bl); + WBUFW(buf, 8) = *battle_get_opt2(bl); + WBUFW(buf, 10) = option; + WBUFB(buf, 12) = 0; // ?? if (bl->type == BL_PC) { // disguises [Valaris] struct map_session_data *sd = ((struct map_session_data *) bl); if (sd && sd->disguise > 23 && sd->disguise < 4001) { - clif_send (buf, packet_len_table[0x119], bl, AREA_WOS); - clif_spawnpc (sd); + clif_send(buf, packet_len_table[0x119], bl, AREA_WOS); + clif_spawnpc(sd); } else - clif_send (buf, packet_len_table[0x119], bl, AREA); + clif_send(buf, packet_len_table[0x119], bl, AREA); } else - clif_send (buf, packet_len_table[0x119], bl, AREA); + clif_send(buf, packet_len_table[0x119], bl, AREA); // アイコンの表示 - for (i = 0; i < sizeof (omask) / sizeof (omask[0]); i++) + for (i = 0; i < sizeof(omask) / sizeof(omask[0]); i++) { if (option & omask[i]) { if (sc_data[scnum[i]].timer == -1) - skill_status_change_start (bl, scnum[i], 0, 0, 0, 0, 0, 0); + skill_status_change_start(bl, scnum[i], 0, 0, 0, 0, 0, 0); } else { - skill_status_change_end (bl, scnum[i], -1); + skill_status_change_end(bl, scnum[i], -1); } } @@ -2648,35 +2647,35 @@ int clif_changeoption (struct block_list *bl) * *------------------------------------------ */ -int clif_useitemack (struct map_session_data *sd, int index, int amount, +int clif_useitemack(struct map_session_data *sd, int index, int amount, int ok) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (!ok) { - int fd = sd->fd; - WFIFOW (fd, 0) = 0xa8; - WFIFOW (fd, 2) = index + 2; - WFIFOW (fd, 4) = amount; - WFIFOB (fd, 6) = ok; - WFIFOSET (fd, packet_len_table[0xa8]); + int fd = sd->fd; + WFIFOW(fd, 0) = 0xa8; + WFIFOW(fd, 2) = index + 2; + WFIFOW(fd, 4) = amount; + WFIFOB(fd, 6) = ok; + WFIFOSET(fd, packet_len_table[0xa8]); } else { uint8_t buf[32]; - WBUFW (buf, 0) = 0x1c8; - WBUFW (buf, 2) = index + 2; + WBUFW(buf, 0) = 0x1c8; + WBUFW(buf, 2) = index + 2; if (sd->inventory_data[index] && sd->inventory_data[index]->view_id > 0) - WBUFW (buf, 4) = sd->inventory_data[index]->view_id; + WBUFW(buf, 4) = sd->inventory_data[index]->view_id; else - WBUFW (buf, 4) = sd->status.inventory[index].nameid; - WBUFL (buf, 6) = sd->bl.id; - WBUFW (buf, 10) = amount; - WBUFB (buf, 12) = ok; - clif_send (buf, packet_len_table[0x1c8], &sd->bl, SELF); + WBUFW(buf, 4) = sd->status.inventory[index].nameid; + WBUFL(buf, 6) = sd->bl.id; + WBUFW(buf, 10) = amount; + WBUFB(buf, 12) = ok; + clif_send(buf, packet_len_table[0x1c8], &sd->bl, SELF); } return 0; @@ -2686,16 +2685,16 @@ int clif_useitemack (struct map_session_data *sd, int index, int amount, * *------------------------------------------ */ -int clif_createchat (struct map_session_data *sd, int fail) +int clif_createchat(struct map_session_data *sd, int fail) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xd6; - WFIFOB (fd, 2) = fail; - WFIFOSET (fd, packet_len_table[0xd6]); + WFIFOW(fd, 0) = 0xd6; + WFIFOB(fd, 2) = fail; + WFIFOSET(fd, packet_len_table[0xd6]); return 0; } @@ -2704,29 +2703,29 @@ int clif_createchat (struct map_session_data *sd, int fail) * *------------------------------------------ */ -int clif_dispchat (struct chat_data *cd, int fd) +int clif_dispchat(struct chat_data *cd, int fd) { uint8_t buf[128]; // 最大title(60バイト)+17 if (cd == NULL || *cd->owner == NULL) return 1; - WBUFW (buf, 0) = 0xd7; - WBUFW (buf, 2) = strlen (cd->title) + 17; - WBUFL (buf, 4) = (*cd->owner)->id; - WBUFL (buf, 8) = cd->bl.id; - WBUFW (buf, 12) = cd->limit; - WBUFW (buf, 14) = cd->users; - WBUFB (buf, 16) = cd->pub; - strcpy ((char *)WBUFP (buf, 17), cd->title); + WBUFW(buf, 0) = 0xd7; + WBUFW(buf, 2) = strlen(cd->title) + 17; + WBUFL(buf, 4) = (*cd->owner)->id; + WBUFL(buf, 8) = cd->bl.id; + WBUFW(buf, 12) = cd->limit; + WBUFW(buf, 14) = cd->users; + WBUFB(buf, 16) = cd->pub; + strcpy((char *)WBUFP(buf, 17), cd->title); if (fd) { - memcpy (WFIFOP (fd, 0), buf, WBUFW (buf, 2)); - WFIFOSET (fd, WBUFW (buf, 2)); + memcpy(WFIFOP(fd, 0), buf, WBUFW(buf, 2)); + WFIFOSET(fd, WBUFW(buf, 2)); } else { - clif_send (buf, WBUFW (buf, 2), *cd->owner, AREA_WOSC); + clif_send(buf, WBUFW(buf, 2), *cd->owner, AREA_WOSC); } return 0; @@ -2737,22 +2736,22 @@ int clif_dispchat (struct chat_data *cd, int fd) * 外部の人用と命令コード(d7->df)が違うだけ *------------------------------------------ */ -int clif_changechatstatus (struct chat_data *cd) +int clif_changechatstatus(struct chat_data *cd) { uint8_t buf[128]; // 最大title(60バイト)+17 if (cd == NULL || cd->usersd[0] == NULL) return 1; - WBUFW (buf, 0) = 0xdf; - WBUFW (buf, 2) = strlen (cd->title) + 17; - WBUFL (buf, 4) = cd->usersd[0]->bl.id; - WBUFL (buf, 8) = cd->bl.id; - WBUFW (buf, 12) = cd->limit; - WBUFW (buf, 14) = cd->users; - WBUFB (buf, 16) = cd->pub; - strcpy ((char *)WBUFP (buf, 17), cd->title); - clif_send (buf, WBUFW (buf, 2), &cd->usersd[0]->bl, CHAT); + WBUFW(buf, 0) = 0xdf; + WBUFW(buf, 2) = strlen(cd->title) + 17; + WBUFL(buf, 4) = cd->usersd[0]->bl.id; + WBUFL(buf, 8) = cd->bl.id; + WBUFW(buf, 12) = cd->limit; + WBUFW(buf, 14) = cd->users; + WBUFB(buf, 16) = cd->pub; + strcpy((char *)WBUFP(buf, 17), cd->title); + clif_send(buf, WBUFW(buf, 2), &cd->usersd[0]->bl, CHAT); return 0; } @@ -2761,22 +2760,22 @@ int clif_changechatstatus (struct chat_data *cd) * *------------------------------------------ */ -int clif_clearchat (struct chat_data *cd, int fd) +int clif_clearchat(struct chat_data *cd, int fd) { uint8_t buf[32]; - nullpo_retr (0, cd); + nullpo_retr(0, cd); - WBUFW (buf, 0) = 0xd8; - WBUFL (buf, 2) = cd->bl.id; + WBUFW(buf, 0) = 0xd8; + WBUFL(buf, 2) = cd->bl.id; if (fd) { - memcpy (WFIFOP (fd, 0), buf, packet_len_table[0xd8]); - WFIFOSET (fd, packet_len_table[0xd8]); + memcpy(WFIFOP(fd, 0), buf, packet_len_table[0xd8]); + WFIFOSET(fd, packet_len_table[0xd8]); } else { - clif_send (buf, packet_len_table[0xd8], *cd->owner, AREA_WOSC); + clif_send(buf, packet_len_table[0xd8], *cd->owner, AREA_WOSC); } return 0; @@ -2786,17 +2785,17 @@ int clif_clearchat (struct chat_data *cd, int fd) * *------------------------------------------ */ -int clif_joinchatfail (struct map_session_data *sd, int fail) +int clif_joinchatfail(struct map_session_data *sd, int fail) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xda; - WFIFOB (fd, 2) = fail; - WFIFOSET (fd, packet_len_table[0xda]); + WFIFOW(fd, 0) = 0xda; + WFIFOB(fd, 2) = fail; + WFIFOSET(fd, packet_len_table[0xda]); return 0; } @@ -2805,24 +2804,24 @@ int clif_joinchatfail (struct map_session_data *sd, int fail) * *------------------------------------------ */ -int clif_joinchatok (struct map_session_data *sd, struct chat_data *cd) +int clif_joinchatok(struct map_session_data *sd, struct chat_data *cd) { - int fd; - int i; + int fd; + int i; - nullpo_retr (0, sd); - nullpo_retr (0, cd); + nullpo_retr(0, sd); + nullpo_retr(0, cd); fd = sd->fd; - WFIFOW (fd, 0) = 0xdb; - WFIFOW (fd, 2) = 8 + (28 * cd->users); - WFIFOL (fd, 4) = cd->bl.id; + WFIFOW(fd, 0) = 0xdb; + WFIFOW(fd, 2) = 8 + (28 * cd->users); + WFIFOL(fd, 4) = cd->bl.id; for (i = 0; i < cd->users; i++) { - WFIFOL (fd, 8 + i * 28) = (i != 0) || ((*cd->owner)->type == BL_NPC); - memcpy (WFIFOP (fd, 8 + i * 28 + 4), cd->usersd[i]->status.name, 24); + WFIFOL(fd, 8 + i * 28) = (i != 0) || ((*cd->owner)->type == BL_NPC); + memcpy(WFIFOP(fd, 8 + i * 28 + 4), cd->usersd[i]->status.name, 24); } - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOSET(fd, WFIFOW(fd, 2)); return 0; } @@ -2831,17 +2830,17 @@ int clif_joinchatok (struct map_session_data *sd, struct chat_data *cd) * *------------------------------------------ */ -int clif_addchat (struct chat_data *cd, struct map_session_data *sd) +int clif_addchat(struct chat_data *cd, struct map_session_data *sd) { uint8_t buf[32]; - nullpo_retr (0, sd); - nullpo_retr (0, cd); + nullpo_retr(0, sd); + nullpo_retr(0, cd); - WBUFW (buf, 0) = 0x0dc; - WBUFW (buf, 2) = cd->users; - memcpy (WBUFP (buf, 4), sd->status.name, 24); - clif_send (buf, packet_len_table[0xdc], &sd->bl, CHAT_WOS); + WBUFW(buf, 0) = 0x0dc; + WBUFW(buf, 2) = cd->users; + memcpy(WBUFP(buf, 4), sd->status.name, 24); + clif_send(buf, packet_len_table[0xdc], &sd->bl, CHAT_WOS); return 0; } @@ -2850,21 +2849,21 @@ int clif_addchat (struct chat_data *cd, struct map_session_data *sd) * *------------------------------------------ */ -int clif_changechatowner (struct chat_data *cd, struct map_session_data *sd) +int clif_changechatowner(struct chat_data *cd, struct map_session_data *sd) { uint8_t buf[64]; - nullpo_retr (0, sd); - nullpo_retr (0, cd); + nullpo_retr(0, sd); + nullpo_retr(0, cd); - WBUFW (buf, 0) = 0xe1; - WBUFL (buf, 2) = 1; - memcpy (WBUFP (buf, 6), cd->usersd[0]->status.name, 24); - WBUFW (buf, 30) = 0xe1; - WBUFL (buf, 32) = 0; - memcpy (WBUFP (buf, 36), sd->status.name, 24); + WBUFW(buf, 0) = 0xe1; + WBUFL(buf, 2) = 1; + memcpy(WBUFP(buf, 6), cd->usersd[0]->status.name, 24); + WBUFW(buf, 30) = 0xe1; + WBUFL(buf, 32) = 0; + memcpy(WBUFP(buf, 36), sd->status.name, 24); - clif_send (buf, packet_len_table[0xe1] * 2, &sd->bl, CHAT); + clif_send(buf, packet_len_table[0xe1] * 2, &sd->bl, CHAT); return 0; } @@ -2873,19 +2872,19 @@ int clif_changechatowner (struct chat_data *cd, struct map_session_data *sd) * *------------------------------------------ */ -int clif_leavechat (struct chat_data *cd, struct map_session_data *sd) +int clif_leavechat(struct chat_data *cd, struct map_session_data *sd) { uint8_t buf[32]; - nullpo_retr (0, sd); - nullpo_retr (0, cd); + nullpo_retr(0, sd); + nullpo_retr(0, cd); - WBUFW (buf, 0) = 0xdd; - WBUFW (buf, 2) = cd->users - 1; - memcpy (WBUFP (buf, 4), sd->status.name, 24); - WBUFB (buf, 28) = 0; + WBUFW(buf, 0) = 0xdd; + WBUFW(buf, 2) = cd->users - 1; + memcpy(WBUFP(buf, 4), sd->status.name, 24); + WBUFB(buf, 28) = 0; - clif_send (buf, packet_len_table[0xdd], &sd->bl, CHAT); + clif_send(buf, packet_len_table[0xdd], &sd->bl, CHAT); return 0; } @@ -2894,16 +2893,16 @@ int clif_leavechat (struct chat_data *cd, struct map_session_data *sd) * 取り引き要請受け *------------------------------------------ */ -int clif_traderequest (struct map_session_data *sd, const char *name) +int clif_traderequest(struct map_session_data *sd, const char *name) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xe5; - strcpy ((char *)WFIFOP (fd, 2), name); - WFIFOSET (fd, packet_len_table[0xe5]); + WFIFOW(fd, 0) = 0xe5; + strcpy((char *)WFIFOP(fd, 2), name); + WFIFOSET(fd, packet_len_table[0xe5]); return 0; } @@ -2912,16 +2911,16 @@ int clif_traderequest (struct map_session_data *sd, const char *name) * 取り引き要求応答 *------------------------------------------ */ -int clif_tradestart (struct map_session_data *sd, int type) +int clif_tradestart(struct map_session_data *sd, int type) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xe7; - WFIFOB (fd, 2) = type; - WFIFOSET (fd, packet_len_table[0xe7]); + WFIFOW(fd, 0) = 0xe7; + WFIFOB(fd, 2) = type; + WFIFOSET(fd, packet_len_table[0xe7]); return 0; } @@ -2930,80 +2929,80 @@ int clif_tradestart (struct map_session_data *sd, int type) * 相手方からのアイテム追加 *------------------------------------------ */ -int clif_tradeadditem (struct map_session_data *sd, +int clif_tradeadditem(struct map_session_data *sd, struct map_session_data *tsd, int index, int amount) { - int fd, j; + int fd, j; - nullpo_retr (0, sd); - nullpo_retr (0, tsd); + nullpo_retr(0, sd); + nullpo_retr(0, tsd); fd = tsd->fd; - WFIFOW (fd, 0) = 0xe9; - WFIFOL (fd, 2) = amount; + WFIFOW(fd, 0) = 0xe9; + WFIFOL(fd, 2) = amount; if (index == 0) { - WFIFOW (fd, 6) = 0; // type id - WFIFOB (fd, 8) = 0; //identify flag - WFIFOB (fd, 9) = 0; // attribute - WFIFOB (fd, 10) = 0; //refine - WFIFOW (fd, 11) = 0; //card (4w) - WFIFOW (fd, 13) = 0; //card (4w) - WFIFOW (fd, 15) = 0; //card (4w) - WFIFOW (fd, 17) = 0; //card (4w) + WFIFOW(fd, 6) = 0; // type id + WFIFOB(fd, 8) = 0; //identify flag + WFIFOB(fd, 9) = 0; // attribute + WFIFOB(fd, 10) = 0; //refine + WFIFOW(fd, 11) = 0; //card (4w) + WFIFOW(fd, 13) = 0; //card (4w) + WFIFOW(fd, 15) = 0; //card (4w) + WFIFOW(fd, 17) = 0; //card (4w) } else { index -= 2; if (sd->inventory_data[index] && sd->inventory_data[index]->view_id > 0) - WFIFOW (fd, 6) = sd->inventory_data[index]->view_id; + WFIFOW(fd, 6) = sd->inventory_data[index]->view_id; else - WFIFOW (fd, 6) = sd->status.inventory[index].nameid; // type id - WFIFOB (fd, 8) = sd->status.inventory[index].identify; //identify flag + WFIFOW(fd, 6) = sd->status.inventory[index].nameid; // type id + WFIFOB(fd, 8) = sd->status.inventory[index].identify; //identify flag if (sd->status.inventory[index].broken == 1) - WFIFOB (fd, 9) = 1; // is broke weapon [Valaris] + WFIFOB(fd, 9) = 1; // is broke weapon [Valaris] else - WFIFOB (fd, 9) = sd->status.inventory[index].attribute; // attribute - WFIFOB (fd, 10) = sd->status.inventory[index].refine; //refine + WFIFOB(fd, 9) = sd->status.inventory[index].attribute; // attribute + WFIFOB(fd, 10) = sd->status.inventory[index].refine; //refine if (sd->status.inventory[index].card[0] == 0x00ff || sd->status.inventory[index].card[0] == 0x00fe || sd->status.inventory[index].card[0] == (short) 0xff00) { - WFIFOW (fd, 11) = sd->status.inventory[index].card[0]; //card (4w) - WFIFOW (fd, 13) = sd->status.inventory[index].card[1]; //card (4w) - WFIFOW (fd, 15) = sd->status.inventory[index].card[2]; //card (4w) - WFIFOW (fd, 17) = sd->status.inventory[index].card[3]; //card (4w) + WFIFOW(fd, 11) = sd->status.inventory[index].card[0]; //card (4w) + WFIFOW(fd, 13) = sd->status.inventory[index].card[1]; //card (4w) + WFIFOW(fd, 15) = sd->status.inventory[index].card[2]; //card (4w) + WFIFOW(fd, 17) = sd->status.inventory[index].card[3]; //card (4w) } else { if (sd->status.inventory[index].card[0] > 0 && (j = - itemdb_viewid (sd->status.inventory[index].card[0])) > 0) - WFIFOW (fd, 11) = j; + itemdb_viewid(sd->status.inventory[index].card[0])) > 0) + WFIFOW(fd, 11) = j; else - WFIFOW (fd, 11) = sd->status.inventory[index].card[0]; + WFIFOW(fd, 11) = sd->status.inventory[index].card[0]; if (sd->status.inventory[index].card[1] > 0 && (j = - itemdb_viewid (sd->status.inventory[index].card[1])) > 0) - WFIFOW (fd, 13) = j; + itemdb_viewid(sd->status.inventory[index].card[1])) > 0) + WFIFOW(fd, 13) = j; else - WFIFOW (fd, 13) = sd->status.inventory[index].card[1]; + WFIFOW(fd, 13) = sd->status.inventory[index].card[1]; if (sd->status.inventory[index].card[2] > 0 && (j = - itemdb_viewid (sd->status.inventory[index].card[2])) > 0) - WFIFOW (fd, 15) = j; + itemdb_viewid(sd->status.inventory[index].card[2])) > 0) + WFIFOW(fd, 15) = j; else - WFIFOW (fd, 15) = sd->status.inventory[index].card[2]; + WFIFOW(fd, 15) = sd->status.inventory[index].card[2]; if (sd->status.inventory[index].card[3] > 0 && (j = - itemdb_viewid (sd->status.inventory[index].card[3])) > 0) - WFIFOW (fd, 17) = j; + itemdb_viewid(sd->status.inventory[index].card[3])) > 0) + WFIFOW(fd, 17) = j; else - WFIFOW (fd, 17) = sd->status.inventory[index].card[3]; + WFIFOW(fd, 17) = sd->status.inventory[index].card[3]; } } - WFIFOSET (fd, packet_len_table[0xe9]); + WFIFOSET(fd, packet_len_table[0xe9]); return 0; } @@ -3012,20 +3011,20 @@ int clif_tradeadditem (struct map_session_data *sd, * アイテム追加成功/失敗 *------------------------------------------ */ -int clif_tradeitemok (struct map_session_data *sd, int index, int amount, +int clif_tradeitemok(struct map_session_data *sd, int index, int amount, int fail) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x1b1; + WFIFOW(fd, 0) = 0x1b1; //WFIFOW(fd,0)=0xea; - WFIFOW (fd, 2) = index; - WFIFOW (fd, 4) = amount; - WFIFOB (fd, 6) = fail; - WFIFOSET (fd, packet_len_table[0x1b1]); + WFIFOW(fd, 2) = index; + WFIFOW(fd, 4) = amount; + WFIFOB(fd, 6) = fail; + WFIFOSET(fd, packet_len_table[0x1b1]); return 0; } @@ -3034,16 +3033,16 @@ int clif_tradeitemok (struct map_session_data *sd, int index, int amount, * 取り引きok押し *------------------------------------------ */ -int clif_tradedeal_lock (struct map_session_data *sd, int fail) +int clif_tradedeal_lock(struct map_session_data *sd, int fail) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xec; - WFIFOB (fd, 2) = fail; // 0=you 1=the other person - WFIFOSET (fd, packet_len_table[0xec]); + WFIFOW(fd, 0) = 0xec; + WFIFOB(fd, 2) = fail; // 0=you 1=the other person + WFIFOSET(fd, packet_len_table[0xec]); return 0; } @@ -3052,15 +3051,15 @@ int clif_tradedeal_lock (struct map_session_data *sd, int fail) * 取り引きがキャンセルされました *------------------------------------------ */ -int clif_tradecancelled (struct map_session_data *sd) +int clif_tradecancelled(struct map_session_data *sd) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xee; - WFIFOSET (fd, packet_len_table[0xee]); + WFIFOW(fd, 0) = 0xee; + WFIFOSET(fd, packet_len_table[0xee]); return 0; } @@ -3069,16 +3068,16 @@ int clif_tradecancelled (struct map_session_data *sd) * 取り引き完了 *------------------------------------------ */ -int clif_tradecompleted (struct map_session_data *sd, int fail) +int clif_tradecompleted(struct map_session_data *sd, int fail) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xf0; - WFIFOB (fd, 2) = fail; - WFIFOSET (fd, packet_len_table[0xf0]); + WFIFOW(fd, 0) = 0xf0; + WFIFOB(fd, 2) = fail; + WFIFOSET(fd, packet_len_table[0xf0]); return 0; } @@ -3087,19 +3086,19 @@ int clif_tradecompleted (struct map_session_data *sd, int fail) * カプラ倉庫のアイテム数を更新 *------------------------------------------ */ -int clif_updatestorageamount (struct map_session_data *sd, +int clif_updatestorageamount(struct map_session_data *sd, struct storage *stor) { - int fd; + int fd; - nullpo_retr (0, sd); - nullpo_retr (0, stor); + nullpo_retr(0, sd); + nullpo_retr(0, stor); fd = sd->fd; - WFIFOW (fd, 0) = 0xf2; // update storage amount - WFIFOW (fd, 2) = stor->storage_amount; //items - WFIFOW (fd, 4) = MAX_STORAGE; //items max - WFIFOSET (fd, packet_len_table[0xf2]); + WFIFOW(fd, 0) = 0xf2; // update storage amount + WFIFOW(fd, 2) = stor->storage_amount; //items + WFIFOW(fd, 4) = MAX_STORAGE; //items max + WFIFOSET(fd, packet_len_table[0xf2]); return 0; } @@ -3108,61 +3107,61 @@ int clif_updatestorageamount (struct map_session_data *sd, * カプラ倉庫にアイテムを追加する *------------------------------------------ */ -int clif_storageitemadded (struct map_session_data *sd, struct storage *stor, +int clif_storageitemadded(struct map_session_data *sd, struct storage *stor, int index, int amount) { - int fd, j; + int fd, j; - nullpo_retr (0, sd); - nullpo_retr (0, stor); + nullpo_retr(0, sd); + nullpo_retr(0, stor); fd = sd->fd; - WFIFOW (fd, 0) = 0xf4; // Storage item added - WFIFOW (fd, 2) = index + 1; // index - WFIFOL (fd, 4) = amount; // amount -/* if((view = itemdb_viewid(stor->storage_[index].nameid)) > 0) - WFIFOW(fd,8) =view; - else*/ - WFIFOW (fd, 8) = stor->storage_[index].nameid; - WFIFOB (fd, 10) = stor->storage_[index].identify; //identify flag + WFIFOW(fd, 0) = 0xf4; // Storage item added + WFIFOW(fd, 2) = index + 1; // index + WFIFOL(fd, 4) = amount; // amount +/* if ((view = itemdb_viewid(stor->storage_[index].nameid)) > 0) + WFIFOW(fd,8) =view; + else*/ + WFIFOW(fd, 8) = stor->storage_[index].nameid; + WFIFOB(fd, 10) = stor->storage_[index].identify; //identify flag if (stor->storage_[index].broken == 1) - WFIFOB (fd, 11) = 1; // is weapon broken [Valaris] + WFIFOB(fd, 11) = 1; // is weapon broken [Valaris] else - WFIFOB (fd, 11) = stor->storage_[index].attribute; // attribute - WFIFOB (fd, 12) = stor->storage_[index].refine; //refine + WFIFOB(fd, 11) = stor->storage_[index].attribute; // attribute + WFIFOB(fd, 12) = stor->storage_[index].refine; //refine if (stor->storage_[index].card[0] == 0x00ff || stor->storage_[index].card[0] == 0x00fe || stor->storage_[index].card[0] == (short) 0xff00) { - WFIFOW (fd, 13) = stor->storage_[index].card[0]; //card (4w) - WFIFOW (fd, 15) = stor->storage_[index].card[1]; //card (4w) - WFIFOW (fd, 17) = stor->storage_[index].card[2]; //card (4w) - WFIFOW (fd, 19) = stor->storage_[index].card[3]; //card (4w) + WFIFOW(fd, 13) = stor->storage_[index].card[0]; //card (4w) + WFIFOW(fd, 15) = stor->storage_[index].card[1]; //card (4w) + WFIFOW(fd, 17) = stor->storage_[index].card[2]; //card (4w) + WFIFOW(fd, 19) = stor->storage_[index].card[3]; //card (4w) } else { if (stor->storage_[index].card[0] > 0 - && (j = itemdb_viewid (stor->storage_[index].card[0])) > 0) - WFIFOW (fd, 13) = j; + && (j = itemdb_viewid(stor->storage_[index].card[0])) > 0) + WFIFOW(fd, 13) = j; else - WFIFOW (fd, 13) = stor->storage_[index].card[0]; + WFIFOW(fd, 13) = stor->storage_[index].card[0]; if (stor->storage_[index].card[1] > 0 - && (j = itemdb_viewid (stor->storage_[index].card[1])) > 0) - WFIFOW (fd, 15) = j; + && (j = itemdb_viewid(stor->storage_[index].card[1])) > 0) + WFIFOW(fd, 15) = j; else - WFIFOW (fd, 15) = stor->storage_[index].card[1]; + WFIFOW(fd, 15) = stor->storage_[index].card[1]; if (stor->storage_[index].card[2] > 0 - && (j = itemdb_viewid (stor->storage_[index].card[2])) > 0) - WFIFOW (fd, 17) = j; + && (j = itemdb_viewid(stor->storage_[index].card[2])) > 0) + WFIFOW(fd, 17) = j; else - WFIFOW (fd, 17) = stor->storage_[index].card[2]; + WFIFOW(fd, 17) = stor->storage_[index].card[2]; if (stor->storage_[index].card[3] > 0 - && (j = itemdb_viewid (stor->storage_[index].card[3])) > 0) - WFIFOW (fd, 19) = j; + && (j = itemdb_viewid(stor->storage_[index].card[3])) > 0) + WFIFOW(fd, 19) = j; else - WFIFOW (fd, 19) = stor->storage_[index].card[3]; + WFIFOW(fd, 19) = stor->storage_[index].card[3]; } - WFIFOSET (fd, packet_len_table[0xf4]); + WFIFOSET(fd, packet_len_table[0xf4]); return 0; } @@ -3171,18 +3170,18 @@ int clif_storageitemadded (struct map_session_data *sd, struct storage *stor, * カプラ倉庫からアイテムを取り去る *------------------------------------------ */ -int clif_storageitemremoved (struct map_session_data *sd, int index, +int clif_storageitemremoved(struct map_session_data *sd, int index, int amount) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xf6; // Storage item removed - WFIFOW (fd, 2) = index + 1; - WFIFOL (fd, 4) = amount; - WFIFOSET (fd, packet_len_table[0xf6]); + WFIFOW(fd, 0) = 0xf6; // Storage item removed + WFIFOW(fd, 2) = index + 1; + WFIFOL(fd, 4) = amount; + WFIFOSET(fd, packet_len_table[0xf6]); return 0; } @@ -3191,27 +3190,27 @@ int clif_storageitemremoved (struct map_session_data *sd, int index, * カプラ倉庫を閉じる *------------------------------------------ */ -int clif_storageclose (struct map_session_data *sd) +int clif_storageclose(struct map_session_data *sd) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xf8; // Storage Closed - WFIFOSET (fd, packet_len_table[0xf8]); + WFIFOW(fd, 0) = 0xf8; // Storage Closed + WFIFOSET(fd, packet_len_table[0xf8]); return 0; } void -clif_changelook_accessories (struct block_list *bl, +clif_changelook_accessories(struct block_list *bl, struct map_session_data *dest) { - int i; + int i; for (i = LOOK_SHOES; i <= LOOK_LAST; i++) - clif_changelook_towards (bl, i, 0, dest); + clif_changelook_towards(bl, i, 0, dest); } // @@ -3222,49 +3221,49 @@ clif_changelook_accessories (struct block_list *bl, *------------------------------------------ */ static -void clif_getareachar_pc (struct map_session_data *sd, +void clif_getareachar_pc(struct map_session_data *sd, struct map_session_data *dstsd) { - int len; + int len; if (dstsd->status.option & OPTION_INVISIBILITY) return; - nullpo_retv (sd); - nullpo_retv (dstsd); + nullpo_retv(sd); + nullpo_retv(dstsd); if (dstsd->walktimer != -1) { - len = clif_set007b (dstsd, WFIFOP (sd->fd, 0)); - WFIFOSET (sd->fd, len); + len = clif_set007b(dstsd, WFIFOP(sd->fd, 0)); + WFIFOSET(sd->fd, len); } else { - len = clif_set0078 (dstsd, WFIFOP (sd->fd, 0)); - WFIFOSET (sd->fd, len); + len = clif_set0078(dstsd, WFIFOP(sd->fd, 0)); + WFIFOSET(sd->fd, len); } if (dstsd->chatID) { struct chat_data *cd; - cd = (struct chat_data *) map_id2bl (dstsd->chatID); + cd = (struct chat_data *) map_id2bl(dstsd->chatID); if (cd->usersd[0] == dstsd) - clif_dispchat (cd, sd->fd); + clif_dispchat(cd, sd->fd); } if (dstsd->spiritball > 0) { - clif_set01e1 (dstsd, WFIFOP (sd->fd, 0)); - WFIFOSET (sd->fd, packet_len_table[0x1e1]); + clif_set01e1(dstsd, WFIFOP(sd->fd, 0)); + WFIFOSET(sd->fd, packet_len_table[0x1e1]); } if (battle_config.save_clothcolor == 1 && dstsd->status.clothes_color > 0) - clif_changelook (&dstsd->bl, LOOK_CLOTHES_COLOR, + clif_changelook(&dstsd->bl, LOOK_CLOTHES_COLOR, dstsd->status.clothes_color); if (sd->status.manner < 0) - clif_changestatus (&sd->bl, SP_MANNER, sd->status.manner); + clif_changestatus(&sd->bl, SP_MANNER, sd->status.manner); - clif_changelook_accessories (&sd->bl, dstsd); - clif_changelook_accessories (&dstsd->bl, sd); + clif_changelook_accessories(&sd->bl, dstsd); + clif_changelook_accessories(&dstsd->bl, sd); } /*========================================== @@ -3272,22 +3271,22 @@ void clif_getareachar_pc (struct map_session_data *sd, *------------------------------------------ */ static -void clif_getareachar_npc (struct map_session_data *sd, struct npc_data *nd) +void clif_getareachar_npc(struct map_session_data *sd, struct npc_data *nd) { - int len; + int len; - nullpo_retv (sd); - nullpo_retv (nd); + nullpo_retv(sd); + nullpo_retv(nd); if (nd->npc_class < 0 || nd->flag & 1 || nd->npc_class == INVISIBLE_CLASS) return; - len = clif_npc0078 (nd, WFIFOP (sd->fd, 0)); - WFIFOSET (sd->fd, len); + len = clif_npc0078(nd, WFIFOP(sd->fd, 0)); + WFIFOSET(sd->fd, len); if (nd->chat_id) { - clif_dispchat ((struct chat_data *) map_id2bl (nd->chat_id), sd->fd); + clif_dispchat((struct chat_data *) map_id2bl(nd->chat_id), sd->fd); } } @@ -3296,18 +3295,18 @@ void clif_getareachar_npc (struct map_session_data *sd, struct npc_data *nd) * 移動停止 *------------------------------------------ */ -int clif_movemob (struct mob_data *md) +int clif_movemob(struct mob_data *md) { unsigned char buf[256]; - int len; + int len; - nullpo_retr (0, md); + nullpo_retr(0, md); - len = clif_mob007b (md, buf); - clif_send (buf, len, &md->bl, AREA); + len = clif_mob007b(md, buf); + clif_send(buf, len, &md->bl, AREA); - if (mob_get_equip (md->mob_class) > 0) // mob equipment [Valaris] - clif_mob_equip (md, mob_get_equip (md->mob_class)); + if (mob_get_equip(md->mob_class) > 0) // mob equipment [Valaris] + clif_mob_equip(md, mob_get_equip(md->mob_class)); return 0; } @@ -3316,22 +3315,22 @@ int clif_movemob (struct mob_data *md) * モンスターの位置修正 *------------------------------------------ */ -int clif_fixmobpos (struct mob_data *md) +int clif_fixmobpos(struct mob_data *md) { unsigned char buf[256]; - int len; + int len; - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->state.state == MS_WALK) { - len = clif_mob007b (md, buf); - clif_send (buf, len, &md->bl, AREA); + len = clif_mob007b(md, buf); + clif_send(buf, len, &md->bl, AREA); } else { - len = clif_mob0078 (md, buf); - clif_send (buf, len, &md->bl, AREA); + len = clif_mob0078(md, buf); + clif_send(buf, len, &md->bl, AREA); } return 0; @@ -3341,24 +3340,24 @@ int clif_fixmobpos (struct mob_data *md) * PCの位置修正 *------------------------------------------ */ -int clif_fixpcpos (struct map_session_data *sd) +int clif_fixpcpos(struct map_session_data *sd) { unsigned char buf[256]; - int len; + int len; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->walktimer != -1) { - len = clif_set007b (sd, buf); - clif_send (buf, len, &sd->bl, AREA); + len = clif_set007b(sd, buf); + clif_send(buf, len, &sd->bl, AREA); } else { - len = clif_set0078 (sd, buf); - clif_send (buf, len, &sd->bl, AREA); + len = clif_set0078(sd, buf); + clif_send(buf, len, &sd->bl, AREA); } - clif_changelook_accessories (&sd->bl, NULL); + clif_changelook_accessories(&sd->bl, NULL); return 0; } @@ -3367,17 +3366,17 @@ int clif_fixpcpos (struct map_session_data *sd) * 通常攻撃エフェクト＆ダメージ *------------------------------------------ */ -int clif_damage (struct block_list *src, struct block_list *dst, +int clif_damage(struct block_list *src, struct block_list *dst, unsigned int tick, int sdelay, int ddelay, int damage, int div, int type, int damage2) { unsigned char buf[256]; struct status_change *sc_data; - nullpo_retr (0, src); - nullpo_retr (0, dst); + nullpo_retr(0, src); + nullpo_retr(0, dst); - sc_data = battle_get_sc_data (dst); + sc_data = battle_get_sc_data(dst); if (type != 4 && dst->type == BL_PC && ((struct map_session_data *) dst)->special_state.infinite_endure) @@ -3391,25 +3390,25 @@ int clif_damage (struct block_list *src, struct block_list *dst, if (damage > 0) damage = damage * (5 + sc_data[SC_HALLUCINATION].val1) + - MRAND (100); + MRAND(100); if (damage2 > 0) damage2 = damage2 * (5 + sc_data[SC_HALLUCINATION].val1) + - MRAND (100); + MRAND(100); } } - WBUFW (buf, 0) = 0x8a; - WBUFL (buf, 2) = src->id; - WBUFL (buf, 6) = dst->id; - WBUFL (buf, 10) = tick; - WBUFL (buf, 14) = sdelay; - WBUFL (buf, 18) = ddelay; - WBUFW (buf, 22) = (damage > 0x7fff) ? 0x7fff : damage; - WBUFW (buf, 24) = div; - WBUFB (buf, 26) = type; - WBUFW (buf, 27) = damage2; - clif_send (buf, packet_len_table[0x8a], src, AREA); + WBUFW(buf, 0) = 0x8a; + WBUFL(buf, 2) = src->id; + WBUFL(buf, 6) = dst->id; + WBUFL(buf, 10) = tick; + WBUFL(buf, 14) = sdelay; + WBUFL(buf, 18) = ddelay; + WBUFW(buf, 22) = (damage > 0x7fff) ? 0x7fff : damage; + WBUFW(buf, 24) = div; + WBUFB(buf, 26) = type; + WBUFW(buf, 27) = damage2; + clif_send(buf, packet_len_table[0x8a], src, AREA); return 0; } @@ -3419,25 +3418,25 @@ int clif_damage (struct block_list *src, struct block_list *dst, *------------------------------------------ */ static -void clif_getareachar_mob (struct map_session_data *sd, struct mob_data *md) +void clif_getareachar_mob(struct map_session_data *sd, struct mob_data *md) { - int len; - nullpo_retv (sd); - nullpo_retv (md); + int len; + nullpo_retv(sd); + nullpo_retv(md); if (md->state.state == MS_WALK) { - len = clif_mob007b (md, WFIFOP (sd->fd, 0)); - WFIFOSET (sd->fd, len); + len = clif_mob007b(md, WFIFOP(sd->fd, 0)); + WFIFOSET(sd->fd, len); } else { - len = clif_mob0078 (md, WFIFOP (sd->fd, 0)); - WFIFOSET (sd->fd, len); + len = clif_mob0078(md, WFIFOP(sd->fd, 0)); + WFIFOSET(sd->fd, len); } - if (mob_get_equip (md->mob_class) > 0) // mob equipment [Valaris] - clif_mob_equip (md, mob_get_equip (md->mob_class)); + if (mob_get_equip(md->mob_class) > 0) // mob equipment [Valaris] + clif_mob_equip(md, mob_get_equip(md->mob_class)); } /*========================================== @@ -3445,30 +3444,30 @@ void clif_getareachar_mob (struct map_session_data *sd, struct mob_data *md) *------------------------------------------ */ static -void clif_getareachar_item (struct map_session_data *sd, +void clif_getareachar_item(struct map_session_data *sd, struct flooritem_data *fitem) { - int view, fd; + int view, fd; - nullpo_retv (sd); - nullpo_retv (fitem); + nullpo_retv(sd); + nullpo_retv(fitem); fd = sd->fd; //009d <ID>.l <item ID>.w <identify flag>.B <X>.w <Y>.w <amount>.w <subX>.B <subY>.B - WFIFOW (fd, 0) = 0x9d; - WFIFOL (fd, 2) = fitem->bl.id; - if ((view = itemdb_viewid (fitem->item_data.nameid)) > 0) - WFIFOW (fd, 6) = view; + WFIFOW(fd, 0) = 0x9d; + WFIFOL(fd, 2) = fitem->bl.id; + if ((view = itemdb_viewid(fitem->item_data.nameid)) > 0) + WFIFOW(fd, 6) = view; else - WFIFOW (fd, 6) = fitem->item_data.nameid; - WFIFOB (fd, 8) = fitem->item_data.identify; - WFIFOW (fd, 9) = fitem->bl.x; - WFIFOW (fd, 11) = fitem->bl.y; - WFIFOW (fd, 13) = fitem->item_data.amount; - WFIFOB (fd, 15) = fitem->subx; - WFIFOB (fd, 16) = fitem->suby; + WFIFOW(fd, 6) = fitem->item_data.nameid; + WFIFOB(fd, 8) = fitem->item_data.identify; + WFIFOW(fd, 9) = fitem->bl.x; + WFIFOW(fd, 11) = fitem->bl.y; + WFIFOW(fd, 13) = fitem->item_data.amount; + WFIFOB(fd, 15) = fitem->subx; + WFIFOB(fd, 16) = fitem->suby; - WFIFOSET (fd, packet_len_table[0x9d]); + WFIFOSET(fd, packet_len_table[0x9d]); } /*========================================== @@ -3476,59 +3475,59 @@ void clif_getareachar_item (struct map_session_data *sd, *------------------------------------------ */ static -int clif_getareachar_skillunit (struct map_session_data *sd, +int clif_getareachar_skillunit(struct map_session_data *sd, struct skill_unit *unit) { - int fd; + int fd; struct block_list *bl; - nullpo_retr (0, unit); + nullpo_retr(0, unit); fd = sd->fd; - bl = map_id2bl (unit->group->src_id); - memset (WFIFOP (fd, 0), 0, packet_len_table[0x1c9]); - WFIFOW (fd, 0) = 0x1c9; - WFIFOL (fd, 2) = unit->bl.id; - WFIFOL (fd, 6) = unit->group->src_id; - WFIFOW (fd, 10) = unit->bl.x; - WFIFOW (fd, 12) = unit->bl.y; - WFIFOB (fd, 14) = unit->group->unit_id; - WFIFOB (fd, 15) = 1; - WFIFOL (fd, 15 + 1) = 0; //1-4調べた限り固定 - WFIFOL (fd, 15 + 5) = 0; //5-8調べた限り固定 + bl = map_id2bl(unit->group->src_id); + memset(WFIFOP(fd, 0), 0, packet_len_table[0x1c9]); + WFIFOW(fd, 0) = 0x1c9; + WFIFOL(fd, 2) = unit->bl.id; + WFIFOL(fd, 6) = unit->group->src_id; + WFIFOW(fd, 10) = unit->bl.x; + WFIFOW(fd, 12) = unit->bl.y; + WFIFOB(fd, 14) = unit->group->unit_id; + WFIFOB(fd, 15) = 1; + WFIFOL(fd, 15 + 1) = 0; //1-4調べた限り固定 + WFIFOL(fd, 15 + 5) = 0; //5-8調べた限り固定 //9-12マップごとで一定の77-80とはまた違う4バイトのかなり大きな数字 - WFIFOL (fd, 15 + 13) = unit->bl.y - 0x12; //13-16ユニットのY座標-18っぽい(Y:17でFF FF FF FF) - WFIFOL (fd, 15 + 17) = 0x004f37dd; //17-20調べた限り固定 - WFIFOL (fd, 15 + 21) = 0x0012f674; //21-24調べた限り固定 - WFIFOL (fd, 15 + 25) = 0x0012f664; //25-28調べた限り固定 - WFIFOL (fd, 15 + 29) = 0x0012f654; //29-32調べた限り固定 - WFIFOL (fd, 15 + 33) = 0x77527bbc; //33-36調べた限り固定 + WFIFOL(fd, 15 + 13) = unit->bl.y - 0x12; //13-16ユニットのY座標-18っぽい(Y:17でFF FF FF FF) + WFIFOL(fd, 15 + 17) = 0x004f37dd; //17-20調べた限り固定 + WFIFOL(fd, 15 + 21) = 0x0012f674; //21-24調べた限り固定 + WFIFOL(fd, 15 + 25) = 0x0012f664; //25-28調べた限り固定 + WFIFOL(fd, 15 + 29) = 0x0012f654; //29-32調べた限り固定 + WFIFOL(fd, 15 + 33) = 0x77527bbc; //33-36調べた限り固定 //37-39 - WFIFOB (fd, 15 + 40) = 0x2d; //40調べた限り固定 - WFIFOL (fd, 15 + 41) = 0; //41-44調べた限り0固定 - WFIFOL (fd, 15 + 45) = 0; //45-48調べた限り0固定 - WFIFOL (fd, 15 + 49) = 0; //49-52調べた限り0固定 - WFIFOL (fd, 15 + 53) = 0x0048d919; //53-56調べた限り固定 - WFIFOL (fd, 15 + 57) = 0x0000003e; //57-60調べた限り固定 - WFIFOL (fd, 15 + 61) = 0x0012f66c; //61-64調べた限り固定 + WFIFOB(fd, 15 + 40) = 0x2d; //40調べた限り固定 + WFIFOL(fd, 15 + 41) = 0; //41-44調べた限り0固定 + WFIFOL(fd, 15 + 45) = 0; //45-48調べた限り0固定 + WFIFOL(fd, 15 + 49) = 0; //49-52調べた限り0固定 + WFIFOL(fd, 15 + 53) = 0x0048d919; //53-56調べた限り固定 + WFIFOL(fd, 15 + 57) = 0x0000003e; //57-60調べた限り固定 + WFIFOL(fd, 15 + 61) = 0x0012f66c; //61-64調べた限り固定 //65-68 //69-72 if (bl) - WFIFOL (fd, 15 + 73) = bl->y; //73-76術者のY座標 - WFIFOL (fd, 15 + 77) = unit->bl.m; //77-80マップIDかなぁ？かなり2バイトで足りそうな数字 - WFIFOB (fd, 15 + 81) = 0xaa; //81終端文字0xaa + WFIFOL(fd, 15 + 73) = bl->y; //73-76術者のY座標 + WFIFOL(fd, 15 + 77) = unit->bl.m; //77-80マップIDかなぁ？かなり2バイトで足りそうな数字 + WFIFOB(fd, 15 + 81) = 0xaa; //81終端文字0xaa /* Graffiti [Valaris] */ if (unit->group->unit_id == 0xb0) { - WFIFOL (fd, 15) = 1; - WFIFOL (fd, 16) = 1; - memcpy (WFIFOP (fd, 17), unit->group->valstr, 80); + WFIFOL(fd, 15) = 1; + WFIFOL(fd, 16) = 1; + memcpy(WFIFOP(fd, 17), unit->group->valstr, 80); } - WFIFOSET (fd, packet_len_table[0x1c9]); + WFIFOSET(fd, packet_len_table[0x1c9]); if (unit->group->skill_id == WZ_ICEWALL) - clif_set0192 (fd, unit->bl.m, unit->bl.x, unit->bl.y, 5); + clif_set0192(fd, unit->bl.m, unit->bl.x, unit->bl.y, 5); return 0; } @@ -3538,15 +3537,15 @@ int clif_getareachar_skillunit (struct map_session_data *sd, *------------------------------------------ */ static -int clif_clearchar_skillunit (struct skill_unit *unit, int fd) +int clif_clearchar_skillunit(struct skill_unit *unit, int fd) { - nullpo_retr (0, unit); + nullpo_retr(0, unit); - WFIFOW (fd, 0) = 0x120; - WFIFOL (fd, 2) = unit->bl.id; - WFIFOSET (fd, packet_len_table[0x120]); + WFIFOW(fd, 0) = 0x120; + WFIFOL(fd, 2) = unit->bl.id; + WFIFOSET(fd, packet_len_table[0x120]); if (unit->group->skill_id == WZ_ICEWALL) - clif_set0192 (fd, unit->bl.m, unit->bl.x, unit->bl.y, unit->val2); + clif_set0192(fd, unit->bl.m, unit->bl.x, unit->bl.y, unit->val2); return 0; } @@ -3555,16 +3554,16 @@ int clif_clearchar_skillunit (struct skill_unit *unit, int fd) * *------------------------------------------ */ -int clif_01ac (struct block_list *bl) +int clif_01ac(struct block_list *bl) { uint8_t buf[32]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x1ac; - WBUFL (buf, 2) = bl->id; + WBUFW(buf, 0) = 0x1ac; + WBUFL(buf, 2) = bl->id; - clif_send (buf, packet_len_table[0x1ac], bl, AREA); + clif_send(buf, packet_len_table[0x1ac], bl, AREA); return 0; } @@ -3573,37 +3572,37 @@ int clif_01ac (struct block_list *bl) *------------------------------------------ */ static -void clif_getareachar (struct block_list *bl, va_list ap) +void clif_getareachar(struct block_list *bl, va_list ap) { struct map_session_data *sd; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); - sd = va_arg (ap, struct map_session_data *); + sd = va_arg(ap, struct map_session_data *); switch (bl->type) { case BL_PC: if (sd == (struct map_session_data *) bl) break; - clif_getareachar_pc (sd, (struct map_session_data *) bl); + clif_getareachar_pc(sd, (struct map_session_data *) bl); break; case BL_NPC: - clif_getareachar_npc (sd, (struct npc_data *) bl); + clif_getareachar_npc(sd, (struct npc_data *) bl); break; case BL_MOB: - clif_getareachar_mob (sd, (struct mob_data *) bl); + clif_getareachar_mob(sd, (struct mob_data *) bl); break; case BL_ITEM: - clif_getareachar_item (sd, (struct flooritem_data *) bl); + clif_getareachar_item(sd, (struct flooritem_data *) bl); break; case BL_SKILL: - clif_getareachar_skillunit (sd, (struct skill_unit *) bl); + clif_getareachar_skillunit(sd, (struct skill_unit *) bl); break; default: if (battle_config.error_log) - printf ("get area char ??? %d\n", bl->type); + printf("get area char ??? %d\n", bl->type); break; } } @@ -3612,13 +3611,13 @@ void clif_getareachar (struct block_list *bl, va_list ap) * *------------------------------------------ */ -void clif_pcoutsight (struct block_list *bl, va_list ap) +void clif_pcoutsight(struct block_list *bl, va_list ap) { struct map_session_data *sd, *dstsd; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd = va_arg (ap, struct map_session_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd = va_arg(ap, struct map_session_data *)); switch (bl->type) { @@ -3626,29 +3625,29 @@ void clif_pcoutsight (struct block_list *bl, va_list ap) dstsd = (struct map_session_data *) bl; if (sd != dstsd) { - clif_clearchar_id (dstsd->bl.id, 0, sd->fd); - clif_clearchar_id (sd->bl.id, 0, dstsd->fd); + clif_clearchar_id(dstsd->bl.id, 0, sd->fd); + clif_clearchar_id(sd->bl.id, 0, dstsd->fd); if (dstsd->chatID) { struct chat_data *cd; - cd = (struct chat_data *) map_id2bl (dstsd->chatID); + cd = (struct chat_data *) map_id2bl(dstsd->chatID); if (cd->usersd[0] == dstsd) - clif_dispchat (cd, sd->fd); + clif_dispchat(cd, sd->fd); } } break; case BL_NPC: if (((struct npc_data *) bl)->npc_class != INVISIBLE_CLASS) - clif_clearchar_id (bl->id, 0, sd->fd); + clif_clearchar_id(bl->id, 0, sd->fd); break; case BL_MOB: - clif_clearchar_id (bl->id, 0, sd->fd); + clif_clearchar_id(bl->id, 0, sd->fd); break; case BL_ITEM: - clif_clearflooritem ((struct flooritem_data *) bl, sd->fd); + clif_clearflooritem((struct flooritem_data *) bl, sd->fd); break; case BL_SKILL: - clif_clearchar_skillunit ((struct skill_unit *) bl, sd->fd); + clif_clearchar_skillunit((struct skill_unit *) bl, sd->fd); break; } } @@ -3657,13 +3656,13 @@ void clif_pcoutsight (struct block_list *bl, va_list ap) * *------------------------------------------ */ -void clif_pcinsight (struct block_list *bl, va_list ap) +void clif_pcinsight(struct block_list *bl, va_list ap) { struct map_session_data *sd, *dstsd; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd = va_arg (ap, struct map_session_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd = va_arg(ap, struct map_session_data *)); switch (bl->type) { @@ -3671,21 +3670,21 @@ void clif_pcinsight (struct block_list *bl, va_list ap) dstsd = (struct map_session_data *) bl; if (sd != dstsd) { - clif_getareachar_pc (sd, dstsd); - clif_getareachar_pc (dstsd, sd); + clif_getareachar_pc(sd, dstsd); + clif_getareachar_pc(dstsd, sd); } break; case BL_NPC: - clif_getareachar_npc (sd, (struct npc_data *) bl); + clif_getareachar_npc(sd, (struct npc_data *) bl); break; case BL_MOB: - clif_getareachar_mob (sd, (struct mob_data *) bl); + clif_getareachar_mob(sd, (struct mob_data *) bl); break; case BL_ITEM: - clif_getareachar_item (sd, (struct flooritem_data *) bl); + clif_getareachar_item(sd, (struct flooritem_data *) bl); break; case BL_SKILL: - clif_getareachar_skillunit (sd, (struct skill_unit *) bl); + clif_getareachar_skillunit(sd, (struct skill_unit *) bl); break; } } @@ -3694,18 +3693,18 @@ void clif_pcinsight (struct block_list *bl, va_list ap) * *------------------------------------------ */ -void clif_moboutsight (struct block_list *bl, va_list ap) +void clif_moboutsight(struct block_list *bl, va_list ap) { struct map_session_data *sd; struct mob_data *md; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (md = va_arg (ap, struct mob_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(md = va_arg(ap, struct mob_data *)); if (bl->type == BL_PC && (sd = (struct map_session_data *) bl)) { - clif_clearchar_id (md->bl.id, 0, sd->fd); + clif_clearchar_id(md->bl.id, 0, sd->fd); } } @@ -3713,18 +3712,18 @@ void clif_moboutsight (struct block_list *bl, va_list ap) * *------------------------------------------ */ -void clif_mobinsight (struct block_list *bl, va_list ap) +void clif_mobinsight(struct block_list *bl, va_list ap) { struct map_session_data *sd; struct mob_data *md; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); - md = va_arg (ap, struct mob_data *); + md = va_arg(ap, struct mob_data *); if (bl->type == BL_PC && (sd = (struct map_session_data *) bl)) { - clif_getareachar_mob (sd, md); + clif_getareachar_mob(sd, md); } } @@ -3732,38 +3731,38 @@ void clif_mobinsight (struct block_list *bl, va_list ap) * *------------------------------------------ */ -int clif_skillinfo (struct map_session_data *sd, int skillid, int type, +int clif_skillinfo(struct map_session_data *sd, int skillid, int type, int range) { - int fd, id; + int fd, id; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; if ((id = sd->status.skill[skillid].id) <= 0) return 0; - WFIFOW (fd, 0) = 0x147; - WFIFOW (fd, 2) = id; + WFIFOW(fd, 0) = 0x147; + WFIFOW(fd, 2) = id; if (type < 0) - WFIFOW (fd, 4) = skill_get_inf (id); + WFIFOW(fd, 4) = skill_get_inf(id); else - WFIFOW (fd, 4) = type; - WFIFOW (fd, 6) = 0; - WFIFOW (fd, 8) = sd->status.skill[skillid].lv; - WFIFOW (fd, 10) = skill_get_sp (id, sd->status.skill[skillid].lv); + WFIFOW(fd, 4) = type; + WFIFOW(fd, 6) = 0; + WFIFOW(fd, 8) = sd->status.skill[skillid].lv; + WFIFOW(fd, 10) = skill_get_sp(id, sd->status.skill[skillid].lv); if (range < 0) { - range = skill_get_range (id, sd->status.skill[skillid].lv); + range = skill_get_range(id, sd->status.skill[skillid].lv); if (range < 0) - range = battle_get_range (&sd->bl) - (range + 1); - WFIFOW (fd, 12) = range; + range = battle_get_range(&sd->bl) - (range + 1); + WFIFOW(fd, 12) = range; } else - WFIFOW (fd, 12) = range; - memset (WFIFOP (fd, 14), 0, 24); - WFIFOB (fd, 38) = - (sd->status.skill[skillid].lv < skill_get_max_raise (id)) ? 1 : 0; - WFIFOSET (fd, packet_len_table[0x147]); + WFIFOW(fd, 12) = range; + memset(WFIFOP(fd, 14), 0, 24); + WFIFOB(fd, 38) = + (sd->status.skill[skillid].lv < skill_get_max_raise(id)) ? 1 : 0; + WFIFOSET(fd, packet_len_table[0x147]); return 0; } @@ -3772,40 +3771,40 @@ int clif_skillinfo (struct map_session_data *sd, int skillid, int type, * スキルリストを送信する *------------------------------------------ */ -int clif_skillinfoblock (struct map_session_data *sd) +int clif_skillinfoblock(struct map_session_data *sd) { - int fd; - int i, c, len = 4, id, range; + int fd; + int i, c, len = 4, id, range; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x10f; + WFIFOW(fd, 0) = 0x10f; for (i = c = 0; i < MAX_SKILL; i++) { if ((id = sd->status.skill[i].id) != 0 && (sd->tmw_version >= 1)) { // [Fate] Version 1 and later don't crash because of bad skill IDs anymore - WFIFOW (fd, len) = id; - WFIFOW (fd, len + 2) = skill_get_inf (id); - WFIFOW (fd, len + 4) = + WFIFOW(fd, len) = id; + WFIFOW(fd, len + 2) = skill_get_inf(id); + WFIFOW(fd, len + 4) = skill_db[i].poolflags | (sd->status. skill[i].flags & (SKILL_POOL_ACTIVATED)); - WFIFOW (fd, len + 6) = sd->status.skill[i].lv; - WFIFOW (fd, len + 8) = skill_get_sp (id, sd->status.skill[i].lv); - range = skill_get_range (id, sd->status.skill[i].lv); + WFIFOW(fd, len + 6) = sd->status.skill[i].lv; + WFIFOW(fd, len + 8) = skill_get_sp(id, sd->status.skill[i].lv); + range = skill_get_range(id, sd->status.skill[i].lv); if (range < 0) - range = battle_get_range (&sd->bl) - (range + 1); - WFIFOW (fd, len + 10) = range; - memset (WFIFOP (fd, len + 12), 0, 24); - WFIFOB (fd, len + 36) = - (sd->status.skill[i].lv < skill_get_max_raise (id)) ? 1 : 0; + range = battle_get_range(&sd->bl) - (range + 1); + WFIFOW(fd, len + 10) = range; + memset(WFIFOP(fd, len + 12), 0, 24); + WFIFOB(fd, len + 36) = + (sd->status.skill[i].lv < skill_get_max_raise(id)) ? 1 : 0; len += 37; c++; } } - WFIFOW (fd, 2) = len; - WFIFOSET (fd, len); + WFIFOW(fd, 2) = len; + WFIFOSET(fd, len); return 0; } @@ -3814,25 +3813,25 @@ int clif_skillinfoblock (struct map_session_data *sd) * スキル割り振り通知 *------------------------------------------ */ -int clif_skillup (struct map_session_data *sd, int skill_num) +int clif_skillup(struct map_session_data *sd, int skill_num) { - int range, fd; + int range, fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x10e; - WFIFOW (fd, 2) = skill_num; - WFIFOW (fd, 4) = sd->status.skill[skill_num].lv; - WFIFOW (fd, 6) = skill_get_sp (skill_num, sd->status.skill[skill_num].lv); - range = skill_get_range (skill_num, sd->status.skill[skill_num].lv); + WFIFOW(fd, 0) = 0x10e; + WFIFOW(fd, 2) = skill_num; + WFIFOW(fd, 4) = sd->status.skill[skill_num].lv; + WFIFOW(fd, 6) = skill_get_sp(skill_num, sd->status.skill[skill_num].lv); + range = skill_get_range(skill_num, sd->status.skill[skill_num].lv); if (range < 0) - range = battle_get_range (&sd->bl) - (range + 1); - WFIFOW (fd, 8) = range; - WFIFOB (fd, 10) = + range = battle_get_range(&sd->bl) - (range + 1); + WFIFOW(fd, 8) = range; + WFIFOB(fd, 10) = (sd->status.skill[skill_num].lv < - skill_get_max_raise (sd->status.skill[skill_num].id)) ? 1 : 0; - WFIFOSET (fd, packet_len_table[0x10e]); + skill_get_max_raise(sd->status.skill[skill_num].id)) ? 1 : 0; + WFIFOSET(fd, packet_len_table[0x10e]); return 0; } @@ -3841,20 +3840,20 @@ int clif_skillup (struct map_session_data *sd, int skill_num) * スキル詠唱エフェクトを送信する *------------------------------------------ */ -int clif_skillcasting (struct block_list *bl, +int clif_skillcasting(struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, int skill_num, int casttime) { unsigned char buf[32]; - WBUFW (buf, 0) = 0x13e; - WBUFL (buf, 2) = src_id; - WBUFL (buf, 6) = dst_id; - WBUFW (buf, 10) = dst_x; - WBUFW (buf, 12) = dst_y; - WBUFW (buf, 14) = skill_num; //魔法詠唱スキル - WBUFL (buf, 16) = skill_get_pl (skill_num); //属性 - WBUFL (buf, 20) = casttime; //skill詠唱時間 - clif_send (buf, packet_len_table[0x13e], bl, AREA); + WBUFW(buf, 0) = 0x13e; + WBUFL(buf, 2) = src_id; + WBUFL(buf, 6) = dst_id; + WBUFW(buf, 10) = dst_x; + WBUFW(buf, 12) = dst_y; + WBUFW(buf, 14) = skill_num; //魔法詠唱スキル + WBUFL(buf, 16) = skill_get_pl(skill_num); //属性 + WBUFL(buf, 20) = casttime; //skill詠唱時間 + clif_send(buf, packet_len_table[0x13e], bl, AREA); return 0; } @@ -3863,15 +3862,15 @@ int clif_skillcasting (struct block_list *bl, * *------------------------------------------ */ -int clif_skillcastcancel (struct block_list *bl) +int clif_skillcastcancel(struct block_list *bl) { unsigned char buf[16]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x1b9; - WBUFL (buf, 2) = bl->id; - clif_send (buf, packet_len_table[0x1b9], bl, AREA); + WBUFW(buf, 0) = 0x1b9; + WBUFL(buf, 2) = bl->id; + clif_send(buf, packet_len_table[0x1b9], bl, AREA); return 0; } @@ -3880,12 +3879,12 @@ int clif_skillcastcancel (struct block_list *bl) * スキル詠唱失敗 *------------------------------------------ */ -int clif_skill_fail (struct map_session_data *sd, int skill_id, int type, +int clif_skill_fail(struct map_session_data *sd, int skill_id, int type, int btype) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; @@ -3894,13 +3893,13 @@ int clif_skill_fail (struct map_session_data *sd, int skill_id, int type, return 0; } - WFIFOW (fd, 0) = 0x110; - WFIFOW (fd, 2) = skill_id; - WFIFOW (fd, 4) = btype; - WFIFOW (fd, 6) = 0; - WFIFOB (fd, 8) = 0; - WFIFOB (fd, 9) = type; - WFIFOSET (fd, packet_len_table[0x110]); + WFIFOW(fd, 0) = 0x110; + WFIFOW(fd, 2) = skill_id; + WFIFOW(fd, 4) = btype; + WFIFOW(fd, 6) = 0; + WFIFOB(fd, 8) = 0; + WFIFOB(fd, 9) = type; + WFIFOSET(fd, packet_len_table[0x110]); return 0; } @@ -3909,17 +3908,17 @@ int clif_skill_fail (struct map_session_data *sd, int skill_id, int type, * スキル攻撃エフェクト＆ダメージ *------------------------------------------ */ -int clif_skill_damage (struct block_list *src, struct block_list *dst, +int clif_skill_damage(struct block_list *src, struct block_list *dst, unsigned int tick, int sdelay, int ddelay, int damage, int div, int skill_id, int skill_lv, int type) { unsigned char buf[64]; struct status_change *sc_data; - nullpo_retr (0, src); - nullpo_retr (0, dst); + nullpo_retr(0, src); + nullpo_retr(0, dst); - sc_data = battle_get_sc_data (dst); + sc_data = battle_get_sc_data(dst); if (type != 5 && dst->type == BL_PC && ((struct map_session_data *) dst)->special_state.infinite_endure) @@ -3930,21 +3929,21 @@ int clif_skill_damage (struct block_list *src, struct block_list *dst, type = 9; if (sc_data[SC_HALLUCINATION].timer != -1 && damage > 0) damage = - damage * (5 + sc_data[SC_HALLUCINATION].val1) + MRAND (100); + damage * (5 + sc_data[SC_HALLUCINATION].val1) + MRAND(100); } - WBUFW (buf, 0) = 0x1de; - WBUFW (buf, 2) = skill_id; - WBUFL (buf, 4) = src->id; - WBUFL (buf, 8) = dst->id; - WBUFL (buf, 12) = tick; - WBUFL (buf, 16) = sdelay; - WBUFL (buf, 20) = ddelay; - WBUFL (buf, 24) = damage; - WBUFW (buf, 28) = skill_lv; - WBUFW (buf, 30) = div; - WBUFB (buf, 32) = (type > 0) ? type : skill_get_hit (skill_id); - clif_send (buf, packet_len_table[0x1de], src, AREA); + WBUFW(buf, 0) = 0x1de; + WBUFW(buf, 2) = skill_id; + WBUFL(buf, 4) = src->id; + WBUFL(buf, 8) = dst->id; + WBUFL(buf, 12) = tick; + WBUFL(buf, 16) = sdelay; + WBUFL(buf, 20) = ddelay; + WBUFL(buf, 24) = damage; + WBUFW(buf, 28) = skill_lv; + WBUFW(buf, 30) = div; + WBUFB(buf, 32) = (type > 0) ? type : skill_get_hit(skill_id); + clif_send(buf, packet_len_table[0x1de], src, AREA); return 0; } @@ -3953,17 +3952,17 @@ int clif_skill_damage (struct block_list *src, struct block_list *dst, * 吹き飛ばしスキル攻撃エフェクト＆ダメージ *------------------------------------------ */ -int clif_skill_damage2 (struct block_list *src, struct block_list *dst, +int clif_skill_damage2(struct block_list *src, struct block_list *dst, unsigned int tick, int sdelay, int ddelay, int damage, int div, int skill_id, int skill_lv, int type) { unsigned char buf[64]; struct status_change *sc_data; - nullpo_retr (0, src); - nullpo_retr (0, dst); + nullpo_retr(0, src); + nullpo_retr(0, dst); - sc_data = battle_get_sc_data (dst); + sc_data = battle_get_sc_data(dst); if (type != 5 && dst->type == BL_PC && ((struct map_session_data *) dst)->special_state.infinite_endure) @@ -3974,23 +3973,23 @@ int clif_skill_damage2 (struct block_list *src, struct block_list *dst, type = 9; if (sc_data[SC_HALLUCINATION].timer != -1 && damage > 0) damage = - damage * (5 + sc_data[SC_HALLUCINATION].val1) + MRAND (100); + damage * (5 + sc_data[SC_HALLUCINATION].val1) + MRAND(100); } - WBUFW (buf, 0) = 0x115; - WBUFW (buf, 2) = skill_id; - WBUFL (buf, 4) = src->id; - WBUFL (buf, 8) = dst->id; - WBUFL (buf, 12) = tick; - WBUFL (buf, 16) = sdelay; - WBUFL (buf, 20) = ddelay; - WBUFW (buf, 24) = dst->x; - WBUFW (buf, 26) = dst->y; - WBUFW (buf, 28) = damage; - WBUFW (buf, 30) = skill_lv; - WBUFW (buf, 32) = div; - WBUFB (buf, 34) = (type > 0) ? type : skill_get_hit (skill_id); - clif_send (buf, packet_len_table[0x115], src, AREA); + WBUFW(buf, 0) = 0x115; + WBUFW(buf, 2) = skill_id; + WBUFL(buf, 4) = src->id; + WBUFL(buf, 8) = dst->id; + WBUFL(buf, 12) = tick; + WBUFL(buf, 16) = sdelay; + WBUFL(buf, 20) = ddelay; + WBUFW(buf, 24) = dst->x; + WBUFW(buf, 26) = dst->y; + WBUFW(buf, 28) = damage; + WBUFW(buf, 30) = skill_lv; + WBUFW(buf, 32) = div; + WBUFB(buf, 34) = (type > 0) ? type : skill_get_hit(skill_id); + clif_send(buf, packet_len_table[0x115], src, AREA); return 0; } @@ -3999,21 +3998,21 @@ int clif_skill_damage2 (struct block_list *src, struct block_list *dst, * 支援/回復スキルエフェクト *------------------------------------------ */ -int clif_skill_nodamage (struct block_list *src, struct block_list *dst, +int clif_skill_nodamage(struct block_list *src, struct block_list *dst, int skill_id, int heal, int fail) { unsigned char buf[32]; - nullpo_retr (0, src); - nullpo_retr (0, dst); + nullpo_retr(0, src); + nullpo_retr(0, dst); - WBUFW (buf, 0) = 0x11a; - WBUFW (buf, 2) = skill_id; - WBUFW (buf, 4) = (heal > 0x7fff) ? 0x7fff : heal; - WBUFL (buf, 6) = dst->id; - WBUFL (buf, 10) = src->id; - WBUFB (buf, 14) = fail; - clif_send (buf, packet_len_table[0x11a], src, AREA); + WBUFW(buf, 0) = 0x11a; + WBUFW(buf, 2) = skill_id; + WBUFW(buf, 4) = (heal > 0x7fff) ? 0x7fff : heal; + WBUFL(buf, 6) = dst->id; + WBUFL(buf, 10) = src->id; + WBUFB(buf, 14) = fail; + clif_send(buf, packet_len_table[0x11a], src, AREA); return 0; } @@ -4022,21 +4021,21 @@ int clif_skill_nodamage (struct block_list *src, struct block_list *dst, * 場所スキルエフェクト *------------------------------------------ */ -int clif_skill_poseffect (struct block_list *src, int skill_id, int val, +int clif_skill_poseffect(struct block_list *src, int skill_id, int val, int x, int y, int tick) { unsigned char buf[32]; - nullpo_retr (0, src); + nullpo_retr(0, src); - WBUFW (buf, 0) = 0x117; - WBUFW (buf, 2) = skill_id; - WBUFL (buf, 4) = src->id; - WBUFW (buf, 8) = val; - WBUFW (buf, 10) = x; - WBUFW (buf, 12) = y; - WBUFL (buf, 14) = tick; - clif_send (buf, packet_len_table[0x117], src, AREA); + WBUFW(buf, 0) = 0x117; + WBUFW(buf, 2) = skill_id; + WBUFL(buf, 4) = src->id; + WBUFW(buf, 8) = val; + WBUFW(buf, 10) = x; + WBUFW(buf, 12) = y; + WBUFL(buf, 14) = tick; + clif_send(buf, packet_len_table[0x117], src, AREA); return 0; } @@ -4045,56 +4044,56 @@ int clif_skill_poseffect (struct block_list *src, int skill_id, int val, * 場所スキルエフェクト表示 *------------------------------------------ */ -int clif_skill_setunit (struct skill_unit *unit) +int clif_skill_setunit(struct skill_unit *unit) { unsigned char buf[128]; struct block_list *bl; - nullpo_retr (0, unit); + nullpo_retr(0, unit); - bl = map_id2bl (unit->group->src_id); + bl = map_id2bl(unit->group->src_id); - memset (WBUFP (buf, 0), 0, packet_len_table[0x1c9]); - WBUFW (buf, 0) = 0x1c9; - WBUFL (buf, 2) = unit->bl.id; - WBUFL (buf, 6) = unit->group->src_id; - WBUFW (buf, 10) = unit->bl.x; - WBUFW (buf, 12) = unit->bl.y; - WBUFB (buf, 14) = unit->group->unit_id; - WBUFB (buf, 15) = 1; - WBUFL (buf, 15 + 1) = 0; //1-4調べた限り固定 - WBUFL (buf, 15 + 5) = 0; //5-8調べた限り固定 + memset(WBUFP(buf, 0), 0, packet_len_table[0x1c9]); + WBUFW(buf, 0) = 0x1c9; + WBUFL(buf, 2) = unit->bl.id; + WBUFL(buf, 6) = unit->group->src_id; + WBUFW(buf, 10) = unit->bl.x; + WBUFW(buf, 12) = unit->bl.y; + WBUFB(buf, 14) = unit->group->unit_id; + WBUFB(buf, 15) = 1; + WBUFL(buf, 15 + 1) = 0; //1-4調べた限り固定 + WBUFL(buf, 15 + 5) = 0; //5-8調べた限り固定 //9-12マップごとで一定の77-80とはまた違う4バイトのかなり大きな数字 - WBUFL (buf, 15 + 13) = unit->bl.y - 0x12; //13-16ユニットのY座標-18っぽい(Y:17でFF FF FF FF) - WBUFL (buf, 15 + 17) = 0x004f37dd; //17-20調べた限り固定(0x1b2で0x004fdbddだった) - WBUFL (buf, 15 + 21) = 0x0012f674; //21-24調べた限り固定 - WBUFL (buf, 15 + 25) = 0x0012f664; //25-28調べた限り固定 - WBUFL (buf, 15 + 29) = 0x0012f654; //29-32調べた限り固定 - WBUFL (buf, 15 + 33) = 0x77527bbc; //33-36調べた限り固定 + WBUFL(buf, 15 + 13) = unit->bl.y - 0x12; //13-16ユニットのY座標-18っぽい(Y:17でFF FF FF FF) + WBUFL(buf, 15 + 17) = 0x004f37dd; //17-20調べた限り固定(0x1b2で0x004fdbddだった) + WBUFL(buf, 15 + 21) = 0x0012f674; //21-24調べた限り固定 + WBUFL(buf, 15 + 25) = 0x0012f664; //25-28調べた限り固定 + WBUFL(buf, 15 + 29) = 0x0012f654; //29-32調べた限り固定 + WBUFL(buf, 15 + 33) = 0x77527bbc; //33-36調べた限り固定 //37-39 - WBUFB (buf, 15 + 40) = 0x2d; //40調べた限り固定 - WBUFL (buf, 15 + 41) = 0; //41-44調べた限り0固定 - WBUFL (buf, 15 + 45) = 0; //45-48調べた限り0固定 - WBUFL (buf, 15 + 49) = 0; //49-52調べた限り0固定 - WBUFL (buf, 15 + 53) = 0x0048d919; //53-56調べた限り固定(0x01b2で0x00495119だった) - WBUFL (buf, 15 + 57) = 0x0000003e; //57-60調べた限り固定 - WBUFL (buf, 15 + 61) = 0x0012f66c; //61-64調べた限り固定 + WBUFB(buf, 15 + 40) = 0x2d; //40調べた限り固定 + WBUFL(buf, 15 + 41) = 0; //41-44調べた限り0固定 + WBUFL(buf, 15 + 45) = 0; //45-48調べた限り0固定 + WBUFL(buf, 15 + 49) = 0; //49-52調べた限り0固定 + WBUFL(buf, 15 + 53) = 0x0048d919; //53-56調べた限り固定(0x01b2で0x00495119だった) + WBUFL(buf, 15 + 57) = 0x0000003e; //57-60調べた限り固定 + WBUFL(buf, 15 + 61) = 0x0012f66c; //61-64調べた限り固定 //65-68 //69-72 if (bl) - WBUFL (buf, 15 + 73) = bl->y; //73-76術者のY座標 - WBUFL (buf, 15 + 77) = unit->bl.m; //77-80マップIDかなぁ？かなり2バイトで足りそうな数字 - WBUFB (buf, 15 + 81) = 0xaa; //81終端文字0xaa + WBUFL(buf, 15 + 73) = bl->y; //73-76術者のY座標 + WBUFL(buf, 15 + 77) = unit->bl.m; //77-80マップIDかなぁ？かなり2バイトで足りそうな数字 + WBUFB(buf, 15 + 81) = 0xaa; //81終端文字0xaa /* Graffiti [Valaris] */ if (unit->group->unit_id == 0xb0) { - WBUFL (buf, 15) = 1; - WBUFL (buf, 16) = 1; - memcpy (WBUFP (buf, 17), unit->group->valstr, 80); + WBUFL(buf, 15) = 1; + WBUFL(buf, 16) = 1; + memcpy(WBUFP(buf, 17), unit->group->valstr, 80); } - clif_send (buf, packet_len_table[0x1c9], &unit->bl, AREA); + clif_send(buf, packet_len_table[0x1c9], &unit->bl, AREA); return 0; } @@ -4102,15 +4101,15 @@ int clif_skill_setunit (struct skill_unit *unit) * 場所スキルエフェクト削除 *------------------------------------------ */ -int clif_skill_delunit (struct skill_unit *unit) +int clif_skill_delunit(struct skill_unit *unit) { unsigned char buf[16]; - nullpo_retr (0, unit); + nullpo_retr(0, unit); - WBUFW (buf, 0) = 0x120; - WBUFL (buf, 2) = unit->bl.id; - clif_send (buf, packet_len_table[0x120], &unit->bl, AREA); + WBUFW(buf, 0) = 0x120; + WBUFL(buf, 2) = unit->bl.id; + clif_send(buf, packet_len_table[0x120], &unit->bl, AREA); return 0; } @@ -4118,22 +4117,22 @@ int clif_skill_delunit (struct skill_unit *unit) * ワープ場所選択 *------------------------------------------ */ -int clif_skill_warppoint (struct map_session_data *sd, int skill_num, +int clif_skill_warppoint(struct map_session_data *sd, int skill_num, const char *map1, const char *map2, const char *map3, const char *map4) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x11c; - WFIFOW (fd, 2) = skill_num; - memcpy (WFIFOP (fd, 4), map1, 16); - memcpy (WFIFOP (fd, 20), map2, 16); - memcpy (WFIFOP (fd, 36), map3, 16); - memcpy (WFIFOP (fd, 52), map4, 16); - WFIFOSET (fd, packet_len_table[0x11c]); + WFIFOW(fd, 0) = 0x11c; + WFIFOW(fd, 2) = skill_num; + memcpy(WFIFOP(fd, 4), map1, 16); + memcpy(WFIFOP(fd, 20), map2, 16); + memcpy(WFIFOP(fd, 36), map3, 16); + memcpy(WFIFOP(fd, 52), map4, 16); + WFIFOSET(fd, packet_len_table[0x11c]); return 0; } @@ -4141,30 +4140,30 @@ int clif_skill_warppoint (struct map_session_data *sd, int skill_num, * メモ応答 *------------------------------------------ */ -int clif_skill_memo (struct map_session_data *sd, int flag) +int clif_skill_memo(struct map_session_data *sd, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x11e; - WFIFOB (fd, 2) = flag; - WFIFOSET (fd, packet_len_table[0x11e]); + WFIFOW(fd, 0) = 0x11e; + WFIFOB(fd, 2) = flag; + WFIFOSET(fd, packet_len_table[0x11e]); return 0; } -int clif_skill_teleportmessage (struct map_session_data *sd, int flag) +int clif_skill_teleportmessage(struct map_session_data *sd, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x189; - WFIFOW (fd, 2) = flag; - WFIFOSET (fd, packet_len_table[0x189]); + WFIFOW(fd, 0) = 0x189; + WFIFOW(fd, 2) = flag; + WFIFOSET(fd, packet_len_table[0x189]); return 0; } @@ -4172,40 +4171,40 @@ int clif_skill_teleportmessage (struct map_session_data *sd, int flag) * モンスター情報 *------------------------------------------ */ -int clif_skill_estimation (struct map_session_data *sd, +int clif_skill_estimation(struct map_session_data *sd, struct block_list *dst) { struct mob_data *md; unsigned char buf[64]; - int i; + int i; - nullpo_retr (0, sd); - nullpo_retr (0, dst); + nullpo_retr(0, sd); + nullpo_retr(0, dst); if (dst->type != BL_MOB) return 0; if ((md = (struct mob_data *) dst) == NULL) return 0; - WBUFW (buf, 0) = 0x18c; - WBUFW (buf, 2) = mob_get_viewclass (md->mob_class); - WBUFW (buf, 4) = mob_db[md->mob_class].lv; - WBUFW (buf, 6) = mob_db[md->mob_class].size; - WBUFL (buf, 8) = md->hp; - WBUFW (buf, 12) = battle_get_def2 (&md->bl); - WBUFW (buf, 14) = mob_db[md->mob_class].race; - WBUFW (buf, 16) = - battle_get_mdef2 (&md->bl) - (mob_db[md->mob_class].vit >> 1); - WBUFW (buf, 18) = battle_get_elem_type (&md->bl); + WBUFW(buf, 0) = 0x18c; + WBUFW(buf, 2) = mob_get_viewclass(md->mob_class); + WBUFW(buf, 4) = mob_db[md->mob_class].lv; + WBUFW(buf, 6) = mob_db[md->mob_class].size; + WBUFL(buf, 8) = md->hp; + WBUFW(buf, 12) = battle_get_def2(&md->bl); + WBUFW(buf, 14) = mob_db[md->mob_class].race; + WBUFW(buf, 16) = + battle_get_mdef2(&md->bl) - (mob_db[md->mob_class].vit >> 1); + WBUFW(buf, 18) = battle_get_elem_type(&md->bl); for (i = 0; i < 9; i++) - WBUFB (buf, 20 + i) = battle_attr_fix (100, i + 1, md->def_ele); + WBUFB(buf, 20 + i) = battle_attr_fix(100, i + 1, md->def_ele); if (sd->status.party_id > 0) - clif_send (buf, packet_len_table[0x18c], &sd->bl, PARTY_AREA); + clif_send(buf, packet_len_table[0x18c], &sd->bl, PARTY_AREA); else { - memcpy (WFIFOP (sd->fd, 0), buf, packet_len_table[0x18c]); - WFIFOSET (sd->fd, packet_len_table[0x18c]); + memcpy(WFIFOP(sd->fd, 0), buf, packet_len_table[0x18c]); + WFIFOSET(sd->fd, packet_len_table[0x18c]); } return 0; } @@ -4214,17 +4213,17 @@ int clif_skill_estimation (struct map_session_data *sd, * 状態異常アイコン/メッセージ表示 *------------------------------------------ */ -int clif_status_change (struct block_list *bl, int type, int flag) +int clif_status_change(struct block_list *bl, int type, int flag) { unsigned char buf[16]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x0196; - WBUFW (buf, 2) = type; - WBUFL (buf, 4) = bl->id; - WBUFB (buf, 8) = flag; - clif_send (buf, packet_len_table[0x196], bl, AREA); + WBUFW(buf, 0) = 0x0196; + WBUFW(buf, 2) = type; + WBUFL(buf, 4) = bl->id; + WBUFB(buf, 8) = flag; + clif_send(buf, packet_len_table[0x196], bl, AREA); return 0; } @@ -4232,16 +4231,16 @@ int clif_status_change (struct block_list *bl, int type, int flag) * Send message (modified by [Yor]) *------------------------------------------ */ -int clif_displaymessage (int fd, const char *mes) +int clif_displaymessage(int fd, const char *mes) { - int len_mes = strlen (mes); + int len_mes = strlen(mes); if (len_mes > 0) { // don't send a void message (it's not displaying on the client chat). @help can send void line. - WFIFOW (fd, 0) = 0x8e; - WFIFOW (fd, 2) = 5 + len_mes; // 4 + len + NULL teminate - memcpy (WFIFOP (fd, 4), mes, len_mes + 1); - WFIFOSET (fd, 5 + len_mes); + WFIFOW(fd, 0) = 0x8e; + WFIFOW(fd, 2) = 5 + len_mes; // 4 + len + NULL teminate + memcpy(WFIFOP(fd, 4), mes, len_mes + 1); + WFIFOSET(fd, 5 + len_mes); } return 0; @@ -4251,23 +4250,23 @@ int clif_displaymessage (int fd, const char *mes) * 天の声を送信する *------------------------------------------ */ -int clif_GMmessage (struct block_list *bl, const char *mes, int len, int flag) +int clif_GMmessage(struct block_list *bl, const char *mes, int len, int flag) { unsigned char lbuf[255]; unsigned char *buf = - ((len + 16) >= sizeof (lbuf)) ? (unsigned char*)malloc (len + 16) : lbuf; - int lp = (flag & 0x10) ? 8 : 4; + ((len + 16) >= sizeof(lbuf)) ? (unsigned char*)malloc(len + 16) : lbuf; + int lp = (flag & 0x10) ? 8 : 4; - WBUFW (buf, 0) = 0x9a; - WBUFW (buf, 2) = len + lp; - WBUFL (buf, 4) = 0x65756c62; - memcpy (WBUFP (buf, lp), mes, len); + WBUFW(buf, 0) = 0x9a; + WBUFW(buf, 2) = len + lp; + WBUFL(buf, 4) = 0x65756c62; + memcpy(WBUFP(buf, lp), mes, len); flag &= 0x07; - clif_send (buf, WBUFW (buf, 2), bl, + clif_send(buf, WBUFW(buf, 2), bl, (flag == 1) ? ALL_SAMEMAP : (flag == 2) ? AREA : (flag == 3) ? SELF : ALL_CLIENT); if (buf != lbuf) - free (buf); + free(buf); return 0; } @@ -4275,12 +4274,12 @@ int clif_GMmessage (struct block_list *bl, const char *mes, int len, int flag) * HPSP回復エフェクトを送信する *------------------------------------------ */ -int clif_heal (int fd, int type, int val) +int clif_heal(int fd, int type, int val) { - WFIFOW (fd, 0) = 0x13d; - WFIFOW (fd, 2) = type; - WFIFOW (fd, 4) = val; - WFIFOSET (fd, packet_len_table[0x13d]); + WFIFOW(fd, 0) = 0x13d; + WFIFOW(fd, 2) = type; + WFIFOW(fd, 4) = val; + WFIFOSET(fd, packet_len_table[0x13d]); return 0; } @@ -4289,24 +4288,24 @@ int clif_heal (int fd, int type, int val) * 復活する *------------------------------------------ */ -int clif_resurrection (struct block_list *bl, int type) +int clif_resurrection(struct block_list *bl, int type) { unsigned char buf[16]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) { // disguises [Valaris] struct map_session_data *sd = ((struct map_session_data *) bl); if (sd && sd->disguise > 23 && sd->disguise < 4001) - clif_spawnpc (sd); + clif_spawnpc(sd); } - WBUFW (buf, 0) = 0x148; - WBUFL (buf, 2) = bl->id; - WBUFW (buf, 6) = type; + WBUFW(buf, 0) = 0x148; + WBUFL(buf, 2) = bl->id; + WBUFW(buf, 6) = type; - clif_send (buf, packet_len_table[0x148], bl, type == 1 ? AREA : AREA_WOS); + clif_send(buf, packet_len_table[0x148], bl, type == 1 ? AREA : AREA_WOS); return 0; } @@ -4315,11 +4314,11 @@ int clif_resurrection (struct block_list *bl, int type) * PVP実装？（仮） *------------------------------------------ */ -int clif_set0199 (int fd, int type) +int clif_set0199(int fd, int type) { - WFIFOW (fd, 0) = 0x199; - WFIFOW (fd, 2) = type; - WFIFOSET (fd, packet_len_table[0x199]); + WFIFOW(fd, 0) = 0x199; + WFIFOW(fd, 2) = type; + WFIFOSET(fd, packet_len_table[0x199]); return 0; } @@ -4328,40 +4327,40 @@ int clif_set0199 (int fd, int type) * PVP実装？(仮) *------------------------------------------ */ -int clif_pvpset (struct map_session_data *sd, int pvprank, int pvpnum, +int clif_pvpset(struct map_session_data *sd, int pvprank, int pvpnum, int type) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (map[sd->bl.m].flag.nopvp) return 0; if (type == 2) { - WFIFOW (sd->fd, 0) = 0x19a; - WFIFOL (sd->fd, 2) = sd->bl.id; + WFIFOW(sd->fd, 0) = 0x19a; + WFIFOL(sd->fd, 2) = sd->bl.id; if (pvprank <= 0) - pc_calc_pvprank (sd); - WFIFOL (sd->fd, 6) = pvprank; - WFIFOL (sd->fd, 10) = pvpnum; - WFIFOSET (sd->fd, packet_len_table[0x19a]); + pc_calc_pvprank(sd); + WFIFOL(sd->fd, 6) = pvprank; + WFIFOL(sd->fd, 10) = pvpnum; + WFIFOSET(sd->fd, packet_len_table[0x19a]); } else { uint8_t buf[32]; - WBUFW (buf, 0) = 0x19a; - WBUFL (buf, 2) = sd->bl.id; + WBUFW(buf, 0) = 0x19a; + WBUFL(buf, 2) = sd->bl.id; if (sd->status.option & 0x46) - WBUFL (buf, 6) = -1; + WBUFL(buf, 6) = -1; else if (pvprank <= 0) - pc_calc_pvprank (sd); - WBUFL (buf, 6) = pvprank; - WBUFL (buf, 10) = pvpnum; + pc_calc_pvprank(sd); + WBUFL(buf, 6) = pvprank; + WBUFL(buf, 10) = pvpnum; if (!type) - clif_send (buf, packet_len_table[0x19a], &sd->bl, AREA); + clif_send(buf, packet_len_table[0x19a], &sd->bl, AREA); else - clif_send (buf, packet_len_table[0x19a], &sd->bl, ALL_SAMEMAP); + clif_send(buf, packet_len_table[0x19a], &sd->bl, ALL_SAMEMAP); } return 0; @@ -4371,15 +4370,15 @@ int clif_pvpset (struct map_session_data *sd, int pvprank, int pvpnum, * *------------------------------------------ */ -int clif_send0199 (int m, int type) +int clif_send0199(int m, int type) { struct block_list bl; uint8_t buf[16]; bl.m = m; - WBUFW (buf, 0) = 0x199; - WBUFW (buf, 2) = type; - clif_send (buf, packet_len_table[0x199], &bl, ALL_SAMEMAP); + WBUFW(buf, 0) = 0x199; + WBUFW(buf, 2) = type; + clif_send(buf, packet_len_table[0x199], &bl, ALL_SAMEMAP); return 0; } @@ -4388,14 +4387,14 @@ int clif_send0199 (int m, int type) * 精錬エフェクトを送信する *------------------------------------------ */ -int clif_refine (int fd, struct map_session_data *sd, int fail, int index, +int clif_refine(int fd, struct map_session_data *sd, int fail, int index, int val) { - WFIFOW (fd, 0) = 0x188; - WFIFOW (fd, 2) = fail; - WFIFOW (fd, 4) = index + 2; - WFIFOW (fd, 6) = val; - WFIFOSET (fd, packet_len_table[0x188]); + WFIFOW(fd, 0) = 0x188; + WFIFOW(fd, 2) = fail; + WFIFOW(fd, 4) = index + 2; + WFIFOW(fd, 6) = val; + WFIFOSET(fd, packet_len_table[0x188]); return 0; } @@ -4404,13 +4403,13 @@ int clif_refine (int fd, struct map_session_data *sd, int fail, int index, * Wisp/page is transmitted to the destination player *------------------------------------------ */ -int clif_wis_message (int fd, const char *nick, const char *mes, int mes_len) // R 0097 <len>.w <nick>.24B <message>.?B +int clif_wis_message(int fd, const char *nick, const char *mes, int mes_len) // R 0097 <len>.w <nick>.24B <message>.?B { - WFIFOW (fd, 0) = 0x97; - WFIFOW (fd, 2) = mes_len + 24 + 4; - memcpy (WFIFOP (fd, 4), nick, 24); - memcpy (WFIFOP (fd, 28), mes, mes_len); - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 0) = 0x97; + WFIFOW(fd, 2) = mes_len + 24 + 4; + memcpy(WFIFOP(fd, 4), nick, 24); + memcpy(WFIFOP(fd, 28), mes, mes_len); + WFIFOSET(fd, WFIFOW(fd, 2)); return 0; } @@ -4418,11 +4417,11 @@ int clif_wis_message (int fd, const char *nick, const char *mes, int mes_len) * The transmission result of Wisp/page is transmitted to the source player *------------------------------------------ */ -int clif_wis_end (int fd, int flag) // R 0098 <type>.B: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target +int clif_wis_end(int fd, int flag) // R 0098 <type>.B: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target { - WFIFOW (fd, 0) = 0x98; - WFIFOW (fd, 2) = flag; - WFIFOSET (fd, packet_len_table[0x98]); + WFIFOW(fd, 0) = 0x98; + WFIFOW(fd, 2) = flag; + WFIFOSET(fd, packet_len_table[0x98]); return 0; } @@ -4430,25 +4429,25 @@ int clif_wis_end (int fd, int flag) // R 0098 <type>.B: 0: success to send wispe * キャラID名前引き結果を送信する *------------------------------------------ */ -int clif_solved_charname (struct map_session_data *sd, int char_id) +int clif_solved_charname(struct map_session_data *sd, int char_id) { - char *p = map_charid2nick (char_id); - int fd; + char *p = map_charid2nick(char_id); + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; if (p != NULL) { - WFIFOW (fd, 0) = 0x194; - WFIFOL (fd, 2) = char_id; - memcpy (WFIFOP (fd, 6), p, 24); - WFIFOSET (fd, packet_len_table[0x194]); + WFIFOW(fd, 0) = 0x194; + WFIFOL(fd, 2) = char_id; + memcpy(WFIFOP(fd, 6), p, 24); + WFIFOSET(fd, packet_len_table[0x194]); } else { - map_reqchariddb (sd, char_id); - chrif_searchcharid (char_id); + map_reqchariddb(sd, char_id); + chrif_searchcharid(char_id); } return 0; } @@ -4457,20 +4456,20 @@ int clif_solved_charname (struct map_session_data *sd, int char_id) * カードの挿入可能リストを返す *------------------------------------------ */ -int clif_use_card (struct map_session_data *sd, int idx) +int clif_use_card(struct map_session_data *sd, int idx) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->inventory_data[idx]) { - int i, c; - int ep = sd->inventory_data[idx]->equip; - int fd = sd->fd; - WFIFOW (fd, 0) = 0x017b; + int i, c; + int ep = sd->inventory_data[idx]->equip; + int fd = sd->fd; + WFIFOW(fd, 0) = 0x017b; for (i = c = 0; i < MAX_INVENTORY; i++) { - int j; + int j; if (sd->inventory_data[i] == NULL) continue; @@ -4497,11 +4496,11 @@ int clif_use_card (struct map_session_data *sd, int idx) if (j == sd->inventory_data[i]->slot) // すでにカードが一杯 continue; - WFIFOW (fd, 4 + c * 2) = i + 2; + WFIFOW(fd, 4 + c * 2) = i + 2; c++; } - WFIFOW (fd, 2) = 4 + c * 2; - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 2) = 4 + c * 2; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; @@ -4511,19 +4510,19 @@ int clif_use_card (struct map_session_data *sd, int idx) * カードの挿入終了 *------------------------------------------ */ -int clif_insert_card (struct map_session_data *sd, int idx_equip, +int clif_insert_card(struct map_session_data *sd, int idx_equip, int idx_card, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x17d; - WFIFOW (fd, 2) = idx_equip + 2; - WFIFOW (fd, 4) = idx_card + 2; - WFIFOB (fd, 6) = flag; - WFIFOSET (fd, packet_len_table[0x17d]); + WFIFOW(fd, 0) = 0x17d; + WFIFOW(fd, 2) = idx_equip + 2; + WFIFOW(fd, 4) = idx_card + 2; + WFIFOB(fd, 6) = flag; + WFIFOSET(fd, packet_len_table[0x17d]); return 0; } @@ -4531,29 +4530,29 @@ int clif_insert_card (struct map_session_data *sd, int idx_equip, * 鑑定可能アイテムリスト送信 *------------------------------------------ */ -int clif_item_identify_list (struct map_session_data *sd) +int clif_item_identify_list(struct map_session_data *sd) { - int i, c; - int fd; + int i, c; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x177; + WFIFOW(fd, 0) = 0x177; for (i = c = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].identify != 1) { - WFIFOW (fd, c * 2 + 4) = i + 2; + WFIFOW(fd, c * 2 + 4) = i + 2; c++; } } if (c > 0) { - WFIFOW (fd, 2) = c * 2 + 4; - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 2) = c * 2 + 4; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; } @@ -4562,17 +4561,17 @@ int clif_item_identify_list (struct map_session_data *sd) * 鑑定結果 *------------------------------------------ */ -int clif_item_identified (struct map_session_data *sd, int idx, int flag) +int clif_item_identified(struct map_session_data *sd, int idx, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x179; - WFIFOW (fd, 2) = idx + 2; - WFIFOB (fd, 4) = flag; - WFIFOSET (fd, packet_len_table[0x179]); + WFIFOW(fd, 0) = 0x179; + WFIFOW(fd, 2) = idx + 2; + WFIFOB(fd, 4) = flag; + WFIFOSET(fd, packet_len_table[0x179]); return 0; } @@ -4581,29 +4580,29 @@ int clif_item_identified (struct map_session_data *sd, int idx, int flag) * ※実際のパケットがわからないので動作しません *------------------------------------------ */ -int clif_item_repair_list (struct map_session_data *sd) +int clif_item_repair_list(struct map_session_data *sd) { - int i, c; - int fd; + int i, c; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x0; + WFIFOW(fd, 0) = 0x0; for (i = c = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].broken != 0) { - WFIFOW (fd, c * 2 + 4) = i + 2; + WFIFOW(fd, c * 2 + 4) = i + 2; c++; } } if (c > 0) { - WFIFOW (fd, 2) = c * 2 + 4; - WFIFOSET (fd, WFIFOW (fd, 2)); + WFIFOW(fd, 2) = c * 2 + 4; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; } @@ -4612,27 +4611,27 @@ int clif_item_repair_list (struct map_session_data *sd) * アイテムによる一時的なスキル効果 *------------------------------------------ */ -int clif_item_skill (struct map_session_data *sd, int skillid, int skilllv, +int clif_item_skill(struct map_session_data *sd, int skillid, int skilllv, const char *name) { - int range, fd; + int range, fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x147; - WFIFOW (fd, 2) = skillid; - WFIFOW (fd, 4) = skill_get_inf (skillid); - WFIFOW (fd, 6) = 0; - WFIFOW (fd, 8) = skilllv; - WFIFOW (fd, 10) = skill_get_sp (skillid, skilllv); - range = skill_get_range (skillid, skilllv); + WFIFOW(fd, 0) = 0x147; + WFIFOW(fd, 2) = skillid; + WFIFOW(fd, 4) = skill_get_inf(skillid); + WFIFOW(fd, 6) = 0; + WFIFOW(fd, 8) = skilllv; + WFIFOW(fd, 10) = skill_get_sp(skillid, skilllv); + range = skill_get_range(skillid, skilllv); if (range < 0) - range = battle_get_range (&sd->bl) - (range + 1); - WFIFOW (fd, 12) = range; - memcpy (WFIFOP (fd, 14), name, 24); - WFIFOB (fd, 38) = 0; - WFIFOSET (fd, packet_len_table[0x147]); + range = battle_get_range(&sd->bl) - (range + 1); + WFIFOW(fd, 12) = range; + memcpy(WFIFOP(fd, 14), name, 24); + WFIFOB(fd, 38) = 0; + WFIFOSET(fd, packet_len_table[0x147]); return 0; } @@ -4640,65 +4639,65 @@ int clif_item_skill (struct map_session_data *sd, int skillid, int skilllv, * カートにアイテム追加 *------------------------------------------ */ -int clif_cart_additem (struct map_session_data *sd, int n, int amount, +int clif_cart_additem(struct map_session_data *sd, int n, int amount, int fail) { - int view, j, fd; + int view, j, fd; unsigned char *buf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - buf = WFIFOP (fd, 0); + buf = WFIFOP(fd, 0); if (n < 0 || n >= MAX_CART || sd->status.cart[n].nameid <= 0) return 1; - WBUFW (buf, 0) = 0x124; - WBUFW (buf, 2) = n + 2; - WBUFL (buf, 4) = amount; - if ((view = itemdb_viewid (sd->status.cart[n].nameid)) > 0) - WBUFW (buf, 8) = view; + WBUFW(buf, 0) = 0x124; + WBUFW(buf, 2) = n + 2; + WBUFL(buf, 4) = amount; + if ((view = itemdb_viewid(sd->status.cart[n].nameid)) > 0) + WBUFW(buf, 8) = view; else - WBUFW (buf, 8) = sd->status.cart[n].nameid; - WBUFB (buf, 10) = sd->status.cart[n].identify; + WBUFW(buf, 8) = sd->status.cart[n].nameid; + WBUFB(buf, 10) = sd->status.cart[n].identify; if (sd->status.cart[n].broken == 1) //is weapon broken [Valaris] - WBUFB (buf, 11) = 1; + WBUFB(buf, 11) = 1; else - WBUFB (buf, 11) = sd->status.cart[n].attribute; - WBUFB (buf, 12) = sd->status.cart[n].refine; + WBUFB(buf, 11) = sd->status.cart[n].attribute; + WBUFB(buf, 12) = sd->status.cart[n].refine; if (sd->status.cart[n].card[0] == 0x00ff || sd->status.cart[n].card[0] == 0x00fe || sd->status.cart[n].card[0] == (short) 0xff00) { - WBUFW (buf, 13) = sd->status.cart[n].card[0]; - WBUFW (buf, 15) = sd->status.cart[n].card[1]; - WBUFW (buf, 17) = sd->status.cart[n].card[2]; - WBUFW (buf, 19) = sd->status.cart[n].card[3]; + WBUFW(buf, 13) = sd->status.cart[n].card[0]; + WBUFW(buf, 15) = sd->status.cart[n].card[1]; + WBUFW(buf, 17) = sd->status.cart[n].card[2]; + WBUFW(buf, 19) = sd->status.cart[n].card[3]; } else { if (sd->status.cart[n].card[0] > 0 - && (j = itemdb_viewid (sd->status.cart[n].card[0])) > 0) - WBUFW (buf, 13) = j; + && (j = itemdb_viewid(sd->status.cart[n].card[0])) > 0) + WBUFW(buf, 13) = j; else - WBUFW (buf, 13) = sd->status.cart[n].card[0]; + WBUFW(buf, 13) = sd->status.cart[n].card[0]; if (sd->status.cart[n].card[1] > 0 - && (j = itemdb_viewid (sd->status.cart[n].card[1])) > 0) - WBUFW (buf, 15) = j; + && (j = itemdb_viewid(sd->status.cart[n].card[1])) > 0) + WBUFW(buf, 15) = j; else - WBUFW (buf, 15) = sd->status.cart[n].card[1]; + WBUFW(buf, 15) = sd->status.cart[n].card[1]; if (sd->status.cart[n].card[2] > 0 - && (j = itemdb_viewid (sd->status.cart[n].card[2])) > 0) - WBUFW (buf, 17) = j; + && (j = itemdb_viewid(sd->status.cart[n].card[2])) > 0) + WBUFW(buf, 17) = j; else - WBUFW (buf, 17) = sd->status.cart[n].card[2]; + WBUFW(buf, 17) = sd->status.cart[n].card[2]; if (sd->status.cart[n].card[3] > 0 - && (j = itemdb_viewid (sd->status.cart[n].card[3])) > 0) - WBUFW (buf, 19) = j; + && (j = itemdb_viewid(sd->status.cart[n].card[3])) > 0) + WBUFW(buf, 19) = j; else - WBUFW (buf, 19) = sd->status.cart[n].card[3]; + WBUFW(buf, 19) = sd->status.cart[n].card[3]; } - WFIFOSET (fd, packet_len_table[0x124]); + WFIFOSET(fd, packet_len_table[0x124]); return 0; } @@ -4706,19 +4705,19 @@ int clif_cart_additem (struct map_session_data *sd, int n, int amount, * カートからアイテム削除 *------------------------------------------ */ -int clif_cart_delitem (struct map_session_data *sd, int n, int amount) +int clif_cart_delitem(struct map_session_data *sd, int n, int amount) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x125; - WFIFOW (fd, 2) = n + 2; - WFIFOL (fd, 4) = amount; + WFIFOW(fd, 0) = 0x125; + WFIFOW(fd, 2) = n + 2; + WFIFOL(fd, 4) = amount; - WFIFOSET (fd, packet_len_table[0x125]); + WFIFOSET(fd, packet_len_table[0x125]); return 0; } @@ -4727,43 +4726,43 @@ int clif_cart_delitem (struct map_session_data *sd, int n, int amount) * カートのアイテムリスト *------------------------------------------ */ -int clif_cart_itemlist (struct map_session_data *sd) +int clif_cart_itemlist(struct map_session_data *sd) { struct item_data *id; - int i, n, fd; + int i, n, fd; unsigned char *buf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - buf = WFIFOP (fd, 0); - WBUFW (buf, 0) = 0x1ef; + buf = WFIFOP(fd, 0); + WBUFW(buf, 0) = 0x1ef; for (i = 0, n = 0; i < MAX_CART; i++) { if (sd->status.cart[i].nameid <= 0) continue; - id = itemdb_search (sd->status.cart[i].nameid); - if (itemdb_isequip2 (id)) + id = itemdb_search(sd->status.cart[i].nameid); + if (itemdb_isequip2(id)) continue; - WBUFW (buf, n * 18 + 4) = i + 2; + WBUFW(buf, n * 18 + 4) = i + 2; if (id->view_id > 0) - WBUFW (buf, n * 18 + 6) = id->view_id; + WBUFW(buf, n * 18 + 6) = id->view_id; else - WBUFW (buf, n * 18 + 6) = sd->status.cart[i].nameid; - WBUFB (buf, n * 18 + 8) = id->type; - WBUFB (buf, n * 18 + 9) = sd->status.cart[i].identify; - WBUFW (buf, n * 18 + 10) = sd->status.cart[i].amount; - WBUFW (buf, n * 18 + 12) = 0; - WBUFW (buf, n * 18 + 14) = sd->status.cart[i].card[0]; - WBUFW (buf, n * 18 + 16) = sd->status.cart[i].card[1]; - WBUFW (buf, n * 18 + 18) = sd->status.cart[i].card[2]; - WBUFW (buf, n * 18 + 20) = sd->status.cart[i].card[3]; + WBUFW(buf, n * 18 + 6) = sd->status.cart[i].nameid; + WBUFB(buf, n * 18 + 8) = id->type; + WBUFB(buf, n * 18 + 9) = sd->status.cart[i].identify; + WBUFW(buf, n * 18 + 10) = sd->status.cart[i].amount; + WBUFW(buf, n * 18 + 12) = 0; + WBUFW(buf, n * 18 + 14) = sd->status.cart[i].card[0]; + WBUFW(buf, n * 18 + 16) = sd->status.cart[i].card[1]; + WBUFW(buf, n * 18 + 18) = sd->status.cart[i].card[2]; + WBUFW(buf, n * 18 + 20) = sd->status.cart[i].card[3]; n++; } if (n) { - WBUFW (buf, 2) = 4 + n * 18; - WFIFOSET (fd, WFIFOW (fd, 2)); + WBUFW(buf, 2) = 4 + n * 18; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; } @@ -4772,77 +4771,77 @@ int clif_cart_itemlist (struct map_session_data *sd) * カートの装備品リスト *------------------------------------------ */ -int clif_cart_equiplist (struct map_session_data *sd) +int clif_cart_equiplist(struct map_session_data *sd) { struct item_data *id; - int i, j, n, fd; + int i, j, n, fd; unsigned char *buf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - buf = WFIFOP (fd, 0); + buf = WFIFOP(fd, 0); - WBUFW (buf, 0) = 0x122; + WBUFW(buf, 0) = 0x122; for (i = 0, n = 0; i < MAX_INVENTORY; i++) { if (sd->status.cart[i].nameid <= 0) continue; - id = itemdb_search (sd->status.cart[i].nameid); - if (!itemdb_isequip2 (id)) + id = itemdb_search(sd->status.cart[i].nameid); + if (!itemdb_isequip2(id)) continue; - WBUFW (buf, n * 20 + 4) = i + 2; + WBUFW(buf, n * 20 + 4) = i + 2; if (id->view_id > 0) - WBUFW (buf, n * 20 + 6) = id->view_id; + WBUFW(buf, n * 20 + 6) = id->view_id; else - WBUFW (buf, n * 20 + 6) = sd->status.cart[i].nameid; - WBUFB (buf, n * 20 + 8) = id->type; - WBUFB (buf, n * 20 + 9) = sd->status.cart[i].identify; - WBUFW (buf, n * 20 + 10) = id->equip; - WBUFW (buf, n * 20 + 12) = sd->status.cart[i].equip; + WBUFW(buf, n * 20 + 6) = sd->status.cart[i].nameid; + WBUFB(buf, n * 20 + 8) = id->type; + WBUFB(buf, n * 20 + 9) = sd->status.cart[i].identify; + WBUFW(buf, n * 20 + 10) = id->equip; + WBUFW(buf, n * 20 + 12) = sd->status.cart[i].equip; if (sd->status.cart[i].broken == 1) - WBUFB (buf, n * 20 + 14) = 1; //is weapon broken [Valaris] + WBUFB(buf, n * 20 + 14) = 1; //is weapon broken [Valaris] else - WBUFB (buf, n * 20 + 14) = sd->status.cart[i].attribute; - WBUFB (buf, n * 20 + 15) = sd->status.cart[i].refine; + WBUFB(buf, n * 20 + 14) = sd->status.cart[i].attribute; + WBUFB(buf, n * 20 + 15) = sd->status.cart[i].refine; if (sd->status.cart[i].card[0] == 0x00ff || sd->status.cart[i].card[0] == 0x00fe || sd->status.cart[i].card[0] == (short) 0xff00) { - WBUFW (buf, n * 20 + 16) = sd->status.cart[i].card[0]; - WBUFW (buf, n * 20 + 18) = sd->status.cart[i].card[1]; - WBUFW (buf, n * 20 + 20) = sd->status.cart[i].card[2]; - WBUFW (buf, n * 20 + 22) = sd->status.cart[i].card[3]; + WBUFW(buf, n * 20 + 16) = sd->status.cart[i].card[0]; + WBUFW(buf, n * 20 + 18) = sd->status.cart[i].card[1]; + WBUFW(buf, n * 20 + 20) = sd->status.cart[i].card[2]; + WBUFW(buf, n * 20 + 22) = sd->status.cart[i].card[3]; } else { if (sd->status.cart[i].card[0] > 0 - && (j = itemdb_viewid (sd->status.cart[i].card[0])) > 0) - WBUFW (buf, n * 20 + 16) = j; + && (j = itemdb_viewid(sd->status.cart[i].card[0])) > 0) + WBUFW(buf, n * 20 + 16) = j; else - WBUFW (buf, n * 20 + 16) = sd->status.cart[i].card[0]; + WBUFW(buf, n * 20 + 16) = sd->status.cart[i].card[0]; if (sd->status.cart[i].card[1] > 0 - && (j = itemdb_viewid (sd->status.cart[i].card[1])) > 0) - WBUFW (buf, n * 20 + 18) = j; + && (j = itemdb_viewid(sd->status.cart[i].card[1])) > 0) + WBUFW(buf, n * 20 + 18) = j; else - WBUFW (buf, n * 20 + 18) = sd->status.cart[i].card[1]; + WBUFW(buf, n * 20 + 18) = sd->status.cart[i].card[1]; if (sd->status.cart[i].card[2] > 0 - && (j = itemdb_viewid (sd->status.cart[i].card[2])) > 0) - WBUFW (buf, n * 20 + 20) = j; + && (j = itemdb_viewid(sd->status.cart[i].card[2])) > 0) + WBUFW(buf, n * 20 + 20) = j; else - WBUFW (buf, n * 20 + 20) = sd->status.cart[i].card[2]; + WBUFW(buf, n * 20 + 20) = sd->status.cart[i].card[2]; if (sd->status.cart[i].card[3] > 0 - && (j = itemdb_viewid (sd->status.cart[i].card[3])) > 0) - WBUFW (buf, n * 20 + 22) = j; + && (j = itemdb_viewid(sd->status.cart[i].card[3])) > 0) + WBUFW(buf, n * 20 + 22) = j; else - WBUFW (buf, n * 20 + 22) = sd->status.cart[i].card[3]; + WBUFW(buf, n * 20 + 22) = sd->status.cart[i].card[3]; } n++; } if (n) { - WBUFW (buf, 2) = 4 + n * 20; - WFIFOSET (fd, WFIFOW (fd, 2)); + WBUFW(buf, 2) = 4 + n * 20; + WFIFOSET(fd, WFIFOW(fd, 2)); } return 0; } @@ -4859,16 +4858,16 @@ int clif_cart_equiplist (struct map_session_data *sd) * 2 The character is already in a party. *------------------------------------------ */ -int clif_party_created (struct map_session_data *sd, int flag) +int clif_party_created(struct map_session_data *sd, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xfa; - WFIFOB (fd, 2) = flag; - WFIFOSET (fd, packet_len_table[0xfa]); + WFIFOW(fd, 0) = 0xfa; + WFIFOB(fd, 2) = flag; + WFIFOSET(fd, packet_len_table[0xfa]); return 0; } @@ -4876,16 +4875,16 @@ int clif_party_created (struct map_session_data *sd, int flag) * パーティ情報送信 *------------------------------------------ */ -int clif_party_info (struct party *p, int fd) +int clif_party_info(struct party *p, int fd) { unsigned char buf[1024]; - int i, c; + int i, c; struct map_session_data *sd = NULL; - nullpo_retr (0, p); + nullpo_retr(0, p); - WBUFW (buf, 0) = 0xfb; - memcpy (WBUFP (buf, 4), p->name, 24); + WBUFW(buf, 0) = 0xfb; + memcpy(WBUFP(buf, 4), p->name, 24); for (i = c = 0; i < MAX_PARTY; i++) { struct party_member *m = &p->member[i]; @@ -4893,23 +4892,23 @@ int clif_party_info (struct party *p, int fd) { if (sd == NULL) sd = m->sd; - WBUFL (buf, 28 + c * 46) = m->account_id; - memcpy (WBUFP (buf, 28 + c * 46 + 4), m->name, 24); - memcpy (WBUFP (buf, 28 + c * 46 + 28), m->map, 16); - WBUFB (buf, 28 + c * 46 + 44) = (m->leader) ? 0 : 1; - WBUFB (buf, 28 + c * 46 + 45) = (m->online) ? 0 : 1; + WBUFL(buf, 28 + c * 46) = m->account_id; + memcpy(WBUFP(buf, 28 + c * 46 + 4), m->name, 24); + memcpy(WBUFP(buf, 28 + c * 46 + 28), m->map, 16); + WBUFB(buf, 28 + c * 46 + 44) = (m->leader) ? 0 : 1; + WBUFB(buf, 28 + c * 46 + 45) = (m->online) ? 0 : 1; c++; } } - WBUFW (buf, 2) = 28 + c * 46; + WBUFW(buf, 2) = 28 + c * 46; if (fd >= 0) { // fdが設定されてるならそれに送る - memcpy (WFIFOP (fd, 0), buf, WBUFW (buf, 2)); - WFIFOSET (fd, WFIFOW (fd, 2)); + memcpy(WFIFOP(fd, 0), buf, WBUFW(buf, 2)); + WFIFOSET(fd, WFIFOW(fd, 2)); return 9; } if (sd != NULL) - clif_send (buf, WBUFW (buf, 2), &sd->bl, PARTY); + clif_send(buf, WBUFW(buf, 2), &sd->bl, PARTY); return 0; } @@ -4920,24 +4919,24 @@ int clif_party_info (struct party *p, int fd) * (R 00fe <sender_ID>.l <party_name>.24B) *------------------------------------------ */ -int clif_party_invite (struct map_session_data *sd, +int clif_party_invite(struct map_session_data *sd, struct map_session_data *tsd) { - int fd; + int fd; struct party *p; - nullpo_retr (0, sd); - nullpo_retr (0, tsd); + nullpo_retr(0, sd); + nullpo_retr(0, tsd); fd = tsd->fd; - if (!(p = party_search (sd->status.party_id))) + if (!(p = party_search(sd->status.party_id))) return 0; - WFIFOW (fd, 0) = 0xfe; - WFIFOL (fd, 2) = sd->status.account_id; - memcpy (WFIFOP (fd, 6), p->name, 24); - WFIFOSET (fd, packet_len_table[0xfe]); + WFIFOW(fd, 0) = 0xfe; + WFIFOL(fd, 2) = sd->status.account_id; + memcpy(WFIFOP(fd, 6), p->name, 24); + WFIFOSET(fd, packet_len_table[0xfe]); return 0; } @@ -4955,17 +4954,17 @@ int clif_party_invite (struct map_session_data *sd, * 4 The character is in the same party. *------------------------------------------ */ -int clif_party_inviteack (struct map_session_data *sd, const char *nick, int flag) +int clif_party_inviteack(struct map_session_data *sd, const char *nick, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xfd; - memcpy (WFIFOP (fd, 2), nick, 24); - WFIFOB (fd, 26) = flag; - WFIFOSET (fd, packet_len_table[0xfd]); + WFIFOW(fd, 0) = 0xfd; + memcpy(WFIFOP(fd, 2), nick, 24); + WFIFOB(fd, 26) = flag; + WFIFOSET(fd, packet_len_table[0xfd]); return 0; } @@ -4976,32 +4975,32 @@ int clif_party_inviteack (struct map_session_data *sd, const char *nick, int fla * 0x100=一人にのみ送信 *------------------------------------------ */ -int clif_party_option (struct party *p, struct map_session_data *sd, int flag) +int clif_party_option(struct party *p, struct map_session_data *sd, int flag) { unsigned char buf[16]; - nullpo_retr (0, p); + nullpo_retr(0, p); // if(battle_config.etc_log) // printf("clif_party_option: %d %d %d\n",p->exp,p->item,flag); if (sd == NULL && flag == 0) { - int i; + int i; for (i = 0; i < MAX_PARTY; i++) - if ((sd = map_id2sd (p->member[i].account_id)) != NULL) + if ((sd = map_id2sd(p->member[i].account_id)) != NULL) break; } if (sd == NULL) return 0; - WBUFW (buf, 0) = 0x101; - WBUFW (buf, 2) = ((flag & 0x01) ? 2 : p->exp); - WBUFW (buf, 4) = ((flag & 0x10) ? 2 : p->item); + WBUFW(buf, 0) = 0x101; + WBUFW(buf, 2) = ((flag & 0x01) ? 2 : p->exp); + WBUFW(buf, 4) = ((flag & 0x10) ? 2 : p->item); if (flag == 0) - clif_send (buf, packet_len_table[0x101], &sd->bl, PARTY); + clif_send(buf, packet_len_table[0x101], &sd->bl, PARTY); else { - memcpy (WFIFOP (sd->fd, 0), buf, packet_len_table[0x101]); - WFIFOSET (sd->fd, packet_len_table[0x101]); + memcpy(WFIFOP(sd->fd, 0), buf, packet_len_table[0x101]); + WFIFOSET(sd->fd, packet_len_table[0x101]); } return 0; } @@ -5010,18 +5009,18 @@ int clif_party_option (struct party *p, struct map_session_data *sd, int flag) * パーティ脱退（脱退前に呼ぶこと） *------------------------------------------ */ -int clif_party_leaved (struct party *p, struct map_session_data *sd, +int clif_party_leaved(struct party *p, struct map_session_data *sd, int account_id, const char *name, int flag) { unsigned char buf[64]; - int i; + int i; - nullpo_retr (0, p); + nullpo_retr(0, p); - WBUFW (buf, 0) = 0x105; - WBUFL (buf, 2) = account_id; - memcpy (WBUFP (buf, 6), name, 24); - WBUFB (buf, 30) = flag & 0x0f; + WBUFW(buf, 0) = 0x105; + WBUFL(buf, 2) = account_id; + memcpy(WBUFP(buf, 6), name, 24); + WBUFB(buf, 30) = flag & 0x0f; if ((flag & 0xf0) == 0) { @@ -5030,12 +5029,12 @@ int clif_party_leaved (struct party *p, struct map_session_data *sd, if ((sd = p->member[i].sd) != NULL) break; if (sd != NULL) - clif_send (buf, packet_len_table[0x105], &sd->bl, PARTY); + clif_send(buf, packet_len_table[0x105], &sd->bl, PARTY); } else if (sd != NULL) { - memcpy (WFIFOP (sd->fd, 0), buf, packet_len_table[0x105]); - WFIFOSET (sd->fd, packet_len_table[0x105]); + memcpy(WFIFOP(sd->fd, 0), buf, packet_len_table[0x105]); + WFIFOSET(sd->fd, packet_len_table[0x105]); } return 0; } @@ -5044,12 +5043,12 @@ int clif_party_leaved (struct party *p, struct map_session_data *sd, * パーティメッセージ送信 *------------------------------------------ */ -int clif_party_message (struct party *p, int account_id, const char *mes, int len) +int clif_party_message(struct party *p, int account_id, const char *mes, int len) { struct map_session_data *sd; - int i; + int i; - nullpo_retr (0, p); + nullpo_retr(0, p); for (i = 0; i < MAX_PARTY; i++) { @@ -5059,11 +5058,11 @@ int clif_party_message (struct party *p, int account_id, const char *mes, int le if (sd != NULL) { unsigned char buf[1024]; - WBUFW (buf, 0) = 0x109; - WBUFW (buf, 2) = len + 8; - WBUFL (buf, 4) = account_id; - memcpy (WBUFP (buf, 8), mes, len); - clif_send (buf, len + 8, &sd->bl, PARTY); + WBUFW(buf, 0) = 0x109; + WBUFW(buf, 2) = len + 8; + WBUFL(buf, 4) = account_id; + memcpy(WBUFP(buf, 8), mes, len); + clif_send(buf, len + 8, &sd->bl, PARTY); } return 0; } @@ -5072,17 +5071,17 @@ int clif_party_message (struct party *p, int account_id, const char *mes, int le * パーティ座標通知 *------------------------------------------ */ -int clif_party_xy (struct party *p, struct map_session_data *sd) +int clif_party_xy(struct party *p, struct map_session_data *sd) { unsigned char buf[16]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WBUFW (buf, 0) = 0x107; - WBUFL (buf, 2) = sd->status.account_id; - WBUFW (buf, 6) = sd->bl.x; - WBUFW (buf, 8) = sd->bl.y; - clif_send (buf, packet_len_table[0x107], &sd->bl, PARTY_SAMEMAP_WOS); + WBUFW(buf, 0) = 0x107; + WBUFL(buf, 2) = sd->status.account_id; + WBUFW(buf, 6) = sd->bl.x; + WBUFW(buf, 8) = sd->bl.y; + clif_send(buf, packet_len_table[0x107], &sd->bl, PARTY_SAMEMAP_WOS); // if(battle_config.etc_log) // printf("clif_party_xy %d\n",sd->status.account_id); return 0; @@ -5092,18 +5091,18 @@ int clif_party_xy (struct party *p, struct map_session_data *sd) * パーティHP通知 *------------------------------------------ */ -int clif_party_hp (struct party *p, struct map_session_data *sd) +int clif_party_hp(struct party *p, struct map_session_data *sd) { unsigned char buf[16]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WBUFW (buf, 0) = 0x106; - WBUFL (buf, 2) = sd->status.account_id; - WBUFW (buf, 6) = (sd->status.hp > 0x7fff) ? 0x7fff : sd->status.hp; - WBUFW (buf, 8) = + WBUFW(buf, 0) = 0x106; + WBUFL(buf, 2) = sd->status.account_id; + WBUFW(buf, 6) = (sd->status.hp > 0x7fff) ? 0x7fff : sd->status.hp; + WBUFW(buf, 8) = (sd->status.max_hp > 0x7fff) ? 0x7fff : sd->status.max_hp; - clif_send (buf, packet_len_table[0x106], &sd->bl, PARTY_AREA_WOS); + clif_send(buf, packet_len_table[0x106], &sd->bl, PARTY_AREA_WOS); // if(battle_config.etc_log) // printf("clif_party_hp %d\n",sd->status.account_id); return 0; @@ -5113,23 +5112,23 @@ int clif_party_hp (struct party *p, struct map_session_data *sd) * パーティ場所移動（未使用） *------------------------------------------ */ -int clif_party_move (struct party *p, struct map_session_data *sd, int online) +int clif_party_move(struct party *p, struct map_session_data *sd, int online) { unsigned char buf[128]; - nullpo_retr (0, sd); - nullpo_retr (0, p); + nullpo_retr(0, sd); + nullpo_retr(0, p); - WBUFW (buf, 0) = 0x104; - WBUFL (buf, 2) = sd->status.account_id; - WBUFL (buf, 6) = 0; - WBUFW (buf, 10) = sd->bl.x; - WBUFW (buf, 12) = sd->bl.y; - WBUFB (buf, 14) = !online; - memcpy (WBUFP (buf, 15), p->name, 24); - memcpy (WBUFP (buf, 39), sd->status.name, 24); - memcpy (WBUFP (buf, 63), map[sd->bl.m].name, 16); - clif_send (buf, packet_len_table[0x104], &sd->bl, PARTY); + WBUFW(buf, 0) = 0x104; + WBUFL(buf, 2) = sd->status.account_id; + WBUFL(buf, 6) = 0; + WBUFW(buf, 10) = sd->bl.x; + WBUFW(buf, 12) = sd->bl.y; + WBUFB(buf, 14) = !online; + memcpy(WBUFP(buf, 15), p->name, 24); + memcpy(WBUFP(buf, 39), sd->status.name, 24); + memcpy(WBUFP(buf, 63), map[sd->bl.m].name, 16); + clif_send(buf, packet_len_table[0x104], &sd->bl, PARTY); return 0; } @@ -5137,22 +5136,22 @@ int clif_party_move (struct party *p, struct map_session_data *sd, int online) * 攻撃するために移動が必要 *------------------------------------------ */ -int clif_movetoattack (struct map_session_data *sd, struct block_list *bl) +int clif_movetoattack(struct map_session_data *sd, struct block_list *bl) { - int fd; + int fd; - nullpo_retr (0, sd); - nullpo_retr (0, bl); + nullpo_retr(0, sd); + nullpo_retr(0, bl); fd = sd->fd; - WFIFOW (fd, 0) = 0x139; - WFIFOL (fd, 2) = bl->id; - WFIFOW (fd, 6) = bl->x; - WFIFOW (fd, 8) = bl->y; - WFIFOW (fd, 10) = sd->bl.x; - WFIFOW (fd, 12) = sd->bl.y; - WFIFOW (fd, 14) = sd->attackrange; - WFIFOSET (fd, packet_len_table[0x139]); + WFIFOW(fd, 0) = 0x139; + WFIFOL(fd, 2) = bl->id; + WFIFOW(fd, 6) = bl->x; + WFIFOW(fd, 8) = bl->y; + WFIFOW(fd, 10) = sd->bl.x; + WFIFOW(fd, 12) = sd->bl.y; + WFIFOW(fd, 14) = sd->attackrange; + WFIFOSET(fd, packet_len_table[0x139]); return 0; } @@ -5160,25 +5159,25 @@ int clif_movetoattack (struct map_session_data *sd, struct block_list *bl) * 製造エフェクト *------------------------------------------ */ -int clif_produceeffect (struct map_session_data *sd, int flag, int nameid) +int clif_produceeffect(struct map_session_data *sd, int flag, int nameid) { - int view, fd; + int view, fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; // 名前の登録と送信を先にしておく - if (map_charid2nick (sd->status.char_id) == NULL) - map_addchariddb (sd->status.char_id, sd->status.name); - clif_solved_charname (sd, sd->status.char_id); - - WFIFOW (fd, 0) = 0x18f; - WFIFOW (fd, 2) = flag; - if ((view = itemdb_viewid (nameid)) > 0) - WFIFOW (fd, 4) = view; + if (map_charid2nick(sd->status.char_id) == NULL) + map_addchariddb(sd->status.char_id, sd->status.name); + clif_solved_charname(sd, sd->status.char_id); + + WFIFOW(fd, 0) = 0x18f; + WFIFOW(fd, 2) = flag; + if ((view = itemdb_viewid(nameid)) > 0) + WFIFOW(fd, 4) = view; else - WFIFOW (fd, 4) = nameid; - WFIFOSET (fd, packet_len_table[0x18f]); + WFIFOW(fd, 4) = nameid; + WFIFOSET(fd, packet_len_table[0x18f]); return 0; } @@ -5186,45 +5185,45 @@ int clif_produceeffect (struct map_session_data *sd, int flag, int nameid) * オートスペル リスト送信 *------------------------------------------ */ -int clif_autospell (struct map_session_data *sd, int skilllv) +int clif_autospell(struct map_session_data *sd, int skilllv) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x1cd; + WFIFOW(fd, 0) = 0x1cd; - if (skilllv > 0 && pc_checkskill (sd, MG_NAPALMBEAT) > 0) - WFIFOL (fd, 2) = MG_NAPALMBEAT; + if (skilllv > 0 && pc_checkskill(sd, MG_NAPALMBEAT) > 0) + WFIFOL(fd, 2) = MG_NAPALMBEAT; else - WFIFOL (fd, 2) = 0x00000000; - if (skilllv > 1 && pc_checkskill (sd, MG_COLDBOLT) > 0) - WFIFOL (fd, 6) = MG_COLDBOLT; + WFIFOL(fd, 2) = 0x00000000; + if (skilllv > 1 && pc_checkskill(sd, MG_COLDBOLT) > 0) + WFIFOL(fd, 6) = MG_COLDBOLT; else - WFIFOL (fd, 6) = 0x00000000; - if (skilllv > 1 && pc_checkskill (sd, MG_FIREBOLT) > 0) - WFIFOL (fd, 10) = MG_FIREBOLT; + WFIFOL(fd, 6) = 0x00000000; + if (skilllv > 1 && pc_checkskill(sd, MG_FIREBOLT) > 0) + WFIFOL(fd, 10) = MG_FIREBOLT; else - WFIFOL (fd, 10) = 0x00000000; - if (skilllv > 1 && pc_checkskill (sd, MG_LIGHTNINGBOLT) > 0) - WFIFOL (fd, 14) = MG_LIGHTNINGBOLT; + WFIFOL(fd, 10) = 0x00000000; + if (skilllv > 1 && pc_checkskill(sd, MG_LIGHTNINGBOLT) > 0) + WFIFOL(fd, 14) = MG_LIGHTNINGBOLT; else - WFIFOL (fd, 14) = 0x00000000; - if (skilllv > 4 && pc_checkskill (sd, MG_SOULSTRIKE) > 0) - WFIFOL (fd, 18) = MG_SOULSTRIKE; + WFIFOL(fd, 14) = 0x00000000; + if (skilllv > 4 && pc_checkskill(sd, MG_SOULSTRIKE) > 0) + WFIFOL(fd, 18) = MG_SOULSTRIKE; else - WFIFOL (fd, 18) = 0x00000000; - if (skilllv > 7 && pc_checkskill (sd, MG_FIREBALL) > 0) - WFIFOL (fd, 22) = MG_FIREBALL; + WFIFOL(fd, 18) = 0x00000000; + if (skilllv > 7 && pc_checkskill(sd, MG_FIREBALL) > 0) + WFIFOL(fd, 22) = MG_FIREBALL; else - WFIFOL (fd, 22) = 0x00000000; - if (skilllv > 9 && pc_checkskill (sd, MG_FROSTDIVER) > 0) - WFIFOL (fd, 26) = MG_FROSTDIVER; + WFIFOL(fd, 22) = 0x00000000; + if (skilllv > 9 && pc_checkskill(sd, MG_FROSTDIVER) > 0) + WFIFOL(fd, 26) = MG_FROSTDIVER; else - WFIFOL (fd, 26) = 0x00000000; + WFIFOL(fd, 26) = 0x00000000; - WFIFOSET (fd, packet_len_table[0x1cd]); + WFIFOSET(fd, packet_len_table[0x1cd]); return 0; } @@ -5232,23 +5231,23 @@ int clif_autospell (struct map_session_data *sd, int skilllv) * ディボーションの青い糸 *------------------------------------------ */ -int clif_devotion (struct map_session_data *sd, int target) +int clif_devotion(struct map_session_data *sd, int target) { unsigned char buf[56]; - int n; + int n; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WBUFW (buf, 0) = 0x1cf; - WBUFL (buf, 2) = sd->bl.id; + WBUFW(buf, 0) = 0x1cf; + WBUFL(buf, 2) = sd->bl.id; // WBUFL(buf,6)=target; for (n = 0; n < 5; n++) - WBUFL (buf, 6 + 4 * n) = sd->dev.val2[n]; + WBUFL(buf, 6 + 4 * n) = sd->dev.val2[n]; // WBUFL(buf,10+4*n)=0; - WBUFB (buf, 26) = 8; - WBUFB (buf, 27) = 0; + WBUFB(buf, 26) = 8; + WBUFB(buf, 27) = 0; - clif_send (buf, packet_len_table[0x1cf], &sd->bl, AREA); + clif_send(buf, packet_len_table[0x1cf], &sd->bl, AREA); return 0; } @@ -5256,16 +5255,16 @@ int clif_devotion (struct map_session_data *sd, int target) * 氣球 *------------------------------------------ */ -int clif_spiritball (struct map_session_data *sd) +int clif_spiritball(struct map_session_data *sd) { unsigned char buf[16]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WBUFW (buf, 0) = 0x1d0; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = sd->spiritball; - clif_send (buf, packet_len_table[0x1d0], &sd->bl, AREA); + WBUFW(buf, 0) = 0x1d0; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = sd->spiritball; + clif_send(buf, packet_len_table[0x1d0], &sd->bl, AREA); return 0; } @@ -5273,16 +5272,16 @@ int clif_spiritball (struct map_session_data *sd) * *------------------------------------------ */ -int clif_combo_delay (struct block_list *bl, int wait) +int clif_combo_delay(struct block_list *bl, int wait) { unsigned char buf[32]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x1d2; - WBUFL (buf, 2) = bl->id; - WBUFL (buf, 6) = wait; - clif_send (buf, packet_len_table[0x1d2], bl, AREA); + WBUFW(buf, 0) = 0x1d2; + WBUFL(buf, 2) = bl->id; + WBUFL(buf, 6) = wait; + clif_send(buf, packet_len_table[0x1d2], bl, AREA); return 0; } @@ -5291,19 +5290,19 @@ int clif_combo_delay (struct block_list *bl, int wait) *白刃取り *------------------------------------------ */ -int clif_bladestop (struct block_list *src, struct block_list *dst, int boolean) +int clif_bladestop(struct block_list *src, struct block_list *dst, int boolean) { unsigned char buf[32]; - nullpo_retr (0, src); - nullpo_retr (0, dst); + nullpo_retr(0, src); + nullpo_retr(0, dst); - WBUFW (buf, 0) = 0x1d1; - WBUFL (buf, 2) = src->id; - WBUFL (buf, 6) = dst->id; - WBUFL (buf, 10) = boolean; + WBUFW(buf, 0) = 0x1d1; + WBUFL(buf, 2) = src->id; + WBUFL(buf, 6) = dst->id; + WBUFL(buf, 10) = boolean; - clif_send (buf, packet_len_table[0x1d1], src, AREA); + clif_send(buf, packet_len_table[0x1d1], src, AREA); return 0; } @@ -5312,7 +5311,7 @@ int clif_bladestop (struct block_list *src, struct block_list *dst, int boolean) * *------------------------------------------ */ -int clif_changemapcell (int m, int x, int y, int cell_type, int type) +int clif_changemapcell(int m, int x, int y, int cell_type, int type) { struct block_list bl; uint8_t buf[32]; @@ -5320,15 +5319,15 @@ int clif_changemapcell (int m, int x, int y, int cell_type, int type) bl.m = m; bl.x = x; bl.y = y; - WBUFW (buf, 0) = 0x192; - WBUFW (buf, 2) = x; - WBUFW (buf, 4) = y; - WBUFW (buf, 6) = cell_type; - memcpy (WBUFP (buf, 8), map[m].name, 16); + WBUFW(buf, 0) = 0x192; + WBUFW(buf, 2) = x; + WBUFW(buf, 4) = y; + WBUFW(buf, 6) = cell_type; + memcpy(WBUFP(buf, 8), map[m].name, 16); if (!type) - clif_send (buf, packet_len_table[0x192], &bl, AREA); + clif_send(buf, packet_len_table[0x192], &bl, AREA); else - clif_send (buf, packet_len_table[0x192], &bl, ALL_SAMEMAP); + clif_send(buf, packet_len_table[0x192], &bl, ALL_SAMEMAP); return 0; } @@ -5337,15 +5336,15 @@ int clif_changemapcell (int m, int x, int y, int cell_type, int type) * MVPエフェクト *------------------------------------------ */ -int clif_mvp_effect (struct map_session_data *sd) +int clif_mvp_effect(struct map_session_data *sd) { unsigned char buf[16]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WBUFW (buf, 0) = 0x10c; - WBUFL (buf, 2) = sd->bl.id; - clif_send (buf, packet_len_table[0x10c], &sd->bl, AREA); + WBUFW(buf, 0) = 0x10c; + WBUFL(buf, 2) = sd->bl.id; + clif_send(buf, packet_len_table[0x10c], &sd->bl, AREA); return 0; } @@ -5353,19 +5352,19 @@ int clif_mvp_effect (struct map_session_data *sd) * MVPアイテム所得 *------------------------------------------ */ -int clif_mvp_item (struct map_session_data *sd, int nameid) +int clif_mvp_item(struct map_session_data *sd, int nameid) { - int view, fd; + int view, fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x10a; - if ((view = itemdb_viewid (nameid)) > 0) - WFIFOW (fd, 2) = view; + WFIFOW(fd, 0) = 0x10a; + if ((view = itemdb_viewid(nameid)) > 0) + WFIFOW(fd, 2) = view; else - WFIFOW (fd, 2) = nameid; - WFIFOSET (fd, packet_len_table[0x10a]); + WFIFOW(fd, 2) = nameid; + WFIFOSET(fd, packet_len_table[0x10a]); return 0; } @@ -5373,16 +5372,16 @@ int clif_mvp_item (struct map_session_data *sd, int nameid) * MVP経験値所得 *------------------------------------------ */ -int clif_mvp_exp (struct map_session_data *sd, int exp) +int clif_mvp_exp(struct map_session_data *sd, int exp) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0x10b; - WFIFOL (fd, 2) = exp; - WFIFOSET (fd, packet_len_table[0x10b]); + WFIFOW(fd, 0) = 0x10b; + WFIFOL(fd, 2) = exp; + WFIFOSET(fd, packet_len_table[0x10b]); return 0; } @@ -5390,68 +5389,68 @@ int clif_mvp_exp (struct map_session_data *sd, int exp) * エモーション *------------------------------------------ */ -void clif_emotion (struct block_list *bl, int type) +void clif_emotion(struct block_list *bl, int type) { unsigned char buf[8]; - nullpo_retv (bl); + nullpo_retv(bl); - WBUFW (buf, 0) = 0xc0; - WBUFL (buf, 2) = bl->id; - WBUFB (buf, 6) = type; - clif_send (buf, packet_len_table[0xc0], bl, AREA); + WBUFW(buf, 0) = 0xc0; + WBUFL(buf, 2) = bl->id; + WBUFB(buf, 6) = type; + clif_send(buf, packet_len_table[0xc0], bl, AREA); } -static void clif_emotion_towards (struct block_list *bl, +static void clif_emotion_towards(struct block_list *bl, struct block_list *target, int type) { unsigned char buf[8]; - int len = packet_len_table[0xc0]; + int len = packet_len_table[0xc0]; struct map_session_data *sd = (struct map_session_data *) target; - nullpo_retv (bl); - nullpo_retv (target); + nullpo_retv(bl); + nullpo_retv(target); if (target->type != BL_PC) return; - WBUFW (buf, 0) = 0xc0; - WBUFL (buf, 2) = bl->id; - WBUFB (buf, 6) = type; + WBUFW(buf, 0) = 0xc0; + WBUFL(buf, 2) = bl->id; + WBUFB(buf, 6) = type; - memcpy (WFIFOP (sd->fd, 0), buf, len); - WFIFOSET (sd->fd, len); + memcpy(WFIFOP(sd->fd, 0), buf, len); + WFIFOSET(sd->fd, len); } /*========================================== * トーキーボックス *------------------------------------------ */ -void clif_talkiebox (struct block_list *bl, const char *talkie) +void clif_talkiebox(struct block_list *bl, const char *talkie) { unsigned char buf[86]; - nullpo_retv (bl); + nullpo_retv(bl); - WBUFW (buf, 0) = 0x191; - WBUFL (buf, 2) = bl->id; - memcpy (WBUFP (buf, 6), talkie, 80); - clif_send (buf, packet_len_table[0x191], bl, AREA); + WBUFW(buf, 0) = 0x191; + WBUFL(buf, 2) = bl->id; + memcpy(WBUFP(buf, 6), talkie, 80); + clif_send(buf, packet_len_table[0x191], bl, AREA); } /*========================================== * 結婚エフェクト *------------------------------------------ */ -void clif_wedding_effect (struct block_list *bl) +void clif_wedding_effect(struct block_list *bl) { unsigned char buf[6]; - nullpo_retv (bl); + nullpo_retv(bl); - WBUFW (buf, 0) = 0x1ea; - WBUFL (buf, 2) = bl->id; - clif_send (buf, packet_len_table[0x1ea], bl, AREA); + WBUFW(buf, 0) = 0x1ea; + WBUFL(buf, 2) = bl->id; + clif_send(buf, packet_len_table[0x1ea], bl, AREA); } /*========================================== @@ -5460,62 +5459,62 @@ void clif_wedding_effect (struct block_list *bl) void clif_callpartner(struct map_session_data *sd) { - unsigned char buf[26]; - char *p; - - nullpo_retv(sd); - - if(sd->status.partner_id){ - WBUFW(buf,0)=0x1e6; - p = map_charid2nick(sd->status.partner_id); - if(p){ - memcpy(WBUFP(buf,2),p,24); - }else{ - map_reqchariddb(sd,sd->status.partner_id); - chrif_searchcharid(sd->status.partner_id); - WBUFB(buf,2) = 0; - } - clif_send(buf,packet_len_table[0x1e6]&sd->bl,AREA); - } - return; + unsigned char buf[26]; + char *p; + + nullpo_retv(sd); + + if (sd->status.partner_id){ + WBUFW(buf,0)=0x1e6; + p = map_charid2nick(sd->status.partner_id); + if (p){ + memcpy(WBUFP(buf,2),p,24); + }else{ + map_reqchariddb(sd,sd->status.partner_id); + chrif_searchcharid(sd->status.partner_id); + WBUFB(buf,2) = 0; + } + clif_send(buf,packet_len_table[0x1e6]&sd->bl,AREA); + } + return; } */ /*========================================== * 座る *------------------------------------------ */ -void clif_sitting (int fd, struct map_session_data *sd) +void clif_sitting(int fd, struct map_session_data *sd) { unsigned char buf[64]; - nullpo_retv (sd); + nullpo_retv(sd); - WBUFW (buf, 0) = 0x8a; - WBUFL (buf, 2) = sd->bl.id; - WBUFB (buf, 26) = 2; - clif_send (buf, packet_len_table[0x8a], &sd->bl, AREA); + WBUFW(buf, 0) = 0x8a; + WBUFL(buf, 2) = sd->bl.id; + WBUFB(buf, 26) = 2; + clif_send(buf, packet_len_table[0x8a], &sd->bl, AREA); } /*========================================== * *------------------------------------------ */ -int clif_disp_onlyself (struct map_session_data *sd, const char *mes, int len) +int clif_disp_onlyself(struct map_session_data *sd, const char *mes, int len) { unsigned char lbuf[255]; unsigned char *buf = - (len + 32 >= sizeof (lbuf)) ? (unsigned char *)malloc (len + 32) : lbuf; + (len + 32 >= sizeof(lbuf)) ? (unsigned char *)malloc(len + 32) : lbuf; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WBUFW (buf, 0) = 0x17f; - WBUFW (buf, 2) = len + 8; - memcpy (WBUFP (buf, 4), mes, len + 4); + WBUFW(buf, 0) = 0x17f; + WBUFW(buf, 2) = len + 8; + memcpy(WBUFP(buf, 4), mes, len + 4); - clif_send (buf, WBUFW (buf, 2), &sd->bl, SELF); + clif_send(buf, WBUFW(buf, 2), &sd->bl, SELF); if (buf != lbuf) - free (buf); + free(buf); return 0; } @@ -5525,30 +5524,30 @@ int clif_disp_onlyself (struct map_session_data *sd, const char *mes, int len) *------------------------------------------ */ -int clif_GM_kickack (struct map_session_data *sd, int id) +int clif_GM_kickack(struct map_session_data *sd, int id) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xcd; - WFIFOL (fd, 2) = id; - WFIFOSET (fd, packet_len_table[0xcd]); + WFIFOW(fd, 0) = 0xcd; + WFIFOL(fd, 2) = id; + WFIFOSET(fd, packet_len_table[0xcd]); return 0; } -void clif_parse_QuitGame (int fd, struct map_session_data *sd); +void clif_parse_QuitGame(int fd, struct map_session_data *sd); -int clif_GM_kick (struct map_session_data *sd, struct map_session_data *tsd, +int clif_GM_kick(struct map_session_data *sd, struct map_session_data *tsd, int type) { - nullpo_retr (0, tsd); + nullpo_retr(0, tsd); if (type) - clif_GM_kickack (sd, tsd->status.account_id); + clif_GM_kickack(sd, tsd->status.account_id); tsd->opt1 = tsd->opt2 = 0; - clif_parse_QuitGame (tsd->fd, tsd); + clif_parse_QuitGame(tsd->fd, tsd); return 0; } @@ -5558,17 +5557,17 @@ int clif_GM_kick (struct map_session_data *sd, struct map_session_data *tsd, *------------------------------------------ */ static -int clif_wisexin (struct map_session_data *sd, int type, int flag) +int clif_wisexin(struct map_session_data *sd, int type, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xd1; - WFIFOB (fd, 2) = type; - WFIFOB (fd, 3) = flag; - WFIFOSET (fd, packet_len_table[0xd1]); + WFIFOW(fd, 0) = 0xd1; + WFIFOB(fd, 2) = type; + WFIFOB(fd, 3) = flag; + WFIFOSET(fd, packet_len_table[0xd1]); return 0; } @@ -5578,17 +5577,17 @@ int clif_wisexin (struct map_session_data *sd, int type, int flag) *------------------------------------------ */ static -int clif_wisall (struct map_session_data *sd, int type, int flag) +int clif_wisall(struct map_session_data *sd, int type, int flag) { - int fd; + int fd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); fd = sd->fd; - WFIFOW (fd, 0) = 0xd2; - WFIFOB (fd, 2) = type; - WFIFOB (fd, 3) = flag; - WFIFOSET (fd, packet_len_table[0xd2]); + WFIFOW(fd, 0) = 0xd2; + WFIFOB(fd, 2) = type; + WFIFOB(fd, 3) = flag; + WFIFOSET(fd, packet_len_table[0xd2]); return 0; } @@ -5597,54 +5596,54 @@ int clif_wisall (struct map_session_data *sd, int type, int flag) * サウンドエフェクト *------------------------------------------ */ -void clif_soundeffect (struct map_session_data *sd, struct block_list *bl, +void clif_soundeffect(struct map_session_data *sd, struct block_list *bl, const char *name, int type) { - int fd; + int fd; - nullpo_retv (sd); - nullpo_retv (bl); + nullpo_retv(sd); + nullpo_retv(bl); fd = sd->fd; - WFIFOW (fd, 0) = 0x1d3; - memcpy (WFIFOP (fd, 2), name, 24); - WFIFOB (fd, 26) = type; - WFIFOL (fd, 27) = 0; - WFIFOL (fd, 31) = bl->id; - WFIFOSET (fd, packet_len_table[0x1d3]); + WFIFOW(fd, 0) = 0x1d3; + memcpy(WFIFOP(fd, 2), name, 24); + WFIFOB(fd, 26) = type; + WFIFOL(fd, 27) = 0; + WFIFOL(fd, 31) = bl->id; + WFIFOSET(fd, packet_len_table[0x1d3]); return; } // displaying special effects (npcs, weather, etc) [Valaris] -int clif_specialeffect (struct block_list *bl, int type, int flag) +int clif_specialeffect(struct block_list *bl, int type, int flag) { unsigned char buf[24]; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - memset (buf, 0, packet_len_table[0x19b]); + memset(buf, 0, packet_len_table[0x19b]); - WBUFW (buf, 0) = 0x19b; - WBUFL (buf, 2) = bl->id; - WBUFL (buf, 6) = type; + WBUFW(buf, 0) = 0x19b; + WBUFL(buf, 2) = bl->id; + WBUFL(buf, 6) = type; if (flag == 2) { struct map_session_data *sd = NULL; - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i] && (sd = (struct map_session_data *)session[i]->session_data) != NULL && sd->state.auth && sd->bl.m == bl->m) - clif_specialeffect (&sd->bl, type, 1); + clif_specialeffect(&sd->bl, type, 1); } } else if (flag == 1) - clif_send (buf, packet_len_table[0x19b], bl, SELF); + clif_send(buf, packet_len_table[0x19b], bl, SELF); else if (!flag) - clif_send (buf, packet_len_table[0x19b], bl, AREA); + clif_send(buf, packet_len_table[0x19b], bl, AREA); return 0; @@ -5659,49 +5658,48 @@ int clif_specialeffect (struct block_list *bl, int type, int flag) *------------------------------------------ */ static -void clif_parse_WantToConnection (int fd, struct map_session_data *sd) +void clif_parse_WantToConnection(int fd, struct map_session_data *sd) { struct map_session_data *old_sd; - int account_id; // account_id in the packet + int account_id; // account_id in the packet if (sd) { if (battle_config.error_log) - printf ("clif_parse_WantToConnection : invalid request?\n"); + printf("clif_parse_WantToConnection : invalid request?\n"); return; } - if (RFIFOW (fd, 0) == 0x72) + if (RFIFOW(fd, 0) == 0x72) { - account_id = RFIFOL (fd, 2); + account_id = RFIFOL(fd, 2); } else return; // Not the auth packet - WFIFOL (fd, 0) = account_id; - WFIFOSET (fd, 4); + WFIFOL(fd, 0) = account_id; + WFIFOSET(fd, 4); // if same account already connected, we disconnect the 2 sessions - if ((old_sd = map_id2sd (account_id)) != NULL) + if ((old_sd = map_id2sd(account_id)) != NULL) { - clif_authfail_fd (fd, 2); // same id - clif_authfail_fd (old_sd->fd, 2); // same id - printf - ("clif_parse_WantToConnection: Double connection for account %d (sessions: #%d (new) and #%d (old)).\n", + clif_authfail_fd(fd, 2); // same id + clif_authfail_fd(old_sd->fd, 2); // same id + printf("clif_parse_WantToConnection: Double connection for account %d (sessions: #%d (new) and #%d (old)).\n", account_id, fd, old_sd->fd); } else { - CREATE (sd, struct map_session_data, 1); + CREATE(sd, struct map_session_data, 1); session[fd]->session_data = sd; sd->fd = fd; - pc_setnewpc (sd, account_id, RFIFOL (fd, 6), RFIFOL (fd, 10), - RFIFOL (fd, 14), RFIFOB (fd, 18), fd); + pc_setnewpc(sd, account_id, RFIFOL(fd, 6), RFIFOL(fd, 10), + RFIFOL(fd, 14), RFIFOB(fd, 18), fd); - map_addiddb (&sd->bl); + map_addiddb(&sd->bl); - chrif_authreq (sd); + chrif_authreq(sd); } return; @@ -5713,11 +5711,11 @@ void clif_parse_WantToConnection (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_LoadEndAck (int fd, struct map_session_data *sd) +void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) { // struct item_data* item; - int i; - nullpo_retv (sd); + int i; + nullpo_retv(sd); if (sd->bl.prev != NULL) return; @@ -5725,61 +5723,61 @@ void clif_parse_LoadEndAck (int fd, struct map_session_data *sd) // 接続ok時 //clif_authok(); if (sd->npc_id) - npc_event_dequeue (sd); - clif_skillinfoblock (sd); - pc_checkitem (sd); + npc_event_dequeue(sd); + clif_skillinfoblock(sd); + pc_checkitem(sd); //guild_info(); // loadendack時 // next exp - clif_updatestatus (sd, SP_NEXTBASEEXP); - clif_updatestatus (sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_NEXTBASEEXP); + clif_updatestatus(sd, SP_NEXTJOBEXP); // skill point - clif_updatestatus (sd, SP_SKILLPOINT); + clif_updatestatus(sd, SP_SKILLPOINT); // item - clif_itemlist (sd); - clif_equiplist (sd); + clif_itemlist(sd); + clif_equiplist(sd); // cart - if (pc_iscarton (sd)) + if (pc_iscarton(sd)) { - 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); } // param all - clif_initialstatus (sd); + clif_initialstatus(sd); // party - party_send_movemap (sd); + party_send_movemap(sd); // 119 // 78 if (battle_config.pc_invincible_time > 0) { - pc_setinvincibletimer (sd, battle_config.pc_invincible_time); + pc_setinvincibletimer(sd, battle_config.pc_invincible_time); } - map_addblock (&sd->bl); // ブロック登録 - clif_spawnpc (sd); // spawn + map_addblock(&sd->bl); // ブロック登録 + clif_spawnpc(sd); // spawn // weight max , now - clif_updatestatus (sd, SP_MAXWEIGHT); - clif_updatestatus (sd, SP_WEIGHT); + clif_updatestatus(sd, SP_MAXWEIGHT); + clif_updatestatus(sd, SP_WEIGHT); // pvp if (sd->pvp_timer != -1 && !battle_config.pk_mode) - delete_timer (sd->pvp_timer, pc_calc_pvprank_timer); + delete_timer(sd->pvp_timer, pc_calc_pvprank_timer); if (map[sd->bl.m].flag.pvp) { if (!battle_config.pk_mode) { // remove pvp stuff for pk_mode [Valaris] sd->pvp_timer = - add_timer (gettick () + 200, pc_calc_pvprank_timer, sd->bl.id, + add_timer(gettick() + 200, pc_calc_pvprank_timer, sd->bl.id, 0); sd->pvp_rank = 0; sd->pvp_lastusers = 0; sd->pvp_point = 5; } - clif_set0199 (sd->fd, 1); + clif_set0199(sd->fd, 1); } else { @@ -5790,55 +5788,55 @@ void clif_parse_LoadEndAck (int fd, struct map_session_data *sd) { sd->state.connect_new = 0; if (sd->status.pc_class != sd->view_class) - clif_changelook (&sd->bl, LOOK_BASE, sd->view_class); + clif_changelook(&sd->bl, LOOK_BASE, sd->view_class); } // view equipment item - clif_changelook (&sd->bl, LOOK_WEAPON, 0); + clif_changelook(&sd->bl, LOOK_WEAPON, 0); if (battle_config.save_clothcolor == 1 && sd->status.clothes_color > 0) - clif_changelook (&sd->bl, LOOK_CLOTHES_COLOR, + clif_changelook(&sd->bl, LOOK_CLOTHES_COLOR, sd->status.clothes_color); if (sd->status.hp < sd->status.max_hp >> 2 - && pc_checkskill (sd, SM_AUTOBERSERK) > 0 + && pc_checkskill(sd, SM_AUTOBERSERK) > 0 && (sd->sc_data[SC_PROVOKE].timer == -1 || sd->sc_data[SC_PROVOKE].val2 == 0)) // オートバーサーク発動 - skill_status_change_start (&sd->bl, SC_PROVOKE, 10, 1, 0, 0, 0, 0); + skill_status_change_start(&sd->bl, SC_PROVOKE, 10, 1, 0, 0, 0, 0); // if(time(&timer) < ((weddingtime=pc_readglobalreg(sd,"PC_WEDDING_TIME")) + 3600)) // skill_status_change_start(&sd->bl,SC_WEDDING,0,weddingtime,0,0,36000,0); if (battle_config.muting_players && sd->status.manner < 0) - skill_status_change_start (&sd->bl, SC_NOCHAT, 0, 0, 0, 0, 0, 0); + skill_status_change_start(&sd->bl, SC_NOCHAT, 0, 0, 0, 0, 0, 0); // option - clif_changeoption (&sd->bl); + clif_changeoption(&sd->bl); if (sd->sc_data[SC_TRICKDEAD].timer != -1) - skill_status_change_end (&sd->bl, SC_TRICKDEAD, -1); + skill_status_change_end(&sd->bl, SC_TRICKDEAD, -1); if (sd->sc_data[SC_SIGNUMCRUCIS].timer != -1 - && !battle_check_undead (7, sd->def_ele)) - skill_status_change_end (&sd->bl, SC_SIGNUMCRUCIS, -1); + && !battle_check_undead(7, sd->def_ele)) + skill_status_change_end(&sd->bl, SC_SIGNUMCRUCIS, -1); if (sd->special_state.infinite_endure && sd->sc_data[SC_ENDURE].timer == -1) - skill_status_change_start (&sd->bl, SC_ENDURE, 10, 1, 0, 0, 0, 0); + skill_status_change_start(&sd->bl, SC_ENDURE, 10, 1, 0, 0, 0, 0); for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].equip && sd->status.inventory[i].equip & 0x0002 && sd->status.inventory[i].broken == 1) - skill_status_change_start (&sd->bl, SC_BROKNWEAPON, 0, 0, 0, 0, 0, + skill_status_change_start(&sd->bl, SC_BROKNWEAPON, 0, 0, 0, 0, 0, 0); if (sd->status.inventory[i].equip && sd->status.inventory[i].equip & 0x0010 && sd->status.inventory[i].broken == 1) - skill_status_change_start (&sd->bl, SC_BROKNARMOR, 0, 0, 0, 0, 0, + skill_status_change_start(&sd->bl, SC_BROKNARMOR, 0, 0, 0, 0, 0, 0); } // clif_changelook_accessories(sd, NULL); - map_foreachinarea (clif_getareachar, sd->bl.m, sd->bl.x - AREA_SIZE, + map_foreachinarea(clif_getareachar, sd->bl.m, sd->bl.x - AREA_SIZE, sd->bl.y - AREA_SIZE, sd->bl.x + AREA_SIZE, sd->bl.y + AREA_SIZE, 0, sd); } @@ -5848,13 +5846,13 @@ void clif_parse_LoadEndAck (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TickSend (int fd, struct map_session_data *sd) +void clif_parse_TickSend(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - sd->client_tick = RFIFOL (fd, 2); - sd->server_tick = gettick (); - clif_servertick (sd); + sd->client_tick = RFIFOL(fd, 2); + sd->server_tick = gettick(); + clif_servertick(sd); } /*========================================== @@ -5862,28 +5860,28 @@ void clif_parse_TickSend (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_WalkToXY (int fd, struct map_session_data *sd) +void clif_parse_WalkToXY(int fd, struct map_session_data *sd) { - int x, y; + int x, y; - nullpo_retv (sd); + nullpo_retv(sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } if (sd->npc_id != 0 || sd->state.storage_open) return; - if (sd->skilltimer != -1 && pc_checkskill (sd, SA_FREECAST) <= 0) // フリーキャスト + if (sd->skilltimer != -1 && pc_checkskill(sd, SA_FREECAST) <= 0) // フリーキャスト return; if (sd->chatID) return; - if (sd->canmove_tick > gettick ()) + if (sd->canmove_tick > gettick()) return; // ステータス異常やハイディング中(トンネルドライブ無)で動けない @@ -5894,17 +5892,17 @@ void clif_parse_WalkToXY (int fd, struct map_session_data *sd) sd->sc_data[SC_SPIDERWEB].timer != -1 || //スパイダーウェッブ (sd->sc_data[SC_DANCING].timer != -1 && sd->sc_data[SC_DANCING].val4)) //合奏スキル演奏中は動けない return; - if ((sd->status.option & 2) && pc_checkskill (sd, RG_TUNNELDRIVE) <= 0) + if ((sd->status.option & 2) && pc_checkskill(sd, RG_TUNNELDRIVE) <= 0) return; if (sd->invincible_timer != -1) - pc_delinvincibletimer (sd); + pc_delinvincibletimer(sd); - pc_stopattack (sd); + pc_stopattack(sd); - x = RFIFOB (fd, 2) * 4 + (RFIFOB (fd, 3) >> 6); - y = ((RFIFOB (fd, 3) & 0x3f) << 4) + (RFIFOB (fd, 4) >> 4); - pc_walktoxy (sd, x, y); + x = RFIFOB(fd, 2) * 4 + (RFIFOB(fd, 3) >> 6); + y = ((RFIFOB(fd, 3) & 0x3f) << 4) + (RFIFOB(fd, 4) >> 4); + pc_walktoxy(sd, x, y); } @@ -5912,41 +5910,41 @@ void clif_parse_WalkToXY (int fd, struct map_session_data *sd) * *------------------------------------------ */ -void clif_parse_QuitGame (int fd, struct map_session_data *sd) +void clif_parse_QuitGame(int fd, struct map_session_data *sd) { - unsigned int tick = gettick (); + unsigned int tick = gettick(); struct skill_unit_group *sg; - nullpo_retv (sd); + nullpo_retv(sd); - WFIFOW (fd, 0) = 0x18b; - if ((!pc_isdead (sd) + WFIFOW(fd, 0) = 0x18b; + if ((!pc_isdead(sd) && (sd->opt1 || (sd->opt2 && !(night_flag == 1 && sd->opt2 == STATE_BLIND)))) - || sd->skilltimer != -1 || (DIFF_TICK (tick, sd->canact_tick) < 0) + || sd->skilltimer != -1 || (DIFF_TICK(tick, sd->canact_tick) < 0) || (sd->sc_data && sd->sc_data[SC_DANCING].timer != -1 && sd->sc_data[SC_DANCING].val4 && (sg = (struct skill_unit_group *) sd->sc_data[SC_DANCING].val2) && sg->src_id == sd->bl.id)) { - WFIFOW (fd, 2) = 1; - WFIFOSET (fd, packet_len_table[0x18b]); + WFIFOW(fd, 2) = 1; + WFIFOSET(fd, packet_len_table[0x18b]); return; } /* Rovert's prevent logout option fixed [Valaris] */ if ((battle_config.prevent_logout - && (gettick () - sd->canlog_tick) >= 10000) + && (gettick() - sd->canlog_tick) >= 10000) || (!battle_config.prevent_logout)) { - clif_setwaitclose (fd); - WFIFOW (fd, 2) = 0; + clif_setwaitclose(fd); + WFIFOW(fd, 2) = 0; } else { - WFIFOW (fd, 2) = 1; + WFIFOW(fd, 2) = 1; } - WFIFOSET (fd, packet_len_table[0x18b]); + WFIFOSET(fd, packet_len_table[0x18b]); } @@ -5955,18 +5953,18 @@ void clif_parse_QuitGame (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_GetCharNameRequest (int fd, struct map_session_data *sd) +void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd) { struct block_list *bl; - int account_id; + int account_id; - account_id = RFIFOL (fd, 2); - bl = map_id2bl (account_id); + account_id = RFIFOL(fd, 2); + bl = map_id2bl(account_id); if (bl == NULL) return; - WFIFOW (fd, 0) = 0x95; - WFIFOL (fd, 2) = account_id; + WFIFOW(fd, 0) = 0x95; + WFIFOL(fd, 2) = account_id; switch (bl->type) { @@ -5974,13 +5972,13 @@ void clif_parse_GetCharNameRequest (int fd, struct map_session_data *sd) { struct map_session_data *ssd = (struct map_session_data *) bl; - nullpo_retv (ssd); + nullpo_retv(ssd); if (ssd->state.shroud_active) - memset (WFIFOP (fd, 6), 0, 24); + memset(WFIFOP(fd, 6), 0, 24); else - memcpy (WFIFOP (fd, 6), ssd->status.name, 24); - WFIFOSET (fd, packet_len_table[0x95]); + memcpy(WFIFOP(fd, 6), ssd->status.name, 24); + WFIFOSET(fd, packet_len_table[0x95]); struct party *p = NULL; @@ -5988,7 +5986,7 @@ void clif_parse_GetCharNameRequest (int fd, struct map_session_data *sd) int send = 0; - if (ssd->status.party_id > 0 && (p = party_search (ssd->status.party_id)) != NULL) + if (ssd->status.party_id > 0 && (p = party_search(ssd->status.party_id)) != NULL) { party_name = p->name; send = 1; @@ -5996,37 +5994,37 @@ void clif_parse_GetCharNameRequest (int fd, struct map_session_data *sd) if (send) { - WFIFOW (fd, 0) = 0x195; - WFIFOL (fd, 2) = account_id; - memcpy (WFIFOP (fd, 6), party_name, 24); - memcpy (WFIFOP (fd, 30), "", 24); - memcpy (WFIFOP (fd, 54), "", 24); - memcpy (WFIFOP (fd, 78), "", 24); // We send this value twice because the client expects it - WFIFOSET (fd, packet_len_table[0x195]); + WFIFOW(fd, 0) = 0x195; + WFIFOL(fd, 2) = account_id; + memcpy(WFIFOP(fd, 6), party_name, 24); + memcpy(WFIFOP(fd, 30), "", 24); + memcpy(WFIFOP(fd, 54), "", 24); + memcpy(WFIFOP(fd, 78), "", 24); // We send this value twice because the client expects it + WFIFOSET(fd, packet_len_table[0x195]); } if (pc_isGM(sd) >= battle_config.hack_info_GM_level) { struct in_addr ip = ssd->ip; - WFIFOW (fd, 0) = 0x20C; + WFIFOW(fd, 0) = 0x20C; // Mask the IP using the char-server password if (battle_config.mask_ip_gms) - ip = MD5_ip(chrif_getpasswd (), ssd->ip); + ip = MD5_ip(chrif_getpasswd(), ssd->ip); - WFIFOL (fd, 2) = account_id; - WFIFOL (fd, 6) = ip.s_addr; - WFIFOSET (fd, packet_len_table[0x20C]); + WFIFOL(fd, 2) = account_id; + WFIFOL(fd, 6) = ip.s_addr; + WFIFOSET(fd, packet_len_table[0x20C]); } } break; case BL_NPC: - memcpy (WFIFOP (fd, 6), ((struct npc_data *) bl)->name, 24); + memcpy(WFIFOP(fd, 6), ((struct npc_data *) bl)->name, 24); { - char *start = (char *)WFIFOP (fd, 6); - char *end = strchr (start, '#'); // [fate] elim hashed out/invisible names for the client + char *start = (char *)WFIFOP(fd, 6); + char *end = strchr(start, '#'); // [fate] elim hashed out/invisible names for the client if (end) while (*end) *end++ = 0; @@ -6035,21 +6033,21 @@ void clif_parse_GetCharNameRequest (int fd, struct map_session_data *sd) while (*start == '_') *start++ = ' '; } - WFIFOSET (fd, packet_len_table[0x95]); + WFIFOSET(fd, packet_len_table[0x95]); break; case BL_MOB: { struct mob_data *md = (struct mob_data *) bl; - nullpo_retv (md); + nullpo_retv(md); - memcpy (WFIFOP (fd, 6), md->name, 24); - WFIFOSET (fd, packet_len_table[0x95]); + memcpy(WFIFOP(fd, 6), md->name, 24); + WFIFOSET(fd, packet_len_table[0x95]); } break; default: if (battle_config.error_log) - printf ("clif_parse_GetCharNameRequest : bad type %d(%d)\n", + printf("clif_parse_GetCharNameRequest : bad type %d (%d)\n", bl->type, account_id); break; } @@ -6063,75 +6061,75 @@ void clif_parse_GetCharNameRequest (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_GlobalMessage (int fd, struct map_session_data *sd) +void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { - int msg_len = RFIFOW (fd, 2) - 4; /* Header (2) + length (2). */ + int msg_len = RFIFOW(fd, 2) - 4; /* Header(2) + length(2). */ size_t message_len = 0; // sometimes uint8_t char *buf = NULL; char *message = NULL; /* The message text only. */ - nullpo_retv (sd); + nullpo_retv(sd); - if (!(buf = clif_validate_chat (sd, 2, &message, &message_len))) + if (!(buf = clif_validate_chat(sd, 2, &message, &message_len))) { - clif_displaymessage (fd, "Your message could not be sent."); + clif_displaymessage(fd, "Your message could not be sent."); return; } - if (is_atcommand (fd, sd, message, 0) != AtCommand_None + if (is_atcommand(fd, sd, message, 0) != AtCommand_None || (sd->sc_data && (sd->sc_data[SC_BERSERK].timer != -1 //バーサーク時は会話も不可 || sd->sc_data[SC_NOCHAT].timer != -1)))//チャット禁止 { - free (buf); + free(buf); return; } - if (!magic_message (sd, buf, msg_len)) + if (!magic_message(sd, buf, msg_len)) { /* Don't send chat that results in an automatic ban. */ - if (tmw_CheckChatSpam (sd, message)) + if (tmw_CheckChatSpam(sd, message)) { - free (buf); - clif_displaymessage (fd, "Your message could not be sent."); + free(buf); + clif_displaymessage(fd, "Your message could not be sent."); return; } /* It's not a spell/magic message, so send the message to others. */ - WBUFW (buf, 0) = 0x8d; - WBUFW (buf, 2) = msg_len + 8; /* Header (2) + length (2) + ID (4). */ - WBUFL (buf, 4) = sd->bl.id; + WBUFW(buf, 0) = 0x8d; + WBUFW(buf, 2) = msg_len + 8; /* Header(2) + length(2) + ID(4). */ + WBUFL(buf, 4) = sd->bl.id; // evil multiuse buffer! - clif_send ((const uint8_t *)buf, msg_len + 8, &sd->bl, + clif_send((const uint8_t *)buf, msg_len + 8, &sd->bl, sd->chatID ? CHAT_WOS : AREA_CHAT_WOC); } /* Send the message back to the speaker. */ - memcpy (WFIFOP (fd, 0), RFIFOP (fd, 0), RFIFOW (fd, 2)); - WFIFOW (fd, 0) = 0x8e; - WFIFOSET (fd, WFIFOW (fd, 2)); + memcpy(WFIFOP(fd, 0), RFIFOP(fd, 0), RFIFOW(fd, 2)); + WFIFOW(fd, 0) = 0x8e; + WFIFOSET(fd, WFIFOW(fd, 2)); - free (buf); + free(buf); return; } -int clif_message (struct block_list *bl, const char *msg) +int clif_message(struct block_list *bl, const char *msg) { - unsigned short msg_len = strlen (msg) + 1; + unsigned short msg_len = strlen(msg) + 1; unsigned char buf[512]; if (msg_len + 16 > 512) return 0; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - WBUFW (buf, 0) = 0x8d; - WBUFW (buf, 2) = msg_len + 8; - WBUFL (buf, 4) = bl->id; - memcpy (WBUFP (buf, 8), msg, msg_len); + WBUFW(buf, 0) = 0x8d; + WBUFW(buf, 2) = msg_len + 8; + WBUFL(buf, 4) = bl->id; + memcpy(WBUFP(buf, 8), msg, msg_len); - clif_send (buf, WBUFW (buf, 2), bl, AREA); + clif_send(buf, WBUFW(buf, 2), bl, AREA); return 0; } @@ -6141,25 +6139,25 @@ int clif_message (struct block_list *bl, const char *msg) *------------------------------------------ */ static -void clif_parse_MapMove (int fd, struct map_session_data *sd) +void clif_parse_MapMove(int fd, struct map_session_data *sd) { // /m /mapmove (as @rura GM command) char output[100]; char map_name[17]; - nullpo_retv (sd); + nullpo_retv(sd); - 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 ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_MapMove))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_MapMove))) { - memcpy (map_name, RFIFOP (fd, 2), 16); - sprintf (output, "%s %d %d", map_name, RFIFOW (fd, 18), - RFIFOW (fd, 20)); - log_atcommand (sd, "@warp %s", output); - atcommand_warp (fd, sd, "@warp", output); + memcpy(map_name, RFIFOP(fd, 2), 16); + sprintf(output, "%s %d %d", map_name, RFIFOW(fd, 18), + RFIFOW(fd, 20)); + log_atcommand(sd, "@warp %s", output); + atcommand_warp(fd, sd, "@warp", output); } return; @@ -6170,29 +6168,29 @@ void clif_parse_MapMove (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ChangeDir (int fd, struct map_session_data *sd) +void clif_parse_ChangeDir(int fd, struct map_session_data *sd) { unsigned char buf[64]; short dir; - nullpo_retv (sd); + nullpo_retv(sd); // RFIFOW(fd,2); // Apparently does nothing? - dir = RFIFOB (fd, 4); + dir = RFIFOB(fd, 4); if (dir == sd->dir) return; - pc_setdir (sd, dir); + pc_setdir(sd, dir); - WBUFW (buf, 0) = 0x9c; - WBUFL (buf, 2) = sd->bl.id; - WBUFW (buf, 6) = 0; - WBUFB (buf, 8) = dir; + WBUFW(buf, 0) = 0x9c; + WBUFL(buf, 2) = sd->bl.id; + WBUFW(buf, 6) = 0; + WBUFB(buf, 8) = dir; if (sd->disguise > 23 && sd->disguise < 4001) // mob disguises [Valaris] - clif_send (buf, packet_len_table[0x9c], &sd->bl, AREA); + clif_send(buf, packet_len_table[0x9c], &sd->bl, AREA); else - clif_send (buf, packet_len_table[0x9c], &sd->bl, AREA_WOS); + clif_send(buf, packet_len_table[0x9c], &sd->bl, AREA_WOS); } @@ -6201,22 +6199,22 @@ void clif_parse_ChangeDir (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_Emotion (int fd, struct map_session_data *sd) +void clif_parse_Emotion(int fd, struct map_session_data *sd) { unsigned char buf[64]; - nullpo_retv (sd); + nullpo_retv(sd); if (battle_config.basic_skill_check == 0 - || pc_checkskill (sd, NV_EMOTE) >= 1) + || pc_checkskill(sd, NV_EMOTE) >= 1) { - WBUFW (buf, 0) = 0xc0; - WBUFL (buf, 2) = sd->bl.id; - WBUFB (buf, 6) = RFIFOB (fd, 2); - clif_send (buf, packet_len_table[0xc0], &sd->bl, AREA); + WBUFW(buf, 0) = 0xc0; + WBUFL(buf, 2) = sd->bl.id; + WBUFB(buf, 6) = RFIFOB(fd, 2); + clif_send(buf, packet_len_table[0xc0], &sd->bl, AREA); } else - clif_skill_fail (sd, 1, 0, 1); + clif_skill_fail(sd, 1, 0, 1); } /*========================================== @@ -6224,11 +6222,11 @@ void clif_parse_Emotion (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_HowManyConnections (int fd, struct map_session_data *sd) +void clif_parse_HowManyConnections(int fd, struct map_session_data *sd) { - WFIFOW (fd, 0) = 0xc2; - WFIFOL (fd, 2) = map_getusers (); - WFIFOSET (fd, packet_len_table[0xc2]); + WFIFOW(fd, 0) = 0xc2; + WFIFOL(fd, 2) = map_getusers(); + WFIFOSET(fd, packet_len_table[0xc2]); } /*========================================== @@ -6236,17 +6234,17 @@ void clif_parse_HowManyConnections (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ActionRequest (int fd, struct map_session_data *sd) +void clif_parse_ActionRequest(int fd, struct map_session_data *sd) { unsigned int tick; unsigned char buf[64]; - int action_type, target_id; + int action_type, target_id; - nullpo_retv (sd); + nullpo_retv(sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } if (sd->npc_id != 0 || sd->opt1 > 0 || sd->status.option & 2 || sd->state.storage_open || @@ -6255,13 +6253,13 @@ void clif_parse_ActionRequest (int fd, struct map_session_data *sd) sd->sc_data[SC_DANCING].timer != -1))) return; - tick = gettick (); + tick = gettick(); - pc_stop_walking (sd, 0); - pc_stopattack (sd); + pc_stop_walking(sd, 0); + pc_stopattack(sd); - target_id = RFIFOL (fd, 2); - action_type = RFIFOB (fd, 6); + target_id = RFIFOL(fd, 2); + action_type = RFIFOB(fd, 6); switch (action_type) { @@ -6271,33 +6269,33 @@ void clif_parse_ActionRequest (int fd, struct map_session_data *sd) || sd->status.option & OPTION_HIDE) return; if (!battle_config.sdelay_attack_enable - && pc_checkskill (sd, SA_FREECAST) <= 0) + && pc_checkskill(sd, SA_FREECAST) <= 0) { - if (DIFF_TICK (tick, sd->canact_tick) < 0) + if (DIFF_TICK(tick, sd->canact_tick) < 0) { - clif_skill_fail (sd, 1, 4, 0); + clif_skill_fail(sd, 1, 4, 0); return; } } if (sd->invincible_timer != -1) - pc_delinvincibletimer (sd); + pc_delinvincibletimer(sd); if (sd->attacktarget > 0) // [Valaris] sd->attacktarget = 0; - pc_attack (sd, target_id, action_type != 0); + pc_attack(sd, target_id, action_type != 0); break; case 0x02: // sitdown - pc_stop_walking (sd, 1); - skill_gangsterparadise (sd, 1); // ギャングスターパラダイス設定 - pc_setsit (sd); - clif_sitting (fd, sd); + pc_stop_walking(sd, 1); + skill_gangsterparadise(sd, 1); // ギャングスターパラダイス設定 + pc_setsit(sd); + clif_sitting(fd, sd); break; case 0x03: // standup - skill_gangsterparadise (sd, 0); // ギャングスターパラダイス解除 - pc_setstand (sd); - WBUFW (buf, 0) = 0x8a; - WBUFL (buf, 2) = sd->bl.id; - WBUFB (buf, 26) = 3; - clif_send (buf, packet_len_table[0x8a], &sd->bl, AREA); + skill_gangsterparadise(sd, 0); // ギャングスターパラダイス解除 + pc_setstand(sd); + WBUFW(buf, 0) = 0x8a; + WBUFL(buf, 2) = sd->bl.id; + WBUFB(buf, 26) = 3; + clif_send(buf, packet_len_table[0x8a], &sd->bl, AREA); break; } } @@ -6307,39 +6305,39 @@ void clif_parse_ActionRequest (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_Restart (int fd, struct map_session_data *sd) +void clif_parse_Restart(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - switch (RFIFOB (fd, 2)) + switch (RFIFOB(fd, 2)) { case 0x00: - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - pc_setstand (sd); - pc_setrestartvalue (sd, 3); - pc_setpos (sd, sd->status.save_point.map, + pc_setstand(sd); + pc_setrestartvalue(sd, 3); + pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 2); } break; case 0x01: - /*if(!pc_isdead(sd) && (sd->opt1 || (sd->opt2 && !(night_flag == 1 && sd->opt2 == STATE_BLIND)))) + /*if (!pc_isdead(sd) && (sd->opt1 || (sd->opt2 && !(night_flag == 1 && sd->opt2 == STATE_BLIND)))) * return; */ /* Rovert's Prevent logout option - Fixed [Valaris] */ if ((battle_config.prevent_logout - && (gettick () - sd->canlog_tick) >= 10000) + && (gettick() - sd->canlog_tick) >= 10000) || (!battle_config.prevent_logout)) { - chrif_charselectreq (sd); + chrif_charselectreq(sd); } else { - WFIFOW (fd, 0) = 0x18b; - WFIFOW (fd, 2) = 1; + WFIFOW(fd, 0) = 0x18b; + WFIFOW(fd, 2) = 1; - WFIFOSET (fd, packet_len_table[0x018b]); + WFIFOSET(fd, packet_len_table[0x018b]); } break; } @@ -6356,34 +6354,34 @@ void clif_parse_Restart (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_Wis (int fd, struct map_session_data *sd) +void clif_parse_Wis(int fd, struct map_session_data *sd) { size_t message_len = 0; char *buf = NULL; char *message = NULL; /* The message text only. */ struct map_session_data *dstsd = NULL; - nullpo_retv (sd); + nullpo_retv(sd); - if (!(buf = clif_validate_chat (sd, 1, &message, &message_len))) + if (!(buf = clif_validate_chat(sd, 1, &message, &message_len))) { - clif_displaymessage (fd, "Your message could not be sent."); + clif_displaymessage(fd, "Your message could not be sent."); return; } - if (is_atcommand (fd, sd, message, 0) != AtCommand_None + if (is_atcommand(fd, sd, message, 0) != AtCommand_None || (sd->sc_data && (sd->sc_data[SC_BERSERK].timer != -1 || sd->sc_data[SC_NOCHAT].timer != -1))) { - free (buf); + free(buf); return; } /* Don't send chat that results in an automatic ban. */ - if (tmw_CheckChatSpam (sd, message)) + if (tmw_CheckChatSpam(sd, message)) { - free (buf); - clif_displaymessage (fd, "Your message could not be sent."); + free(buf); + clif_displaymessage(fd, "Your message could not be sent."); return; } @@ -6393,50 +6391,50 @@ void clif_parse_Wis (int fd, struct map_session_data *sd) * conflict (for instance, "Test" versus "test"), the char-server must * settle the discrepancy. */ - if (!(dstsd = map_nick2sd ((const char *)RFIFOP (fd, 4))) - || strcmp (dstsd->status.name, (const char *)RFIFOP (fd, 4)) != 0) - intif_wis_message (sd, (const char *)RFIFOP (fd, 4), message, RFIFOW (fd, 2) - 28); + if (!(dstsd = map_nick2sd((const char *)RFIFOP(fd, 4))) + || strcmp(dstsd->status.name, (const char *)RFIFOP(fd, 4)) != 0) + intif_wis_message(sd, (const char *)RFIFOP(fd, 4), message, RFIFOW(fd, 2) - 28); else { /* Refuse messages addressed to self. */ if (dstsd->fd == fd) { const char *mes = "You cannot page yourself."; - clif_wis_message (fd, wisp_server_name, mes, strlen (mes) + 1); + clif_wis_message(fd, wisp_server_name, mes, strlen(mes) + 1); } else { /* The target is ignoring all whispers. */ if (dstsd->ignoreAll == 1) /* Ignored by target. */ - clif_wis_end (fd, 2); + clif_wis_end(fd, 2); else { int i; - size_t end = sizeof (dstsd->ignore) / sizeof (dstsd->ignore[0]); + size_t end = sizeof(dstsd->ignore) / sizeof(dstsd->ignore[0]); /* See if the source player is being ignored. */ for (i = 0; i < end; ++i) - if (strcmp (dstsd->ignore[i].name, sd->status.name) == 0) + if (strcmp(dstsd->ignore[i].name, sd->status.name) == 0) { /* Ignored by target. */ - clif_wis_end (fd, 2); + clif_wis_end(fd, 2); break; } /* The player is not being ignored. */ if (i == end) { - clif_wis_message (dstsd->fd, sd->status.name, message, - RFIFOW (fd, 2) - 28); + clif_wis_message(dstsd->fd, sd->status.name, message, + RFIFOW(fd, 2) - 28); /* The whisper was sent successfully. */ - clif_wis_end (fd, 0); + clif_wis_end(fd, 0); } } } } - free (buf); + free(buf); } /*========================================== @@ -6444,23 +6442,23 @@ void clif_parse_Wis (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_GMmessage (int fd, struct map_session_data *sd) +void clif_parse_GMmessage(int fd, struct map_session_data *sd) { char m[512]; char output[200]; - nullpo_retv (sd); + nullpo_retv(sd); - if ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_Broadcast))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_Broadcast))) { - strncpy (m, (const char *)RFIFOP (fd, 4), RFIFOW (fd, 2) - 4); - m[RFIFOW (fd, 2) - 4] = 0; - log_atcommand (sd, "/announce %s", m); + strncpy(m, (const char *)RFIFOP(fd, 4), RFIFOW(fd, 2) - 4); + m[RFIFOW(fd, 2) - 4] = 0; + log_atcommand(sd, "/announce %s", m); - memset (output, '\0', sizeof (output)); - snprintf (output, 199, "%s : %s", sd->status.name, m); + memset(output, '\0', sizeof(output)); + snprintf(output, 199, "%s : %s", sd->status.name, m); - intif_GMmessage (output, strlen (output) + 1, 0); + intif_GMmessage(output, strlen(output) + 1, 0); } } @@ -6469,19 +6467,19 @@ void clif_parse_GMmessage (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TakeItem (int fd, struct map_session_data *sd) +void clif_parse_TakeItem(int fd, struct map_session_data *sd) { struct flooritem_data *fitem; - int map_object_id; + int map_object_id; - nullpo_retv (sd); + nullpo_retv(sd); - map_object_id = RFIFOL (fd, 2); - fitem = (struct flooritem_data *) map_id2bl (map_object_id); + map_object_id = RFIFOL(fd, 2); + fitem = (struct flooritem_data *) map_id2bl(map_object_id); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } @@ -6495,14 +6493,14 @@ void clif_parse_TakeItem (int fd, struct map_session_data *sd) if (fitem == NULL || fitem->bl.m != sd->bl.m) return; - if (abs (sd->bl.x - fitem->bl.x) >= 2 - || abs (sd->bl.y - fitem->bl.y) >= 2) + if (abs(sd->bl.x - fitem->bl.x) >= 2 + || abs(sd->bl.y - fitem->bl.y) >= 2) return; // too far away to pick up if (sd->state.shroud_active && sd->state.shroud_disappears_on_pickup) - magic_unshroud (sd); + magic_unshroud(sd); - pc_takeitem (sd, fitem); + pc_takeitem(sd, fitem); } /*========================================== @@ -6510,15 +6508,15 @@ void clif_parse_TakeItem (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_DropItem (int fd, struct map_session_data *sd) +void clif_parse_DropItem(int fd, struct map_session_data *sd) { - int item_index, item_amount; + int item_index, item_amount; - nullpo_retv (sd); + nullpo_retv(sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } if (map[sd->bl.m].flag.no_player_drops) @@ -6535,10 +6533,10 @@ void clif_parse_DropItem (int fd, struct map_session_data *sd) return; } - item_index = RFIFOW (fd, 2) - 2; - item_amount = RFIFOW (fd, 4); + item_index = RFIFOW(fd, 2) - 2; + item_amount = RFIFOW(fd, 4); - pc_dropitem (sd, item_index, item_amount); + pc_dropitem(sd, item_index, item_amount); } /*========================================== @@ -6546,13 +6544,13 @@ void clif_parse_DropItem (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_UseItem (int fd, struct map_session_data *sd) +void clif_parse_UseItem(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } if (sd->npc_id != 0 || sd->opt1 > 0 || (sd->sc_data && @@ -6563,9 +6561,9 @@ void clif_parse_UseItem (int fd, struct map_session_data *sd) return; if (sd->invincible_timer != -1) - pc_delinvincibletimer (sd); + pc_delinvincibletimer(sd); - pc_useitem (sd, RFIFOW (fd, 2) - 2); + pc_useitem(sd, RFIFOW(fd, 2) - 2); } /*========================================== @@ -6573,18 +6571,18 @@ void clif_parse_UseItem (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_EquipItem (int fd, struct map_session_data *sd) +void clif_parse_EquipItem(int fd, struct map_session_data *sd) { - int index; + int index; - nullpo_retv (sd); + nullpo_retv(sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } - index = RFIFOW (fd, 2) - 2; + index = RFIFOW(fd, 2) - 2; if (sd->npc_id != 0) return; if (sd->sc_data @@ -6604,8 +6602,8 @@ void clif_parse_EquipItem (int fd, struct map_session_data *sd) if (sd->inventory_data[index]) { if (sd->inventory_data[index]->type == 10) - RFIFOW (fd, 4) = 0x8000; // 矢を無理やり装備できるように（−−； - pc_equipitem (sd, index, RFIFOW (fd, 4)); + RFIFOW(fd, 4) = 0x8000; // 矢を無理やり装備できるように（−−； + pc_equipitem(sd, index, RFIFOW(fd, 4)); } } @@ -6614,24 +6612,24 @@ void clif_parse_EquipItem (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_UnequipItem (int fd, struct map_session_data *sd) +void clif_parse_UnequipItem(int fd, struct map_session_data *sd) { - int index; + int index; - nullpo_retv (sd); + nullpo_retv(sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } - index = RFIFOW (fd, 2) - 2; + index = RFIFOW(fd, 2) - 2; if (sd->status.inventory[index].broken == 1 && sd->sc_data && sd->sc_data[SC_BROKNWEAPON].timer != -1) - skill_status_change_end (&sd->bl, SC_BROKNWEAPON, -1); + skill_status_change_end(&sd->bl, SC_BROKNWEAPON, -1); if (sd->status.inventory[index].broken == 1 && sd->sc_data && sd->sc_data[SC_BROKNARMOR].timer != -1) - skill_status_change_end (&sd->bl, SC_BROKNARMOR, -1); + skill_status_change_end(&sd->bl, SC_BROKNARMOR, -1); if (sd->sc_data && (sd->sc_data[SC_BLADESTOP].timer != -1 || sd->sc_data[SC_BERSERK].timer != -1)) @@ -6639,7 +6637,7 @@ void clif_parse_UnequipItem (int fd, struct map_session_data *sd) if (sd->npc_id != 0 || sd->opt1 > 0) return; - pc_unequipitem (sd, index, 0); + pc_unequipitem(sd, index, 0); } /*========================================== @@ -6647,18 +6645,18 @@ void clif_parse_UnequipItem (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcClicked (int fd, struct map_session_data *sd) +void clif_parse_NpcClicked(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - clif_clearchar_area (&sd->bl, 1); + clif_clearchar_area(&sd->bl, 1); return; } if (sd->npc_id != 0) return; - npc_click (sd, RFIFOL (fd, 2)); + npc_click(sd, RFIFOL(fd, 2)); } /*========================================== @@ -6666,9 +6664,9 @@ void clif_parse_NpcClicked (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcBuySellSelected (int fd, struct map_session_data *sd) +void clif_parse_NpcBuySellSelected(int fd, struct map_session_data *sd) { - npc_buysellsel (sd, RFIFOL (fd, 2), RFIFOB (fd, 6)); + npc_buysellsel(sd, RFIFOL(fd, 2), RFIFOB(fd, 6)); } /*========================================== @@ -6676,19 +6674,19 @@ void clif_parse_NpcBuySellSelected (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcBuyListSend (int fd, struct map_session_data *sd) +void clif_parse_NpcBuyListSend(int fd, struct map_session_data *sd) { - int fail = 0, n; + int fail = 0, n; unsigned short *item_list; - n = (RFIFOW (fd, 2) - 4) / 4; - item_list = (unsigned short *) RFIFOP (fd, 4); + n = (RFIFOW(fd, 2) - 4) / 4; + item_list = (unsigned short *) RFIFOP(fd, 4); - fail = npc_buylist (sd, n, item_list); + fail = npc_buylist(sd, n, item_list); - WFIFOW (fd, 0) = 0xca; - WFIFOB (fd, 2) = fail; - WFIFOSET (fd, packet_len_table[0xca]); + WFIFOW(fd, 0) = 0xca; + WFIFOB(fd, 2) = fail; + WFIFOSET(fd, packet_len_table[0xca]); } /*========================================== @@ -6696,19 +6694,19 @@ void clif_parse_NpcBuyListSend (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcSellListSend (int fd, struct map_session_data *sd) +void clif_parse_NpcSellListSend(int fd, struct map_session_data *sd) { - int fail = 0, n; + int fail = 0, n; unsigned short *item_list; - n = (RFIFOW (fd, 2) - 4) / 4; - item_list = (unsigned short *) RFIFOP (fd, 4); + n = (RFIFOW(fd, 2) - 4) / 4; + item_list = (unsigned short *) RFIFOP(fd, 4); - fail = npc_selllist (sd, n, item_list); + fail = npc_selllist(sd, n, item_list); - WFIFOW (fd, 0) = 0xcb; - WFIFOB (fd, 2) = fail; - WFIFOSET (fd, packet_len_table[0xcb]); + WFIFOW(fd, 0) = 0xcb; + WFIFOB(fd, 2) = fail; + WFIFOSET(fd, packet_len_table[0xcb]); } /*========================================== @@ -6716,10 +6714,10 @@ void clif_parse_NpcSellListSend (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_CreateChatRoom (int fd, struct map_session_data *sd) +void clif_parse_CreateChatRoom(int fd, struct map_session_data *sd) { - chat_createchat (sd, RFIFOW (fd, 4), RFIFOB (fd, 6), (const char *)RFIFOP (fd, 7), - (const char *)RFIFOP (fd, 15), RFIFOW (fd, 2) - 15); + chat_createchat(sd, RFIFOW(fd, 4), RFIFOB(fd, 6), (const char *)RFIFOP(fd, 7), + (const char *)RFIFOP(fd, 15), RFIFOW(fd, 2) - 15); } /*========================================== @@ -6727,9 +6725,9 @@ void clif_parse_CreateChatRoom (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ChatAddMember (int fd, struct map_session_data *sd) +void clif_parse_ChatAddMember(int fd, struct map_session_data *sd) { - chat_joinchat (sd, RFIFOL (fd, 2), (const char *)RFIFOP (fd, 6)); + chat_joinchat(sd, RFIFOL(fd, 2), (const char *)RFIFOP(fd, 6)); } /*========================================== @@ -6737,10 +6735,10 @@ void clif_parse_ChatAddMember (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ChatRoomStatusChange (int fd, struct map_session_data *sd) +void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data *sd) { - chat_changechatstatus (sd, RFIFOW (fd, 4), RFIFOB (fd, 6), (const char *)RFIFOP (fd, 7), - (const char *)RFIFOP (fd, 15), RFIFOW (fd, 2) - 15); + chat_changechatstatus(sd, RFIFOW(fd, 4), RFIFOB(fd, 6), (const char *)RFIFOP(fd, 7), + (const char *)RFIFOP(fd, 15), RFIFOW(fd, 2) - 15); } /*========================================== @@ -6748,9 +6746,9 @@ void clif_parse_ChatRoomStatusChange (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ChangeChatOwner (int fd, struct map_session_data *sd) +void clif_parse_ChangeChatOwner(int fd, struct map_session_data *sd) { - chat_changechatowner (sd, (const char *)RFIFOP (fd, 6)); + chat_changechatowner(sd, (const char *)RFIFOP(fd, 6)); } /*========================================== @@ -6758,9 +6756,9 @@ void clif_parse_ChangeChatOwner (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_KickFromChat (int fd, struct map_session_data *sd) +void clif_parse_KickFromChat(int fd, struct map_session_data *sd) { - chat_kickchat (sd, (const char *)RFIFOP (fd, 2)); + chat_kickchat(sd, (const char *)RFIFOP(fd, 2)); } /*========================================== @@ -6768,9 +6766,9 @@ void clif_parse_KickFromChat (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ChatLeave (int fd, struct map_session_data *sd) +void clif_parse_ChatLeave(int fd, struct map_session_data *sd) { - chat_leavechat (sd); + chat_leavechat(sd); } /*========================================== @@ -6778,17 +6776,17 @@ void clif_parse_ChatLeave (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TradeRequest (int fd, struct map_session_data *sd) +void clif_parse_TradeRequest(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if (battle_config.basic_skill_check == 0 - || pc_checkskill (sd, NV_TRADE) >= 1) + || pc_checkskill(sd, NV_TRADE) >= 1) { - trade_traderequest (sd, RFIFOL (sd->fd, 2)); + trade_traderequest(sd, RFIFOL(sd->fd, 2)); } else - clif_skill_fail (sd, 1, 0, 0); + clif_skill_fail(sd, 1, 0, 0); } /*========================================== @@ -6796,11 +6794,11 @@ void clif_parse_TradeRequest (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TradeAck (int fd, struct map_session_data *sd) +void clif_parse_TradeAck(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - trade_tradeack (sd, RFIFOB (sd->fd, 2)); + trade_tradeack(sd, RFIFOB(sd->fd, 2)); } /*========================================== @@ -6808,11 +6806,11 @@ void clif_parse_TradeAck (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TradeAddItem (int fd, struct map_session_data *sd) +void clif_parse_TradeAddItem(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - trade_tradeadditem (sd, RFIFOW (sd->fd, 2), RFIFOL (sd->fd, 4)); + trade_tradeadditem(sd, RFIFOW(sd->fd, 2), RFIFOL(sd->fd, 4)); } /*========================================== @@ -6820,9 +6818,9 @@ void clif_parse_TradeAddItem (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TradeOk (int fd, struct map_session_data *sd) +void clif_parse_TradeOk(int fd, struct map_session_data *sd) { - trade_tradeok (sd); + trade_tradeok(sd); } /*========================================== @@ -6830,9 +6828,9 @@ void clif_parse_TradeOk (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TradeCansel (int fd, struct map_session_data *sd) +void clif_parse_TradeCansel(int fd, struct map_session_data *sd) { - trade_tradecancel (sd); + trade_tradecancel(sd); } /*========================================== @@ -6840,9 +6838,9 @@ void clif_parse_TradeCansel (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_TradeCommit (int fd, struct map_session_data *sd) +void clif_parse_TradeCommit(int fd, struct map_session_data *sd) { - trade_tradecommit (sd); + trade_tradecommit(sd); } /*========================================== @@ -6850,9 +6848,9 @@ void clif_parse_TradeCommit (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_StopAttack (int fd, struct map_session_data *sd) +void clif_parse_StopAttack(int fd, struct map_session_data *sd) { - pc_stopattack (sd); + pc_stopattack(sd); } /*========================================== @@ -6860,13 +6858,13 @@ void clif_parse_StopAttack (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_PutItemToCart (int fd, struct map_session_data *sd) +void clif_parse_PutItemToCart(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if (sd->npc_id != 0 || sd->trade_partner != 0) return; - pc_putitemtocart (sd, RFIFOW (fd, 2) - 2, RFIFOL (fd, 4)); + pc_putitemtocart(sd, RFIFOW(fd, 2) - 2, RFIFOL(fd, 4)); } /*========================================== @@ -6874,13 +6872,13 @@ void clif_parse_PutItemToCart (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_GetItemFromCart (int fd, struct map_session_data *sd) +void clif_parse_GetItemFromCart(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if (sd->npc_id != 0 || sd->trade_partner != 0) return; - pc_getitemfromcart (sd, RFIFOW (fd, 2) - 2, RFIFOL (fd, 4)); + pc_getitemfromcart(sd, RFIFOW(fd, 2) - 2, RFIFOL(fd, 4)); } /*========================================== @@ -6888,9 +6886,9 @@ void clif_parse_GetItemFromCart (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_RemoveOption (int fd, struct map_session_data *sd) +void clif_parse_RemoveOption(int fd, struct map_session_data *sd) { - if (pc_isriding (sd)) + if (pc_isriding(sd)) { // jobchange when removing peco [Valaris] if (sd->status.pc_class == 13) sd->status.pc_class = sd->view_class = 7; @@ -6905,7 +6903,7 @@ void clif_parse_RemoveOption (int fd, struct map_session_data *sd) sd->status.pc_class = sd->view_class = 4015; } - pc_setoption (sd, 0); + pc_setoption(sd, 0); } /*========================================== @@ -6913,9 +6911,9 @@ void clif_parse_RemoveOption (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ChangeCart (int fd, struct map_session_data *sd) +void clif_parse_ChangeCart(int fd, struct map_session_data *sd) { - pc_setcart (sd, RFIFOW (fd, 2)); + pc_setcart(sd, RFIFOW(fd, 2)); } /*========================================== @@ -6923,9 +6921,9 @@ void clif_parse_ChangeCart (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_StatusUp (int fd, struct map_session_data *sd) +void clif_parse_StatusUp(int fd, struct map_session_data *sd) { - pc_statusup (sd, RFIFOW (fd, 2)); + pc_statusup(sd, RFIFOW(fd, 2)); } /*========================================== @@ -6933,9 +6931,9 @@ void clif_parse_StatusUp (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_SkillUp (int fd, struct map_session_data *sd) +void clif_parse_SkillUp(int fd, struct map_session_data *sd) { - pc_skillup (sd, RFIFOW (fd, 2)); + pc_skillup(sd, RFIFOW(fd, 2)); } /*========================================== @@ -6943,30 +6941,30 @@ void clif_parse_SkillUp (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_UseSkillToId (int fd, struct map_session_data *sd) +void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) { - int skillnum, skilllv, lv, target_id; - unsigned int tick = gettick (); + int skillnum, skilllv, lv, target_id; + unsigned int tick = gettick(); - nullpo_retv (sd); + nullpo_retv(sd); if (map[sd->bl.m].flag.noskill) return; if (sd->chatID || sd->npc_id != 0 || sd->state.storage_open) return; - skilllv = RFIFOW (fd, 2); - skillnum = RFIFOW (fd, 4); - target_id = RFIFOL (fd, 6); + skilllv = RFIFOW(fd, 2); + skillnum = RFIFOW(fd, 4); + target_id = RFIFOL(fd, 6); if (sd->skilltimer != -1) { if (skillnum != SA_CASTCANCEL) return; } - else if (DIFF_TICK (tick, sd->canact_tick) < 0) + else if (DIFF_TICK(tick, sd->canact_tick) < 0) { - clif_skill_fail (sd, skillnum, 4, 0); + clif_skill_fail(sd, skillnum, 4, 0); return; } @@ -6976,12 +6974,12 @@ void clif_parse_UseSkillToId (int fd, struct map_session_data *sd) || sd->sc_data[SC_WEDDING].timer != -1 || sd->view_class == 22) return; if (sd->invincible_timer != -1) - pc_delinvincibletimer (sd); + pc_delinvincibletimer(sd); if (sd->skillitem >= 0 && sd->skillitem == skillnum) { if (skilllv != sd->skillitemlv) skilllv = sd->skillitemlv; - skill_use_id (sd, target_id, skillnum, skilllv); + skill_use_id(sd, target_id, skillnum, skilllv); } else { @@ -6995,21 +6993,21 @@ void clif_parse_UseSkillToId (int fd, struct map_session_data *sd) if (!sd->state.skill_flag) { sd->state.skill_flag = 1; - clif_skillinfo (sd, MO_EXTREMITYFIST, 1, -1); + clif_skillinfo(sd, MO_EXTREMITYFIST, 1, -1); return; } else if (sd->bl.id == target_id) { - clif_skillinfo (sd, MO_EXTREMITYFIST, 1, -1); + clif_skillinfo(sd, MO_EXTREMITYFIST, 1, -1); return; } } } - if ((lv = pc_checkskill (sd, skillnum)) > 0) + if ((lv = pc_checkskill(sd, skillnum)) > 0) { if (skilllv > lv) skilllv = lv; - skill_use_id (sd, target_id, skillnum, skilllv); + skill_use_id(sd, target_id, skillnum, skilllv); if (sd->state.skill_flag) sd->state.skill_flag = 0; } @@ -7021,13 +7019,13 @@ void clif_parse_UseSkillToId (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_UseSkillToPos (int fd, struct map_session_data *sd) +void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd) { - int skillnum, skilllv, lv, x, y; - unsigned int tick = gettick (); - int skillmoreinfo; + int skillnum, skilllv, lv, x, y; + unsigned int tick = gettick(); + int skillmoreinfo; - nullpo_retv (sd); + nullpo_retv(sd); if (map[sd->bl.m].flag.noskill) return; @@ -7037,28 +7035,28 @@ void clif_parse_UseSkillToPos (int fd, struct map_session_data *sd) return; skillmoreinfo = -1; - skilllv = RFIFOW (fd, 2); - skillnum = RFIFOW (fd, 4); - x = RFIFOW (fd, 6); - y = RFIFOW (fd, 8); - if (RFIFOW (fd, 0) == 0x190) + skilllv = RFIFOW(fd, 2); + skillnum = RFIFOW(fd, 4); + x = RFIFOW(fd, 6); + y = RFIFOW(fd, 8); + if (RFIFOW(fd, 0) == 0x190) skillmoreinfo = 10; if (skillmoreinfo != -1) { - if (pc_issit (sd)) + if (pc_issit(sd)) { - clif_skill_fail (sd, skillnum, 0, 0); + clif_skill_fail(sd, skillnum, 0, 0); return; } - memcpy (talkie_mes, RFIFOP (fd, skillmoreinfo), 80); + memcpy(talkie_mes, RFIFOP(fd, skillmoreinfo), 80); } if (sd->skilltimer != -1) return; - else if (DIFF_TICK (tick, sd->canact_tick) < 0) + else if (DIFF_TICK(tick, sd->canact_tick) < 0) { - clif_skill_fail (sd, skillnum, 4, 0); + clif_skill_fail(sd, skillnum, 4, 0); return; } @@ -7068,21 +7066,21 @@ void clif_parse_UseSkillToPos (int fd, struct map_session_data *sd) || sd->sc_data[SC_WEDDING].timer != -1 || sd->view_class == 22) return; if (sd->invincible_timer != -1) - pc_delinvincibletimer (sd); + pc_delinvincibletimer(sd); if (sd->skillitem >= 0 && sd->skillitem == skillnum) { if (skilllv != sd->skillitemlv) skilllv = sd->skillitemlv; - skill_use_pos (sd, x, y, skillnum, skilllv); + skill_use_pos(sd, x, y, skillnum, skilllv); } else { sd->skillitem = sd->skillitemlv = -1; - if ((lv = pc_checkskill (sd, skillnum)) > 0) + if ((lv = pc_checkskill(sd, skillnum)) > 0) { if (skilllv > lv) skilllv = lv; - skill_use_pos (sd, x, y, skillnum, skilllv); + skill_use_pos(sd, x, y, skillnum, skilllv); } } } @@ -7092,9 +7090,9 @@ void clif_parse_UseSkillToPos (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_UseSkillMap (int fd, struct map_session_data *sd) +void clif_parse_UseSkillMap(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if (map[sd->bl.m].flag.noskill) return; @@ -7110,9 +7108,9 @@ void clif_parse_UseSkillMap (int fd, struct map_session_data *sd) return; if (sd->invincible_timer != -1) - pc_delinvincibletimer (sd); + pc_delinvincibletimer(sd); - skill_castend_map (sd, RFIFOW (fd, 2), (const char *)RFIFOP (fd, 4)); + skill_castend_map(sd, RFIFOW(fd, 2), (const char *)RFIFOP(fd, 4)); } /*========================================== @@ -7120,9 +7118,9 @@ void clif_parse_UseSkillMap (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_RequestMemo (int fd, struct map_session_data *sd) +void clif_parse_RequestMemo(int fd, struct map_session_data *sd) { - pc_memo (sd, -1); + pc_memo(sd, -1); } /*========================================== @@ -7130,12 +7128,12 @@ void clif_parse_RequestMemo (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcSelectMenu (int fd, struct map_session_data *sd) +void clif_parse_NpcSelectMenu(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - sd->npc_menu = RFIFOB (fd, 6); - map_scriptcont (sd, RFIFOL (fd, 2)); + sd->npc_menu = RFIFOB(fd, 6); + map_scriptcont(sd, RFIFOL(fd, 2)); } /*========================================== @@ -7143,9 +7141,9 @@ void clif_parse_NpcSelectMenu (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcNextClicked (int fd, struct map_session_data *sd) +void clif_parse_NpcNextClicked(int fd, struct map_session_data *sd) { - map_scriptcont (sd, RFIFOL (fd, 2)); + map_scriptcont(sd, RFIFOL(fd, 2)); } /*========================================== @@ -7153,17 +7151,17 @@ void clif_parse_NpcNextClicked (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcAmountInput (int fd, struct map_session_data *sd) +void clif_parse_NpcAmountInput(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); #define RFIFOL_(fd,pos) (*(int*)(session[fd]->rdata+session[fd]->rdata_pos+(pos))) //Input Value overflow Exploit FIX - sd->npc_amount = RFIFOL_ (fd, 6); //fixed by Lupus. npc_amount is (int) but was RFIFOL changing it to (unsigned int) + sd->npc_amount = RFIFOL_(fd, 6); //fixed by Lupus. npc_amount is (int) but was RFIFOL changing it to (unsigned int) #undef RFIFOL_ - map_scriptcont (sd, RFIFOL (fd, 2)); + map_scriptcont(sd, RFIFOL(fd, 2)); } /*========================================== @@ -7173,12 +7171,12 @@ void clif_parse_NpcAmountInput (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcStringInput (int fd, struct map_session_data *sd) +void clif_parse_NpcStringInput(int fd, struct map_session_data *sd) { - int len; - nullpo_retv (sd); + int len; + nullpo_retv(sd); - len = RFIFOW (fd, 2) - 8; + len = RFIFOW(fd, 2) - 8; /* * If we check for equal to 0, too, we'll freeze clients that send (or @@ -7187,17 +7185,17 @@ void clif_parse_NpcStringInput (int fd, struct map_session_data *sd) if (len < 0) return; - if (len >= sizeof (sd->npc_str) - 1) + if (len >= sizeof(sd->npc_str) - 1) { - printf ("clif_parse_NpcStringInput(): Input string too long!\n"); - len = sizeof (sd->npc_str) - 1; + printf("clif_parse_NpcStringInput(): Input string too long!\n"); + len = sizeof(sd->npc_str) - 1; } if (len > 0) - strncpy (sd->npc_str, (const char *)RFIFOP (fd, 8), len); + strncpy(sd->npc_str, (const char *)RFIFOP(fd, 8), len); sd->npc_str[len] = '\0'; - map_scriptcont (sd, RFIFOL (fd, 4)); + map_scriptcont(sd, RFIFOL(fd, 4)); } /*========================================== @@ -7205,9 +7203,9 @@ void clif_parse_NpcStringInput (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_NpcCloseClicked (int fd, struct map_session_data *sd) +void clif_parse_NpcCloseClicked(int fd, struct map_session_data *sd) { - map_scriptcont (sd, RFIFOL (fd, 2)); + map_scriptcont(sd, RFIFOL(fd, 2)); } /*========================================== @@ -7215,9 +7213,9 @@ void clif_parse_NpcCloseClicked (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ItemIdentify (int fd, struct map_session_data *sd) +void clif_parse_ItemIdentify(int fd, struct map_session_data *sd) { - pc_item_identify (sd, RFIFOW (fd, 2) - 2); + pc_item_identify(sd, RFIFOW(fd, 2) - 2); } /*========================================== @@ -7225,9 +7223,9 @@ void clif_parse_ItemIdentify (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_AutoSpell (int fd, struct map_session_data *sd) +void clif_parse_AutoSpell(int fd, struct map_session_data *sd) { - skill_autospell (sd, RFIFOW (fd, 2)); + skill_autospell(sd, RFIFOW(fd, 2)); } /*========================================== @@ -7235,9 +7233,9 @@ void clif_parse_AutoSpell (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_UseCard (int fd, struct map_session_data *sd) +void clif_parse_UseCard(int fd, struct map_session_data *sd) { - clif_use_card (sd, RFIFOW (fd, 2) - 2); + clif_use_card(sd, RFIFOW(fd, 2) - 2); } /*========================================== @@ -7245,9 +7243,9 @@ void clif_parse_UseCard (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_InsertCard (int fd, struct map_session_data *sd) +void clif_parse_InsertCard(int fd, struct map_session_data *sd) { - pc_insert_card (sd, RFIFOW (fd, 2) - 2, RFIFOW (fd, 4) - 2); + pc_insert_card(sd, RFIFOW(fd, 2) - 2, RFIFOW(fd, 4) - 2); } /*========================================== @@ -7255,12 +7253,12 @@ void clif_parse_InsertCard (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_SolveCharName (int fd, struct map_session_data *sd) +void clif_parse_SolveCharName(int fd, struct map_session_data *sd) { - int char_id; + int char_id; - char_id = RFIFOL (fd, 2); - clif_solved_charname (sd, char_id); + char_id = RFIFOL(fd, 2); + clif_solved_charname(sd, char_id); } /*========================================== @@ -7268,25 +7266,25 @@ void clif_parse_SolveCharName (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ResetChar (int fd, struct map_session_data *sd) +void clif_parse_ResetChar(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - if (battle_config.atc_gmonly == 0 || pc_isGM (sd)) + if (battle_config.atc_gmonly == 0 || pc_isGM(sd)) { - switch (RFIFOW (fd, 2)) + switch (RFIFOW(fd, 2)) { case 0: - log_atcommand (sd, "@charstreset %s", sd->status.name); - if (pc_isGM (sd) >= - get_atcommand_level (AtCommand_ResetState)) - pc_resetstate (sd); + log_atcommand(sd, "@charstreset %s", sd->status.name); + if (pc_isGM(sd) >= + get_atcommand_level(AtCommand_ResetState)) + pc_resetstate(sd); break; case 1: - log_atcommand (sd, "@charskreset %s", sd->status.name); - if (pc_isGM (sd) >= - get_atcommand_level (AtCommand_ResetState)) - pc_resetskill (sd); + log_atcommand(sd, "@charskreset %s", sd->status.name); + if (pc_isGM(sd) >= + get_atcommand_level(AtCommand_ResetState)) + pc_resetskill(sd); break; } } @@ -7297,19 +7295,19 @@ void clif_parse_ResetChar (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_LGMmessage (int fd, struct map_session_data *sd) +void clif_parse_LGMmessage(int fd, struct map_session_data *sd) { unsigned char buf[64]; - nullpo_retv (sd); + nullpo_retv(sd); - if ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_LocalBroadcast))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_LocalBroadcast))) { - WBUFW (buf, 0) = 0x9a; - WBUFW (buf, 2) = RFIFOW (fd, 2); - memcpy (WBUFP (buf, 4), RFIFOP (fd, 4), RFIFOW (fd, 2) - 4); - clif_send (buf, RFIFOW (fd, 2), &sd->bl, ALL_SAMEMAP); + WBUFW(buf, 0) = 0x9a; + WBUFW(buf, 2) = RFIFOW(fd, 2); + memcpy(WBUFP(buf, 4), RFIFOP(fd, 4), RFIFOW(fd, 2) - 4); + clif_send(buf, RFIFOW(fd, 2), &sd->bl, ALL_SAMEMAP); } } @@ -7318,21 +7316,21 @@ void clif_parse_LGMmessage (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_MoveToKafra (int fd, struct map_session_data *sd) +void clif_parse_MoveToKafra(int fd, struct map_session_data *sd) { - int item_index, item_amount; + int item_index, item_amount; - nullpo_retv (sd); + nullpo_retv(sd); - item_index = RFIFOW (fd, 2) - 2; - item_amount = RFIFOL (fd, 4); + item_index = RFIFOW(fd, 2) - 2; + item_amount = RFIFOL(fd, 4); if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_open) return; if (sd->state.storage_open) - storage_storageadd (sd, item_index, item_amount); + storage_storageadd(sd, item_index, item_amount); } /*========================================== @@ -7340,21 +7338,21 @@ void clif_parse_MoveToKafra (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_MoveFromKafra (int fd, struct map_session_data *sd) +void clif_parse_MoveFromKafra(int fd, struct map_session_data *sd) { - int item_index, item_amount; + int item_index, item_amount; - nullpo_retv (sd); + nullpo_retv(sd); - item_index = RFIFOW (fd, 2) - 1; - item_amount = RFIFOL (fd, 4); + item_index = RFIFOW(fd, 2) - 1; + item_amount = RFIFOL(fd, 4); if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_open) return; if (sd->state.storage_open) - storage_storageget (sd, item_index, item_amount); + storage_storageget(sd, item_index, item_amount); } /*========================================== @@ -7362,15 +7360,15 @@ void clif_parse_MoveFromKafra (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_MoveToKafraFromCart (int fd, struct map_session_data *sd) +void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_open) return; if (sd->state.storage_open) - storage_storageaddfromcart (sd, RFIFOW (fd, 2) - 2, RFIFOL (fd, 4)); + storage_storageaddfromcart(sd, RFIFOW(fd, 2) - 2, RFIFOL(fd, 4)); } /*========================================== @@ -7378,15 +7376,15 @@ void clif_parse_MoveToKafraFromCart (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_MoveFromKafraToCart (int fd, struct map_session_data *sd) +void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_open) return; if (sd->state.storage_open) - storage_storagegettocart (sd, RFIFOW (fd, 2) - 1, RFIFOL (fd, 4)); + storage_storagegettocart(sd, RFIFOW(fd, 2) - 1, RFIFOL(fd, 4)); } /*========================================== @@ -7394,12 +7392,12 @@ void clif_parse_MoveFromKafraToCart (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_CloseKafra (int fd, struct map_session_data *sd) +void clif_parse_CloseKafra(int fd, struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if (sd->state.storage_open) - storage_storageclose (sd); + storage_storageclose(sd); } /*========================================== @@ -7410,15 +7408,15 @@ void clif_parse_CloseKafra (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_CreateParty (int fd, struct map_session_data *sd) +void clif_parse_CreateParty(int fd, struct map_session_data *sd) { if (battle_config.basic_skill_check == 0 - || pc_checkskill (sd, NV_PARTY) >= 2) + || pc_checkskill(sd, NV_PARTY) >= 2) { - party_create (sd, (const char *)RFIFOP (fd, 2)); + party_create(sd, (const char *)RFIFOP(fd, 2)); } else - clif_skill_fail (sd, 1, 0, 4); + clif_skill_fail(sd, 1, 0, 4); } /*========================================== @@ -7434,15 +7432,15 @@ void clif_parse_CreateParty (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_CreateParty2 (int fd, struct map_session_data *sd) +void clif_parse_CreateParty2(int fd, struct map_session_data *sd) { if (battle_config.basic_skill_check == 0 - || pc_checkskill (sd, NV_PARTY) >= 2) + || pc_checkskill(sd, NV_PARTY) >= 2) { - party_create (sd, (const char *)RFIFOP (fd, 2)); + party_create(sd, (const char *)RFIFOP(fd, 2)); } else - clif_skill_fail (sd, 1, 0, 4); + clif_skill_fail(sd, 1, 0, 4); } /*========================================== @@ -7453,9 +7451,9 @@ void clif_parse_CreateParty2 (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_PartyInvite (int fd, struct map_session_data *sd) +void clif_parse_PartyInvite(int fd, struct map_session_data *sd) { - party_invite (sd, RFIFOL (fd, 2)); + party_invite(sd, RFIFOL(fd, 2)); } /*========================================== @@ -7466,17 +7464,17 @@ void clif_parse_PartyInvite (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_ReplyPartyInvite (int fd, struct map_session_data *sd) +void clif_parse_ReplyPartyInvite(int fd, struct map_session_data *sd) { if (battle_config.basic_skill_check == 0 - || pc_checkskill (sd, NV_PARTY) >= 1) + || pc_checkskill(sd, NV_PARTY) >= 1) { - party_reply_invite (sd, RFIFOL (fd, 2), RFIFOL (fd, 6)); + party_reply_invite(sd, RFIFOL(fd, 2), RFIFOL(fd, 6)); } else { - party_reply_invite (sd, RFIFOL (fd, 2), 0); - clif_skill_fail (sd, 1, 0, 4); + party_reply_invite(sd, RFIFOL(fd, 2), 0); + clif_skill_fail(sd, 1, 0, 4); } } @@ -7485,9 +7483,9 @@ void clif_parse_ReplyPartyInvite (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_LeaveParty (int fd, struct map_session_data *sd) +void clif_parse_LeaveParty(int fd, struct map_session_data *sd) { - party_leave (sd); + party_leave(sd); } /*========================================== @@ -7495,9 +7493,9 @@ void clif_parse_LeaveParty (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_RemovePartyMember (int fd, struct map_session_data *sd) +void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd) { - party_removemember (sd, RFIFOL (fd, 2), (const char *)RFIFOP (fd, 6)); + party_removemember(sd, RFIFOL(fd, 2), (const char *)RFIFOP(fd, 6)); } /*========================================== @@ -7505,9 +7503,9 @@ void clif_parse_RemovePartyMember (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_PartyChangeOption (int fd, struct map_session_data *sd) +void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd) { - party_changeoption (sd, RFIFOW (fd, 2), RFIFOW (fd, 4)); + party_changeoption(sd, RFIFOW(fd, 2), RFIFOW(fd, 4)); } /*========================================== @@ -7519,38 +7517,38 @@ void clif_parse_PartyChangeOption (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_PartyMessage (int fd, struct map_session_data *sd) +void clif_parse_PartyMessage(int fd, struct map_session_data *sd) { size_t message_len = 0; char *buf = NULL; char *message = NULL; /* The message text only. */ - nullpo_retv (sd); + nullpo_retv(sd); - if (!(buf = clif_validate_chat (sd, 0, &message, &message_len))) + if (!(buf = clif_validate_chat(sd, 0, &message, &message_len))) { - clif_displaymessage (fd, "Your message could not be sent."); + clif_displaymessage(fd, "Your message could not be sent."); return; } - if (is_atcommand (fd, sd, message, 0) != AtCommand_None + if (is_atcommand(fd, sd, message, 0) != AtCommand_None || (sd->sc_data && (sd->sc_data[SC_BERSERK].timer != -1 //バーサーク時は会話も不可 || sd->sc_data[SC_NOCHAT].timer != -1))) //チャット禁止 { - free (buf); + free(buf); return; } /* Don't send chat that results in an automatic ban. */ - if (tmw_CheckChatSpam (sd, message)) + if (tmw_CheckChatSpam(sd, message)) { - free (buf); - clif_displaymessage (fd, "Your message could not be sent."); + free(buf); + clif_displaymessage(fd, "Your message could not be sent."); return; } - party_send_message (sd, message, RFIFOW (fd, 2) - 4); - free (buf); + party_send_message(sd, message, RFIFOW(fd, 2) - 4); + free(buf); } /*========================================== @@ -7558,32 +7556,32 @@ void clif_parse_PartyMessage (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_GM_Monster_Item (int fd, struct map_session_data *sd) +void clif_parse_GM_Monster_Item(int fd, struct map_session_data *sd) { char monster_item_name[25]; - nullpo_retv (sd); + nullpo_retv(sd); - memset (monster_item_name, '\0', sizeof (monster_item_name)); + memset(monster_item_name, '\0', sizeof(monster_item_name)); - if (battle_config.atc_gmonly == 0 || pc_isGM (sd)) + if (battle_config.atc_gmonly == 0 || pc_isGM(sd)) { - memcpy (monster_item_name, RFIFOP (fd, 2), 24); + memcpy(monster_item_name, RFIFOP(fd, 2), 24); - if (mobdb_searchname (monster_item_name) != 0) + if (mobdb_searchname(monster_item_name) != 0) { - if (pc_isGM (sd) >= get_atcommand_level (AtCommand_Monster)) + if (pc_isGM(sd) >= get_atcommand_level(AtCommand_Monster)) { - log_atcommand (sd, "@spawn %s", monster_item_name); - atcommand_spawn (fd, sd, "@spawn", monster_item_name); // as @spawn + log_atcommand(sd, "@spawn %s", monster_item_name); + atcommand_spawn(fd, sd, "@spawn", monster_item_name); // as @spawn } } - else if (itemdb_searchname (monster_item_name) != NULL) + else if (itemdb_searchname(monster_item_name) != NULL) { - if (pc_isGM (sd) >= get_atcommand_level (AtCommand_Item)) + if (pc_isGM(sd) >= get_atcommand_level(AtCommand_Item)) { - log_atcommand (sd, "@item %s", monster_item_name); - atcommand_item (fd, sd, "@item", monster_item_name); // as @item + log_atcommand(sd, "@item %s", monster_item_name); + atcommand_item(fd, sd, "@item", monster_item_name); // as @item } } @@ -7592,40 +7590,40 @@ void clif_parse_GM_Monster_Item (int fd, struct map_session_data *sd) // Kick (right click menu for GM "(name) force to quit") static -void clif_parse_GMKick (int fd, struct map_session_data *sd) +void clif_parse_GMKick(int fd, struct map_session_data *sd) { struct block_list *target; - int tid = RFIFOL (fd, 2); + int tid = RFIFOL(fd, 2); - nullpo_retv (sd); + nullpo_retv(sd); - if ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_Kick))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_Kick))) { - target = map_id2bl (tid); + target = map_id2bl(tid); if (target) { if (target->type == BL_PC) { struct map_session_data *tsd = (struct map_session_data *) target; - log_atcommand (sd, "@kick %s", tsd->status.name); - if (pc_isGM (sd) > pc_isGM (tsd)) - clif_GM_kick (sd, tsd, 1); + log_atcommand(sd, "@kick %s", tsd->status.name); + if (pc_isGM(sd) > pc_isGM(tsd)) + clif_GM_kick(sd, tsd, 1); else - clif_GM_kickack (sd, 0); + clif_GM_kickack(sd, 0); } else if (target->type == BL_MOB) { struct mob_data *md = (struct mob_data *) target; sd->state.attack_type = 0; - mob_damage (&sd->bl, md, md->hp, 2); + mob_damage(&sd->bl, md, md->hp, 2); } else - clif_GM_kickack (sd, 0); + clif_GM_kickack(sd, 0); } else - clif_GM_kickack (sd, 0); + clif_GM_kickack(sd, 0); } } @@ -7634,20 +7632,20 @@ void clif_parse_GMKick (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_Shift (int fd, struct map_session_data *sd) +void clif_parse_Shift(int fd, struct map_session_data *sd) { // Rewriten by [Yor] char player_name[25]; - nullpo_retv (sd); + nullpo_retv(sd); - memset (player_name, '\0', sizeof (player_name)); + memset(player_name, '\0', sizeof(player_name)); - if ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_Goto))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_Goto))) { - memcpy (player_name, RFIFOP (fd, 2), 24); - log_atcommand (sd, "@goto %s", player_name); - atcommand_goto (fd, sd, "@goto", player_name); // as @jumpto + memcpy(player_name, RFIFOP(fd, 2), 24); + log_atcommand(sd, "@goto %s", player_name); + atcommand_goto(fd, sd, "@goto", player_name); // as @jumpto } return; @@ -7658,46 +7656,46 @@ void clif_parse_Shift (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_Recall (int fd, struct map_session_data *sd) +void clif_parse_Recall(int fd, struct map_session_data *sd) { // Added by RoVeRT char player_name[25]; - nullpo_retv (sd); + nullpo_retv(sd); - memset (player_name, '\0', sizeof (player_name)); + memset(player_name, '\0', sizeof(player_name)); - if ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_Recall))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_Recall))) { - memcpy (player_name, RFIFOP (fd, 2), 24); - log_atcommand (sd, "@recall %s", player_name); - atcommand_recall (fd, sd, "@recall", player_name); // as @recall + memcpy(player_name, RFIFOP(fd, 2), 24); + log_atcommand(sd, "@recall %s", player_name); + atcommand_recall(fd, sd, "@recall", player_name); // as @recall } return; } static -void clif_parse_GMHide (int fd, struct map_session_data *sd) +void clif_parse_GMHide(int fd, struct map_session_data *sd) { // Modified by [Yor] - nullpo_retv (sd); + nullpo_retv(sd); //printf("%2x %2x %2x\n", RFIFOW(fd,0), RFIFOW(fd,2), RFIFOW(fd,4)); // R 019d <Option_value>.2B <flag>.2B - if ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_Hide))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_Hide))) { - log_atcommand (sd, "@hide"); + log_atcommand(sd, "@hide"); if (sd->status.option & OPTION_HIDE) { // OPTION_HIDE = 0x40 sd->status.option &= ~OPTION_HIDE; // OPTION_HIDE = 0x40 - clif_displaymessage (fd, "Invisible: Off."); + clif_displaymessage(fd, "Invisible: Off."); } else { sd->status.option |= OPTION_HIDE; // OPTION_HIDE = 0x40 - clif_displaymessage (fd, "Invisible: On."); + clif_displaymessage(fd, "Invisible: On."); } - clif_changeoption (&sd->bl); + clif_changeoption(&sd->bl); } } @@ -7706,20 +7704,20 @@ void clif_parse_GMHide (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_GMReqNoChat (int fd, struct map_session_data *sd) +void clif_parse_GMReqNoChat(int fd, struct map_session_data *sd) { - int tid = RFIFOL (fd, 2); - int type = RFIFOB (fd, 6); - int limit = RFIFOW (fd, 7); - struct block_list *bl = map_id2bl (tid); + int tid = RFIFOL(fd, 2); + int type = RFIFOB(fd, 6); + int limit = RFIFOW(fd, 7); + struct block_list *bl = map_id2bl(tid); struct map_session_data *dstsd; - int dstfd; + int dstfd; - nullpo_retv (sd); + nullpo_retv(sd); if (!battle_config.muting_players) { - clif_displaymessage (fd, "Muting is disabled."); + clif_displaymessage(fd, "Muting is disabled."); return; } @@ -7727,23 +7725,23 @@ void clif_parse_GMReqNoChat (int fd, struct map_session_data *sd) limit = 0 - limit; if (bl->type == BL_PC && (dstsd = (struct map_session_data *) bl)) { - if ((tid == bl->id && type == 2 && !pc_isGM (sd)) - || (pc_isGM (sd) > pc_isGM (dstsd))) + if ((tid == bl->id && type == 2 && !pc_isGM(sd)) + || (pc_isGM(sd) > pc_isGM(dstsd))) { dstfd = dstsd->fd; - WFIFOW (dstfd, 0) = 0x14b; - WFIFOB (dstfd, 2) = (type == 2) ? 1 : type; - memcpy (WFIFOP (dstfd, 3), sd->status.name, 24); - WFIFOSET (dstfd, packet_len_table[0x14b]); + WFIFOW(dstfd, 0) = 0x14b; + WFIFOB(dstfd, 2) = (type == 2) ? 1 : type; + memcpy(WFIFOP(dstfd, 3), sd->status.name, 24); + WFIFOSET(dstfd, packet_len_table[0x14b]); dstsd->status.manner -= limit; if (dstsd->status.manner < 0) - skill_status_change_start (bl, SC_NOCHAT, 0, 0, 0, 0, 0, 0); + skill_status_change_start(bl, SC_NOCHAT, 0, 0, 0, 0, 0, 0); else { dstsd->status.manner = 0; - skill_status_change_end (bl, SC_NOCHAT, -1); + skill_status_change_end(bl, SC_NOCHAT, -1); } - printf ("name:%s type:%d limit:%d manner:%d\n", + printf("name:%s type:%d limit:%d manner:%d\n", dstsd->status.name, type, limit, dstsd->status.manner); } } @@ -7756,149 +7754,144 @@ void clif_parse_GMReqNoChat (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_GMReqNoChatCount (int fd, struct map_session_data *sd) +void clif_parse_GMReqNoChatCount(int fd, struct map_session_data *sd) { - int tid = RFIFOL (fd, 2); + int tid = RFIFOL(fd, 2); - WFIFOW (fd, 0) = 0x1e0; - WFIFOL (fd, 2) = tid; - sprintf ((char *)WFIFOP (fd, 6), "%d", tid); + WFIFOW(fd, 0) = 0x1e0; + WFIFOL(fd, 2) = tid; + sprintf((char *)WFIFOP(fd, 6), "%d", tid); // memcpy(WFIFOP(fd,6),"TESTNAME",24); - WFIFOSET (fd, packet_len_table[0x1e0]); + WFIFOSET(fd, packet_len_table[0x1e0]); return; } static -void clif_parse_PMIgnore (int fd, struct map_session_data *sd) +void clif_parse_PMIgnore(int fd, struct map_session_data *sd) { // Rewritten by [Yor] char output[1024]; char *nick; // S 00cf <nick>.24B <type>.B: 00 (/ex nick) deny speech from nick, 01 (/in nick) allow speech from nick - int i; - int pos; + int i; + int pos; - memset (output, '\0', sizeof (output)); + memset(output, '\0', sizeof(output)); - nick = (char *)RFIFOP (fd, 2); // speed up + nick = (char *)RFIFOP(fd, 2); // speed up //printf("Ignore: char '%s' state: %d\n", nick, RFIFOB(fd,26)); // we ask for deny (we add nick only if it's not already exist - if (RFIFOB (fd, 26) == 0) + if (RFIFOB(fd, 26) == 0) { // type - if (strlen (nick) >= 4 && strlen (nick) < 24) + if (strlen(nick) >= 4 && strlen(nick) < 24) { // do something only if nick can be exist pos = -1; - for (i = 0; i < (sizeof (sd->ignore) / sizeof (sd->ignore[0])); + for (i = 0; i < (sizeof(sd->ignore) / sizeof(sd->ignore[0])); i++) { - if (strcmp (sd->ignore[i].name, nick) == 0) + if (strcmp(sd->ignore[i].name, nick) == 0) break; else if (pos == -1 && sd->ignore[i].name[0] == '\0') pos = i; } - WFIFOW (fd, 0) = 0x0d1; // R 00d1 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail - WFIFOB (fd, 2) = 0; + WFIFOW(fd, 0) = 0x0d1; // R 00d1 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail + WFIFOB(fd, 2) = 0; // if a position is found and name not found, we add it in the list if (pos != -1 - && i == (sizeof (sd->ignore) / sizeof (sd->ignore[0]))) + && i == (sizeof(sd->ignore) / sizeof(sd->ignore[0]))) { - memcpy (sd->ignore[pos].name, nick, 24); - WFIFOB (fd, 3) = 0; // success - WFIFOSET (fd, packet_len_table[0x0d1]); - if (strcmp (wisp_server_name, nick) == 0) + memcpy(sd->ignore[pos].name, nick, 24); + WFIFOB(fd, 3) = 0; // success + WFIFOSET(fd, packet_len_table[0x0d1]); + if (strcmp(wisp_server_name, nick) == 0) { // to found possible bot users that automaticaly ignores people. - sprintf (output, + sprintf(output, "Character '%s' (account: %d) has tried to block wisps from '%s' (wisp name of the server). Bot user?", sd->status.name, sd->status.account_id, wisp_server_name); - intif_wis_message_to_gm (wisp_server_name, + intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, - output, strlen (output) + 1); + output, strlen(output) + 1); // send something to be inform and force bot to ignore twice... If GM receiving block + block again, it's a bot :) - clif_wis_message (fd, wisp_server_name, + clif_wis_message(fd, wisp_server_name, "Add me in your ignore list, doesn't block my wisps.", - strlen - ("Add me in your ignore list, doesn't block my wisps.") + strlen("Add me in your ignore list, doesn't block my wisps.") + 1); } } else { - WFIFOB (fd, 3) = 1; // fail - if (i == (sizeof (sd->ignore) / sizeof (sd->ignore[0]))) + WFIFOB(fd, 3) = 1; // fail + if (i == (sizeof(sd->ignore) / sizeof(sd->ignore[0]))) { - clif_wis_message (fd, wisp_server_name, + clif_wis_message(fd, wisp_server_name, "You can not block more people.", - strlen - ("You can not block more people.") + 1); - if (strcmp (wisp_server_name, nick) == 0) + strlen("You can not block more people.") + 1); + if (strcmp(wisp_server_name, nick) == 0) { // to found possible bot users that automaticaly ignores people. - sprintf (output, + sprintf(output, "Character '%s' (account: %d) has tried to block wisps from '%s' (wisp name of the server). Bot user?", sd->status.name, sd->status.account_id, wisp_server_name); - intif_wis_message_to_gm (wisp_server_name, + intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, - output, strlen (output) + 1); + output, strlen(output) + 1); } } else { - clif_wis_message (fd, wisp_server_name, + clif_wis_message(fd, wisp_server_name, "This player is already blocked.", - strlen - ("This player is already blocked.") + + strlen("This player is already blocked.") + 1); - if (strcmp (wisp_server_name, nick) == 0) + if (strcmp(wisp_server_name, nick) == 0) { // to found possible bot users that automaticaly ignores people. - sprintf (output, + sprintf(output, "Character '%s' (account: %d) has tried AGAIN to block wisps from '%s' (wisp name of the server). Bot user?", sd->status.name, sd->status.account_id, wisp_server_name); - intif_wis_message_to_gm (wisp_server_name, + intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, - output, strlen (output) + 1); + output, strlen(output) + 1); } } } } else - clif_wis_message (fd, wisp_server_name, + clif_wis_message(fd, wisp_server_name, "It's impossible to block this player.", - strlen ("It's impossible to block this player.") + strlen("It's impossible to block this player.") + 1); // we ask for allow (we remove all same nick if exist) } else { - if (strlen (nick) >= 4 && strlen (nick) < 24) + if (strlen(nick) >= 4 && strlen(nick) < 24) { // do something only if nick can be exist - WFIFOW (fd, 0) = 0x0d1; // R 00d1 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail - WFIFOB (fd, 2) = 1; - for (i = 0; i < (sizeof (sd->ignore) / sizeof (sd->ignore[0])); + WFIFOW(fd, 0) = 0x0d1; // R 00d1 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail + WFIFOB(fd, 2) = 1; + for (i = 0; i < (sizeof(sd->ignore) / sizeof(sd->ignore[0])); i++) - if (strcmp (sd->ignore[i].name, nick) == 0) + if (strcmp(sd->ignore[i].name, nick) == 0) { - memset (sd->ignore[i].name, 0, - sizeof (sd->ignore[i].name)); - WFIFOB (fd, 3) = 0; // success - WFIFOSET (fd, packet_len_table[0x0d1]); + memset(sd->ignore[i].name, 0, + sizeof(sd->ignore[i].name)); + WFIFOB(fd, 3) = 0; // success + WFIFOSET(fd, packet_len_table[0x0d1]); break; } - if (i == (sizeof (sd->ignore) / sizeof (sd->ignore[0]))) + if (i == (sizeof(sd->ignore) / sizeof(sd->ignore[0]))) { - WFIFOB (fd, 3) = 1; // fail - WFIFOSET (fd, packet_len_table[0x0d1]); - clif_wis_message (fd, wisp_server_name, + WFIFOB(fd, 3) = 1; // fail + WFIFOSET(fd, packet_len_table[0x0d1]); + clif_wis_message(fd, wisp_server_name, "This player is not blocked by you.", - strlen - ("This player is not blocked by you.") + 1); + strlen("This player is not blocked by you.") + 1); } } else - clif_wis_message (fd, wisp_server_name, + clif_wis_message(fd, wisp_server_name, "It's impossible to unblock this player.", - strlen - ("It's impossible to unblock this player.") + + strlen("It's impossible to unblock this player.") + 1); } @@ -7910,45 +7903,45 @@ void clif_parse_PMIgnore (int fd, struct map_session_data *sd) } static -void clif_parse_PMIgnoreAll (int fd, struct map_session_data *sd) +void clif_parse_PMIgnoreAll(int fd, struct map_session_data *sd) { // Rewritten by [Yor] //printf("Ignore all: state: %d\n", RFIFOB(fd,2)); - if (RFIFOB (fd, 2) == 0) + if (RFIFOB(fd, 2) == 0) { // S 00d0 <type>len.B: 00 (/exall) deny all speech, 01 (/inall) allow all speech - WFIFOW (fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail - WFIFOB (fd, 2) = 0; + WFIFOW(fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail + WFIFOB(fd, 2) = 0; if (sd->ignoreAll == 0) { sd->ignoreAll = 1; - WFIFOB (fd, 3) = 0; // success - WFIFOSET (fd, packet_len_table[0x0d2]); + WFIFOB(fd, 3) = 0; // success + WFIFOSET(fd, packet_len_table[0x0d2]); } else { - WFIFOB (fd, 3) = 1; // fail - WFIFOSET (fd, packet_len_table[0x0d2]); - clif_wis_message (fd, wisp_server_name, + WFIFOB(fd, 3) = 1; // fail + WFIFOSET(fd, packet_len_table[0x0d2]); + clif_wis_message(fd, wisp_server_name, "You already block everyone.", - strlen ("You already block everyone.") + 1); + strlen("You already block everyone.") + 1); } } else { - WFIFOW (fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail - WFIFOB (fd, 2) = 1; + WFIFOW(fd, 0) = 0x0d2; // R 00d2 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail + WFIFOB(fd, 2) = 1; if (sd->ignoreAll == 1) { sd->ignoreAll = 0; - WFIFOB (fd, 3) = 0; // success - WFIFOSET (fd, packet_len_table[0x0d2]); + WFIFOB(fd, 3) = 0; // success + WFIFOSET(fd, packet_len_table[0x0d2]); } else { - WFIFOB (fd, 3) = 1; // fail - WFIFOSET (fd, packet_len_table[0x0d2]); - clif_wis_message (fd, wisp_server_name, + WFIFOB(fd, 3) = 1; // fail + WFIFOSET(fd, packet_len_table[0x0d2]); + clif_wis_message(fd, wisp_server_name, "You already allow everyone.", - strlen ("You already allow everyone.") + 1); + strlen("You already allow everyone.") + 1); } } @@ -7956,33 +7949,33 @@ void clif_parse_PMIgnoreAll (int fd, struct map_session_data *sd) } static -void clif_parse_skillMessage (int fd, struct map_session_data *sd) +void clif_parse_skillMessage(int fd, struct map_session_data *sd) { // Added by RoVeRT - int skillid, skilllv, x, y; + int skillid, skilllv, x, y; char *mes; - skilllv = RFIFOW (fd, 2); - skillid = RFIFOW (fd, 4); + skilllv = RFIFOW(fd, 2); + skillid = RFIFOW(fd, 4); - y = RFIFOB (fd, 6); - x = RFIFOB (fd, 8); + y = RFIFOB(fd, 6); + x = RFIFOB(fd, 8); - mes = (char *)RFIFOP (fd, 10); + mes = (char *)RFIFOP(fd, 10); // skill 220 = graffiti // printf("skill: %d %d location: %3d %3d message: %s\n", skillid, skilllv, x, y, (char*)mes); } static -int monk (struct map_session_data *sd, struct block_list *target, int type) +int monk(struct map_session_data *sd, struct block_list *target, int type) { //R 01d1 <Monk id>L <Target monster id>L <Bool>L - int fd = sd->fd; - WFIFOW (fd, 0) = 0x1d1; - WFIFOL (fd, 2) = sd->bl.id; - WFIFOL (fd, 6) = target->id; - WFIFOL (fd, 10) = type; - WFIFOSET (fd, packet_len_table[0x1d1]); + int fd = sd->fd; + WFIFOW(fd, 0) = 0x1d1; + WFIFOL(fd, 2) = sd->bl.id; + WFIFOL(fd, 6) = target->id; + WFIFOL(fd, 10) = type; + WFIFOSET(fd, packet_len_table[0x1d1]); return 0; } @@ -7992,7 +7985,7 @@ int monk (struct map_session_data *sd, struct block_list *target, int type) *------------------------------------------ */ static -void clif_parse_sn_doridori (int fd, struct map_session_data *sd) +void clif_parse_sn_doridori(int fd, struct map_session_data *sd) { if (sd) sd->doridori_counter = 1; @@ -8005,32 +7998,32 @@ void clif_parse_sn_doridori (int fd, struct map_session_data *sd) *------------------------------------------ */ static -void clif_parse_sn_explosionspirits (int fd, struct map_session_data *sd) +void clif_parse_sn_explosionspirits(int fd, struct map_session_data *sd) { if (sd) { - int nextbaseexp = pc_nextbaseexp (sd); - struct pc_base_job s_class = pc_calc_base_job (sd->status.pc_class); + int nextbaseexp = pc_nextbaseexp(sd); + struct pc_base_job s_class = pc_calc_base_job(sd->status.pc_class); if (battle_config.etc_log) { if (nextbaseexp != 0) - printf ("SuperNovice explosionspirits!! %d %d %d %d\n", + printf("SuperNovice explosionspirits!! %d %d %d %d\n", sd->bl.id, s_class.job, sd->status.base_exp, - (int) ((double) 1000 * sd->status.base_exp / + (int)((double) 1000 * sd->status.base_exp / nextbaseexp)); else - printf ("SuperNovice explosionspirits!! %d %d %d 000\n", + printf("SuperNovice explosionspirits!! %d %d %d 000\n", sd->bl.id, s_class.job, sd->status.base_exp); } if (s_class.job == 23 && sd->status.base_exp > 0 && nextbaseexp > 0 - && (int) ((double) 1000 * sd->status.base_exp / nextbaseexp) % + && (int)((double) 1000 * sd->status.base_exp / nextbaseexp) % 100 == 0) { - clif_skill_nodamage (&sd->bl, &sd->bl, MO_EXPLOSIONSPIRITS, 5, 1); - skill_status_change_start (&sd->bl, + clif_skill_nodamage(&sd->bl, &sd->bl, MO_EXPLOSIONSPIRITS, 5, 1); + skill_status_change_start(&sd->bl, SkillStatusChangeTable [MO_EXPLOSIONSPIRITS], 5, 0, 0, 0, - skill_get_time (MO_EXPLOSIONSPIRITS, + skill_get_time(MO_EXPLOSIONSPIRITS, 5), 0); } } @@ -8043,556 +8036,556 @@ void clif_parse_sn_explosionspirits (int fd, struct map_session_data *sd) // rate -1 is unlimited typedef struct func_table { - void (*func)(int fd, struct map_session_data *sd); - int rate; + void(*func)(int fd, struct map_session_data *sd); + int rate; } func_table; // *INDENT-OFF* func_table clif_parse_func_table[0x220] = { - { NULL, 0 }, // 0 - { NULL, 0 }, // 1 - { NULL, 0 }, // 2 - { NULL, 0 }, // 3 - { NULL, 0 }, // 4 - { NULL, 0 }, // 5 - { NULL, 0 }, // 6 - { NULL, 0 }, // 7 - { NULL, 0 }, // 8 - { NULL, 0 }, // 9 - { NULL, 0 }, // a - { NULL, 0 }, // b - { NULL, 0 }, // c - { NULL, 0 }, // d - { NULL, 0 }, // e - { NULL, 0 }, // f - { NULL, 0 }, // 10 - { NULL, 0 }, // 11 - { NULL, 0 }, // 12 - { NULL, 0 }, // 13 - { NULL, 0 }, // 14 - { NULL, 0 }, // 15 - { NULL, 0 }, // 16 - { NULL, 0 }, // 17 - { NULL, 0 }, // 18 - { NULL, 0 }, // 19 - { NULL, 0 }, // 1a - { NULL, 0 }, // 1b - { NULL, 0 }, // 1c - { NULL, 0 }, // 1d - { NULL, 0 }, // 1e - { NULL, 0 }, // 1f - { NULL, 0 }, // 20 - { NULL, 0 }, // 21 - { NULL, 0 }, // 22 - { NULL, 0 }, // 23 - { NULL, 0 }, // 24 - { NULL, 0 }, // 25 - { NULL, 0 }, // 26 - { NULL, 0 }, // 27 - { NULL, 0 }, // 28 - { NULL, 0 }, // 29 - { NULL, 0 }, // 2a - { NULL, 0 }, // 2b - { NULL, 0 }, // 2c - { NULL, 0 }, // 2d - { NULL, 0 }, // 2e - { NULL, 0 }, // 2f - { NULL, 0 }, // 30 - { NULL, 0 }, // 31 - { NULL, 0 }, // 32 - { NULL, 0 }, // 33 - { NULL, 0 }, // 34 - { NULL, 0 }, // 35 - { NULL, 0 }, // 36 - { NULL, 0 }, // 37 - { NULL, 0 }, // 38 - { NULL, 0 }, // 39 - { NULL, 0 }, // 3a - { NULL, 0 }, // 3b - { NULL, 0 }, // 3c - { NULL, 0 }, // 3d - { NULL, 0 }, // 3e - { NULL, 0 }, // 3f - { NULL, 0 }, // 40 - { NULL, 0 }, // 41 - { NULL, 0 }, // 42 - { NULL, 0 }, // 43 - { NULL, 0 }, // 44 - { NULL, 0 }, // 45 - { NULL, 0 }, // 46 - { NULL, 0 }, // 47 - { NULL, 0 }, // 48 - { NULL, 0 }, // 49 - { NULL, 0 }, // 4a - { NULL, 0 }, // 4b - { NULL, 0 }, // 4c - { NULL, 0 }, // 4d - { NULL, 0 }, // 4e - { NULL, 0 }, // 4f - { NULL, 0 }, // 50 - { NULL, 0 }, // 51 - { NULL, 0 }, // 52 - { NULL, 0 }, // 53 - { NULL, 0 }, // 54 - { NULL, 0 }, // 55 - { NULL, 0 }, // 56 - { NULL, 0 }, // 57 - { NULL, 0 }, // 58 - { NULL, 0 }, // 59 - { NULL, 0 }, // 5a - { NULL, 0 }, // 5b - { NULL, 0 }, // 5c - { NULL, 0 }, // 5d - { NULL, 0 }, // 5e - { NULL, 0 }, // 5f - { NULL, 0 }, // 60 - { NULL, 0 }, // 61 - { NULL, 0 }, // 62 - { NULL, 0 }, // 63 - { NULL, 0 }, // 64 - { NULL, 0 }, // 65 - { NULL, 0 }, // 66 - { NULL, 0 }, // 67 - { NULL, 0 }, // 68 - { NULL, 0 }, // 69 - { NULL, 0 }, // 6a - { NULL, 0 }, // 6b - { NULL, 0 }, // 6c - { NULL, 0 }, // 6d - { NULL, 0 }, // 6e - { NULL, 0 }, // 6f - { NULL, 0 }, // 70 - { NULL, 0 }, // 71 - { clif_parse_WantToConnection, 0 }, // 72 - { NULL, 0 }, // 73 - { NULL, 0 }, // 74 - { NULL, 0 }, // 75 - { NULL, 0 }, // 76 - { NULL, 0 }, // 77 - { NULL, 0 }, // 78 - { NULL, 0 }, // 79 - { NULL, 0 }, // 7a - { NULL, 0 }, // 7b - { NULL, 0 }, // 7c - { clif_parse_LoadEndAck, -1 }, // 7d - { clif_parse_TickSend, 0 }, // 7e - { NULL, 0 }, // 7f - { NULL, 0 }, // 80 - { NULL, 0 }, // 81 - { NULL, 0 }, // 82 - { NULL, 0 }, // 83 - { NULL, 0 }, // 84 - { clif_parse_WalkToXY, -1 }, // 85 Walk code limits this on it's own - { NULL, 0 }, // 86 - { NULL, 0 }, // 87 - { NULL, 0 }, // 88 - { clif_parse_ActionRequest, 1000 }, // 89 Special case - see below - { NULL, 0 }, // 8a - { NULL, 0 }, // 8b - { clif_parse_GlobalMessage, 300 }, // 8c - { NULL, 0 }, // 8d - { NULL, 0 }, // 8e - { NULL, 0 }, // 8f - { clif_parse_NpcClicked, 500 }, // 90 - { NULL, 0 }, // 91 - { NULL, 0 }, // 92 - { NULL, 0 }, // 93 - { clif_parse_GetCharNameRequest, -1 }, // 94 - { NULL, 0 }, // 95 - { clif_parse_Wis, 300 }, // 96 - { NULL, 0 }, // 97 - { NULL, 0 }, // 98 - { clif_parse_GMmessage, 300 }, // 99 - { NULL, 0 }, // 9a - { clif_parse_ChangeDir, -1 }, // 9b - { NULL, 0 }, // 9c - { NULL, 0 }, // 9d - { NULL, 0 }, // 9e - { clif_parse_TakeItem, 400 }, // 9f - { NULL, 0 }, // a0 - { NULL, 0 }, // a1 - { clif_parse_DropItem, 50 }, // a2 - { NULL, 0 }, // a3 - { NULL, 0 }, // a4 - { NULL, 0 }, // a5 - { NULL, 0 }, // a6 - { clif_parse_UseItem, 0 }, // a7 - { NULL, 0 }, // a8 - { clif_parse_EquipItem, -1 }, // a9 Special case - outfit window (not implemented yet - needs to allow bursts) - { NULL, 0 }, // aa - { clif_parse_UnequipItem, -1 }, // ab Special case - outfit window (not implemented yet - needs to allow bursts) - { NULL, 0 }, // ac - { NULL, 0 }, // ad - { NULL, 0 }, // ae - { NULL, 0 }, // af - { NULL, 0 }, // b0 - { NULL, 0 }, // b1 - { clif_parse_Restart, 0 }, // b2 - { NULL, 0 }, // b3 - { NULL, 0 }, // b4 - { NULL, 0 }, // b5 - { NULL, 0 }, // b6 - { NULL, 0 }, // b7 - { clif_parse_NpcSelectMenu, 0 }, // b8 - { clif_parse_NpcNextClicked, -1 }, // b9 - { NULL, 0 }, // ba - { clif_parse_StatusUp, -1 }, // bb People click this very quickly - { NULL, 0 }, // bc - { NULL, 0 }, // bd - { NULL, 0 }, // be - { clif_parse_Emotion, 1000 }, // bf - { NULL, 0 }, // c0 - { clif_parse_HowManyConnections, 0 }, // c1 - { NULL, 0 }, // c2 - { NULL, 0 }, // c3 - { NULL, 0 }, // c4 - { clif_parse_NpcBuySellSelected, 0 }, // c5 - { NULL, 0 }, // c6 - { NULL, 0 }, // c7 - { clif_parse_NpcBuyListSend, -1 }, // c8 - { clif_parse_NpcSellListSend, -1 }, // c9 Selling multiple 1-slot items - { NULL, 0 }, // ca - { NULL, 0 }, // cb - { clif_parse_GMKick, 0 }, // cc - { NULL, 0 }, // cd - { NULL, 0 }, // ce - { clif_parse_PMIgnore, 0 }, // cf - { clif_parse_PMIgnoreAll, 0 }, // d0 - { NULL, 0 }, // d1 - { NULL, 0 }, // d2 - { NULL, 0 }, // d3 - { NULL, 0 }, // d4 - { clif_parse_CreateChatRoom, 1000 }, // d5 - { NULL, 0 }, // d6 - { NULL, 0 }, // d7 - { NULL, 0 }, // d8 - { clif_parse_ChatAddMember, 0 }, // d9 - { NULL, 0 }, // da - { NULL, 0 }, // db - { NULL, 0 }, // dc - { NULL, 0 }, // dd - { clif_parse_ChatRoomStatusChange, 0 }, // de - { NULL, 0 }, // df - { clif_parse_ChangeChatOwner, 0 }, // e0 - { NULL, 0 }, // e1 - { clif_parse_KickFromChat, 0 }, // e2 - { clif_parse_ChatLeave, 0 }, // e3 - { clif_parse_TradeRequest, 2000 }, // e4 - { NULL, 0 }, // e5 - { clif_parse_TradeAck, 0 }, // e6 - { NULL, 0 }, // e7 - { clif_parse_TradeAddItem, 0 }, // e8 - { NULL, 0 }, // e9 - { NULL, 0 }, // ea - { clif_parse_TradeOk, 0 }, // eb - { NULL, 0 }, // ec - { clif_parse_TradeCansel, 0 }, // ed - { NULL, 0 }, // ee - { clif_parse_TradeCommit, 0 }, // ef - { NULL, 0 }, // f0 - { NULL, 0 }, // f1 - { NULL, 0 }, // f2 - { clif_parse_MoveToKafra, -1 }, // f3 - { NULL, 0 }, // f4 - { clif_parse_MoveFromKafra, -1 }, // f5 - { NULL, 0 }, // f6 - { clif_parse_CloseKafra, 0 }, // f7 - { NULL, 0 }, // f8 - { clif_parse_CreateParty, 2000 }, // f9 - { NULL, 0 }, // fa - { NULL, 0 }, // fb - { clif_parse_PartyInvite, 2000 }, // fc - { NULL, 0 }, // fd - { NULL, 0 }, // fe - { clif_parse_ReplyPartyInvite, 0 }, // ff - { clif_parse_LeaveParty, 0 }, // 100 - { NULL, 0 }, // 101 - { clif_parse_PartyChangeOption, 0 }, // 102 - { clif_parse_RemovePartyMember, 0 }, // 103 - { NULL, 0 }, // 104 - { NULL, 0 }, // 105 - { NULL, 0 }, // 106 - { NULL, 0 }, // 107 - { clif_parse_PartyMessage, 300 }, // 108 - { NULL, 0 }, // 109 - { NULL, 0 }, // 10a - { NULL, 0 }, // 10b - { NULL, 0 }, // 10c - { NULL, 0 }, // 10d - { NULL, 0 }, // 10e - { NULL, 0 }, // 10f - { NULL, 0 }, // 110 - { NULL, 0 }, // 111 - { clif_parse_SkillUp, -1 }, // 112 - { clif_parse_UseSkillToId, 0 }, // 113 - { NULL, 0 }, // 114 - { NULL, 0 }, // 115 - { clif_parse_UseSkillToPos, 0 }, // 116 - { NULL, 0 }, // 117 - { clif_parse_StopAttack, 0 }, // 118 - { NULL, 0 }, // 119 - { NULL, 0 }, // 11a - { clif_parse_UseSkillMap, 0 }, // 11b - { NULL, 0 }, // 11c - { clif_parse_RequestMemo, 0 }, // 11d - { NULL, 0 }, // 11e - { NULL, 0 }, // 11f - { NULL, 0 }, // 120 - { NULL, 0 }, // 121 - { NULL, 0 }, // 122 - { NULL, 0 }, // 123 - { NULL, 0 }, // 124 - { NULL, 0 }, // 125 - { clif_parse_PutItemToCart, 0 }, // 126 - { clif_parse_GetItemFromCart, 0 }, // 127 - { clif_parse_MoveFromKafraToCart, 0 }, // 128 - { clif_parse_MoveToKafraFromCart, 0 }, // 129 - { clif_parse_RemoveOption, 0 }, // 12a - { NULL, 0 }, // 12b - { NULL, 0 }, // 12c - { NULL, 0 }, // 12d - { NULL, 0 }, // 12e - { NULL, 0 }, // 12f - { NULL, 0 }, // 130 - { NULL, 0 }, // 131 - { NULL, 0 }, // 132 - { NULL, 0 }, // 133 - { NULL, 0 }, // 134 - { NULL, 0 }, // 135 - { NULL, 0 }, // 136 - { NULL, 0 }, // 137 - { NULL, 0 }, // 138 - { NULL, 0 }, // 139 - { NULL, 0 }, // 13a - { NULL, 0 }, // 13b - { NULL, 0 }, // 13c - { NULL, 0 }, // 13d - { NULL, 0 }, // 13e - { clif_parse_GM_Monster_Item, 0 }, // 13f - { clif_parse_MapMove, 0 }, // 140 - { NULL, 0 }, // 141 - { NULL, 0 }, // 142 - { clif_parse_NpcAmountInput, 300 }, // 143 - { NULL, 0 }, // 144 - { NULL, 0 }, // 145 - { clif_parse_NpcCloseClicked, 300 }, // 146 - { NULL, 0 }, // 147 - { NULL, 0 }, // 148 - { clif_parse_GMReqNoChat, 0 }, // 149 - { NULL, 0 }, // 14a - { NULL, 0 }, // 14b - { NULL, 0 }, // 14c - { NULL, 0 }, // 14d - { NULL, 0 }, // 14e - { NULL, 0 }, // 14f - { NULL, 0 }, // 150 - { NULL, 0 }, // 151 - { NULL, 0 }, // 152 - { NULL, 0 }, // 153 - { NULL, 0 }, // 154 - { NULL, 0 }, // 155 - { NULL, 0 }, // 156 - { NULL, 0 }, // 157 - { NULL, 0 }, // 158 - { NULL, 0 }, // 159 - { NULL, 0 }, // 15a - { NULL, 0 }, // 15b - { NULL, 0 }, // 15c - { NULL, 0 }, // 15d - { NULL, 0 }, // 15e - { NULL, 0 }, // 15f - { NULL, 0 }, // 160 - { NULL, 0 }, // 161 - { NULL, 0 }, // 162 - { NULL, 0 }, // 163 - { NULL, 0 }, // 164 - { NULL, 0 }, // 165 - { NULL, 0 }, // 166 - { NULL, 0 }, // 167 - { NULL, 0 }, // 168 - { NULL, 0 }, // 169 - { NULL, 0 }, // 16a - { NULL, 0 }, // 16b - { NULL, 0 }, // 16c - { NULL, 0 }, // 16d - { NULL, 0 }, // 16e - { NULL, 0 }, // 16f - { NULL, 0 }, // 170 - { NULL, 0 }, // 171 - { NULL, 0 }, // 172 - { NULL, 0 }, // 173 - { NULL, 0 }, // 174 - { NULL, 0 }, // 175 - { NULL, 0 }, // 176 - { NULL, 0 }, // 177 - { clif_parse_ItemIdentify, 0 }, // 178 - { NULL, 0 }, // 179 - { clif_parse_UseCard, 0 }, // 17a - { NULL, 0 }, // 17b - { clif_parse_InsertCard, 0 }, // 17c - { NULL, 0 }, // 17d - { NULL, 0 }, // 17e - { NULL, 0 }, // 17f - { NULL, 0 }, // 180 - { NULL, 0 }, // 181 - { NULL, 0 }, // 182 - { NULL, 0 }, // 183 - { NULL, 0 }, // 184 - { NULL, 0 }, // 185 - { NULL, 0 }, // 186 - { NULL, 0 }, // 187 - { NULL, 0 }, // 188 - { NULL, 0 }, // 189 - { clif_parse_QuitGame, 0 }, // 18a - { NULL, 0 }, // 18b - { NULL, 0 }, // 18c - { NULL, 0 }, // 18d - { NULL, 0 }, // 18e - { NULL, 0 }, // 18f - { clif_parse_UseSkillToPos, 0 }, // 190 - { NULL, 0 }, // 191 - { NULL, 0 }, // 192 - { clif_parse_SolveCharName, 0 }, // 193 - { NULL, 0 }, // 194 - { NULL, 0 }, // 195 - { NULL, 0 }, // 196 - { clif_parse_ResetChar, 0 }, // 197 - { NULL, 0 }, // 198 - { NULL, 0 }, // 199 - { NULL, 0 }, // 19a - { NULL, 0 }, // 19b - { clif_parse_LGMmessage, 0 }, // 19c - { clif_parse_GMHide, 300 }, // 19d - { NULL, 0 }, // 19e - { NULL, 0 }, // 19f - { NULL, 0 }, // 1a0 - { NULL, 0 }, // 1a1 - { NULL, 0 }, // 1a2 - { NULL, 0 }, // 1a3 - { NULL, 0 }, // 1a4 - { NULL, 0 }, // 1a5 - { NULL, 0 }, // 1a6 - { NULL, 0 }, // 1a7 - { NULL, 0 }, // 1a8 - { NULL, 0 }, // 1a9 - { NULL, 0 }, // 1aa - { NULL, 0 }, // 1ab - { NULL, 0 }, // 1ac - { NULL, 0 }, // 1ad - { NULL, 0 }, // 1ae - { clif_parse_ChangeCart, 0 }, // 1af - { NULL, 0 }, // 1b0 - { NULL, 0 }, // 1b1 - { NULL, 0 }, // 1b2 - { NULL, 0 }, // 1b3 - { NULL, 0 }, // 1b4 - { NULL, 0 }, // 1b5 - { NULL, 0 }, // 1b6 - { NULL, 0 }, // 1b7 - { NULL, 0 }, // 1b8 - { NULL, 0 }, // 1b9 - { clif_parse_Shift, 300 }, // 1ba - { clif_parse_Shift, 300 }, // 1bb - { clif_parse_Recall, 300 }, // 1bc - { clif_parse_Recall, 300 }, // 1bd - { NULL, 0 }, // 1be - { NULL, 0 }, // 1bf - { NULL, 0 }, // 1c0 - { NULL, 0 }, // 1c1 - { NULL, 0 }, // 1c2 - { NULL, 0 }, // 1c3 - { NULL, 0 }, // 1c4 - { NULL, 0 }, // 1c5 - { NULL, 0 }, // 1c6 - { NULL, 0 }, // 1c7 - { NULL, 0 }, // 1c8 - { NULL, 0 }, // 1c9 - { NULL, 0 }, // 1ca - { NULL, 0 }, // 1cb - { NULL, 0 }, // 1cc - { NULL, 0 }, // 1cd - { clif_parse_AutoSpell, 0 }, // 1ce - { NULL, 0 }, // 1cf - { NULL, 0 }, // 1d0 - { NULL, 0 }, // 1d1 - { NULL, 0 }, // 1d2 - { NULL, 0 }, // 1d3 - { NULL, 0 }, // 1d4 - { clif_parse_NpcStringInput, 300 }, // 1d5 - { NULL, 0 }, // 1d6 - { NULL, 0 }, // 1d7 - { NULL, 0 }, // 1d8 - { NULL, 0 }, // 1d9 - { NULL, 0 }, // 1da - { NULL, 0 }, // 1db - { NULL, 0 }, // 1dc - { NULL, 0 }, // 1dd - { NULL, 0 }, // 1de - { clif_parse_GMReqNoChatCount, 0 }, // 1df - { NULL, 0 }, // 1e0 - { NULL, 0 }, // 1e1 - { NULL, 0 }, // 1e2 - { NULL, 0 }, // 1e3 - { NULL, 0 }, // 1e4 - { NULL, 0 }, // 1e5 - { NULL, 0 }, // 1e6 - { clif_parse_sn_doridori, 0 }, // 1e7 - { clif_parse_CreateParty2, 1000 }, // 1e8 - { NULL, 0 }, // 1e9 - { NULL, 0 }, // 1ea - { NULL, 0 }, // 1eb - { NULL, 0 }, // 1ec - { clif_parse_sn_explosionspirits, 0 }, // 1ed - { NULL, 0 }, // 1ee - { NULL, 0 }, // 1ef - { NULL, 0 }, // 1f0 - { NULL, 0 }, // 1f1 - { NULL, 0 }, // 1f2 - { NULL, 0 }, // 1f3 - { NULL, 0 }, // 1f4 - { NULL, 0 }, // 1f5 - { NULL, 0 }, // 1f6 - { NULL, 0 }, // 1f7 - { NULL, 0 }, // 1f8 - { NULL, 0 }, // 1f9 - { NULL, 0 }, // 1fa - { NULL, 0 }, // 1fb - { NULL, 0 }, // 1fc - { NULL, 0 }, // 1fd - { NULL, 0 }, // 1fe - { NULL, 0 }, // 1ff - { NULL, 0 }, // 200 - { NULL, 0 }, // 201 - { NULL, 0 }, // 202 - { NULL, 0 }, // 203 - { NULL, 0 }, // 204 - { NULL, 0 }, // 205 - { NULL, 0 }, // 206 - { NULL, 0 }, // 207 - { NULL, 0 }, // 208 - { NULL, 0 }, // 209 - { NULL, 0 }, // 20a - { NULL, 0 }, // 20b - { NULL, 0 }, // 20c - { NULL, 0 }, // 20d - { NULL, 0 }, // 20e - { NULL, 0 }, // 20f - { NULL, 0 }, // 210 - { NULL, 0 }, // 211 - { NULL, 0 }, // 212 - { NULL, 0 }, // 213 - { NULL, 0 }, // 214 - { NULL, 0 }, // 215 - { NULL, 0 }, // 216 - { NULL, 0 }, // 217 - { NULL, 0 }, // 218 - { NULL, 0 }, // 219 - { NULL, 0 }, // 21a - { NULL, 0 }, // 21b - { NULL, 0 }, // 21c - { NULL, 0 }, // 21d - { NULL, 0 }, // 21e - { NULL, 0 }, // 21f + { NULL, 0 }, // 0 + { NULL, 0 }, // 1 + { NULL, 0 }, // 2 + { NULL, 0 }, // 3 + { NULL, 0 }, // 4 + { NULL, 0 }, // 5 + { NULL, 0 }, // 6 + { NULL, 0 }, // 7 + { NULL, 0 }, // 8 + { NULL, 0 }, // 9 + { NULL, 0 }, // a + { NULL, 0 }, // b + { NULL, 0 }, // c + { NULL, 0 }, // d + { NULL, 0 }, // e + { NULL, 0 }, // f + { NULL, 0 }, // 10 + { NULL, 0 }, // 11 + { NULL, 0 }, // 12 + { NULL, 0 }, // 13 + { NULL, 0 }, // 14 + { NULL, 0 }, // 15 + { NULL, 0 }, // 16 + { NULL, 0 }, // 17 + { NULL, 0 }, // 18 + { NULL, 0 }, // 19 + { NULL, 0 }, // 1a + { NULL, 0 }, // 1b + { NULL, 0 }, // 1c + { NULL, 0 }, // 1d + { NULL, 0 }, // 1e + { NULL, 0 }, // 1f + { NULL, 0 }, // 20 + { NULL, 0 }, // 21 + { NULL, 0 }, // 22 + { NULL, 0 }, // 23 + { NULL, 0 }, // 24 + { NULL, 0 }, // 25 + { NULL, 0 }, // 26 + { NULL, 0 }, // 27 + { NULL, 0 }, // 28 + { NULL, 0 }, // 29 + { NULL, 0 }, // 2a + { NULL, 0 }, // 2b + { NULL, 0 }, // 2c + { NULL, 0 }, // 2d + { NULL, 0 }, // 2e + { NULL, 0 }, // 2f + { NULL, 0 }, // 30 + { NULL, 0 }, // 31 + { NULL, 0 }, // 32 + { NULL, 0 }, // 33 + { NULL, 0 }, // 34 + { NULL, 0 }, // 35 + { NULL, 0 }, // 36 + { NULL, 0 }, // 37 + { NULL, 0 }, // 38 + { NULL, 0 }, // 39 + { NULL, 0 }, // 3a + { NULL, 0 }, // 3b + { NULL, 0 }, // 3c + { NULL, 0 }, // 3d + { NULL, 0 }, // 3e + { NULL, 0 }, // 3f + { NULL, 0 }, // 40 + { NULL, 0 }, // 41 + { NULL, 0 }, // 42 + { NULL, 0 }, // 43 + { NULL, 0 }, // 44 + { NULL, 0 }, // 45 + { NULL, 0 }, // 46 + { NULL, 0 }, // 47 + { NULL, 0 }, // 48 + { NULL, 0 }, // 49 + { NULL, 0 }, // 4a + { NULL, 0 }, // 4b + { NULL, 0 }, // 4c + { NULL, 0 }, // 4d + { NULL, 0 }, // 4e + { NULL, 0 }, // 4f + { NULL, 0 }, // 50 + { NULL, 0 }, // 51 + { NULL, 0 }, // 52 + { NULL, 0 }, // 53 + { NULL, 0 }, // 54 + { NULL, 0 }, // 55 + { NULL, 0 }, // 56 + { NULL, 0 }, // 57 + { NULL, 0 }, // 58 + { NULL, 0 }, // 59 + { NULL, 0 }, // 5a + { NULL, 0 }, // 5b + { NULL, 0 }, // 5c + { NULL, 0 }, // 5d + { NULL, 0 }, // 5e + { NULL, 0 }, // 5f + { NULL, 0 }, // 60 + { NULL, 0 }, // 61 + { NULL, 0 }, // 62 + { NULL, 0 }, // 63 + { NULL, 0 }, // 64 + { NULL, 0 }, // 65 + { NULL, 0 }, // 66 + { NULL, 0 }, // 67 + { NULL, 0 }, // 68 + { NULL, 0 }, // 69 + { NULL, 0 }, // 6a + { NULL, 0 }, // 6b + { NULL, 0 }, // 6c + { NULL, 0 }, // 6d + { NULL, 0 }, // 6e + { NULL, 0 }, // 6f + { NULL, 0 }, // 70 + { NULL, 0 }, // 71 + { clif_parse_WantToConnection, 0 }, // 72 + { NULL, 0 }, // 73 + { NULL, 0 }, // 74 + { NULL, 0 }, // 75 + { NULL, 0 }, // 76 + { NULL, 0 }, // 77 + { NULL, 0 }, // 78 + { NULL, 0 }, // 79 + { NULL, 0 }, // 7a + { NULL, 0 }, // 7b + { NULL, 0 }, // 7c + { clif_parse_LoadEndAck, -1 }, // 7d + { clif_parse_TickSend, 0 }, // 7e + { NULL, 0 }, // 7f + { NULL, 0 }, // 80 + { NULL, 0 }, // 81 + { NULL, 0 }, // 82 + { NULL, 0 }, // 83 + { NULL, 0 }, // 84 + { clif_parse_WalkToXY, -1 }, // 85 Walk code limits this on it's own + { NULL, 0 }, // 86 + { NULL, 0 }, // 87 + { NULL, 0 }, // 88 + { clif_parse_ActionRequest, 1000 }, // 89 Special case - see below + { NULL, 0 }, // 8a + { NULL, 0 }, // 8b + { clif_parse_GlobalMessage, 300 }, // 8c + { NULL, 0 }, // 8d + { NULL, 0 }, // 8e + { NULL, 0 }, // 8f + { clif_parse_NpcClicked, 500 }, // 90 + { NULL, 0 }, // 91 + { NULL, 0 }, // 92 + { NULL, 0 }, // 93 + { clif_parse_GetCharNameRequest, -1 }, // 94 + { NULL, 0 }, // 95 + { clif_parse_Wis, 300 }, // 96 + { NULL, 0 }, // 97 + { NULL, 0 }, // 98 + { clif_parse_GMmessage, 300 }, // 99 + { NULL, 0 }, // 9a + { clif_parse_ChangeDir, -1 }, // 9b + { NULL, 0 }, // 9c + { NULL, 0 }, // 9d + { NULL, 0 }, // 9e + { clif_parse_TakeItem, 400 }, // 9f + { NULL, 0 }, // a0 + { NULL, 0 }, // a1 + { clif_parse_DropItem, 50 }, // a2 + { NULL, 0 }, // a3 + { NULL, 0 }, // a4 + { NULL, 0 }, // a5 + { NULL, 0 }, // a6 + { clif_parse_UseItem, 0 }, // a7 + { NULL, 0 }, // a8 + { clif_parse_EquipItem, -1 }, // a9 Special case - outfit window (not implemented yet - needs to allow bursts) + { NULL, 0 }, // aa + { clif_parse_UnequipItem, -1 }, // ab Special case - outfit window (not implemented yet - needs to allow bursts) + { NULL, 0 }, // ac + { NULL, 0 }, // ad + { NULL, 0 }, // ae + { NULL, 0 }, // af + { NULL, 0 }, // b0 + { NULL, 0 }, // b1 + { clif_parse_Restart, 0 }, // b2 + { NULL, 0 }, // b3 + { NULL, 0 }, // b4 + { NULL, 0 }, // b5 + { NULL, 0 }, // b6 + { NULL, 0 }, // b7 + { clif_parse_NpcSelectMenu, 0 }, // b8 + { clif_parse_NpcNextClicked, -1 }, // b9 + { NULL, 0 }, // ba + { clif_parse_StatusUp, -1 }, // bb People click this very quickly + { NULL, 0 }, // bc + { NULL, 0 }, // bd + { NULL, 0 }, // be + { clif_parse_Emotion, 1000 }, // bf + { NULL, 0 }, // c0 + { clif_parse_HowManyConnections, 0 }, // c1 + { NULL, 0 }, // c2 + { NULL, 0 }, // c3 + { NULL, 0 }, // c4 + { clif_parse_NpcBuySellSelected, 0 }, // c5 + { NULL, 0 }, // c6 + { NULL, 0 }, // c7 + { clif_parse_NpcBuyListSend, -1 }, // c8 + { clif_parse_NpcSellListSend, -1 }, // c9 Selling multiple 1-slot items + { NULL, 0 }, // ca + { NULL, 0 }, // cb + { clif_parse_GMKick, 0 }, // cc + { NULL, 0 }, // cd + { NULL, 0 }, // ce + { clif_parse_PMIgnore, 0 }, // cf + { clif_parse_PMIgnoreAll, 0 }, // d0 + { NULL, 0 }, // d1 + { NULL, 0 }, // d2 + { NULL, 0 }, // d3 + { NULL, 0 }, // d4 + { clif_parse_CreateChatRoom, 1000 }, // d5 + { NULL, 0 }, // d6 + { NULL, 0 }, // d7 + { NULL, 0 }, // d8 + { clif_parse_ChatAddMember, 0 }, // d9 + { NULL, 0 }, // da + { NULL, 0 }, // db + { NULL, 0 }, // dc + { NULL, 0 }, // dd + { clif_parse_ChatRoomStatusChange, 0 }, // de + { NULL, 0 }, // df + { clif_parse_ChangeChatOwner, 0 }, // e0 + { NULL, 0 }, // e1 + { clif_parse_KickFromChat, 0 }, // e2 + { clif_parse_ChatLeave, 0 }, // e3 + { clif_parse_TradeRequest, 2000 }, // e4 + { NULL, 0 }, // e5 + { clif_parse_TradeAck, 0 }, // e6 + { NULL, 0 }, // e7 + { clif_parse_TradeAddItem, 0 }, // e8 + { NULL, 0 }, // e9 + { NULL, 0 }, // ea + { clif_parse_TradeOk, 0 }, // eb + { NULL, 0 }, // ec + { clif_parse_TradeCansel, 0 }, // ed + { NULL, 0 }, // ee + { clif_parse_TradeCommit, 0 }, // ef + { NULL, 0 }, // f0 + { NULL, 0 }, // f1 + { NULL, 0 }, // f2 + { clif_parse_MoveToKafra, -1 }, // f3 + { NULL, 0 }, // f4 + { clif_parse_MoveFromKafra, -1 }, // f5 + { NULL, 0 }, // f6 + { clif_parse_CloseKafra, 0 }, // f7 + { NULL, 0 }, // f8 + { clif_parse_CreateParty, 2000 }, // f9 + { NULL, 0 }, // fa + { NULL, 0 }, // fb + { clif_parse_PartyInvite, 2000 }, // fc + { NULL, 0 }, // fd + { NULL, 0 }, // fe + { clif_parse_ReplyPartyInvite, 0 }, // ff + { clif_parse_LeaveParty, 0 }, // 100 + { NULL, 0 }, // 101 + { clif_parse_PartyChangeOption, 0 }, // 102 + { clif_parse_RemovePartyMember, 0 }, // 103 + { NULL, 0 }, // 104 + { NULL, 0 }, // 105 + { NULL, 0 }, // 106 + { NULL, 0 }, // 107 + { clif_parse_PartyMessage, 300 }, // 108 + { NULL, 0 }, // 109 + { NULL, 0 }, // 10a + { NULL, 0 }, // 10b + { NULL, 0 }, // 10c + { NULL, 0 }, // 10d + { NULL, 0 }, // 10e + { NULL, 0 }, // 10f + { NULL, 0 }, // 110 + { NULL, 0 }, // 111 + { clif_parse_SkillUp, -1 }, // 112 + { clif_parse_UseSkillToId, 0 }, // 113 + { NULL, 0 }, // 114 + { NULL, 0 }, // 115 + { clif_parse_UseSkillToPos, 0 }, // 116 + { NULL, 0 }, // 117 + { clif_parse_StopAttack, 0 }, // 118 + { NULL, 0 }, // 119 + { NULL, 0 }, // 11a + { clif_parse_UseSkillMap, 0 }, // 11b + { NULL, 0 }, // 11c + { clif_parse_RequestMemo, 0 }, // 11d + { NULL, 0 }, // 11e + { NULL, 0 }, // 11f + { NULL, 0 }, // 120 + { NULL, 0 }, // 121 + { NULL, 0 }, // 122 + { NULL, 0 }, // 123 + { NULL, 0 }, // 124 + { NULL, 0 }, // 125 + { clif_parse_PutItemToCart, 0 }, // 126 + { clif_parse_GetItemFromCart, 0 }, // 127 + { clif_parse_MoveFromKafraToCart, 0 }, // 128 + { clif_parse_MoveToKafraFromCart, 0 }, // 129 + { clif_parse_RemoveOption, 0 }, // 12a + { NULL, 0 }, // 12b + { NULL, 0 }, // 12c + { NULL, 0 }, // 12d + { NULL, 0 }, // 12e + { NULL, 0 }, // 12f + { NULL, 0 }, // 130 + { NULL, 0 }, // 131 + { NULL, 0 }, // 132 + { NULL, 0 }, // 133 + { NULL, 0 }, // 134 + { NULL, 0 }, // 135 + { NULL, 0 }, // 136 + { NULL, 0 }, // 137 + { NULL, 0 }, // 138 + { NULL, 0 }, // 139 + { NULL, 0 }, // 13a + { NULL, 0 }, // 13b + { NULL, 0 }, // 13c + { NULL, 0 }, // 13d + { NULL, 0 }, // 13e + { clif_parse_GM_Monster_Item, 0 }, // 13f + { clif_parse_MapMove, 0 }, // 140 + { NULL, 0 }, // 141 + { NULL, 0 }, // 142 + { clif_parse_NpcAmountInput, 300 }, // 143 + { NULL, 0 }, // 144 + { NULL, 0 }, // 145 + { clif_parse_NpcCloseClicked, 300 }, // 146 + { NULL, 0 }, // 147 + { NULL, 0 }, // 148 + { clif_parse_GMReqNoChat, 0 }, // 149 + { NULL, 0 }, // 14a + { NULL, 0 }, // 14b + { NULL, 0 }, // 14c + { NULL, 0 }, // 14d + { NULL, 0 }, // 14e + { NULL, 0 }, // 14f + { NULL, 0 }, // 150 + { NULL, 0 }, // 151 + { NULL, 0 }, // 152 + { NULL, 0 }, // 153 + { NULL, 0 }, // 154 + { NULL, 0 }, // 155 + { NULL, 0 }, // 156 + { NULL, 0 }, // 157 + { NULL, 0 }, // 158 + { NULL, 0 }, // 159 + { NULL, 0 }, // 15a + { NULL, 0 }, // 15b + { NULL, 0 }, // 15c + { NULL, 0 }, // 15d + { NULL, 0 }, // 15e + { NULL, 0 }, // 15f + { NULL, 0 }, // 160 + { NULL, 0 }, // 161 + { NULL, 0 }, // 162 + { NULL, 0 }, // 163 + { NULL, 0 }, // 164 + { NULL, 0 }, // 165 + { NULL, 0 }, // 166 + { NULL, 0 }, // 167 + { NULL, 0 }, // 168 + { NULL, 0 }, // 169 + { NULL, 0 }, // 16a + { NULL, 0 }, // 16b + { NULL, 0 }, // 16c + { NULL, 0 }, // 16d + { NULL, 0 }, // 16e + { NULL, 0 }, // 16f + { NULL, 0 }, // 170 + { NULL, 0 }, // 171 + { NULL, 0 }, // 172 + { NULL, 0 }, // 173 + { NULL, 0 }, // 174 + { NULL, 0 }, // 175 + { NULL, 0 }, // 176 + { NULL, 0 }, // 177 + { clif_parse_ItemIdentify, 0 }, // 178 + { NULL, 0 }, // 179 + { clif_parse_UseCard, 0 }, // 17a + { NULL, 0 }, // 17b + { clif_parse_InsertCard, 0 }, // 17c + { NULL, 0 }, // 17d + { NULL, 0 }, // 17e + { NULL, 0 }, // 17f + { NULL, 0 }, // 180 + { NULL, 0 }, // 181 + { NULL, 0 }, // 182 + { NULL, 0 }, // 183 + { NULL, 0 }, // 184 + { NULL, 0 }, // 185 + { NULL, 0 }, // 186 + { NULL, 0 }, // 187 + { NULL, 0 }, // 188 + { NULL, 0 }, // 189 + { clif_parse_QuitGame, 0 }, // 18a + { NULL, 0 }, // 18b + { NULL, 0 }, // 18c + { NULL, 0 }, // 18d + { NULL, 0 }, // 18e + { NULL, 0 }, // 18f + { clif_parse_UseSkillToPos, 0 }, // 190 + { NULL, 0 }, // 191 + { NULL, 0 }, // 192 + { clif_parse_SolveCharName, 0 }, // 193 + { NULL, 0 }, // 194 + { NULL, 0 }, // 195 + { NULL, 0 }, // 196 + { clif_parse_ResetChar, 0 }, // 197 + { NULL, 0 }, // 198 + { NULL, 0 }, // 199 + { NULL, 0 }, // 19a + { NULL, 0 }, // 19b + { clif_parse_LGMmessage, 0 }, // 19c + { clif_parse_GMHide, 300 }, // 19d + { NULL, 0 }, // 19e + { NULL, 0 }, // 19f + { NULL, 0 }, // 1a0 + { NULL, 0 }, // 1a1 + { NULL, 0 }, // 1a2 + { NULL, 0 }, // 1a3 + { NULL, 0 }, // 1a4 + { NULL, 0 }, // 1a5 + { NULL, 0 }, // 1a6 + { NULL, 0 }, // 1a7 + { NULL, 0 }, // 1a8 + { NULL, 0 }, // 1a9 + { NULL, 0 }, // 1aa + { NULL, 0 }, // 1ab + { NULL, 0 }, // 1ac + { NULL, 0 }, // 1ad + { NULL, 0 }, // 1ae + { clif_parse_ChangeCart, 0 }, // 1af + { NULL, 0 }, // 1b0 + { NULL, 0 }, // 1b1 + { NULL, 0 }, // 1b2 + { NULL, 0 }, // 1b3 + { NULL, 0 }, // 1b4 + { NULL, 0 }, // 1b5 + { NULL, 0 }, // 1b6 + { NULL, 0 }, // 1b7 + { NULL, 0 }, // 1b8 + { NULL, 0 }, // 1b9 + { clif_parse_Shift, 300 }, // 1ba + { clif_parse_Shift, 300 }, // 1bb + { clif_parse_Recall, 300 }, // 1bc + { clif_parse_Recall, 300 }, // 1bd + { NULL, 0 }, // 1be + { NULL, 0 }, // 1bf + { NULL, 0 }, // 1c0 + { NULL, 0 }, // 1c1 + { NULL, 0 }, // 1c2 + { NULL, 0 }, // 1c3 + { NULL, 0 }, // 1c4 + { NULL, 0 }, // 1c5 + { NULL, 0 }, // 1c6 + { NULL, 0 }, // 1c7 + { NULL, 0 }, // 1c8 + { NULL, 0 }, // 1c9 + { NULL, 0 }, // 1ca + { NULL, 0 }, // 1cb + { NULL, 0 }, // 1cc + { NULL, 0 }, // 1cd + { clif_parse_AutoSpell, 0 }, // 1ce + { NULL, 0 }, // 1cf + { NULL, 0 }, // 1d0 + { NULL, 0 }, // 1d1 + { NULL, 0 }, // 1d2 + { NULL, 0 }, // 1d3 + { NULL, 0 }, // 1d4 + { clif_parse_NpcStringInput, 300 }, // 1d5 + { NULL, 0 }, // 1d6 + { NULL, 0 }, // 1d7 + { NULL, 0 }, // 1d8 + { NULL, 0 }, // 1d9 + { NULL, 0 }, // 1da + { NULL, 0 }, // 1db + { NULL, 0 }, // 1dc + { NULL, 0 }, // 1dd + { NULL, 0 }, // 1de + { clif_parse_GMReqNoChatCount, 0 }, // 1df + { NULL, 0 }, // 1e0 + { NULL, 0 }, // 1e1 + { NULL, 0 }, // 1e2 + { NULL, 0 }, // 1e3 + { NULL, 0 }, // 1e4 + { NULL, 0 }, // 1e5 + { NULL, 0 }, // 1e6 + { clif_parse_sn_doridori, 0 }, // 1e7 + { clif_parse_CreateParty2, 1000 }, // 1e8 + { NULL, 0 }, // 1e9 + { NULL, 0 }, // 1ea + { NULL, 0 }, // 1eb + { NULL, 0 }, // 1ec + { clif_parse_sn_explosionspirits, 0 }, // 1ed + { NULL, 0 }, // 1ee + { NULL, 0 }, // 1ef + { NULL, 0 }, // 1f0 + { NULL, 0 }, // 1f1 + { NULL, 0 }, // 1f2 + { NULL, 0 }, // 1f3 + { NULL, 0 }, // 1f4 + { NULL, 0 }, // 1f5 + { NULL, 0 }, // 1f6 + { NULL, 0 }, // 1f7 + { NULL, 0 }, // 1f8 + { NULL, 0 }, // 1f9 + { NULL, 0 }, // 1fa + { NULL, 0 }, // 1fb + { NULL, 0 }, // 1fc + { NULL, 0 }, // 1fd + { NULL, 0 }, // 1fe + { NULL, 0 }, // 1ff + { NULL, 0 }, // 200 + { NULL, 0 }, // 201 + { NULL, 0 }, // 202 + { NULL, 0 }, // 203 + { NULL, 0 }, // 204 + { NULL, 0 }, // 205 + { NULL, 0 }, // 206 + { NULL, 0 }, // 207 + { NULL, 0 }, // 208 + { NULL, 0 }, // 209 + { NULL, 0 }, // 20a + { NULL, 0 }, // 20b + { NULL, 0 }, // 20c + { NULL, 0 }, // 20d + { NULL, 0 }, // 20e + { NULL, 0 }, // 20f + { NULL, 0 }, // 210 + { NULL, 0 }, // 211 + { NULL, 0 }, // 212 + { NULL, 0 }, // 213 + { NULL, 0 }, // 214 + { NULL, 0 }, // 215 + { NULL, 0 }, // 216 + { NULL, 0 }, // 217 + { NULL, 0 }, // 218 + { NULL, 0 }, // 219 + { NULL, 0 }, // 21a + { NULL, 0 }, // 21b + { NULL, 0 }, // 21c + { NULL, 0 }, // 21d + { NULL, 0 }, // 21e + { NULL, 0 }, // 21f }; // *INDENT-ON* @@ -8608,7 +8601,7 @@ int clif_check_packet_flood(int fd, int cmd) // as approved bots (GMlvl1) should not have to work around // flood logic. if (!sd || pc_isGM(sd) || clif_parse_func_table[cmd].rate == -1) - return 0; + return 0; // Timer has wrapped if (tick < sd->flood_rates[cmd]) @@ -8624,7 +8617,7 @@ int clif_check_packet_flood(int fd, int cmd) // ActionRequest - attacks are allowed a faster rate than sit/stand if (cmd == 0x89) { - int action_type = RFIFOB (fd, 6); + int action_type = RFIFOB(fd, 6); if (action_type == 0x00 || action_type == 0x07) rate = 20; else @@ -8677,7 +8670,7 @@ int clif_check_packet_flood(int fd, int cmd) } #define WARN_MALFORMED_MSG(sd, msg) \ - printf ("clif_validate_chat(): %s (ID %d) sent a malformed" \ + printf("clif_validate_chat(): %s (ID %d) sent a malformed" \ " message: %s.\n", sd->status.name, sd->status.account_id, msg) /** * Validate message integrity (inspired by upstream source (eAthena)). @@ -8691,7 +8684,7 @@ int clif_check_packet_flood(int fd, int cmd) * @param[out] message_len the length of the actual text, excluding NUL * @return a dynamically allocated copy of the message, or NULL upon failure */ -static char *clif_validate_chat (struct map_session_data *sd, int type, +static char *clif_validate_chat(struct map_session_data *sd, int type, char **message, size_t *message_len) { int fd; @@ -8705,7 +8698,7 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, *message = NULL; *message_len = 0; - nullpo_retr (NULL, sd); + nullpo_retr(NULL, sd); /* * Don't send chat in the period between the ban and the connection's * closure. @@ -8714,8 +8707,8 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, return NULL; fd = sd->fd; - msg_len = RFIFOW (fd, 2) - 4; - name_len = strlen (sd->status.name); + msg_len = RFIFOW(fd, 2) - 4; + name_len = strlen(sd->status.name); /* * At least one character is required in all instances. * Notes for length checks: @@ -8731,14 +8724,14 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, /* The player just sent the header (2) and length (2) words. */ if (!msg_len) { - WARN_MALFORMED_MSG (sd, "no message sent"); + WARN_MALFORMED_MSG(sd, "no message sent"); return NULL; } /* The client sent (or claims to have sent) an empty message. */ if (msg_len == min_len) { - WARN_MALFORMED_MSG (sd, "empty message"); + WARN_MALFORMED_MSG(sd, "empty message"); return NULL; } @@ -8746,12 +8739,12 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, if (type == 1 && msg_len < min_len) { /* Disallow malformed messages. */ - clif_setwaitclose (fd); - WARN_MALFORMED_MSG (sd, "illegal target name"); + clif_setwaitclose(fd); + WARN_MALFORMED_MSG(sd, "illegal target name"); return NULL; } - p = (char *) ((type != 1) ? RFIFOP (fd, 4) : RFIFOP (fd, 28)); + p = (char *)((type != 1) ? RFIFOP(fd, 4) : RFIFOP(fd, 28)); buf_len = (type == 1) ? msg_len - min_len: msg_len; /* @@ -8763,15 +8756,15 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, */ if (buf_len >= battle_config.chat_maxline) { - WARN_MALFORMED_MSG (sd, "exceeded maximum message length"); + WARN_MALFORMED_MSG(sd, "exceeded maximum message length"); return NULL; } /* We're leaving an extra eight bytes for public/global chat, 1 for NUL. */ buf_len += (type == 2) ? 8 + 1 : 1; - buf = (char *) malloc (buf_len); - memcpy ((type != 2) ? buf : buf + 8, p, + buf = (char *) malloc(buf_len); + memcpy((type != 2) ? buf : buf + 8, p, (type != 2) ? buf_len - 1 : buf_len - 8 - 1); buf[buf_len - 1] = '\0'; p = (type != 2) ? buf : buf + 8; @@ -8786,13 +8779,13 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, { char *pos = NULL; if (!(pos = strstr(p, " : ")) - || strncmp (p, sd->status.name, name_len) + || strncmp(p, sd->status.name, name_len) || pos - p != name_len) { - free (buf); + free(buf); /* Disallow malformed/spoofed messages. */ - clif_setwaitclose (fd); - WARN_MALFORMED_MSG (sd, "spoofed name/invalid format"); + clif_setwaitclose(fd); + WARN_MALFORMED_MSG(sd, "spoofed name/invalid format"); return NULL; } /* Step beyond the separator. */ @@ -8809,51 +8802,51 @@ static char *clif_validate_chat (struct map_session_data *sd, int type, * socket.cのdo_parsepacketから呼び出される *------------------------------------------ */ -static void clif_parse (int fd) +static void clif_parse(int fd) { - int packet_len = 0, cmd = 0; + int packet_len = 0, cmd = 0; struct map_session_data *sd = (struct map_session_data *)session[fd]->session_data; if (!sd || (sd && !sd->state.auth)) { - if (RFIFOREST (fd) < 2) + if (RFIFOREST(fd) < 2) { // too small a packet disconnect session[fd]->eof = 1; } - if (RFIFOW (fd, 0) != 0x72) + if (RFIFOW(fd, 0) != 0x72) { // first packet not auth, disconnect session[fd]->eof = 1; } } // 接続が切れてるので後始末 - if (!chrif_isconnect () || session[fd]->eof) + if (!chrif_isconnect() || session[fd]->eof) { // char鯖に繋がってない間は接続禁止 (!chrif_isconnect()) if (sd && sd->state.auth) { - pc_logout (sd); - clif_quitsave (fd, sd); + pc_logout(sd); + clif_quitsave(fd, sd); if (sd->status.name != NULL) - printf ("Player [%s] has logged off your server.\n", sd->status.name); // Player logout display [Valaris] + printf("Player [%s] has logged off your server.\n", sd->status.name); // Player logout display [Valaris] else - printf ("Player with account [%d] has logged off your server.\n", sd->bl.id); // Player logout display [Yor] + printf("Player with account [%d] has logged off your server.\n", sd->bl.id); // Player logout display [Yor] } else if (sd) { // not authentified! (refused by char-server or disconnect before to be authentified) - printf ("Player with account [%d] has logged off your server (not auth account).\n", sd->bl.id); // Player logout display [Yor] - map_deliddb (&sd->bl); // account_id has been included in the DB before auth answer + printf("Player with account [%d] has logged off your server (not auth account).\n", sd->bl.id); // Player logout display [Yor] + map_deliddb(&sd->bl); // account_id has been included in the DB before auth answer } if (fd) - close (fd); + close(fd); if (fd) - delete_session (fd); + delete_session(fd); return; } - if (RFIFOREST (fd) < 2) + if (RFIFOREST(fd) < 2) return; // Too small (no packet number) - cmd = RFIFOW (fd, 0); + cmd = RFIFOW(fd, 0); // 管理用パケット処理 if (cmd >= 30000) @@ -8861,16 +8854,16 @@ static void clif_parse (int fd) switch (cmd) { case 0x7530: // Athena情報所得 - WFIFOW (fd, 0) = 0x7531; - WFIFOB (fd, 2) = ATHENA_MAJOR_VERSION; - WFIFOB (fd, 3) = ATHENA_MINOR_VERSION; - WFIFOB (fd, 4) = ATHENA_REVISION; - WFIFOB (fd, 5) = ATHENA_RELEASE_FLAG; - WFIFOB (fd, 6) = ATHENA_OFFICIAL_FLAG; - WFIFOB (fd, 7) = ATHENA_SERVER_MAP; - WFIFOW (fd, 8) = ATHENA_MOD_VERSION; - WFIFOSET (fd, 10); - RFIFOSKIP (fd, 2); + WFIFOW(fd, 0) = 0x7531; + WFIFOB(fd, 2) = ATHENA_MAJOR_VERSION; + WFIFOB(fd, 3) = ATHENA_MINOR_VERSION; + WFIFOB(fd, 4) = ATHENA_REVISION; + WFIFOB(fd, 5) = ATHENA_RELEASE_FLAG; + WFIFOB(fd, 6) = ATHENA_OFFICIAL_FLAG; + WFIFOB(fd, 7) = ATHENA_SERVER_MAP; + WFIFOW(fd, 8) = ATHENA_MOD_VERSION; + WFIFOSET(fd, 10); + RFIFOSKIP(fd, 2); break; case 0x7532: // 接続の切断 session[fd]->eof = 1; @@ -8885,11 +8878,11 @@ static void clif_parse (int fd) packet_len = packet_len_table[cmd]; if (packet_len == -1) { - if (RFIFOREST (fd) < 4) + if (RFIFOREST(fd) < 4) { return; // Runt packet (variable length without a length sent) } - packet_len = RFIFOW (fd, 2); + packet_len = RFIFOW(fd, 2); if (packet_len < 4 || packet_len > 32768) { session[fd]->eof = 1; @@ -8897,7 +8890,7 @@ static void clif_parse (int fd) } } - if (RFIFOREST (fd) < packet_len) + if (RFIFOREST(fd) < packet_len) { return; // Runt packet (sent legnth is too small) } @@ -8915,7 +8908,7 @@ static void clif_parse (int fd) return; } - clif_parse_func_table[cmd].func (fd, sd); + clif_parse_func_table[cmd].func(fd, sd); } else { @@ -8923,78 +8916,76 @@ static void clif_parse (int fd) if (battle_config.error_log) { if (fd) - printf ("\nclif_parse: session #%d, packet 0x%x, lenght %d\n", + printf("\nclif_parse: session #%d, packet 0x%x, lenght %d\n", fd, cmd, packet_len); #ifdef DUMP_UNKNOWN_PACKET { - int i; + int i; FILE *fp; char packet_txt[256] = "save/packet.txt"; time_t now; - printf - ("---- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F"); + printf("---- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F"); for (i = 0; i < packet_len; i++) { if ((i & 15) == 0) - printf ("\n%04X ", i); - printf ("%02X ", RFIFOB (fd, i)); + printf("\n%04X ", i); + printf("%02X ", RFIFOB(fd, i)); } if (sd && sd->state.auth) { if (sd->status.name != NULL) - printf - ("\nAccount ID %d, character ID %d, player name %s.\n", + printf("\nAccount ID %d, character ID %d, player name %s.\n", sd->status.account_id, sd->status.char_id, sd->status.name); else - printf ("\nAccount ID %d.\n", sd->bl.id); + printf("\nAccount ID %d.\n", sd->bl.id); } else if (sd) // not authentified! (refused by char-server or disconnect before to be authentified) - printf ("\nAccount ID %d.\n", sd->bl.id); + printf("\nAccount ID %d.\n", sd->bl.id); - if ((fp = fopen_ (packet_txt, "a")) == NULL) + if ((fp = fopen_(packet_txt, "a")) == NULL) { - printf ("clif.c: cant write [%s] !!! data is lost !!!\n", + printf("clif.c: cant write [%s] !!! data is lost !!!\n", packet_txt); return; } else { - time (&now); + time(&now); if (sd && sd->state.auth) { if (sd->status.name != NULL) - fprintf (fp, + fprintf(fp, "%sPlayer with account ID %d (character ID %d, player name %s) sent wrong packet:\n", - asctime (gmtime (&now)), + asctime(gmtime(&now)), sd->status.account_id, sd->status.char_id, sd->status.name); else - fprintf (fp, + fprintf(fp, "%sPlayer with account ID %d sent wrong packet:\n", - asctime (gmtime (&now)), sd->bl.id); + asctime(gmtime(&now)), sd->bl.id); } else if (sd) // not authentified! (refused by char-server or disconnect before to be authentified) - fprintf (fp, + fprintf(fp, "%sPlayer with account ID %d sent wrong packet:\n", - asctime (gmtime (&now)), sd->bl.id); + asctime(gmtime(&now)), sd->bl.id); - fprintf (fp, + fprintf(fp, "\t---- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F"); for (i = 0; i < packet_len; i++) { if ((i & 15) == 0) - fprintf (fp, "\n\t%04X ", i); - fprintf (fp, "%02X ", RFIFOB (fd, i)); + fprintf(fp, "\n\t%04X ", i); + fprintf(fp, "%02X ", RFIFOB(fd, i)); } - fprintf (fp, "\n\n"); - fclose_ (fp); + fprintf(fp, "\n\n"); + fclose_(fp); } } #endif } } - RFIFOSKIP (fd, packet_len); + RFIFOSKIP(fd, packet_len); } /*========================================== @@ -9003,23 +8994,23 @@ static void clif_parse (int fd) */ int do_init_clif (void) { - int i; + int i; - set_defaultparse (clif_parse); + set_defaultparse(clif_parse); for (i = 0; i < 10; i++) { - if (make_listen_port (map_port)) + if (make_listen_port(map_port)) break; #ifdef LCCWIN32 - Sleep (20000); + Sleep(20000); #else - sleep (20); + sleep(20); #endif } if (i == 10) { - printf ("cant bind game port\n"); - exit (1); + printf("cant bind game port\n"); + exit(1); } return 0; diff --git a/src/map/clif.hpp b/src/map/clif.hpp index 998730d..c3d2555 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -10,233 +10,233 @@ #include "map.hpp" -void clif_setip (const char *); -void clif_setport (int); - -struct in_addr clif_getip (void); -int clif_getport (void); -int clif_countusers (void); -void clif_setwaitclose (int); - -int clif_authok (struct map_session_data *); -int clif_authfail_fd (int, int); -int clif_charselectok (int); -int clif_dropflooritem (struct flooritem_data *); -int clif_clearflooritem (struct flooritem_data *, int); -int clif_clearchar (struct block_list *, int); // area or fd -int clif_clearchar_delay (unsigned int, struct block_list *, int); +void clif_setip(const char *); +void clif_setport(int); + +struct in_addr clif_getip(void); +int clif_getport(void); +int clif_countusers(void); +void clif_setwaitclose(int); + +int clif_authok(struct map_session_data *); +int clif_authfail_fd(int, int); +int clif_charselectok(int); +int clif_dropflooritem(struct flooritem_data *); +int clif_clearflooritem(struct flooritem_data *, int); +int clif_clearchar(struct block_list *, int); // area or fd +int clif_clearchar_delay(unsigned int, struct block_list *, int); #define clif_clearchar_area(bl,type) clif_clearchar(bl,type) -int clif_clearchar_id (int, int, int); -int clif_spawnpc (struct map_session_data *); //area -int clif_spawnnpc (struct npc_data *); // area -int clif_spawn_fake_npc_for_player (struct map_session_data *sd, +int clif_clearchar_id(int, int, int); +int clif_spawnpc(struct map_session_data *); //area +int clif_spawnnpc(struct npc_data *); // area +int clif_spawn_fake_npc_for_player(struct map_session_data *sd, int fake_npc_id); -int clif_spawnmob (struct mob_data *); // area -int clif_walkok (struct map_session_data *); // self -int clif_movechar (struct map_session_data *); // area -int clif_movemob (struct mob_data *); //area -int clif_changemap (struct map_session_data *, const char *, int, int); //self -int clif_changemapserver (struct map_session_data *, const char *, int, int, struct in_addr, int); //self -int clif_fixpos (struct block_list *); // area -int clif_fixmobpos (struct mob_data *md); -int clif_fixpcpos (struct map_session_data *sd); -int clif_npcbuysell (struct map_session_data *, int); //self -int clif_buylist (struct map_session_data *, struct npc_data *); //self -int clif_selllist (struct map_session_data *); //self -int clif_scriptmes (struct map_session_data *, int, const char *); //self -int clif_scriptnext (struct map_session_data *, int); //self -int clif_scriptclose (struct map_session_data *, int); //self -int clif_scriptmenu (struct map_session_data *, int, const char *); //self -int clif_scriptinput (struct map_session_data *, int); //self -int clif_scriptinputstr (struct map_session_data *sd, int npcid); // self -int clif_cutin (struct map_session_data *, const char *, int); //self -int clif_viewpoint (struct map_session_data *, int, int, int, int, int, int); //self -int clif_additem (struct map_session_data *, int, int, int); //self -int clif_delitem (struct map_session_data *, int, int); //self -int clif_updatestatus (struct map_session_data *, int); //self -int clif_changestatus (struct block_list *, int, int); //area -int clif_damage (struct block_list *, struct block_list *, unsigned int, int, int, int, int, int, int); // area +int clif_spawnmob(struct mob_data *); // area +int clif_walkok(struct map_session_data *); // self +int clif_movechar(struct map_session_data *); // area +int clif_movemob(struct mob_data *); //area +int clif_changemap(struct map_session_data *, const char *, int, int); //self +int clif_changemapserver(struct map_session_data *, const char *, int, int, struct in_addr, int); //self +int clif_fixpos(struct block_list *); // area +int clif_fixmobpos(struct mob_data *md); +int clif_fixpcpos(struct map_session_data *sd); +int clif_npcbuysell(struct map_session_data *, int); //self +int clif_buylist(struct map_session_data *, struct npc_data *); //self +int clif_selllist(struct map_session_data *); //self +int clif_scriptmes(struct map_session_data *, int, const char *); //self +int clif_scriptnext(struct map_session_data *, int); //self +int clif_scriptclose(struct map_session_data *, int); //self +int clif_scriptmenu(struct map_session_data *, int, const char *); //self +int clif_scriptinput(struct map_session_data *, int); //self +int clif_scriptinputstr(struct map_session_data *sd, int npcid); // self +int clif_cutin(struct map_session_data *, const char *, int); //self +int clif_viewpoint(struct map_session_data *, int, int, int, int, int, int); //self +int clif_additem(struct map_session_data *, int, int, int); //self +int clif_delitem(struct map_session_data *, int, int); //self +int clif_updatestatus(struct map_session_data *, int); //self +int clif_changestatus(struct block_list *, int, int); //area +int clif_damage(struct block_list *, struct block_list *, unsigned int, int, int, int, int, int, int); // area #define clif_takeitem(src,dst) clif_damage(src,dst,0,0,0,0,0,1,0) -int clif_changelook (struct block_list *, int, int); // area -int clif_changelook_towards (struct block_list *, int, int, struct map_session_data *dst); // area or target -void clif_changelook_accessories (struct block_list *bl, struct map_session_data *dst); // area or target; list gloves, boots etc. -int clif_arrowequip (struct map_session_data *sd, int val); //self -int clif_arrow_fail (struct map_session_data *sd, int type); //self -int clif_statusupack (struct map_session_data *, int, int, int); // self -int clif_equipitemack (struct map_session_data *, int, int, int); // self -int clif_unequipitemack (struct map_session_data *, int, int, int); // self -int clif_misceffect (struct block_list *, int); // area -int clif_changeoption (struct block_list *); // area -int clif_useitemack (struct map_session_data *, int, int, int); // self - -int clif_createchat (struct map_session_data *, int); // self -int clif_dispchat (struct chat_data *, int); // area or fd -int clif_joinchatfail (struct map_session_data *, int); // self -int clif_joinchatok (struct map_session_data *, struct chat_data *); // self -int clif_addchat (struct chat_data *, struct map_session_data *); // chat -int clif_changechatowner (struct chat_data *, struct map_session_data *); // chat -int clif_clearchat (struct chat_data *, int); // area or fd -int clif_leavechat (struct chat_data *, struct map_session_data *); // chat -int clif_changechatstatus (struct chat_data *); // chat - -void clif_emotion (struct block_list *bl, int type); -void clif_talkiebox (struct block_list *bl, const char *talkie); -void clif_wedding_effect (struct block_list *bl); -void clif_sitting (int fd, struct map_session_data *sd); +int clif_changelook(struct block_list *, int, int); // area +int clif_changelook_towards(struct block_list *, int, int, struct map_session_data *dst); // area or target +void clif_changelook_accessories(struct block_list *bl, struct map_session_data *dst); // area or target; list gloves, boots etc. +int clif_arrowequip(struct map_session_data *sd, int val); //self +int clif_arrow_fail(struct map_session_data *sd, int type); //self +int clif_statusupack(struct map_session_data *, int, int, int); // self +int clif_equipitemack(struct map_session_data *, int, int, int); // self +int clif_unequipitemack(struct map_session_data *, int, int, int); // self +int clif_misceffect(struct block_list *, int); // area +int clif_changeoption(struct block_list *); // area +int clif_useitemack(struct map_session_data *, int, int, int); // self + +int clif_createchat(struct map_session_data *, int); // self +int clif_dispchat(struct chat_data *, int); // area or fd +int clif_joinchatfail(struct map_session_data *, int); // self +int clif_joinchatok(struct map_session_data *, struct chat_data *); // self +int clif_addchat(struct chat_data *, struct map_session_data *); // chat +int clif_changechatowner(struct chat_data *, struct map_session_data *); // chat +int clif_clearchat(struct chat_data *, int); // area or fd +int clif_leavechat(struct chat_data *, struct map_session_data *); // chat +int clif_changechatstatus(struct chat_data *); // chat + +void clif_emotion(struct block_list *bl, int type); +void clif_talkiebox(struct block_list *bl, const char *talkie); +void clif_wedding_effect(struct block_list *bl); +void clif_sitting(int fd, struct map_session_data *sd); //void clif_callpartner(struct map_session_data *sd); //void clif_sitting(struct map_session_data *sd); -void clif_soundeffect (struct map_session_data *sd, struct block_list *bl, +void clif_soundeffect(struct map_session_data *sd, struct block_list *bl, const char *name, int type); // trade -int clif_traderequest (struct map_session_data *sd, const char *name); -int clif_tradestart (struct map_session_data *sd, int type); -int clif_tradeadditem (struct map_session_data *sd, +int clif_traderequest(struct map_session_data *sd, const char *name); +int clif_tradestart(struct map_session_data *sd, int type); +int clif_tradeadditem(struct map_session_data *sd, struct map_session_data *tsd, int index, int amount); -int clif_tradeitemok (struct map_session_data *sd, int index, int amount, +int clif_tradeitemok(struct map_session_data *sd, int index, int amount, int fail); -int clif_tradedeal_lock (struct map_session_data *sd, int fail); -int clif_tradecancelled (struct map_session_data *sd); -int clif_tradecompleted (struct map_session_data *sd, int fail); +int clif_tradedeal_lock(struct map_session_data *sd, int fail); +int clif_tradecancelled(struct map_session_data *sd); +int clif_tradecompleted(struct map_session_data *sd, int fail); // storage #include "storage.hpp" -int clif_storageitemlist (struct map_session_data *sd, struct storage *stor); -int clif_storageequiplist (struct map_session_data *sd, +int clif_storageitemlist(struct map_session_data *sd, struct storage *stor); +int clif_storageequiplist(struct map_session_data *sd, struct storage *stor); -int clif_updatestorageamount (struct map_session_data *sd, +int clif_updatestorageamount(struct map_session_data *sd, struct storage *stor); -int clif_storageitemadded (struct map_session_data *sd, struct storage *stor, +int clif_storageitemadded(struct map_session_data *sd, struct storage *stor, int index, int amount); -int clif_storageitemremoved (struct map_session_data *sd, int index, +int clif_storageitemremoved(struct map_session_data *sd, int index, int amount); -int clif_storageclose (struct map_session_data *sd); +int clif_storageclose(struct map_session_data *sd); -void clif_pcinsight (struct block_list *, va_list); // map_forallinmovearea callback -void clif_pcoutsight (struct block_list *, va_list); // map_forallinmovearea callback -void clif_mobinsight (struct block_list *, va_list); // map_forallinmovearea callback -void clif_moboutsight (struct block_list *, va_list); // map_forallinmovearea callback +void clif_pcinsight(struct block_list *, va_list); // map_forallinmovearea callback +void clif_pcoutsight(struct block_list *, va_list); // map_forallinmovearea callback +void clif_mobinsight(struct block_list *, va_list); // map_forallinmovearea callback +void clif_moboutsight(struct block_list *, va_list); // map_forallinmovearea callback -int clif_npc_class_change (struct block_list *bl, int npc_class, int type); -int clif_mob_class_change (struct mob_data *md, int mob_class); -int clif_mob_equip (struct mob_data *md, int nameid); // [Valaris] +int clif_npc_class_change(struct block_list *bl, int npc_class, int type); +int clif_mob_class_change(struct mob_data *md, int mob_class); +int clif_mob_equip(struct mob_data *md, int nameid); // [Valaris] -int clif_skillinfo (struct map_session_data *sd, int skillid, int type, +int clif_skillinfo(struct map_session_data *sd, int skillid, int type, int range); -int clif_skillinfoblock (struct map_session_data *sd); -int clif_skillup (struct map_session_data *sd, int skill_num); +int clif_skillinfoblock(struct map_session_data *sd); +int clif_skillup(struct map_session_data *sd, int skill_num); -int clif_skillcasting (struct block_list *bl, +int clif_skillcasting(struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, int skill_num, int casttime); -int clif_skillcastcancel (struct block_list *bl); -int clif_skill_fail (struct map_session_data *sd, int skill_id, int type, +int clif_skillcastcancel(struct block_list *bl); +int clif_skill_fail(struct map_session_data *sd, int skill_id, int type, int btype); -int clif_skill_damage (struct block_list *src, struct block_list *dst, +int clif_skill_damage(struct block_list *src, struct block_list *dst, unsigned int tick, int sdelay, int ddelay, int damage, int div, int skill_id, int skill_lv, int type); -int clif_skill_damage2 (struct block_list *src, struct block_list *dst, +int clif_skill_damage2(struct block_list *src, struct block_list *dst, unsigned int tick, int sdelay, int ddelay, int damage, int div, int skill_id, int skill_lv, int type); -int clif_skill_nodamage (struct block_list *src, struct block_list *dst, +int clif_skill_nodamage(struct block_list *src, struct block_list *dst, int skill_id, int heal, int fail); -int clif_skill_poseffect (struct block_list *src, int skill_id, int val, +int clif_skill_poseffect(struct block_list *src, int skill_id, int val, int x, int y, int tick); -int clif_skill_estimation (struct map_session_data *sd, +int clif_skill_estimation(struct map_session_data *sd, struct block_list *dst); -int clif_skill_warppoint (struct map_session_data *sd, int skill_num, +int clif_skill_warppoint(struct map_session_data *sd, int skill_num, const char *map1, const char *map2, const char *map3, const char *map4); -int clif_skill_memo (struct map_session_data *sd, int flag); -int clif_skill_teleportmessage (struct map_session_data *sd, int flag); +int clif_skill_memo(struct map_session_data *sd, int flag); +int clif_skill_teleportmessage(struct map_session_data *sd, int flag); -int clif_produceeffect (struct map_session_data *sd, int flag, int nameid); +int clif_produceeffect(struct map_session_data *sd, int flag, int nameid); -int clif_skill_setunit (struct skill_unit *unit); -int clif_skill_delunit (struct skill_unit *unit); +int clif_skill_setunit(struct skill_unit *unit); +int clif_skill_delunit(struct skill_unit *unit); -int clif_01ac (struct block_list *bl); +int clif_01ac(struct block_list *bl); -int clif_autospell (struct map_session_data *sd, int skilllv); -int clif_devotion (struct map_session_data *sd, int target); -int clif_spiritball (struct map_session_data *sd); -int clif_combo_delay (struct block_list *src, int wait); -int clif_bladestop (struct block_list *src, struct block_list *dst, +int clif_autospell(struct map_session_data *sd, int skilllv); +int clif_devotion(struct map_session_data *sd, int target); +int clif_spiritball(struct map_session_data *sd); +int clif_combo_delay(struct block_list *src, int wait); +int clif_bladestop(struct block_list *src, struct block_list *dst, int boolean); -int clif_changemapcell (int m, int x, int y, int cell_type, int type); +int clif_changemapcell(int m, int x, int y, int cell_type, int type); -int clif_status_change (struct block_list *bl, int type, int flag); +int clif_status_change(struct block_list *bl, int type, int flag); -int clif_wis_message (int fd, const char *nick, const char *mes, int mes_len); -int clif_wis_end (int fd, int flag); +int clif_wis_message(int fd, const char *nick, const char *mes, int mes_len); +int clif_wis_end(int fd, int flag); -int clif_solved_charname (struct map_session_data *sd, int char_id); +int clif_solved_charname(struct map_session_data *sd, int char_id); -int clif_use_card (struct map_session_data *sd, int idx); -int clif_insert_card (struct map_session_data *sd, int idx_equip, +int clif_use_card(struct map_session_data *sd, int idx); +int clif_insert_card(struct map_session_data *sd, int idx_equip, int idx_card, int flag); -int clif_itemlist (struct map_session_data *sd); -int clif_equiplist (struct map_session_data *sd); +int clif_itemlist(struct map_session_data *sd); +int clif_equiplist(struct map_session_data *sd); -int clif_cart_additem (struct map_session_data *, int, int, int); -int clif_cart_delitem (struct map_session_data *, int, int); -int clif_cart_itemlist (struct map_session_data *sd); -int clif_cart_equiplist (struct map_session_data *sd); +int clif_cart_additem(struct map_session_data *, int, int, int); +int clif_cart_delitem(struct map_session_data *, int, int); +int clif_cart_itemlist(struct map_session_data *sd); +int clif_cart_equiplist(struct map_session_data *sd); -int clif_item_identify_list (struct map_session_data *sd); -int clif_item_identified (struct map_session_data *sd, int idx, int flag); -int clif_item_repair_list (struct map_session_data *sd); +int clif_item_identify_list(struct map_session_data *sd); +int clif_item_identified(struct map_session_data *sd, int idx, int flag); +int clif_item_repair_list(struct map_session_data *sd); -int clif_item_skill (struct map_session_data *sd, int skillid, int skilllv, +int clif_item_skill(struct map_session_data *sd, int skillid, int skilllv, const char *name); -int clif_mvp_effect (struct map_session_data *sd); -int clif_mvp_item (struct map_session_data *sd, int nameid); -int clif_mvp_exp (struct map_session_data *sd, int exp); +int clif_mvp_effect(struct map_session_data *sd); +int clif_mvp_item(struct map_session_data *sd, int nameid); +int clif_mvp_exp(struct map_session_data *sd, int exp); -int clif_movetoattack (struct map_session_data *sd, struct block_list *bl); +int clif_movetoattack(struct map_session_data *sd, struct block_list *bl); // party -int clif_party_created (struct map_session_data *sd, int flag); -int clif_party_info (struct party *p, int fd); -int clif_party_invite (struct map_session_data *sd, +int clif_party_created(struct map_session_data *sd, int flag); +int clif_party_info(struct party *p, int fd); +int clif_party_invite(struct map_session_data *sd, struct map_session_data *tsd); -int clif_party_inviteack (struct map_session_data *sd, const char *nick, int flag); -int clif_party_option (struct party *p, struct map_session_data *sd, +int clif_party_inviteack(struct map_session_data *sd, const char *nick, int flag); +int clif_party_option(struct party *p, struct map_session_data *sd, int flag); -int clif_party_leaved (struct party *p, struct map_session_data *sd, +int clif_party_leaved(struct party *p, struct map_session_data *sd, int account_id, const char *name, int flag); -int clif_party_message (struct party *p, int account_id, const char *mes, int len); -int clif_party_move (struct party *p, struct map_session_data *sd, +int clif_party_message(struct party *p, int account_id, const char *mes, int len); +int clif_party_move(struct party *p, struct map_session_data *sd, int online); -int clif_party_xy (struct party *p, struct map_session_data *sd); -int clif_party_hp (struct party *p, struct map_session_data *sd); +int clif_party_xy(struct party *p, struct map_session_data *sd); +int clif_party_hp(struct party *p, struct map_session_data *sd); // atcommand -int clif_displaymessage (int fd, const char *mes); -int clif_disp_onlyself (struct map_session_data *sd, const char *mes, int len); -int clif_GMmessage (struct block_list *bl, const char *mes, int len, int flag); -int clif_heal (int fd, int type, int val); -int clif_resurrection (struct block_list *bl, int type); -int clif_set0199 (int fd, int type); -int clif_pvpset (struct map_session_data *sd, int pvprank, int pvpnum, +int clif_displaymessage(int fd, const char *mes); +int clif_disp_onlyself(struct map_session_data *sd, const char *mes, int len); +int clif_GMmessage(struct block_list *bl, const char *mes, int len, int flag); +int clif_heal(int fd, int type, int val); +int clif_resurrection(struct block_list *bl, int type); +int clif_set0199(int fd, int type); +int clif_pvpset(struct map_session_data *sd, int pvprank, int pvpnum, int type); -int clif_send0199 (int map, int type); -int clif_refine (int fd, struct map_session_data *sd, int fail, int index, +int clif_send0199(int map, int type); +int clif_refine(int fd, struct map_session_data *sd, int fail, int index, int val); -int clif_specialeffect (struct block_list *bl, int type, int flag); // special effects [Valaris] -int clif_message (struct block_list *bl, const char *msg); // messages (from mobs/npcs) [Valaris] +int clif_specialeffect(struct block_list *bl, int type, int flag); // special effects [Valaris] +int clif_message(struct block_list *bl, const char *msg); // messages (from mobs/npcs) [Valaris] -int clif_GM_kickack (struct map_session_data *sd, int id); -int clif_GM_kick (struct map_session_data *sd, struct map_session_data *tsd, +int clif_GM_kickack(struct map_session_data *sd, int id); +int clif_GM_kick(struct map_session_data *sd, struct map_session_data *tsd, int type); -int clif_foreachclient (int (*)(struct map_session_data *, va_list), ...); +int clif_foreachclient(int(*)(struct map_session_data *, va_list), ...); -int do_final_clif (void); -int do_init_clif (void); +int do_final_clif (void); +int do_init_clif (void); #endif diff --git a/src/map/intif.cpp b/src/map/intif.cpp index c0c63b0..b8d21f3 100644 --- a/src/map/intif.cpp +++ b/src/map/intif.cpp @@ -48,39 +48,39 @@ static const int packet_len_table[] = { }; extern int char_fd; // inter serverのfdはchar_fdを使う -#define inter_fd (char_fd) // エイリアス +#define inter_fd char_fd // エイリアス //----------------------------------------------------------------- // inter serverへの送信 // Message for all GMs on all map servers -int intif_GMmessage (const char *mes, int len, int flag) +int intif_GMmessage(const char *mes, int len, int flag) { - int lp = (flag & 0x10) ? 8 : 4; - WFIFOW (inter_fd, 0) = 0x3000; - WFIFOW (inter_fd, 2) = lp + len; - WFIFOL (inter_fd, 4) = 0x65756c62; - memcpy (WFIFOP (inter_fd, lp), mes, len); - WFIFOSET (inter_fd, WFIFOW (inter_fd, 2)); + int lp = (flag & 0x10) ? 8 : 4; + WFIFOW(inter_fd, 0) = 0x3000; + WFIFOW(inter_fd, 2) = lp + len; + WFIFOL(inter_fd, 4) = 0x65756c62; + memcpy(WFIFOP(inter_fd, lp), mes, len); + WFIFOSET(inter_fd, WFIFOW(inter_fd, 2)); return 0; } // The transmission of Wisp/Page to inter-server (player not found on this server) -int intif_wis_message (struct map_session_data *sd, const char *nick, const char *mes, +int intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, int mes_len) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WFIFOW (inter_fd, 0) = 0x3001; - WFIFOW (inter_fd, 2) = mes_len + 52; - memcpy (WFIFOP (inter_fd, 4), sd->status.name, 24); - memcpy (WFIFOP (inter_fd, 28), nick, 24); - memcpy (WFIFOP (inter_fd, 52), mes, mes_len); - WFIFOSET (inter_fd, WFIFOW (inter_fd, 2)); + WFIFOW(inter_fd, 0) = 0x3001; + WFIFOW(inter_fd, 2) = mes_len + 52; + memcpy(WFIFOP(inter_fd, 4), sd->status.name, 24); + memcpy(WFIFOP(inter_fd, 28), nick, 24); + memcpy(WFIFOP(inter_fd, 52), mes, mes_len); + WFIFOSET(inter_fd, WFIFOW(inter_fd, 2)); if (battle_config.etc_log) - printf ("intif_wis_message from %s to %s (message: '%s')\n", + printf("intif_wis_message from %s to %s (message: '%s')\n", sd->status.name, nick, mes); return 0; @@ -88,173 +88,172 @@ int intif_wis_message (struct map_session_data *sd, const char *nick, const char // The reply of Wisp/page static -int intif_wis_replay (int id, int flag) +int intif_wis_replay(int id, int flag) { - WFIFOW (inter_fd, 0) = 0x3002; - WFIFOL (inter_fd, 2) = id; - WFIFOB (inter_fd, 6) = flag; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target - WFIFOSET (inter_fd, 7); + WFIFOW(inter_fd, 0) = 0x3002; + WFIFOL(inter_fd, 2) = id; + WFIFOB(inter_fd, 6) = flag; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + WFIFOSET(inter_fd, 7); if (battle_config.etc_log) - printf ("intif_wis_replay: id: %d, flag:%d\n", id, flag); + printf("intif_wis_replay: id: %d, flag:%d\n", id, flag); return 0; } // The transmission of GM only Wisp/Page from server to inter-server -int intif_wis_message_to_gm (const char *Wisp_name, int min_gm_level, const char *mes, +int intif_wis_message_to_gm(const char *Wisp_name, int min_gm_level, const char *mes, int mes_len) { - WFIFOW (inter_fd, 0) = 0x3003; - WFIFOW (inter_fd, 2) = mes_len + 30; - memcpy (WFIFOP (inter_fd, 4), Wisp_name, 24); - WFIFOW (inter_fd, 28) = (short) min_gm_level; - memcpy (WFIFOP (inter_fd, 30), mes, mes_len); - WFIFOSET (inter_fd, WFIFOW (inter_fd, 2)); + WFIFOW(inter_fd, 0) = 0x3003; + WFIFOW(inter_fd, 2) = mes_len + 30; + memcpy(WFIFOP(inter_fd, 4), Wisp_name, 24); + WFIFOW(inter_fd, 28) = (short) min_gm_level; + memcpy(WFIFOP(inter_fd, 30), mes, mes_len); + WFIFOSET(inter_fd, WFIFOW(inter_fd, 2)); if (battle_config.etc_log) - printf - ("intif_wis_message_to_gm: from: '%s', min level: %d, message: '%s'.\n", + printf("intif_wis_message_to_gm: from: '%s', min level: %d, message: '%s'.\n", Wisp_name, min_gm_level, mes); return 0; } // アカウント変数送信 -int intif_saveaccountreg (struct map_session_data *sd) +int intif_saveaccountreg(struct map_session_data *sd) { - int j, p; + int j, p; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WFIFOW (inter_fd, 0) = 0x3004; - WFIFOL (inter_fd, 4) = sd->bl.id; + WFIFOW(inter_fd, 0) = 0x3004; + WFIFOL(inter_fd, 4) = sd->bl.id; for (j = 0, p = 8; j < sd->status.account_reg_num; j++, p += 36) { - memcpy (WFIFOP (inter_fd, p), sd->status.account_reg[j].str, 32); - WFIFOL (inter_fd, p + 32) = sd->status.account_reg[j].value; + memcpy(WFIFOP(inter_fd, p), sd->status.account_reg[j].str, 32); + WFIFOL(inter_fd, p + 32) = sd->status.account_reg[j].value; } - WFIFOW (inter_fd, 2) = p; - WFIFOSET (inter_fd, p); + WFIFOW(inter_fd, 2) = p; + WFIFOSET(inter_fd, p); return 0; } // アカウント変数要求 -int intif_request_accountreg (struct map_session_data *sd) +int intif_request_accountreg(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); - WFIFOW (inter_fd, 0) = 0x3005; - WFIFOL (inter_fd, 2) = sd->bl.id; - WFIFOSET (inter_fd, 6); + WFIFOW(inter_fd, 0) = 0x3005; + WFIFOL(inter_fd, 2) = sd->bl.id; + WFIFOSET(inter_fd, 6); return 0; } // 倉庫データ要求 -int intif_request_storage (int account_id) +int intif_request_storage(int account_id) { - WFIFOW (inter_fd, 0) = 0x3010; - WFIFOL (inter_fd, 2) = account_id; - WFIFOSET (inter_fd, 6); + WFIFOW(inter_fd, 0) = 0x3010; + WFIFOL(inter_fd, 2) = account_id; + WFIFOSET(inter_fd, 6); return 0; } // 倉庫データ送信 -int intif_send_storage (struct storage *stor) +int intif_send_storage(struct storage *stor) { - nullpo_retr (0, stor); - WFIFOW (inter_fd, 0) = 0x3011; - WFIFOW (inter_fd, 2) = sizeof (struct storage) + 8; - WFIFOL (inter_fd, 4) = stor->account_id; - memcpy (WFIFOP (inter_fd, 8), stor, sizeof (struct storage)); - WFIFOSET (inter_fd, WFIFOW (inter_fd, 2)); + nullpo_retr(0, stor); + WFIFOW(inter_fd, 0) = 0x3011; + WFIFOW(inter_fd, 2) = sizeof(struct storage) + 8; + WFIFOL(inter_fd, 4) = stor->account_id; + memcpy(WFIFOP(inter_fd, 8), stor, sizeof(struct storage)); + WFIFOSET(inter_fd, WFIFOW(inter_fd, 2)); return 0; } // パーティ作成要求 -int intif_create_party (struct map_session_data *sd, const char *name) +int intif_create_party(struct map_session_data *sd, const char *name) { - nullpo_retr (0, sd); - - WFIFOW (inter_fd, 0) = 0x3020; - WFIFOL (inter_fd, 2) = sd->status.account_id; - memcpy (WFIFOP (inter_fd, 6), name, 24); - memcpy (WFIFOP (inter_fd, 30), sd->status.name, 24); - memcpy (WFIFOP (inter_fd, 54), map[sd->bl.m].name, 16); - WFIFOW (inter_fd, 70) = sd->status.base_level; - WFIFOSET (inter_fd, 72); + nullpo_retr(0, sd); + + WFIFOW(inter_fd, 0) = 0x3020; + WFIFOL(inter_fd, 2) = sd->status.account_id; + memcpy(WFIFOP(inter_fd, 6), name, 24); + memcpy(WFIFOP(inter_fd, 30), sd->status.name, 24); + memcpy(WFIFOP(inter_fd, 54), map[sd->bl.m].name, 16); + WFIFOW(inter_fd, 70) = sd->status.base_level; + WFIFOSET(inter_fd, 72); // if(battle_config.etc_log) // printf("intif: create party\n"); return 0; } // パーティ情報要求 -int intif_request_partyinfo (int party_id) +int intif_request_partyinfo(int party_id) { - WFIFOW (inter_fd, 0) = 0x3021; - WFIFOL (inter_fd, 2) = party_id; - WFIFOSET (inter_fd, 6); + WFIFOW(inter_fd, 0) = 0x3021; + WFIFOL(inter_fd, 2) = party_id; + WFIFOSET(inter_fd, 6); // if(battle_config.etc_log) // printf("intif: request party info\n"); return 0; } // パーティ追加要求 -int intif_party_addmember (int party_id, int account_id) +int intif_party_addmember(int party_id, int account_id) { struct map_session_data *sd; - sd = map_id2sd (account_id); + sd = map_id2sd(account_id); // if(battle_config.etc_log) // printf("intif: party add member %d %d\n",party_id,account_id); if (sd != NULL) { - WFIFOW (inter_fd, 0) = 0x3022; - WFIFOL (inter_fd, 2) = party_id; - WFIFOL (inter_fd, 6) = account_id; - memcpy (WFIFOP (inter_fd, 10), sd->status.name, 24); - memcpy (WFIFOP (inter_fd, 34), map[sd->bl.m].name, 16); - WFIFOW (inter_fd, 50) = sd->status.base_level; - WFIFOSET (inter_fd, 52); + WFIFOW(inter_fd, 0) = 0x3022; + WFIFOL(inter_fd, 2) = party_id; + WFIFOL(inter_fd, 6) = account_id; + memcpy(WFIFOP(inter_fd, 10), sd->status.name, 24); + memcpy(WFIFOP(inter_fd, 34), map[sd->bl.m].name, 16); + WFIFOW(inter_fd, 50) = sd->status.base_level; + WFIFOSET(inter_fd, 52); } return 0; } // パーティ設定変更 -int intif_party_changeoption (int party_id, int account_id, int exp, int item) +int intif_party_changeoption(int party_id, int account_id, int exp, int item) { - WFIFOW (inter_fd, 0) = 0x3023; - WFIFOL (inter_fd, 2) = party_id; - WFIFOL (inter_fd, 6) = account_id; - WFIFOW (inter_fd, 10) = exp; - WFIFOW (inter_fd, 12) = item; - WFIFOSET (inter_fd, 14); + WFIFOW(inter_fd, 0) = 0x3023; + WFIFOL(inter_fd, 2) = party_id; + WFIFOL(inter_fd, 6) = account_id; + WFIFOW(inter_fd, 10) = exp; + WFIFOW(inter_fd, 12) = item; + WFIFOSET(inter_fd, 14); return 0; } // パーティ脱退要求 -int intif_party_leave (int party_id, int account_id) +int intif_party_leave(int party_id, int account_id) { // if(battle_config.etc_log) // printf("intif: party leave %d %d\n",party_id,account_id); - WFIFOW (inter_fd, 0) = 0x3024; - WFIFOL (inter_fd, 2) = party_id; - WFIFOL (inter_fd, 6) = account_id; - WFIFOSET (inter_fd, 10); + WFIFOW(inter_fd, 0) = 0x3024; + WFIFOL(inter_fd, 2) = party_id; + WFIFOL(inter_fd, 6) = account_id; + WFIFOSET(inter_fd, 10); return 0; } // パーティ移動要求 -int intif_party_changemap (struct map_session_data *sd, int online) +int intif_party_changemap(struct map_session_data *sd, int online) { if (sd != NULL) { - WFIFOW (inter_fd, 0) = 0x3025; - WFIFOL (inter_fd, 2) = sd->status.party_id; - WFIFOL (inter_fd, 6) = sd->status.account_id; - memcpy (WFIFOP (inter_fd, 10), map[sd->bl.m].name, 16); - WFIFOB (inter_fd, 26) = online; - WFIFOW (inter_fd, 27) = sd->status.base_level; - WFIFOSET (inter_fd, 29); + WFIFOW(inter_fd, 0) = 0x3025; + WFIFOL(inter_fd, 2) = sd->status.party_id; + WFIFOL(inter_fd, 6) = sd->status.account_id; + memcpy(WFIFOP(inter_fd, 10), map[sd->bl.m].name, 16); + WFIFOB(inter_fd, 26) = online; + WFIFOW(inter_fd, 27) = sd->status.base_level; + WFIFOSET(inter_fd, 29); } // if(battle_config.etc_log) // printf("party: change map\n"); @@ -262,36 +261,36 @@ int intif_party_changemap (struct map_session_data *sd, int online) } // パーティー解散要求 -int intif_break_party (int party_id) +int intif_break_party(int party_id) { - WFIFOW (inter_fd, 0) = 0x3026; - WFIFOL (inter_fd, 2) = party_id; - WFIFOSET (inter_fd, 6); + WFIFOW(inter_fd, 0) = 0x3026; + WFIFOL(inter_fd, 2) = party_id; + WFIFOSET(inter_fd, 6); return 0; } // パーティ会話送信 -int intif_party_message (int party_id, int account_id, const char *mes, int len) +int intif_party_message(int party_id, int account_id, const char *mes, int len) { // if(battle_config.etc_log) // printf("intif_party_message: %s\n",mes); - WFIFOW (inter_fd, 0) = 0x3027; - WFIFOW (inter_fd, 2) = len + 12; - WFIFOL (inter_fd, 4) = party_id; - WFIFOL (inter_fd, 8) = account_id; - memcpy (WFIFOP (inter_fd, 12), mes, len); - WFIFOSET (inter_fd, len + 12); + WFIFOW(inter_fd, 0) = 0x3027; + WFIFOW(inter_fd, 2) = len + 12; + WFIFOL(inter_fd, 4) = party_id; + WFIFOL(inter_fd, 8) = account_id; + memcpy(WFIFOP(inter_fd, 12), mes, len); + WFIFOSET(inter_fd, len + 12); return 0; } // パーティ競合チェック要求 -int intif_party_checkconflict (int party_id, int account_id, const char *nick) +int intif_party_checkconflict(int party_id, int account_id, const char *nick) { - WFIFOW (inter_fd, 0) = 0x3028; - WFIFOL (inter_fd, 2) = party_id; - WFIFOL (inter_fd, 6) = account_id; - memcpy (WFIFOP (inter_fd, 10), nick, 24); - WFIFOSET (inter_fd, 34); + WFIFOW(inter_fd, 0) = 0x3028; + WFIFOL(inter_fd, 2) = party_id; + WFIFOL(inter_fd, 6) = account_id; + memcpy(WFIFOP(inter_fd, 10), nick, 24); + WFIFOSET(inter_fd, 34); return 0; } @@ -300,110 +299,109 @@ int intif_party_checkconflict (int party_id, int account_id, const char *nick) // Wisp/Page reception static -int intif_parse_WisMessage (int fd) +int intif_parse_WisMessage(int fd) { // rewritten by [Yor] struct map_session_data *sd; - int i; + int i; if (battle_config.etc_log) - printf - ("intif_parse_wismessage: id: %d, from: %s, to: %s, message: '%s'\n", - RFIFOL (fd, 4), RFIFOP (fd, 8), RFIFOP (fd, 32), RFIFOP (fd, + printf("intif_parse_wismessage: id: %d, from: %s, to: %s, message: '%s'\n", + RFIFOL(fd, 4), RFIFOP(fd, 8), RFIFOP(fd, 32), RFIFOP(fd, 56)); - sd = map_nick2sd ((const char *)RFIFOP (fd, 32)); // Searching destination player - if (sd != NULL && strcmp (sd->status.name, (const char *)RFIFOP (fd, 32)) == 0) + sd = map_nick2sd((const char *)RFIFOP(fd, 32)); // Searching destination player + if (sd != NULL && strcmp(sd->status.name, (const char *)RFIFOP(fd, 32)) == 0) { // exactly same name (inter-server have checked the name before) // if player ignore all if (sd->ignoreAll == 1) - intif_wis_replay (RFIFOL (fd, 4), 2); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + intif_wis_replay(RFIFOL(fd, 4), 2); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target else { - const char *wisp_source = (const char *)RFIFOP (fd, 8); // speed up + const char *wisp_source = (const char *)RFIFOP(fd, 8); // speed up // if player ignore the source character - for (i = 0; i < (sizeof (sd->ignore) / sizeof (sd->ignore[0])); + for (i = 0; i < (sizeof(sd->ignore) / sizeof(sd->ignore[0])); i++) - if (strcmp (sd->ignore[i].name, wisp_source) == 0) + if (strcmp(sd->ignore[i].name, wisp_source) == 0) { - intif_wis_replay (RFIFOL (fd, 4), 2); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + intif_wis_replay(RFIFOL(fd, 4), 2); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target break; } // if source player not found in ignore list - if (i == (sizeof (sd->ignore) / sizeof (sd->ignore[0]))) + if (i == (sizeof(sd->ignore) / sizeof(sd->ignore[0]))) { - clif_wis_message (sd->fd, (const char *)RFIFOP (fd, 8), (const char *)RFIFOP (fd, 56), - RFIFOW (fd, 2) - 56); - intif_wis_replay (RFIFOL (fd, 4), 0); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + clif_wis_message(sd->fd, (const char *)RFIFOP(fd, 8), (const char *)RFIFOP(fd, 56), + RFIFOW(fd, 2) - 56); + intif_wis_replay(RFIFOL(fd, 4), 0); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target } } } else - intif_wis_replay (RFIFOL (fd, 4), 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + intif_wis_replay(RFIFOL(fd, 4), 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target return 0; } // Wisp/page transmission result reception static -int intif_parse_WisEnd (int fd) +int intif_parse_WisEnd(int fd) { struct map_session_data *sd; if (battle_config.etc_log) - printf ("intif_parse_wisend: player: %s, flag: %d\n", RFIFOP (fd, 2), RFIFOB (fd, 26)); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target - sd = map_nick2sd ((const char *)RFIFOP (fd, 2)); + printf("intif_parse_wisend: player: %s, flag: %d\n", RFIFOP(fd, 2), RFIFOB(fd, 26)); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + sd = map_nick2sd((const char *)RFIFOP(fd, 2)); if (sd != NULL) - clif_wis_end (sd->fd, RFIFOB (fd, 26)); + clif_wis_end(sd->fd, RFIFOB(fd, 26)); return 0; } // Received wisp message from map-server via char-server for ALL gm static -int mapif_parse_WisToGM (int fd) +int mapif_parse_WisToGM(int fd) { // 0x3003/0x3803 <packet_len>.w <wispname>.24B <min_gm_level>.w <message>.?B - int i, min_gm_level, len; + int i, min_gm_level, len; struct map_session_data *pl_sd; char Wisp_name[24]; char mbuf[255]; - if (RFIFOW (fd, 2) - 30 <= 0) + if (RFIFOW(fd, 2) - 30 <= 0) return 0; - len = RFIFOW (fd, 2) - 30; - char *message = ((len) >= 255) ? (char *) malloc (len) : mbuf; + len = RFIFOW(fd, 2) - 30; + char *message = ((len) >= 255) ? (char *) malloc(len) : mbuf; - min_gm_level = (int) RFIFOW (fd, 28); - memcpy (Wisp_name, RFIFOP (fd, 4), 24); + min_gm_level = (int) RFIFOW(fd, 28); + memcpy(Wisp_name, RFIFOP(fd, 4), 24); Wisp_name[23] = '\0'; - memcpy (message, RFIFOP (fd, 30), len); + memcpy(message, RFIFOP(fd, 30), len); message[len - 1] = '\0'; // information is sended to all online GM for (i = 0; i < fd_max; i++) if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data) && pl_sd->state.auth) - if (pc_isGM (pl_sd) >= min_gm_level) - clif_wis_message (i, Wisp_name, message, - strlen (message) + 1); + if (pc_isGM(pl_sd) >= min_gm_level) + clif_wis_message(i, Wisp_name, message, + strlen(message) + 1); if (message != mbuf) - free (message); + free(message); return 0; } // アカウント変数通知 static -int intif_parse_AccountReg (int fd) +int intif_parse_AccountReg(int fd) { - int j, p; + int j, p; struct map_session_data *sd; - if ((sd = map_id2sd (RFIFOL (fd, 4))) == NULL) + if ((sd = map_id2sd(RFIFOL(fd, 4))) == NULL) return 1; - for (p = 8, j = 0; p < RFIFOW (fd, 2) && j < ACCOUNT_REG_NUM; + for (p = 8, j = 0; p < RFIFOW(fd, 2) && j < ACCOUNT_REG_NUM; p += 36, j++) { - memcpy (sd->status.account_reg[j].str, RFIFOP (fd, p), 32); - sd->status.account_reg[j].value = RFIFOL (fd, p + 32); + memcpy(sd->status.account_reg[j].str, RFIFOP(fd, p), 32); + sd->status.account_reg[j].value = RFIFOL(fd, p + 32); } sd->status.account_reg_num = j; // printf("intif: accountreg\n"); @@ -413,161 +411,159 @@ int intif_parse_AccountReg (int fd) // 倉庫データ受信 static -int intif_parse_LoadStorage (int fd) +int intif_parse_LoadStorage(int fd) { struct storage *stor; struct map_session_data *sd; - sd = map_id2sd (RFIFOL (fd, 4)); + sd = map_id2sd(RFIFOL(fd, 4)); if (sd == NULL) { if (battle_config.error_log) - printf ("intif_parse_LoadStorage: user not found %d\n", - RFIFOL (fd, 4)); + printf("intif_parse_LoadStorage: user not found %d\n", + RFIFOL(fd, 4)); return 1; } - stor = account2storage (RFIFOL (fd, 4)); + stor = account2storage(RFIFOL(fd, 4)); if (stor->storage_status == 1) { // Already open.. lets ignore this update if (battle_config.error_log) - printf - ("intif_parse_LoadStorage: storage received for a client already open (User %d:%d)\n", + printf("intif_parse_LoadStorage: storage received for a client already open (User %d:%d)\n", sd->status.account_id, sd->status.char_id); return 1; } if (stor->dirty) { // Already have storage, and it has been modified and not saved yet! Exploit! [Skotlex] if (battle_config.error_log) - printf - ("intif_parse_LoadStorage: received storage for an already modified non-saved storage! (User %d:%d)\n", + printf("intif_parse_LoadStorage: received storage for an already modified non-saved storage! (User %d:%d)\n", sd->status.account_id, sd->status.char_id); return 1; } - if (RFIFOW (fd, 2) - 8 != sizeof (struct storage)) + if (RFIFOW(fd, 2) - 8 != sizeof(struct storage)) { if (battle_config.error_log) - printf ("intif_parse_LoadStorage: data size error %d %d\n", - RFIFOW (fd, 2) - 8, sizeof (struct storage)); + printf("intif_parse_LoadStorage: data size error %d %d\n", + RFIFOW(fd, 2) - 8, sizeof(struct storage)); return 1; } if (battle_config.save_log) - printf ("intif_openstorage: %d\n", RFIFOL (fd, 4)); - memcpy (stor, RFIFOP (fd, 8), sizeof (struct storage)); + printf("intif_openstorage: %d\n", RFIFOL(fd, 4)); + memcpy(stor, RFIFOP(fd, 8), sizeof(struct storage)); stor->dirty = 0; stor->storage_status = 1; sd->state.storage_open = 1; - clif_storageitemlist (sd, stor); - clif_storageequiplist (sd, stor); - clif_updatestorageamount (sd, stor); + clif_storageitemlist(sd, stor); + clif_storageequiplist(sd, stor); + clif_updatestorageamount(sd, stor); return 0; } // 倉庫データ送信成功 static -int intif_parse_SaveStorage (int fd) +int intif_parse_SaveStorage(int fd) { if (battle_config.save_log) - printf ("intif_savestorage: done %d %d\n", RFIFOL (fd, 2), - RFIFOB (fd, 6)); - storage_storage_saved (RFIFOL (fd, 2)); + printf("intif_savestorage: done %d %d\n", RFIFOL(fd, 2), + RFIFOB(fd, 6)); + storage_storage_saved(RFIFOL(fd, 2)); return 0; } // パーティ作成可否 static -int intif_parse_PartyCreated (int fd) +int intif_parse_PartyCreated(int fd) { if (battle_config.etc_log) - printf ("intif: party created\n"); - party_created (RFIFOL (fd, 2), RFIFOB (fd, 6), RFIFOL (fd, 7), - (const char *)RFIFOP (fd, 11)); + printf("intif: party created\n"); + party_created(RFIFOL(fd, 2), RFIFOB(fd, 6), RFIFOL(fd, 7), + (const char *)RFIFOP(fd, 11)); return 0; } // パーティ情報 static -int intif_parse_PartyInfo (int fd) +int intif_parse_PartyInfo(int fd) { - if (RFIFOW (fd, 2) == 8) + if (RFIFOW(fd, 2) == 8) { if (battle_config.error_log) - printf ("intif: party noinfo %d\n", RFIFOL (fd, 4)); - party_recv_noinfo (RFIFOL (fd, 4)); + printf("intif: party noinfo %d\n", RFIFOL(fd, 4)); + party_recv_noinfo(RFIFOL(fd, 4)); return 0; } // printf("intif: party info %d\n",RFIFOL(fd,4)); - if (RFIFOW (fd, 2) != sizeof (struct party) + 4) + if (RFIFOW(fd, 2) != sizeof(struct party) + 4) { if (battle_config.error_log) - printf ("intif: party info : data size error %d %d %d\n", - RFIFOL (fd, 4), RFIFOW (fd, 2), - sizeof (struct party) + 4); + printf("intif: party info : data size error %d %d %d\n", + RFIFOL(fd, 4), RFIFOW(fd, 2), + sizeof(struct party) + 4); } - party_recv_info ((struct party *) RFIFOP (fd, 4)); + party_recv_info((struct party *) RFIFOP(fd, 4)); return 0; } // パーティ追加通知 static -int intif_parse_PartyMemberAdded (int fd) +int intif_parse_PartyMemberAdded(int fd) { if (battle_config.etc_log) - printf ("intif: party member added %d %d %d\n", RFIFOL (fd, 2), - RFIFOL (fd, 6), RFIFOB (fd, 10)); - party_member_added (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOB (fd, 10)); + printf("intif: party member added %d %d %d\n", RFIFOL(fd, 2), + RFIFOL(fd, 6), RFIFOB(fd, 10)); + party_member_added(RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOB(fd, 10)); return 0; } // パーティ設定変更通知 static -int intif_parse_PartyOptionChanged (int fd) +int intif_parse_PartyOptionChanged(int fd) { - party_optionchanged (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOW (fd, 10), - RFIFOW (fd, 12), RFIFOB (fd, 14)); + party_optionchanged(RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), + RFIFOW(fd, 12), RFIFOB(fd, 14)); return 0; } // パーティ脱退通知 static -int intif_parse_PartyMemberLeaved (int fd) +int intif_parse_PartyMemberLeaved(int fd) { if (battle_config.etc_log) - printf ("intif: party member leaved %d %d %s\n", RFIFOL (fd, 2), - RFIFOL (fd, 6), (const char *)RFIFOP (fd, 10)); - party_member_leaved (RFIFOL (fd, 2), RFIFOL (fd, 6), (const char *)RFIFOP (fd, 10)); + printf("intif: party member leaved %d %d %s\n", RFIFOL(fd, 2), + RFIFOL(fd, 6), (const char *)RFIFOP(fd, 10)); + party_member_leaved(RFIFOL(fd, 2), RFIFOL(fd, 6), (const char *)RFIFOP(fd, 10)); return 0; } // パーティ解散通知 static -int intif_parse_PartyBroken (int fd) +int intif_parse_PartyBroken(int fd) { - party_broken (RFIFOL (fd, 2)); + party_broken(RFIFOL(fd, 2)); return 0; } // パーティ移動通知 static -int intif_parse_PartyMove (int fd) +int intif_parse_PartyMove(int fd) { // if(battle_config.etc_log) // printf("intif: party move %d %d %s %d %d\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOP(fd,10),RFIFOB(fd,26),RFIFOW(fd,27)); - party_recv_movemap (RFIFOL (fd, 2), RFIFOL (fd, 6), (const char *)RFIFOP (fd, 10), - RFIFOB (fd, 26), RFIFOW (fd, 27)); + party_recv_movemap(RFIFOL(fd, 2), RFIFOL(fd, 6), (const char *)RFIFOP(fd, 10), + RFIFOB(fd, 26), RFIFOW(fd, 27)); return 0; } // パーティメッセージ static -int intif_parse_PartyMessage (int fd) +int intif_parse_PartyMessage(int fd) { // if(battle_config.etc_log) // printf("intif_parse_PartyMessage: %s\n",RFIFOP(fd,12)); - party_recv_message (RFIFOL (fd, 4), RFIFOL (fd, 8), (const char *)RFIFOP (fd, 12), - RFIFOW (fd, 2) - 12); + party_recv_message(RFIFOL(fd, 4), RFIFOL(fd, 8), (const char *)RFIFOP(fd, 12), + RFIFOW(fd, 2) - 12); return 0; } @@ -575,14 +571,14 @@ int intif_parse_PartyMessage (int fd) // inter serverからの通信 // エラーがあれば0(false)を返すこと // パケットが処理できれば1,パケット長が足りなければ2を返すこと -int intif_parse (int fd) +int intif_parse(int fd) { - int packet_len; - int cmd = RFIFOW (fd, 0); + int packet_len; + int cmd = RFIFOW(fd, 0); // パケットのID確認 if (cmd < 0x3800 || cmd >= - 0x3800 + (sizeof (packet_len_table) / sizeof (packet_len_table[0])) + 0x3800 + (sizeof(packet_len_table) / sizeof(packet_len_table[0])) || packet_len_table[cmd - 0x3800] == 0) { return 0; @@ -591,13 +587,13 @@ int intif_parse (int fd) packet_len = packet_len_table[cmd - 0x3800]; if (packet_len == -1) { - if (RFIFOREST (fd) < 4) + if (RFIFOREST(fd) < 4) return 2; - packet_len = RFIFOW (fd, 2); + packet_len = RFIFOW(fd, 2); } // if(battle_config.etc_log) // printf("intif_parse %d %x %d %d\n",fd,cmd,packet_len,RFIFOREST(fd)); - if (RFIFOREST (fd) < packet_len) + if (RFIFOREST(fd) < packet_len) { return 2; } @@ -605,57 +601,57 @@ int intif_parse (int fd) switch (cmd) { case 0x3800: - clif_GMmessage (NULL, (const char *)RFIFOP (fd, 4), packet_len - 4, 0); + clif_GMmessage(NULL, (const char *)RFIFOP(fd, 4), packet_len - 4, 0); break; case 0x3801: - intif_parse_WisMessage (fd); + intif_parse_WisMessage(fd); break; case 0x3802: - intif_parse_WisEnd (fd); + intif_parse_WisEnd(fd); break; case 0x3803: - mapif_parse_WisToGM (fd); + mapif_parse_WisToGM(fd); break; case 0x3804: - intif_parse_AccountReg (fd); + intif_parse_AccountReg(fd); break; case 0x3810: - intif_parse_LoadStorage (fd); + intif_parse_LoadStorage(fd); break; case 0x3811: - intif_parse_SaveStorage (fd); + intif_parse_SaveStorage(fd); break; case 0x3820: - intif_parse_PartyCreated (fd); + intif_parse_PartyCreated(fd); break; case 0x3821: - intif_parse_PartyInfo (fd); + intif_parse_PartyInfo(fd); break; case 0x3822: - intif_parse_PartyMemberAdded (fd); + intif_parse_PartyMemberAdded(fd); break; case 0x3823: - intif_parse_PartyOptionChanged (fd); + intif_parse_PartyOptionChanged(fd); break; case 0x3824: - intif_parse_PartyMemberLeaved (fd); + intif_parse_PartyMemberLeaved(fd); break; case 0x3825: - intif_parse_PartyMove (fd); + intif_parse_PartyMove(fd); break; case 0x3826: - intif_parse_PartyBroken (fd); + intif_parse_PartyBroken(fd); break; case 0x3827: - intif_parse_PartyMessage (fd); + intif_parse_PartyMessage(fd); break; default: if (battle_config.error_log) - printf ("intif_parse : unknown packet %d %x\n", fd, - RFIFOW (fd, 0)); + printf("intif_parse : unknown packet %d %x\n", fd, + RFIFOW(fd, 0)); return 0; } // パケット読み飛ばし - RFIFOSKIP (fd, packet_len); + RFIFOSKIP(fd, packet_len); return 1; } diff --git a/src/map/intif.hpp b/src/map/intif.hpp index 97afce6..185ce73 100644 --- a/src/map/intif.hpp +++ b/src/map/intif.hpp @@ -2,30 +2,30 @@ #ifndef INTIF_HPP #define INTIF_HPP -int intif_parse (int fd); +int intif_parse(int fd); -int intif_GMmessage (const char *mes, int len, int flag); +int intif_GMmessage(const char *mes, int len, int flag); -int intif_wis_message (struct map_session_data *sd, const char *nick, const char *mes, +int intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, int mes_len); -int intif_wis_message_to_gm (const char *Wisp_name, int min_gm_level, const char *mes, +int intif_wis_message_to_gm(const char *Wisp_name, int min_gm_level, const char *mes, int mes_len); -int intif_saveaccountreg (struct map_session_data *sd); -int intif_request_accountreg (struct map_session_data *sd); +int intif_saveaccountreg(struct map_session_data *sd); +int intif_request_accountreg(struct map_session_data *sd); -int intif_request_storage (int account_id); -int intif_send_storage (struct storage *stor); +int intif_request_storage(int account_id); +int intif_send_storage(struct storage *stor); -int intif_create_party (struct map_session_data *sd, const char *name); -int intif_request_partyinfo (int party_id); -int intif_party_addmember (int party_id, int account_id); -int intif_party_changeoption (int party_id, int account_id, int exp, +int intif_create_party(struct map_session_data *sd, const char *name); +int intif_request_partyinfo(int party_id); +int intif_party_addmember(int party_id, int account_id); +int intif_party_changeoption(int party_id, int account_id, int exp, int item); -int intif_party_leave (int party_id, int accound_id); -int intif_party_changemap (struct map_session_data *sd, int online); -int intif_break_party (int party_id); -int intif_party_message (int party_id, int account_id, const char *mes, int len); -int intif_party_checkconflict (int party_id, int account_id, const char *nick); +int intif_party_leave(int party_id, int accound_id); +int intif_party_changemap(struct map_session_data *sd, int online); +int intif_break_party(int party_id); +int intif_party_message(int party_id, int account_id, const char *mes, int len); +int intif_party_checkconflict(int party_id, int account_id, const char *nick); #endif diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index 03e59d6..8d0eb3b 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -18,7 +18,7 @@ #include "memwatch.hpp" #endif -#define MAX_RANDITEM 2000 +#define MAX_RANDITEM 2000 // ** ITEMDB_OVERRIDE_NAME_VERBOSE ** // 定義すると、itemdb.txtとgrfで名前が異なる場合、表示します. @@ -36,12 +36,12 @@ static int blue_box_default = 0, violet_box_default = 0, card_album_default = // Function declarations -static void itemdb_read (void); -static int itemdb_readdb (void); -static int itemdb_read_randomitem (void); -static int itemdb_read_itemavail (void); -static int itemdb_read_itemnametable (void); -static int itemdb_read_noequip (void); +static void itemdb_read(void); +static int itemdb_readdb(void); +static int itemdb_read_randomitem(void); +static int itemdb_read_itemavail(void); +static int itemdb_read_itemnametable(void); +static int itemdb_read_noequip(void); /*========================================== * 名前で検索用 @@ -49,15 +49,15 @@ static int itemdb_read_noequip (void); */ // name = item alias, so we should find items aliases first. if not found then look for "jname" (full name) static -void itemdb_searchname_sub (db_key_t key, db_val_t data, va_list ap) +void itemdb_searchname_sub(db_key_t key, db_val_t data, va_list ap) { struct item_data *item = (struct item_data *) data, **dst; char *str; - str = va_arg (ap, char *); - dst = va_arg (ap, struct item_data **); + str = va_arg(ap, char *); + dst = va_arg(ap, struct item_data **); // if( strcasecmp(item->name,str)==0 || strcmp(item->jname,str)==0 || // memcmp(item->name,str,24)==0 || memcmp(item->jname,str,24)==0 ) - if (strcasecmp (item->name, str) == 0) //by lupus + if (strcasecmp(item->name, str) == 0) //by lupus *dst = item; } @@ -66,13 +66,13 @@ void itemdb_searchname_sub (db_key_t key, db_val_t data, va_list ap) *------------------------------------------ */ static -int itemdb_searchjname_sub (void *key, void *data, va_list ap) +int itemdb_searchjname_sub(void *key, void *data, va_list ap) { struct item_data *item = (struct item_data *) data, **dst; char *str; - str = va_arg (ap, char *); - dst = va_arg (ap, struct item_data **); - if (strcasecmp (item->jname, str) == 0) + str = va_arg(ap, char *); + dst = va_arg(ap, struct item_data **); + if (strcasecmp(item->jname, str) == 0) *dst = item; return 0; } @@ -81,10 +81,10 @@ int itemdb_searchjname_sub (void *key, void *data, va_list ap) * 名前で検索 *------------------------------------------ */ -struct item_data *itemdb_searchname (const char *str) +struct item_data *itemdb_searchname(const char *str) { struct item_data *item = NULL; - numdb_foreach (item_db, itemdb_searchname_sub, str, &item); + numdb_foreach(item_db, itemdb_searchname_sub, str, &item); return item; } @@ -92,14 +92,14 @@ struct item_data *itemdb_searchname (const char *str) * 箱系アイテム検索 *------------------------------------------ */ -int itemdb_searchrandomid (int flags) +int itemdb_searchrandomid(int flags) { - int nameid = 0, i, index, count; + int nameid = 0, i, index, count; struct random_item_data *list = NULL; struct { - int nameid, count; + int nameid, count; struct random_item_data *list; } data[] = { @@ -126,8 +126,8 @@ int itemdb_searchrandomid (int flags) { for (i = 0; i < 1000; i++) { - index = MRAND (count); - if (MRAND (1000000) < list[index].per) + index = MRAND(count); + if (MRAND(1000000) < list[index].per) { nameid = list[index].nameid; break; @@ -142,23 +142,23 @@ int itemdb_searchrandomid (int flags) * DBの存在確認 *------------------------------------------ */ -struct item_data *itemdb_exists (int nameid) +struct item_data *itemdb_exists(int nameid) { - return (struct item_data *)numdb_search (item_db, nameid); + return (struct item_data *)numdb_search(item_db, nameid); } /*========================================== * DBの検索 *------------------------------------------ */ -struct item_data *itemdb_search (int nameid) +struct item_data *itemdb_search(int nameid) { - struct item_data *id = (struct item_data *)numdb_search (item_db, nameid); + struct item_data *id = (struct item_data *)numdb_search(item_db, nameid); if (id) return id; - id = (struct item_data *) calloc (1, sizeof (struct item_data)); - numdb_insert (item_db, nameid, id); + id = (struct item_data *) calloc(1, sizeof(struct item_data)); + numdb_insert(item_db, nameid, id); id->nameid = nameid; id->value_buy = 10; @@ -196,9 +196,9 @@ struct item_data *itemdb_search (int nameid) * *------------------------------------------ */ -int itemdb_isequip (int nameid) +int itemdb_isequip(int nameid) { - int type = itemdb_type (nameid); + int type = itemdb_type(nameid); if (type == 0 || type == 2 || type == 3 || type == 6 || type == 10) return 0; return 1; @@ -208,11 +208,11 @@ int itemdb_isequip (int nameid) * *------------------------------------------ */ -int itemdb_isequip2 (struct item_data *data) +int itemdb_isequip2(struct item_data *data) { if (data) { - int type = data->type; + int type = data->type; if (type == 0 || type == 2 || type == 3 || type == 6 || type == 10) return 0; else @@ -225,9 +225,9 @@ int itemdb_isequip2 (struct item_data *data) * *------------------------------------------ */ -int itemdb_isequip3 (int nameid) +int itemdb_isequip3(int nameid) { - int type = itemdb_type (nameid); + int type = itemdb_type(nameid); if (type == 4 || type == 5 || type == 8) return 1; return 0; @@ -237,7 +237,7 @@ int itemdb_isequip3 (int nameid) * 捨てられるアイテムは1、そうでないアイテムは0 *------------------------------------------ */ -int itemdb_isdropable (int nameid) +int itemdb_isdropable(int nameid) { //結婚指輪は捨てられない switch (nameid) @@ -257,30 +257,30 @@ int itemdb_isdropable (int nameid) * *------------------------------------------ */ -static int itemdb_read_itemslottable (void) +static int itemdb_read_itemslottable(void) { char *buf, *p; size_t s; - buf = (char *)grfio_reads ("data\\itemslottable.txt", &s); + buf = (char *)grfio_reads("data\\itemslottable.txt", &s); if (buf == NULL) return -1; buf[s] = 0; for (p = buf; p - buf < s;) { - int nameid, equip; - sscanf (p, "%d#%d#", &nameid, &equip); - itemdb_search (nameid)->equip = equip; - p = strchr (p, 10); + int nameid, equip; + sscanf(p, "%d#%d#", &nameid, &equip); + itemdb_search(nameid)->equip = equip; + p = strchr(p, 10); if (!p) break; p++; - p = strchr (p, 10); + p = strchr(p, 10); if (!p) break; p++; } - free (buf); + free(buf); return 0; } @@ -289,42 +289,42 @@ static int itemdb_read_itemslottable (void) * アイテムデータベースの読み込み *------------------------------------------ */ -static int itemdb_readdb (void) +static int itemdb_readdb(void) { FILE *fp; char line[1024]; - int ln = 0, lines = 0; - int nameid, j; + int ln = 0, lines = 0; + int nameid, j; char *str[32], *p, *np; struct item_data *id; - int i = 0; + int i = 0; const char *filename[] = { "db/item_db.txt", "db/item_db2.txt" }; for (i = 0; i < 2; i++) { - fp = fopen_ (filename[i], "r"); + fp = fopen_(filename[i], "r"); if (fp == NULL) { if (i > 0) continue; - printf ("can't read %s\n", filename[i]); - exit (1); + printf("can't read %s\n", filename[i]); + exit(1); } lines = 0; - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { lines++; if (line[0] == '/' && line[1] == '/') continue; - memset (str, 0, sizeof (str)); + memset(str, 0, sizeof(str)); for (j = 0, np = p = line; j < 17 && p; j++) { while (*p == '\t' || *p == ' ') p++; str[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) { *p++ = 0; @@ -334,18 +334,18 @@ static int itemdb_readdb (void) if (str[0] == NULL) continue; - nameid = atoi (str[0]); + nameid = atoi(str[0]); if (nameid <= 0 || nameid >= 20000) continue; ln++; //ID,Name,Jname,Type,Price,Sell,Weight,ATK,DEF,Range,Slot,Job,Gender,Loc,wLV,eLV,View - id = itemdb_search (nameid); - memcpy (id->name, str[1], 24); - memcpy (id->jname, str[2], 24); - id->type = atoi (str[3]); - id->value_buy = atoi (str[4]); - id->value_sell = atoi (str[5]); + id = itemdb_search(nameid); + memcpy(id->name, str[1], 24); + memcpy(id->jname, str[2], 24); + id->type = atoi(str[3]); + id->value_buy = atoi(str[4]); + id->value_sell = atoi(str[5]); if (id->value_buy == 0 && id->value_sell == 0) { } @@ -357,17 +357,17 @@ static int itemdb_readdb (void) { id->value_sell = id->value_buy / 2; } - id->weight = atoi (str[6]); - id->atk = atoi (str[7]); - id->def = atoi (str[8]); - id->range = atoi (str[9]); - id->magic_bonus = atoi (str[10]); - id->slot = atoi (str[11]); - id->sex = atoi (str[12]); - id->equip = atoi (str[13]); - id->wlv = atoi (str[14]); - id->elv = atoi (str[15]); - id->look = atoi (str[16]); + id->weight = atoi(str[6]); + id->atk = atoi(str[7]); + id->def = atoi(str[8]); + id->range = atoi(str[9]); + id->magic_bonus = atoi(str[10]); + id->slot = atoi(str[11]); + id->sex = atoi(str[12]); + id->equip = atoi(str[13]); + id->wlv = atoi(str[14]); + id->elv = atoi(str[15]); + id->look = atoi(str[16]); id->flag.available = 1; id->flag.value_notdc = 0; id->flag.value_notoc = 0; @@ -376,16 +376,16 @@ static int itemdb_readdb (void) id->use_script = NULL; id->equip_script = NULL; - if ((p = strchr (np, '{')) == NULL) + if ((p = strchr(np, '{')) == NULL) continue; - id->use_script = parse_script (p, lines); + id->use_script = parse_script(p, lines); - if ((p = strchr (p + 1, '{')) == NULL) + if ((p = strchr(p + 1, '{')) == NULL) continue; - id->equip_script = parse_script (p, lines); + id->equip_script = parse_script(p, lines); } - fclose_ (fp); - printf ("read %s done (count=%d)\n", filename[i], ln); + fclose_(fp); + printf("read %s done (count=%d)\n", filename[i], ln); } return 0; } @@ -396,12 +396,12 @@ static int itemdb_readdb (void) * ランダムアイテム出現データの読み込み *------------------------------------------ */ -static int itemdb_read_randomitem (void) +static int itemdb_read_randomitem(void) { FILE *fp; char line[1024]; - int ln = 0; - int nameid, i, j; + int ln = 0; + int nameid, i, j; char *str[10], *p; const struct @@ -426,7 +426,7 @@ static int itemdb_read_randomitem (void) { "db/item_scroll.txt", scroll, &scroll_count, &scroll_default},}; - for (i = 0; i < sizeof (data) / sizeof (data[0]); i++) + for (i = 0; i < sizeof(data) / sizeof(data[0]); i++) { struct random_item_data *pd = data[i].pdata; int *pc = data[i].pcount; @@ -434,21 +434,21 @@ static int itemdb_read_randomitem (void) const char *fn = data[i].filename; *pdefault = 0; - if ((fp = fopen_ (fn, "r")) == NULL) + if ((fp = fopen_(fn, "r")) == NULL) { - printf ("can't read %s\n", fn); + printf("can't read %s\n", fn); continue; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { if (line[0] == '/' && line[1] == '/') continue; - memset (str, 0, sizeof (str)); + memset(str, 0, sizeof(str)); for (j = 0, p = line; j < 3 && p; j++) { str[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } @@ -456,28 +456,28 @@ static int itemdb_read_randomitem (void) if (str[0] == NULL) continue; - nameid = atoi (str[0]); + nameid = atoi(str[0]); if (nameid < 0 || nameid >= 20000) continue; if (nameid == 0) { if (str[2]) - *pdefault = atoi (str[2]); + *pdefault = atoi(str[2]); continue; } if (str[2]) { pd[*pc].nameid = nameid; - pd[(*pc)++].per = atoi (str[2]); + pd[(*pc)++].per = atoi(str[2]); } if (ln >= MAX_RANDITEM) break; ln++; } - fclose_ (fp); - printf ("read %s done (count=%d)\n", fn, *pc); + fclose_(fp); + printf("read %s done (count=%d)\n", fn, *pc); } return 0; @@ -487,30 +487,30 @@ static int itemdb_read_randomitem (void) * アイテム使用可能フラグのオーバーライド *------------------------------------------ */ -static int itemdb_read_itemavail (void) +static int itemdb_read_itemavail(void) { FILE *fp; char line[1024]; - int ln = 0; - int nameid, j, k; + int ln = 0; + int nameid, j, k; char *str[10], *p; - if ((fp = fopen_ ("db/item_avail.txt", "r")) == NULL) + if ((fp = fopen_("db/item_avail.txt", "r")) == NULL) { - printf ("can't read db/item_avail.txt\n"); + printf("can't read db/item_avail.txt\n"); return -1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { struct item_data *id; if (line[0] == '/' && line[1] == '/') continue; - memset (str, 0, sizeof (str)); + memset(str, 0, sizeof(str)); for (j = 0, p = line; j < 2 && p; j++) { str[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } @@ -518,10 +518,10 @@ static int itemdb_read_itemavail (void) if (str[0] == NULL) continue; - nameid = atoi (str[0]); - if (nameid < 0 || nameid >= 20000 || !(id = itemdb_exists (nameid))) + nameid = atoi(str[0]); + if (nameid < 0 || nameid >= 20000 || !(id = itemdb_exists(nameid))) continue; - k = atoi (str[1]); + k = atoi(str[1]); if (k > 0) { id->flag.available = 1; @@ -531,8 +531,8 @@ static int itemdb_read_itemavail (void) id->flag.available = 0; ln++; } - fclose_ (fp); - printf ("read db/item_avail.txt done (count=%d)\n", ln); + fclose_(fp); + printf("read db/item_avail.txt done (count=%d)\n", ln); return 0; } @@ -540,12 +540,12 @@ static int itemdb_read_itemavail (void) * アイテムの名前テーブルを読み込む *------------------------------------------ */ -static int itemdb_read_itemnametable (void) +static int itemdb_read_itemnametable(void) { char *buf, *p; size_t s; - buf = (char *)grfio_reads ("data\\idnum2itemdisplaynametable.txt", &s); + buf = (char *)grfio_reads("data\\idnum2itemdisplaynametable.txt", &s); if (buf == NULL) return -1; @@ -553,31 +553,31 @@ static int itemdb_read_itemnametable (void) buf[s] = 0; for (p = buf; p - buf < s;) { - int nameid; + int nameid; char buf2[64]; - if (sscanf (p, "%d#%[^#]#", &nameid, buf2) == 2) + if (sscanf(p, "%d#%[^#]#", &nameid, buf2) == 2) { #ifdef ITEMDB_OVERRIDE_NAME_VERBOSE - if (itemdb_exists (nameid) && - strncmp (itemdb_search (nameid)->jname, buf2, 24) != 0) + if (itemdb_exists(nameid) && + strncmp(itemdb_search(nameid)->jname, buf2, 24) != 0) { - printf ("[override] %d %s => %s\n", nameid, - itemdb_search (nameid)->jname, buf2); + printf("[override] %d %s => %s\n", nameid, + itemdb_search(nameid)->jname, buf2); } #endif - memcpy (itemdb_search (nameid)->jname, buf2, 24); + memcpy(itemdb_search(nameid)->jname, buf2, 24); } - p = strchr (p, 10); + p = strchr(p, 10); if (!p) break; p++; } - free (buf); - printf ("read data\\idnum2itemdisplaynametable.txt done.\n"); + free(buf); + printf("read data\\idnum2itemdisplaynametable.txt done.\n"); return 0; } @@ -586,12 +586,12 @@ static int itemdb_read_itemnametable (void) * カードイラストのリソース名前テーブルを読み込む *------------------------------------------ */ -static int itemdb_read_cardillustnametable (void) +static int itemdb_read_cardillustnametable(void) { char *buf, *p; size_t s; - buf = (char *)grfio_reads ("data\\num2cardillustnametable.txt", &s); + buf = (char *)grfio_reads("data\\num2cardillustnametable.txt", &s); if (buf == NULL) return -1; @@ -599,23 +599,23 @@ static int itemdb_read_cardillustnametable (void) buf[s] = 0; for (p = buf; p - buf < s;) { - int nameid; + int nameid; char buf2[64]; - if (sscanf (p, "%d#%[^#]#", &nameid, buf2) == 2) + if (sscanf(p, "%d#%[^#]#", &nameid, buf2) == 2) { - strcat (buf2, ".bmp"); - memcpy (itemdb_search (nameid)->cardillustname, buf2, 64); + strcat(buf2, ".bmp"); + memcpy(itemdb_search(nameid)->cardillustname, buf2, 64); // printf("%d %s\n",nameid,itemdb_search(nameid)->cardillustname); } - p = strchr (p, 10); + p = strchr(p, 10); if (!p) break; p++; } - free (buf); - printf ("read data\\num2cardillustnametable.txt done.\n"); + free(buf); + printf("read data\\num2cardillustnametable.txt done.\n"); return 0; } @@ -624,46 +624,46 @@ static int itemdb_read_cardillustnametable (void) * 装備制限ファイル読み出し *------------------------------------------ */ -static int itemdb_read_noequip (void) +static int itemdb_read_noequip(void) { FILE *fp; char line[1024]; - int ln = 0; - int nameid, j; + int ln = 0; + int nameid, j; char *str[32], *p; struct item_data *id; - if ((fp = fopen_ ("db/item_noequip.txt", "r")) == NULL) + if ((fp = fopen_("db/item_noequip.txt", "r")) == NULL) { - printf ("can't read db/item_noequip.txt\n"); + printf("can't read db/item_noequip.txt\n"); return -1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { if (line[0] == '/' && line[1] == '/') continue; - memset (str, 0, sizeof (str)); + memset(str, 0, sizeof(str)); for (j = 0, p = line; j < 2 && p; j++) { str[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } if (str[0] == NULL) continue; - nameid = atoi (str[0]); - if (nameid <= 0 || nameid >= 20000 || !(id = itemdb_exists (nameid))) + nameid = atoi(str[0]); + if (nameid <= 0 || nameid >= 20000 || !(id = itemdb_exists(nameid))) continue; - id->flag.no_equip = atoi (str[1]); + id->flag.no_equip = atoi(str[1]); ln++; } - fclose_ (fp); - printf ("read db/item_noequip.txt done (count=%d)\n", ln); + fclose_(fp); + printf("read db/item_noequip.txt done (count=%d)\n", ln); return 0; } @@ -671,20 +671,20 @@ static int itemdb_read_noequip (void) * *------------------------------------------ */ -static void itemdb_final (db_key_t key, db_val_t data, va_list ap) +static void itemdb_final(db_key_t key, db_val_t data, va_list ap) { struct item_data *id; - nullpo_retv (id = (struct item_data *)data); + nullpo_retv(id = (struct item_data *)data); if (id->use_script) - free (const_cast<ScriptCode *>(id->use_script)); + free(const_cast<ScriptCode *>(id->use_script)); if (id->equip_script) - free (const_cast<ScriptCode *>(id->equip_script)); - free (id); + free(const_cast<ScriptCode *>(id->equip_script)); + free(id); } -void itemdb_reload (void) +void itemdb_reload(void) { /* * @@ -693,18 +693,18 @@ void itemdb_reload (void) * */ - do_init_itemdb (); + do_init_itemdb(); } /*========================================== * *------------------------------------------ */ -void do_final_itemdb (void) +void do_final_itemdb(void) { if (item_db) { - numdb_final (item_db, itemdb_final); + numdb_final(item_db, itemdb_final); item_db = NULL; } } @@ -712,15 +712,15 @@ void do_final_itemdb (void) /* static FILE *dfp; static int itemdebug(void *key,void *data,va_list ap){ -// struct item_data *id=(struct item_data *)data; - fprintf(dfp,"%6d",(int)key); - return 0; +// struct item_data *id=(struct item_data *)data; + fprintf(dfp,"%6d", (int)key); + return 0; } void itemdebugtxt() { - dfp=fopen_("itemdebug.txt","wt"); - numdb_foreach(item_db,itemdebug); - fclose_(dfp); + dfp=fopen_("itemdebug.txt","wt"); + numdb_foreach(item_db,itemdebug); + fclose_(dfp); } */ @@ -728,27 +728,27 @@ void itemdebugtxt() * Removed item_value_db, don't re-add *------------------------------------ */ -static void itemdb_read (void) +static void itemdb_read(void) { - itemdb_read_itemslottable (); - itemdb_readdb (); - itemdb_read_randomitem (); - itemdb_read_itemavail (); - itemdb_read_noequip (); - itemdb_read_cardillustnametable (); + itemdb_read_itemslottable(); + itemdb_readdb(); + itemdb_read_randomitem(); + itemdb_read_itemavail(); + itemdb_read_noequip(); + itemdb_read_cardillustnametable(); if (!battle_config.item_name_override_grffile) - itemdb_read_itemnametable (); + itemdb_read_itemnametable(); } /*========================================== * *------------------------------------------ */ -int do_init_itemdb (void) +int do_init_itemdb(void) { - item_db = numdb_init (); + item_db = numdb_init(); - itemdb_read (); + itemdb_read(); return 0; } diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index e03892d..a132067 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -7,25 +7,25 @@ struct item_data { - int nameid; + int nameid; char name[24], jname[24]; char prefix[24], suffix[24]; char cardillustname[64]; - int value_buy; - int value_sell; - int type; - int sex; - int equip; - int weight; - int atk; - int def; - int range; - int magic_bonus; - int slot; - int look; - int elv; - int wlv; - int refine; + int value_buy; + int value_sell; + int type; + int sex; + int equip; + int weight; + int atk; + int def; + int range; + int magic_bonus; + int slot; + int look; + int elv; + int wlv; + int refine; const ScriptCode *use_script; const ScriptCode *equip_script; struct @@ -37,18 +37,18 @@ struct item_data unsigned no_drop:1; unsigned no_use:1; } flag; - int view_id; + int view_id; }; struct random_item_data { - int nameid; - int per; + int nameid; + int per; }; -struct item_data *itemdb_searchname (const char *name); -struct item_data *itemdb_search (int nameid); -struct item_data *itemdb_exists (int nameid); +struct item_data *itemdb_searchname(const char *name); +struct item_data *itemdb_search(int nameid); +struct item_data *itemdb_exists(int nameid); #define itemdb_type(n) itemdb_search(n)->type #define itemdb_atk(n) itemdb_search(n)->atk #define itemdb_def(n) itemdb_search(n)->def @@ -60,24 +60,24 @@ struct item_data *itemdb_exists (int nameid); #define itemdb_wlv(n) itemdb_search(n)->wlv #define itemdb_range(n) itemdb_search(n)->range #define itemdb_slot(n) itemdb_search(n)->slot -#define itemdb_available(n) (itemdb_exists(n) && itemdb_search(n)->flag.available) -#define itemdb_viewid(n) (itemdb_search(n)->view_id) +#define itemdb_available(n) (itemdb_exists(n) && itemdb_search(n)->flag.available) +#define itemdb_viewid(n) (itemdb_search(n)->view_id) -int itemdb_searchrandomid (int flags); +int itemdb_searchrandomid(int flags); #define itemdb_value_buy(n) itemdb_search(n)->value_buy #define itemdb_value_sell(n) itemdb_search(n)->value_sell #define itemdb_value_notdc(n) itemdb_search(n)->flag.value_notdc #define itemdb_value_notoc(n) itemdb_search(n)->flag.value_notoc -int itemdb_isequip (int); -int itemdb_isequip2 (struct item_data *); -int itemdb_isequip3 (int); -int itemdb_isdropable (int nameid); +int itemdb_isequip(int); +int itemdb_isequip2(struct item_data *); +int itemdb_isequip3(int); +int itemdb_isdropable(int nameid); -void itemdb_reload (void); +void itemdb_reload(void); -void do_final_itemdb (void); -int do_init_itemdb (void); +void do_final_itemdb(void); +int do_init_itemdb(void); #endif diff --git a/src/map/magic-expr-eval.hpp b/src/map/magic-expr-eval.hpp index a08b964..09e6f66 100644 --- a/src/map/magic-expr-eval.hpp +++ b/src/map/magic-expr-eval.hpp @@ -6,11 +6,11 @@ static int heading_x[8] = { 0, -1, -1, -1, 0, 1, 1, 1 }; static int heading_y[8] = { 1, 1, 0, -1, -1, -1, 0, 1 }; -int magic_signature_check (const char *opname, const char *funname, const char *signature, +int magic_signature_check(const char *opname, const char *funname, const char *signature, int args_nr, val_t * args, int line, int column); void -magic_area_rect (int *m, int *x, int *y, int *width, int *height, +magic_area_rect(int *m, int *x, int *y, int *width, int *height, area_t * area); #define ARGINT(x) args[x].v.v_int diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp index 4b4e3a3..7207afc 100644 --- a/src/map/magic-expr.cpp +++ b/src/map/magic-expr.cpp @@ -7,14 +7,14 @@ #define IS_SOLID(c) ((c) == 1 || (c) == 5) -int map_is_solid (int m, int x, int y) +int map_is_solid(int m, int x, int y) { - return (IS_SOLID (map_getcell (m, x, y))); + return (IS_SOLID(map_getcell(m, x, y))); } #undef IS_SOLID -static void free_area (area_t * area) +static void free_area(area_t * area) { if (!area) return; @@ -22,26 +22,26 @@ static void free_area (area_t * area) switch (area->ty) { case AREA_UNION: - free_area (area->a.a_union[0]); - free_area (area->a.a_union[1]); + free_area(area->a.a_union[0]); + free_area(area->a.a_union[1]); break; default: break; } - free (area); + free(area); } -static area_t *dup_area (area_t * area) +static area_t *dup_area(area_t * area) { - area_t *retval = (area_t *)malloc (sizeof (area_t)); + area_t *retval = (area_t *)malloc(sizeof(area_t)); *retval = *area; switch (area->ty) { case AREA_UNION: - retval->a.a_union[0] = dup_area (retval->a.a_union[0]); - retval->a.a_union[1] = dup_area (retval->a.a_union[1]); + retval->a.a_union[0] = dup_area(retval->a.a_union[0]); + retval->a.a_union[1] = dup_area(retval->a.a_union[1]); break; default: break; @@ -50,17 +50,17 @@ static area_t *dup_area (area_t * area) return retval; } -void magic_copy_var (val_t * dest, val_t * src) +void magic_copy_var(val_t * dest, val_t * src) { *dest = *src; switch (dest->ty) { case TY_STRING: - dest->v.v_string = strdup (dest->v.v_string); + dest->v.v_string = strdup(dest->v.v_string); break; case TY_AREA: - dest->v.v_area = dup_area (dest->v.v_area); + dest->v.v_area = dup_area(dest->v.v_area); break; default: break; @@ -68,15 +68,15 @@ void magic_copy_var (val_t * dest, val_t * src) } -void magic_clear_var (val_t * v) +void magic_clear_var(val_t * v) { switch (v->ty) { case TY_STRING: - free (v->v.v_string); + free(v->v.v_string); break; case TY_AREA: - free_area (v->v.v_area); + free_area(v->v.v_area); break; default: break; @@ -84,7 +84,7 @@ void magic_clear_var (val_t * v) } static -const char *show_entity (entity_t * entity) +const char *show_entity(entity_t * entity) { switch (entity->type) { @@ -108,7 +108,7 @@ const char *show_entity (entity_t * entity) } } -static void stringify (val_t * v, int within_op) +static void stringify(val_t * v, int within_op) { static const char *dirs[8] = { "south", "south-west", "west", "north-west", "north", "north-east", @@ -119,50 +119,50 @@ static void stringify (val_t * v, int within_op) switch (v->ty) { case TY_UNDEF: - buf = strdup ("UNDEF"); + buf = strdup("UNDEF"); break; case TY_INT: - buf = (char *)malloc (32); - sprintf (buf, "%i", v->v.v_int); + buf = (char *)malloc(32); + sprintf(buf, "%i", v->v.v_int); break; case TY_STRING: return; case TY_DIR: - buf = strdup (dirs[v->v.v_int]); + buf = strdup(dirs[v->v.v_int]); break; case TY_ENTITY: - buf = strdup (show_entity (v->v.v_entity)); + buf = strdup(show_entity(v->v.v_entity)); break; case TY_LOCATION: - buf = (char *) malloc (128); - sprintf (buf, "<\"%s\", %d, %d>", map[v->v.v_location.m].name, + buf = (char *) malloc(128); + sprintf(buf, "<\"%s\", %d, %d>", map[v->v.v_location.m].name, v->v.v_location.x, v->v.v_location.y); break; case TY_AREA: - buf = strdup ("%area"); - free_area (v->v.v_area); + buf = strdup("%area"); + free_area(v->v.v_area); break; case TY_SPELL: - buf = strdup (v->v.v_spell->name); + buf = strdup(v->v.v_spell->name); break; case TY_INVOCATION: { invocation_t *invocation = within_op - ? v->v.v_invocation : (invocation_t *) map_id2bl (v->v.v_int); - buf = strdup (invocation->spell->name); + ? v->v.v_invocation : (invocation_t *) map_id2bl(v->v.v_int); + buf = strdup(invocation->spell->name); } break; default: - fprintf (stderr, "[magic] INTERNAL ERROR: Cannot stringify %d\n", + fprintf(stderr, "[magic] INTERNAL ERROR: Cannot stringify %d\n", v->ty); return; } @@ -171,29 +171,29 @@ static void stringify (val_t * v, int within_op) v->ty = TY_STRING; } -static void intify (val_t * v) +static void intify(val_t * v) { if (v->ty == TY_INT) return; - magic_clear_var (v); + magic_clear_var(v); v->ty = TY_INT; v->v.v_int = 1; } static -area_t *area_new (int ty) +area_t *area_new(int ty) { area_t *retval; - CREATE (retval, area_t, 1); + CREATE(retval, area_t, 1); retval->ty = ty; return retval; } static -area_t *area_union (area_t * area, area_t * other_area) +area_t *area_union(area_t * area, area_t * other_area) { - area_t *retval = area_new (AREA_UNION); + area_t *retval = area_new(AREA_UNION); retval->a.a_union[0] = area; retval->a.a_union[1] = other_area; retval->size = area->size + other_area->size; /* Assume no overlap */ @@ -203,11 +203,11 @@ area_t *area_union (area_t * area, area_t * other_area) /** * Turns location into area, leaves other types untouched */ -static void make_area (val_t * v) +static void make_area(val_t * v) { if (v->ty == TY_LOCATION) { - area_t *a = (area_t *)malloc (sizeof (area_t)); + area_t *a = (area_t *)malloc(sizeof(area_t)); v->ty = TY_AREA; a->ty = AREA_LOCATION; a->a.a_loc = v->v.v_location; @@ -215,18 +215,18 @@ static void make_area (val_t * v) } } -static void make_location (val_t * v) +static void make_location(val_t * v) { if (v->ty == TY_AREA && v->v.v_area->ty == AREA_LOCATION) { location_t location = v->v.v_area->a.a_loc; - free_area (v->v.v_area); + free_area(v->v.v_area); v->ty = TY_LOCATION; v->v.v_location = location; } } -static void make_spell (val_t * v) +static void make_spell(val_t * v) { if (v->ty == TY_INVOCATION) { @@ -241,210 +241,210 @@ static void make_spell (val_t * v) } } -static int fun_add (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_add(env_t * env, int args_nr, val_t * result, val_t * args) { - if (TY (0) == TY_INT && TY (1) == TY_INT) + if (TY(0) == TY_INT && TY(1) == TY_INT) { /* Integer addition */ - RESULTINT = ARGINT (0) + ARGINT (1); + RESULTINT = ARGINT(0) + ARGINT(1); result->ty = TY_INT; } - else if (ARG_MAY_BE_AREA (0) && ARG_MAY_BE_AREA (1)) + else if (ARG_MAY_BE_AREA(0) && ARG_MAY_BE_AREA(1)) { /* Area union */ - make_area (&args[0]); - make_area (&args[1]); - RESULTAREA = area_union (ARGAREA (0), ARGAREA (1)); - ARGAREA (0) = NULL; - ARGAREA (1) = NULL; + make_area(&args[0]); + make_area(&args[1]); + RESULTAREA = area_union(ARGAREA(0), ARGAREA(1)); + ARGAREA(0) = NULL; + ARGAREA(1) = NULL; result->ty = TY_AREA; } else { /* Anything else -> string concatenation */ - stringify (&args[0], 1); - stringify (&args[1], 1); + stringify(&args[0], 1); + stringify(&args[1], 1); /* Yes, we could speed this up. */ RESULTSTR = - (char *) malloc (1 + strlen (ARGSTR (0)) + strlen (ARGSTR (1))); - strcpy (RESULTSTR, ARGSTR (0)); - strcat (RESULTSTR, ARGSTR (1)); + (char *) malloc(1 + strlen(ARGSTR(0)) + strlen(ARGSTR(1))); + strcpy(RESULTSTR, ARGSTR(0)); + strcat(RESULTSTR, ARGSTR(1)); result->ty = TY_STRING; } return 0; } -static int fun_sub (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_sub(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) - ARGINT (1); + RESULTINT = ARGINT(0) - ARGINT(1); return 0; } -static int fun_mul (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_mul(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) * ARGINT (1); + RESULTINT = ARGINT(0) * ARGINT(1); return 0; } -static int fun_div (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_div(env_t * env, int args_nr, val_t * result, val_t * args) { - if (!ARGINT (1)) + if (!ARGINT(1)) return 1; /* division by zero */ - RESULTINT = ARGINT (0) / ARGINT (1); + RESULTINT = ARGINT(0) / ARGINT(1); return 0; } -static int fun_mod (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_mod(env_t * env, int args_nr, val_t * result, val_t * args) { - if (!ARGINT (1)) + if (!ARGINT(1)) return 1; /* division by zero */ - RESULTINT = ARGINT (0) % ARGINT (1); + RESULTINT = ARGINT(0) % ARGINT(1); return 0; } -static int fun_or (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_or(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) || ARGINT (1); + RESULTINT = ARGINT(0) || ARGINT(1); return 0; } -static int fun_and (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_and(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) && ARGINT (1); + RESULTINT = ARGINT(0) && ARGINT(1); return 0; } -static int fun_not (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_not(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = !ARGINT (0); + RESULTINT = !ARGINT(0); return 0; } -static int fun_neg (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_neg(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ~ARGINT (0); + RESULTINT = ~ARGINT(0); return 0; } -static int fun_gte (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_gte(env_t * env, int args_nr, val_t * result, val_t * args) { - if (TY (0) == TY_STRING || TY (1) == TY_STRING) + if (TY(0) == TY_STRING || TY(1) == TY_STRING) { - stringify (&args[0], 1); - stringify (&args[1], 1); - RESULTINT = strcmp (ARGSTR (0), ARGSTR (1)) >= 0; + stringify(&args[0], 1); + stringify(&args[1], 1); + RESULTINT = strcmp(ARGSTR(0), ARGSTR(1)) >= 0; } else { - intify (&args[0]); - intify (&args[1]); - RESULTINT = ARGINT (0) >= ARGINT (1); + intify(&args[0]); + intify(&args[1]); + RESULTINT = ARGINT(0) >= ARGINT(1); } return 0; } -static int fun_gt (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_gt(env_t * env, int args_nr, val_t * result, val_t * args) { - if (TY (0) == TY_STRING || TY (1) == TY_STRING) + if (TY(0) == TY_STRING || TY(1) == TY_STRING) { - stringify (&args[0], 1); - stringify (&args[1], 1); - RESULTINT = strcmp (ARGSTR (0), ARGSTR (1)) > 0; + stringify(&args[0], 1); + stringify(&args[1], 1); + RESULTINT = strcmp(ARGSTR(0), ARGSTR(1)) > 0; } else { - intify (&args[0]); - intify (&args[1]); - RESULTINT = ARGINT (0) > ARGINT (1); + intify(&args[0]); + intify(&args[1]); + RESULTINT = ARGINT(0) > ARGINT(1); } return 0; } -static int fun_eq (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_eq(env_t * env, int args_nr, val_t * result, val_t * args) { - if (TY (0) == TY_STRING || TY (1) == TY_STRING) + if (TY(0) == TY_STRING || TY(1) == TY_STRING) { - stringify (&args[0], 1); - stringify (&args[1], 1); - RESULTINT = strcmp (ARGSTR (0), ARGSTR (1)) == 0; + stringify(&args[0], 1); + stringify(&args[1], 1); + RESULTINT = strcmp(ARGSTR(0), ARGSTR(1)) == 0; } - else if (TY (0) == TY_DIR && TY (1) == TY_DIR) - RESULTINT = ARGDIR (0) == ARGDIR (1); - else if (TY (0) == TY_ENTITY && TY (1) == TY_ENTITY) - RESULTINT = ARGENTITY (0) == ARGENTITY (1); - else if (TY (0) == TY_LOCATION && TY (1) == TY_LOCATION) - RESULTINT = (ARGLOCATION (0).x == ARGLOCATION (1).x - && ARGLOCATION (0).y == ARGLOCATION (1).y - && ARGLOCATION (0).m == ARGLOCATION (1).m); - else if (TY (0) == TY_AREA && TY (1) == TY_AREA) - RESULTINT = ARGAREA (0) == ARGAREA (1); /* Probably not that great an idea... */ - else if (TY (0) == TY_SPELL && TY (1) == TY_SPELL) - RESULTINT = ARGSPELL (0) == ARGSPELL (1); - else if (TY (0) == TY_INVOCATION && TY (1) == TY_INVOCATION) - RESULTINT = ARGINVOCATION (0) == ARGINVOCATION (1); + else if (TY(0) == TY_DIR && TY(1) == TY_DIR) + RESULTINT = ARGDIR(0) == ARGDIR(1); + else if (TY(0) == TY_ENTITY && TY(1) == TY_ENTITY) + RESULTINT = ARGENTITY(0) == ARGENTITY(1); + else if (TY(0) == TY_LOCATION && TY(1) == TY_LOCATION) + RESULTINT = (ARGLOCATION(0).x == ARGLOCATION(1).x + && ARGLOCATION(0).y == ARGLOCATION(1).y + && ARGLOCATION(0).m == ARGLOCATION(1).m); + else if (TY(0) == TY_AREA && TY(1) == TY_AREA) + RESULTINT = ARGAREA(0) == ARGAREA(1); /* Probably not that great an idea... */ + else if (TY(0) == TY_SPELL && TY(1) == TY_SPELL) + RESULTINT = ARGSPELL(0) == ARGSPELL(1); + else if (TY(0) == TY_INVOCATION && TY(1) == TY_INVOCATION) + RESULTINT = ARGINVOCATION(0) == ARGINVOCATION(1); else { - intify (&args[0]); - intify (&args[1]); - RESULTINT = ARGINT (0) == ARGINT (1); + intify(&args[0]); + intify(&args[1]); + RESULTINT = ARGINT(0) == ARGINT(1); } return 0; } -static int fun_bitand (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_bitand(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) & ARGINT (1); + RESULTINT = ARGINT(0) & ARGINT(1); return 0; } -static int fun_bitor (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_bitor(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) | ARGINT (1); + RESULTINT = ARGINT(0) | ARGINT(1); return 0; } -static int fun_bitxor (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_bitxor(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) ^ ARGINT (1); + RESULTINT = ARGINT(0) ^ ARGINT(1); return 0; } -static int fun_bitshl (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_bitshl(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) << ARGINT (1); + RESULTINT = ARGINT(0) << ARGINT(1); return 0; } -static int fun_bitshr (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_bitshr(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGINT (0) >> ARGINT (1); + RESULTINT = ARGINT(0) >> ARGINT(1); return 0; } -static int fun_max (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_max(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = MAX (ARGINT (0), ARGINT (1)); + RESULTINT = MAX(ARGINT(0), ARGINT(1)); return 0; } -static int fun_min (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_min(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = MIN (ARGINT (0), ARGINT (1)); + RESULTINT = MIN(ARGINT(0), ARGINT(1)); return 0; } static int -fun_if_then_else (env_t * env, int args_nr, val_t * result, val_t * args) +fun_if_then_else(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ARGINT (0)) - magic_copy_var (result, &args[1]); + if (ARGINT(0)) + magic_copy_var(result, &args[1]); else - magic_copy_var (result, &args[2]); + magic_copy_var(result, &args[2]); return 0; } void -magic_area_rect (int *m, int *x, int *y, int *width, int *height, +magic_area_rect(int *m, int *x, int *y, int *width, int *height, area_t * area) { switch (area->ty) @@ -470,10 +470,10 @@ magic_area_rect (int *m, int *x, int *y, int *width, int *height, case AREA_BAR: { - int tx = area->a.a_bar.loc.x; - int ty = area->a.a_bar.loc.y; - int twidth = area->a.a_bar.width; - int tdepth = area->a.a_bar.width; + int tx = area->a.a_bar.loc.x; + int ty = area->a.a_bar.loc.y; + int twidth = area->a.a_bar.width; + int tdepth = area->a.a_bar.width; *m = area->a.a_bar.loc.m; switch (area->a.a_bar.dir) @@ -507,7 +507,7 @@ magic_area_rect (int *m, int *x, int *y, int *width, int *height, break; default: - fprintf (stderr, + fprintf(stderr, "Error: Trying to compute area of NE/SE/NW/SW-facing bar"); *x = tx; *y = ty; @@ -518,98 +518,98 @@ magic_area_rect (int *m, int *x, int *y, int *width, int *height, } } -int magic_location_in_area (int m, int x, int y, area_t * area) +int magic_location_in_area(int m, int x, int y, area_t * area) { switch (area->ty) { case AREA_UNION: - return magic_location_in_area (m, x, y, area->a.a_union[0]) - || magic_location_in_area (m, x, y, area->a.a_union[1]); + return magic_location_in_area(m, x, y, area->a.a_union[0]) + || magic_location_in_area(m, x, y, area->a.a_union[1]); case AREA_LOCATION: case AREA_RECT: case AREA_BAR: { - int am; - int ax, ay, awidth, aheight; - magic_area_rect (&am, &ax, &ay, &awidth, &aheight, area); + int am; + int ax, ay, awidth, aheight; + magic_area_rect(&am, &ax, &ay, &awidth, &aheight, area); return (am == m && (x >= ax) && (y >= ay) && (x < ax + awidth) && (y < ay + aheight)); } default: - fprintf (stderr, "INTERNAL ERROR: Invalid area\n"); + fprintf(stderr, "INTERNAL ERROR: Invalid area\n"); return 0; } } -static int fun_is_in (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_is_in(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = magic_location_in_area (ARGLOCATION (0).m, - ARGLOCATION (0).x, - ARGLOCATION (0).y, ARGAREA (1)); + RESULTINT = magic_location_in_area(ARGLOCATION(0).m, + ARGLOCATION(0).x, + ARGLOCATION(0).y, ARGAREA(1)); return 0; } -static int fun_skill (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_skill(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ETY (0) != BL_PC - || ARGINT (1) < 0 - || ARGINT (1) >= MAX_SKILL - || ARGPC (0)->status.skill[ARGINT (1)].id != ARGINT (1)) + if (ETY(0) != BL_PC + || ARGINT(1) < 0 + || ARGINT(1) >= MAX_SKILL + || ARGPC(0)->status.skill[ARGINT(1)].id != ARGINT(1)) RESULTINT = 0; else - RESULTINT = ARGPC (0)->status.skill[ARGINT (1)].lv; + RESULTINT = ARGPC(0)->status.skill[ARGINT(1)].lv; return 0; } static int -fun_has_shroud (env_t * env, int args_nr, val_t * result, val_t * args) +fun_has_shroud(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = (ETY (0) == BL_PC && ARGPC (0)->state.shroud_active); + RESULTINT = (ETY(0) == BL_PC && ARGPC(0)->state.shroud_active); return 0; } #define BATTLE_GETTER(name) static int fun_get_##name(env_t *env, int args_nr, val_t *result, val_t *args) { RESULTINT = battle_get_##name(ARGENTITY(0)); return 0; } -BATTLE_GETTER (str); -BATTLE_GETTER (agi); -BATTLE_GETTER (vit); -BATTLE_GETTER (dex); -BATTLE_GETTER (luk); -BATTLE_GETTER (int); -BATTLE_GETTER (lv); -BATTLE_GETTER (hp); -BATTLE_GETTER (mdef); -BATTLE_GETTER (def); -BATTLE_GETTER (max_hp); -BATTLE_GETTER (dir); - -#define MMO_GETTER(name) static int fun_get_##name(env_t *env, int args_nr, val_t *result, val_t *args) { \ - if (ETY(0) == BL_PC) \ - RESULTINT = ARGPC(0)->status.name; \ - else \ - RESULTINT = 0; \ - return 0; } - -MMO_GETTER (sp); -MMO_GETTER (max_sp); +BATTLE_GETTER(str); +BATTLE_GETTER(agi); +BATTLE_GETTER(vit); +BATTLE_GETTER(dex); +BATTLE_GETTER(luk); +BATTLE_GETTER(int); +BATTLE_GETTER(lv); +BATTLE_GETTER(hp); +BATTLE_GETTER(mdef); +BATTLE_GETTER(def); +BATTLE_GETTER(max_hp); +BATTLE_GETTER(dir); + +#define MMO_GETTER(name) static int fun_get_##name(env_t *env, int args_nr, val_t *result, val_t *args) { \ + if (ETY(0) == BL_PC) \ + RESULTINT = ARGPC(0)->status.name; \ + else \ + RESULTINT = 0; \ + return 0; } + +MMO_GETTER(sp); +MMO_GETTER(max_sp); static int -fun_name_of (env_t * env, int args_nr, val_t * result, val_t * args) +fun_name_of(env_t * env, int args_nr, val_t * result, val_t * args) { - if (TY (0) == TY_ENTITY) + if (TY(0) == TY_ENTITY) { - RESULTSTR = strdup (show_entity (ARGENTITY (0))); + RESULTSTR = strdup(show_entity(ARGENTITY(0))); return 0; } - else if (TY (0) == TY_SPELL) + else if (TY(0) == TY_SPELL) { - RESULTSTR = strdup (ARGSPELL (0)->name); + RESULTSTR = strdup(ARGSPELL(0)->name); return 0; } - else if (TY (0) == TY_INVOCATION) + else if (TY(0) == TY_INVOCATION) { - RESULTSTR = strdup (ARGINVOCATION (0)->spell->name); + RESULTSTR = strdup(ARGINVOCATION(0)->spell->name); return 0; } return 1; @@ -617,25 +617,25 @@ fun_name_of (env_t * env, int args_nr, val_t * result, val_t * args) /* [Freeyorp] I'm putting this one in as name_of seems to have issues with summoned or spawned mobs. */ static int -fun_mob_id (env_t * env, int args_nr, val_t * result, val_t * args) +fun_mob_id(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ETY (0) != BL_MOB) return 1; - RESULTINT = ((struct mob_data *) (ARGENTITY(0)))->mob_class; + if (ETY(0) != BL_MOB) return 1; + RESULTINT = ((struct mob_data *)(ARGENTITY(0)))->mob_class; return 0; } -#define COPY_LOCATION(dest, src) (dest).x = (src).x; (dest).y = (src).y; (dest).m = (src).m; +#define COPY_LOCATION(dest, src) (dest).x = (src).x;(dest).y = (src).y;(dest).m = (src).m; static int -fun_location (env_t * env, int args_nr, val_t * result, val_t * args) +fun_location(env_t * env, int args_nr, val_t * result, val_t * args) { - COPY_LOCATION (RESULTLOCATION, *(ARGENTITY (0))); + COPY_LOCATION(RESULTLOCATION, *(ARGENTITY(0))); return 0; } -static int fun_random (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_random(env_t * env, int args_nr, val_t * result, val_t * args) { - int delta = ARGINT (0); + int delta = ARGINT(0); if (delta < 0) delta = -delta; if (delta == 0) @@ -643,40 +643,40 @@ static int fun_random (env_t * env, int args_nr, val_t * result, val_t * args) RESULTINT = 0; return 0; } - RESULTINT = MRAND (delta); + RESULTINT = MRAND(delta); - if (ARGINT (0) < 0) + if (ARGINT(0) < 0) RESULTINT = -RESULTINT; return 0; } static int -fun_random_dir (env_t * env, int args_nr, val_t * result, val_t * args) +fun_random_dir(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ARGINT (0)) - RESULTDIR = mt_random () & 0x7; + if (ARGINT(0)) + RESULTDIR = mt_random() & 0x7; else - RESULTDIR = (mt_random () & 0x3) * 2; + RESULTDIR = (mt_random() & 0x3) * 2; return 0; } static int -fun_hash_entity (env_t * env, int args_nr, val_t * result, val_t * args) +fun_hash_entity(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGENTITY (0)->id; + RESULTINT = ARGENTITY(0)->id; return 0; } -int // ret -1: not a string, ret 1: no such item, ret 0: OK -magic_find_item (val_t * args, int index, struct item *item, int *stackable) +int // ret -1: not a string, ret 1: no such item, ret 0: OK +magic_find_item(val_t * args, int index, struct item *item, int *stackable) { struct item_data *item_data; - int must_add_sequentially; + int must_add_sequentially; - if (TY (index) == TY_INT) - item_data = itemdb_exists (ARGINT (index)); - else if (TY (index) == TY_STRING) - item_data = itemdb_searchname (ARGSTR (index)); + if (TY(index) == TY_INT) + item_data = itemdb_exists(ARGINT(index)); + else if (TY(index) == TY_STRING) + item_data = itemdb_searchname(ARGSTR(index)); else return -1; @@ -688,7 +688,7 @@ magic_find_item (val_t * args, int index, struct item *item, int *stackable) if (stackable) *stackable = !must_add_sequentially; - memset (item, 0, sizeof (struct item)); + memset(item, 0, sizeof(struct item)); item->nameid = item_data->nameid; item->identify = 1; @@ -696,31 +696,31 @@ magic_find_item (val_t * args, int index, struct item *item, int *stackable) } static int -fun_count_item (env_t * env, int args_nr, val_t * result, val_t * args) +fun_count_item(env_t * env, int args_nr, val_t * result, val_t * args) { - character_t *chr = (ETY (0) == BL_PC) ? ARGPC (0) : NULL; - int stackable; + character_t *chr = (ETY(0) == BL_PC) ? ARGPC(0) : NULL; + int stackable; struct item item; - GET_ARG_ITEM (1, item, stackable); + GET_ARG_ITEM(1, item, stackable); if (!chr) return 1; - RESULTINT = pc_count_all_items (chr, item.nameid); + RESULTINT = pc_count_all_items(chr, item.nameid); return 0; } static int -fun_is_equipped (env_t * env, int args_nr, val_t * result, val_t * args) +fun_is_equipped(env_t * env, int args_nr, val_t * result, val_t * args) { - character_t *chr = (ETY (0) == BL_PC) ? ARGPC (0) : NULL; - int stackable; + character_t *chr = (ETY(0) == BL_PC) ? ARGPC(0) : NULL; + int stackable; struct item item; - int i; - int retval = 0; + int i; + int retval = 0; - GET_ARG_ITEM (1, item, stackable); + GET_ARG_ITEM(1, item, stackable); if (!chr) return 1; @@ -739,33 +739,33 @@ fun_is_equipped (env_t * env, int args_nr, val_t * result, val_t * args) } static int -fun_is_married (env_t * env, int args_nr, val_t * result, val_t * args) +fun_is_married(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = (ETY (0) == BL_PC && ARGPC (0)->status.partner_id); + RESULTINT = (ETY(0) == BL_PC && ARGPC(0)->status.partner_id); return 0; } static int -fun_is_dead (env_t * env, int args_nr, val_t * result, val_t * args) +fun_is_dead(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = (ETY (0) == BL_PC && pc_isdead (ARGPC (0))); + RESULTINT = (ETY(0) == BL_PC && pc_isdead(ARGPC(0))); return 0; } -static int fun_is_pc (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_is_pc(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = (ETY (0) == BL_PC); + RESULTINT = (ETY(0) == BL_PC); return 0; } static int -fun_partner (env_t * env, int args_nr, val_t * result, val_t * args) +fun_partner(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ETY (0) == BL_PC && ARGPC (0)->status.partner_id) + if (ETY(0) == BL_PC && ARGPC(0)->status.partner_id) { RESULTENTITY = (entity_t *) - map_nick2sd (map_charid2nick (ARGPC (0)->status.partner_id)); + map_nick2sd(map_charid2nick(ARGPC(0)->status.partner_id)); return 0; } else @@ -773,13 +773,13 @@ fun_partner (env_t * env, int args_nr, val_t * result, val_t * args) } static int -fun_awayfrom (env_t * env, int args_nr, val_t * result, val_t * args) +fun_awayfrom(env_t * env, int args_nr, val_t * result, val_t * args) { - location_t *loc = &ARGLOCATION (0); - int dx = heading_x[ARGDIR (1)]; - int dy = heading_y[ARGDIR (1)]; - int distance = ARGINT (2); - while (distance-- && !map_is_solid (loc->m, loc->x + dx, loc->y + dy)) + location_t *loc = &ARGLOCATION(0); + int dx = heading_x[ARGDIR(1)]; + int dy = heading_y[ARGDIR(1)]; + int distance = ARGINT(2); + while (distance-- && !map_is_solid(loc->m, loc->x + dx, loc->y + dy)) { loc->x += dx; loc->y += dy; @@ -789,62 +789,62 @@ fun_awayfrom (env_t * env, int args_nr, val_t * result, val_t * args) return 0; } -static int fun_failed (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_failed(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = TY (0) == TY_FAIL; + RESULTINT = TY(0) == TY_FAIL; return 0; } -static int fun_npc (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_npc(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTENTITY = (entity_t *) npc_name2id (ARGSTR (0)); + RESULTENTITY = (entity_t *) npc_name2id(ARGSTR(0)); return RESULTENTITY == NULL; } -static int fun_pc (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_pc(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTENTITY = (entity_t *) map_nick2sd (ARGSTR (0)); + RESULTENTITY = (entity_t *) map_nick2sd(ARGSTR(0)); return RESULTENTITY == NULL; } static int -fun_distance (env_t * env, int args_nr, val_t * result, val_t * args) +fun_distance(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ARGLOCATION (0).m != ARGLOCATION (1).m) + if (ARGLOCATION(0).m != ARGLOCATION(1).m) RESULTINT = INT_MAX; else - RESULTINT = MAX (abs (ARGLOCATION (0).x - ARGLOCATION (1).x), - abs (ARGLOCATION (0).y - ARGLOCATION (1).y)); + RESULTINT = MAX(abs(ARGLOCATION(0).x - ARGLOCATION(1).x), + abs(ARGLOCATION(0).y - ARGLOCATION(1).y)); return 0; } static int -fun_rdistance (env_t * env, int args_nr, val_t * result, val_t * args) +fun_rdistance(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ARGLOCATION (0).m != ARGLOCATION (1).m) + if (ARGLOCATION(0).m != ARGLOCATION(1).m) RESULTINT = INT_MAX; else { - int dx = ARGLOCATION (0).x - ARGLOCATION (1).x; - int dy = ARGLOCATION (0).y - ARGLOCATION (1).y; - RESULTINT = (int) (sqrt ((dx * dx) + (dy * dy))); + int dx = ARGLOCATION(0).x - ARGLOCATION(1).x; + int dy = ARGLOCATION(0).y - ARGLOCATION(1).y; + RESULTINT = (int)(sqrt((dx * dx) + (dy * dy))); } return 0; } -static int fun_anchor (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_anchor(env_t * env, int args_nr, val_t * result, val_t * args) { - teleport_anchor_t *anchor = magic_find_anchor (ARGSTR (0)); + teleport_anchor_t *anchor = magic_find_anchor(ARGSTR(0)); if (!anchor) return 1; - magic_eval (env, result, anchor->location); + magic_eval(env, result, anchor->location); - make_area (result); + make_area(result); if (result->ty != TY_AREA) { - magic_clear_var (result); + magic_clear_var(result); return 1; } @@ -852,29 +852,29 @@ static int fun_anchor (env_t * env, int args_nr, val_t * result, val_t * args) } static int -fun_line_of_sight (env_t * env, int args_nr, val_t * result, val_t * args) +fun_line_of_sight(env_t * env, int args_nr, val_t * result, val_t * args) { entity_t e1, e2; - COPY_LOCATION (e1, ARGLOCATION (0)); - COPY_LOCATION (e2, ARGLOCATION (1)); + COPY_LOCATION(e1, ARGLOCATION(0)); + COPY_LOCATION(e2, ARGLOCATION(1)); - RESULTINT = battle_check_range (&e1, &e2, 0); + RESULTINT = battle_check_range(&e1, &e2, 0); return 0; } -void magic_random_location (location_t * dest, area_t * area) +void magic_random_location(location_t * dest, area_t * area) { switch (area->ty) { case AREA_UNION: { - int rv = MRAND (area->size); + int rv = MRAND(area->size); if (rv < area->a.a_union[0]->size) - magic_random_location (dest, area->a.a_union[0]); + magic_random_location(dest, area->a.a_union[0]); else - magic_random_location (dest, area->a.a_union[1]); + magic_random_location(dest, area->a.a_union[1]); break; } @@ -882,8 +882,8 @@ void magic_random_location (location_t * dest, area_t * area) case AREA_RECT: case AREA_BAR: { - int m, x, y, w, h; - magic_area_rect (&m, &x, &y, &w, &h, area); + int m, x, y, w, h; + magic_area_rect(&m, &x, &y, &w, &h, area); if (w <= 1) w = 1; @@ -891,16 +891,16 @@ void magic_random_location (location_t * dest, area_t * area) if (h <= 1) h = 1; - x += MRAND (w); - y += MRAND (h); + x += MRAND(w); + y += MRAND(h); - if (!map_is_solid (m, x, y)) + if (!map_is_solid(m, x, y)) { - int start_x = x; - int start_y = y; - int i; - int initial_dir = mt_random () & 0x7; - int dir = initial_dir; + int start_x = x; + int start_y = y; + int i; + int initial_dir = mt_random() & 0x7; + int dir = initial_dir; /* try all directions, up to a distance to 10, for a free slot */ do @@ -908,7 +908,7 @@ void magic_random_location (location_t * dest, area_t * area) x = start_x; y = start_y; - for (i = 0; i < 10 && map_is_solid (m, x, y); i++) + for (i = 0; i < 10 && map_is_solid(m, x, y); i++) { x += heading_x[dir]; y += heading_y[dir]; @@ -916,7 +916,7 @@ void magic_random_location (location_t * dest, area_t * area) dir = (dir + 1) & 0x7; } - while (map_is_solid (m, x, y) && dir != initial_dir); + while (map_is_solid(m, x, y) && dir != initial_dir); } /* We've tried our best. If the map is still solid, the engine will automatically randomise the target location if we try to warp. */ @@ -928,36 +928,36 @@ void magic_random_location (location_t * dest, area_t * area) } default: - fprintf (stderr, "Unknown area type %d\n", area->ty); + fprintf(stderr, "Unknown area type %d\n", area->ty); } } static int -fun_pick_location (env_t * env, int args_nr, val_t * result, val_t * args) +fun_pick_location(env_t * env, int args_nr, val_t * result, val_t * args) { - magic_random_location (&result->v.v_location, ARGAREA (0)); + magic_random_location(&result->v.v_location, ARGAREA(0)); return 0; } static int -fun_read_script_int (env_t * env, int args_nr, val_t * result, val_t * args) +fun_read_script_int(env_t * env, int args_nr, val_t * result, val_t * args) { - entity_t *subject_p = ARGENTITY (0); - char *var_name = ARGSTR (1); + entity_t *subject_p = ARGENTITY(0); + char *var_name = ARGSTR(1); if (subject_p->type != BL_PC) return 1; - RESULTINT = pc_readglobalreg ((character_t *) subject_p, var_name); + RESULTINT = pc_readglobalreg((character_t *) subject_p, var_name); return 0; } -static int fun_rbox (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_rbox(env_t * env, int args_nr, val_t * result, val_t * args) { - location_t loc = ARGLOCATION (0); - int radius = ARGINT (1); + location_t loc = ARGLOCATION(0); + int radius = ARGINT(1); - RESULTAREA = area_new (AREA_RECT); + RESULTAREA = area_new(AREA_RECT); RESULTAREA->a.a_rect.loc.m = loc.m; RESULTAREA->a.a_rect.loc.x = loc.x - radius; RESULTAREA->a.a_rect.loc.y = loc.y - radius; @@ -968,78 +968,78 @@ static int fun_rbox (env_t * env, int args_nr, val_t * result, val_t * args) } static int -fun_running_status_update (env_t * env, int args_nr, val_t * result, +fun_running_status_update(env_t * env, int args_nr, val_t * result, val_t * args) { - if (ETY (0) != BL_PC && ETY (0) != BL_MOB) + if (ETY(0) != BL_PC && ETY(0) != BL_MOB) return 1; - RESULTINT = battle_get_sc_data (ARGENTITY (0))[ARGINT (1)].timer != -1; + RESULTINT = battle_get_sc_data(ARGENTITY(0))[ARGINT(1)].timer != -1; return 0; } static int -fun_status_option (env_t * env, int args_nr, val_t * result, val_t * args) +fun_status_option(env_t * env, int args_nr, val_t * result, val_t * args) { RESULTINT = - ((((struct map_session_data *) ARGENTITY (0))-> - status.option & ARGINT (0)) != 0); + ((((struct map_session_data *) ARGENTITY(0))-> + status.option & ARGINT(0)) != 0); return 0; } static int -fun_element (env_t * env, int args_nr, val_t * result, val_t * args) +fun_element(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = battle_get_element (ARGENTITY (0)) % 10; + RESULTINT = battle_get_element(ARGENTITY(0)) % 10; return 0; } static int -fun_element_level (env_t * env, int args_nr, val_t * result, val_t * args) +fun_element_level(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = battle_get_element (ARGENTITY (0)) / 10; + RESULTINT = battle_get_element(ARGENTITY(0)) / 10; return 0; } -static int fun_index (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_index(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = ARGSPELL (0)->index; + RESULTINT = ARGSPELL(0)->index; return 0; } static int -fun_is_exterior (env_t * env, int args_nr, val_t * result, val_t * args) +fun_is_exterior(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = map[ARGLOCATION (0).m].name[4] == '1'; + RESULTINT = map[ARGLOCATION(0).m].name[4] == '1'; return 0; } static int -fun_contains_string (env_t * env, int args_nr, val_t * result, val_t * args) +fun_contains_string(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = NULL != strstr (ARGSTR (0), ARGSTR (1)); + RESULTINT = NULL != strstr(ARGSTR(0), ARGSTR(1)); return 0; } -static int fun_strstr (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_strstr(env_t * env, int args_nr, val_t * result, val_t * args) { - char *offset = strstr (ARGSTR (0), ARGSTR (1)); - RESULTINT = offset - ARGSTR (0); + char *offset = strstr(ARGSTR(0), ARGSTR(1)); + RESULTINT = offset - ARGSTR(0); return offset == NULL; } -static int fun_strlen (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_strlen(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = strlen (ARGSTR (0)); + RESULTINT = strlen(ARGSTR(0)); return 0; } -static int fun_substr (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_substr(env_t * env, int args_nr, val_t * result, val_t * args) { - const char *src = ARGSTR (0); - const int slen = strlen (src); - int offset = ARGINT (1); - int len = ARGINT (2); + const char *src = ARGSTR(0); + const int slen = strlen(src); + int offset = ARGINT(1); + int len = ARGINT(2); if (len < 0) len = 0; @@ -1052,28 +1052,28 @@ static int fun_substr (env_t * env, int args_nr, val_t * result, val_t * args) if (offset + len > slen) len = slen - offset; - RESULTSTR = (char *) calloc (1, 1 + len); - memcpy (RESULTSTR, src + offset, len); + RESULTSTR = (char *) calloc(1, 1 + len); + memcpy(RESULTSTR, src + offset, len); return 0; } -static int fun_sqrt (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_sqrt(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = (int) sqrt (ARGINT (0)); + RESULTINT = (int) sqrt(ARGINT(0)); return 0; } static int -fun_map_level (env_t * env, int args_nr, val_t * result, val_t * args) +fun_map_level(env_t * env, int args_nr, val_t * result, val_t * args) { - RESULTINT = map[ARGLOCATION (0).m].name[4] - '0'; + RESULTINT = map[ARGLOCATION(0).m].name[4] - '0'; return 0; } -static int fun_map_nr (env_t * env, int args_nr, val_t * result, val_t * args) +static int fun_map_nr(env_t * env, int args_nr, val_t * result, val_t * args) { - const char *mapname = map[ARGLOCATION (0).m].name; + const char *mapname = map[ARGLOCATION(0).m].name; RESULTINT = ((mapname[0] - '0') * 100) + ((mapname[1] - '0') * 10) + ((mapname[2] - '0')); @@ -1081,28 +1081,28 @@ static int fun_map_nr (env_t * env, int args_nr, val_t * result, val_t * args) } static int -fun_dir_towards (env_t * env, int args_nr, val_t * result, val_t * args) +fun_dir_towards(env_t * env, int args_nr, val_t * result, val_t * args) { - int dx; - int dy; + int dx; + int dy; - if (ARGLOCATION (0).m != ARGLOCATION (1).m) + if (ARGLOCATION(0).m != ARGLOCATION(1).m) return 1; - dx = ARGLOCATION (1).x - ARGLOCATION (0).x; - dy = ARGLOCATION (1).y - ARGLOCATION (0).y; + dx = ARGLOCATION(1).x - ARGLOCATION(0).x; + dy = ARGLOCATION(1).y - ARGLOCATION(0).y; - if (ARGINT (1)) + if (ARGINT(1)) { /* 8-direction mode */ - if (abs (dx) > abs (dy) * 2) + if (abs(dx) > abs(dy) * 2) { /* east or west */ if (dx < 0) RESULTINT = 2 /* west */ ; else RESULTINT = 6 /* east */ ; } - else if (abs (dy) > abs (dx) * 2) + else if (abs(dy) > abs(dx) * 2) { /* north or south */ if (dy > 0) RESULTINT = 0 /* south */ ; @@ -1127,7 +1127,7 @@ fun_dir_towards (env_t * env, int args_nr, val_t * result, val_t * args) else { /* 4-direction mode */ - if (abs (dx) > abs (dy)) + if (abs(dx) > abs(dy)) { /* east or west */ if (dx < 0) RESULTINT = 2 /* west */ ; @@ -1147,14 +1147,14 @@ fun_dir_towards (env_t * env, int args_nr, val_t * result, val_t * args) } static int -fun_extract_healer_xp (env_t * env, int args_nr, val_t * result, val_t * args) +fun_extract_healer_xp(env_t * env, int args_nr, val_t * result, val_t * args) { - character_t *sd = (ETY (0) == BL_PC) ? ARGPC (0) : NULL; + character_t *sd = (ETY(0) == BL_PC) ? ARGPC(0) : NULL; if (!sd) RESULTINT = 0; else - RESULTINT = pc_extract_healer_exp (sd, ARGINT (1)); + RESULTINT = pc_extract_healer_exp(sd, ARGINT(1)); return 0; } @@ -1183,19 +1183,19 @@ static fun_t functions[] = { {"is_in", "la", 'i', fun_is_in}, {"if_then_else", "i__", '_', fun_if_then_else}, {"skill", "ei", 'i', fun_skill}, - BATTLE_RECORD (str), - BATTLE_RECORD (agi), - BATTLE_RECORD (vit), - BATTLE_RECORD (dex), - BATTLE_RECORD (luk), - BATTLE_RECORD (int), - BATTLE_RECORD2 ("level", lv), - BATTLE_RECORD (mdef), - BATTLE_RECORD (def), - BATTLE_RECORD (hp), - BATTLE_RECORD (max_hp), - BATTLE_RECORD (sp), - BATTLE_RECORD (max_sp), + BATTLE_RECORD(str), + BATTLE_RECORD(agi), + BATTLE_RECORD(vit), + BATTLE_RECORD(dex), + BATTLE_RECORD(luk), + BATTLE_RECORD(int), + BATTLE_RECORD2("level", lv), + BATTLE_RECORD(mdef), + BATTLE_RECORD(def), + BATTLE_RECORD(hp), + BATTLE_RECORD(max_hp), + BATTLE_RECORD(sp), + BATTLE_RECORD(max_sp), {"dir", "e", 'd', fun_get_dir}, {"name_of", ".", 's', fun_name_of}, {"mob_id", "e", 'i', fun_mob_id}, @@ -1242,12 +1242,12 @@ static fun_t functions[] = { static int functions_are_sorted = 0; static -int compare_fun (const void *lhs, const void *rhs) +int compare_fun(const void *lhs, const void *rhs) { - return strcmp (((fun_t *) lhs)->name, ((fun_t *) rhs)->name); + return strcmp(((fun_t *) lhs)->name, ((fun_t *) rhs)->name); } -fun_t *magic_get_fun (const char *name, int *index) +fun_t *magic_get_fun(const char *name, int *index) { static int functions_nr; fun_t *result; @@ -1261,12 +1261,12 @@ fun_t *magic_get_fun (const char *name, int *index) ++it; functions_nr = it - functions; - qsort (functions, functions_nr, sizeof (fun_t), compare_fun); + qsort(functions, functions_nr, sizeof(fun_t), compare_fun); functions_are_sorted = 1; } key.name = name; - result = (fun_t *) bsearch (&key, functions, functions_nr, sizeof (fun_t), + result = (fun_t *) bsearch(&key, functions, functions_nr, sizeof(fun_t), compare_fun); if (result && index) @@ -1275,19 +1275,19 @@ fun_t *magic_get_fun (const char *name, int *index) return result; } -static int // 1 on failure -eval_location (env_t * env, location_t * dest, e_location_t * expr) +static int // 1 on failure +eval_location(env_t * env, location_t * dest, e_location_t * expr) { val_t m, x, y; - magic_eval (env, &m, expr->m); - magic_eval (env, &x, expr->x); - magic_eval (env, &y, expr->y); + magic_eval(env, &m, expr->m); + magic_eval(env, &x, expr->x); + magic_eval(env, &y, expr->y); - if (CHECK_TYPE (&m, TY_STRING) - && CHECK_TYPE (&x, TY_INT) && CHECK_TYPE (&y, TY_INT)) + if (CHECK_TYPE(&m, TY_STRING) + && CHECK_TYPE(&x, TY_INT) && CHECK_TYPE(&y, TY_INT)) { - int map_id = map_mapname2mapid (m.v.v_string); - magic_clear_var (&m); + int map_id = map_mapname2mapid(m.v.v_string); + magic_clear_var(&m); if (map_id < 0) return 1; dest->m = map_id; @@ -1297,25 +1297,25 @@ eval_location (env_t * env, location_t * dest, e_location_t * expr) } else { - magic_clear_var (&m); - magic_clear_var (&x); - magic_clear_var (&y); + magic_clear_var(&m); + magic_clear_var(&x); + magic_clear_var(&y); return 1; } } -static area_t *eval_area (env_t * env, e_area_t * expr) +static area_t *eval_area(env_t * env, e_area_t * expr) { - area_t *area = (area_t *)malloc (sizeof (area_t)); + area_t *area = (area_t *)malloc(sizeof(area_t)); area->ty = expr->ty; switch (expr->ty) { case AREA_LOCATION: area->size = 1; - if (eval_location (env, &area->a.a_loc, &expr->a.a_loc)) + if (eval_location(env, &area->a.a_loc, &expr->a.a_loc)) { - free (area); + free(area); return NULL; } else @@ -1323,10 +1323,10 @@ static area_t *eval_area (env_t * env, e_area_t * expr) case AREA_UNION: { - int i, fail = 0; + int i, fail = 0; for (i = 0; i < 2; i++) { - area->a.a_union[i] = eval_area (env, expr->a.a_union[i]); + area->a.a_union[i] = eval_area(env, expr->a.a_union[i]); if (!area->a.a_union[i]) fail = 1; } @@ -1336,9 +1336,9 @@ static area_t *eval_area (env_t * env, e_area_t * expr) for (i = 0; i < 2; i++) { if (area->a.a_union[i]) - free_area (area->a.a_union[i]); + free_area(area->a.a_union[i]); } - free (area); + free(area); return NULL; } area->size = area->a.a_union[0]->size + area->a.a_union[1]->size; @@ -1348,27 +1348,27 @@ static area_t *eval_area (env_t * env, e_area_t * expr) case AREA_RECT: { val_t width, height; - magic_eval (env, &width, expr->a.a_rect.width); - magic_eval (env, &height, expr->a.a_rect.height); + magic_eval(env, &width, expr->a.a_rect.width); + magic_eval(env, &height, expr->a.a_rect.height); area->a.a_rect.width = width.v.v_int; area->a.a_rect.height = height.v.v_int; - if (CHECK_TYPE (&width, TY_INT) - && CHECK_TYPE (&height, TY_INT) - && !eval_location (env, &(area->a.a_rect.loc), + if (CHECK_TYPE(&width, TY_INT) + && CHECK_TYPE(&height, TY_INT) + && !eval_location(env, &(area->a.a_rect.loc), &expr->a.a_rect.loc)) { area->size = area->a.a_rect.width * area->a.a_rect.height; - magic_clear_var (&width); - magic_clear_var (&height); + magic_clear_var(&width); + magic_clear_var(&height); return area; } else { - free (area); - magic_clear_var (&width); - magic_clear_var (&height); + free(area); + magic_clear_var(&width); + magic_clear_var(&height); return NULL; } } @@ -1376,46 +1376,46 @@ static area_t *eval_area (env_t * env, e_area_t * expr) case AREA_BAR: { val_t width, depth, dir; - magic_eval (env, &width, expr->a.a_bar.width); - magic_eval (env, &depth, expr->a.a_bar.depth); - magic_eval (env, &dir, expr->a.a_bar.dir); + magic_eval(env, &width, expr->a.a_bar.width); + magic_eval(env, &depth, expr->a.a_bar.depth); + magic_eval(env, &dir, expr->a.a_bar.dir); area->a.a_bar.width = width.v.v_int; area->a.a_bar.depth = depth.v.v_int; area->a.a_bar.dir = dir.v.v_int; - if (CHECK_TYPE (&width, TY_INT) - && CHECK_TYPE (&depth, TY_INT) - && CHECK_TYPE (&dir, TY_DIR) - && !eval_location (env, &area->a.a_bar.loc, + if (CHECK_TYPE(&width, TY_INT) + && CHECK_TYPE(&depth, TY_INT) + && CHECK_TYPE(&dir, TY_DIR) + && !eval_location(env, &area->a.a_bar.loc, &expr->a.a_bar.loc)) { area->size = (area->a.a_bar.width * 2 + 1) * area->a.a_bar.depth; - magic_clear_var (&width); - magic_clear_var (&depth); - magic_clear_var (&dir); + magic_clear_var(&width); + magic_clear_var(&depth); + magic_clear_var(&dir); return area; } else { - free (area); - magic_clear_var (&width); - magic_clear_var (&depth); - magic_clear_var (&dir); + free(area); + magic_clear_var(&width); + magic_clear_var(&depth); + magic_clear_var(&dir); return NULL; } } default: - fprintf (stderr, "INTERNAL ERROR: Unknown area type %d\n", + fprintf(stderr, "INTERNAL ERROR: Unknown area type %d\n", area->ty); - free (area); + free(area); return NULL; } } -static int type_key (char ty_key) +static int type_key(char ty_key) { switch (ty_key) { @@ -1440,34 +1440,34 @@ static int type_key (char ty_key) } } -int magic_signature_check (const char *opname, const char *funname, const char *signature, +int magic_signature_check(const char *opname, const char *funname, const char *signature, int args_nr, val_t * args, int line, int column) { - int i; + int i; for (i = 0; i < args_nr; i++) { val_t *arg = &args[i]; char ty_key = signature[i]; - int ty = arg->ty; - int desired_ty = type_key (ty_key); + int ty = arg->ty; + int desired_ty = type_key(ty_key); if (ty == TY_ENTITY) { /* Dereference entities in preparation for calling function */ - arg->v.v_entity = map_id2bl (arg->v.v_int); + arg->v.v_entity = map_id2bl(arg->v.v_int); if (!arg->v.v_entity) ty = arg->ty = TY_FAIL; } else if (ty == TY_INVOCATION) { - arg->v.v_invocation = (invocation_t *) map_id2bl (arg->v.v_int); + arg->v.v_invocation = (invocation_t *) map_id2bl(arg->v.v_int); if (!arg->v.v_entity) ty = arg->ty = TY_FAIL; } if (!ty_key) { - fprintf (stderr, + fprintf(stderr, "[magic-eval]: L%d:%d: Too many arguments (%d) to %s `%s'\n", line, column, args_nr, opname, funname); return 1; @@ -1481,7 +1481,7 @@ int magic_signature_check (const char *opname, const char *funname, const char * if (ty == TY_UNDEF) { - fprintf (stderr, + fprintf(stderr, "[magic-eval]: L%d:%d: Argument #%d to %s `%s' undefined\n", line, column, i + 1, opname, funname); return 1; @@ -1491,19 +1491,19 @@ int magic_signature_check (const char *opname, const char *funname, const char * switch (desired_ty) { case TY_INT: - intify (arg); + intify(arg); break; /* 100% success rate */ case TY_STRING: - stringify (arg, 1); + stringify(arg, 1); break; /* 100% success rate */ case TY_AREA: - make_area (arg); + make_area(arg); break; /* Only works for locations */ case TY_LOCATION: - make_location (arg); + make_location(arg); break; /* Only works for some areas */ case TY_SPELL: - make_spell (arg); + make_spell(arg); break; /* Only works for still-active invocatoins */ default: break; /* We'll fail right below */ @@ -1513,7 +1513,7 @@ int magic_signature_check (const char *opname, const char *funname, const char * if (ty != desired_ty) { /* Coercion failed? */ if (ty != TY_FAIL) - fprintf (stderr, + fprintf(stderr, "[magic-eval]: L%d:%d: Argument #%d to %s `%s' of incorrect type (%d)\n", line, column, i + 1, opname, funname, ty); return 1; @@ -1525,7 +1525,7 @@ int magic_signature_check (const char *opname, const char *funname, const char * #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" -void magic_eval (env_t * env, val_t * dest, expr_t * expr) +void magic_eval(env_t * env, val_t * dest, expr_t * expr) { #ifdef RECENT_GCC #pragma GCC diagnostic pop @@ -1533,18 +1533,18 @@ void magic_eval (env_t * env, val_t * dest, expr_t * expr) switch (expr->ty) { case EXPR_VAL: - magic_copy_var (dest, &expr->e.e_val); + magic_copy_var(dest, &expr->e.e_val); break; case EXPR_LOCATION: - if (eval_location (env, &dest->v.v_location, &expr->e.e_location)) + if (eval_location(env, &dest->v.v_location, &expr->e.e_location)) dest->ty = TY_FAIL; else dest->ty = TY_LOCATION; break; case EXPR_AREA: - if ((dest->v.v_area = eval_area (env, &expr->e.e_area))) + if ((dest->v.v_area = eval_area(env, &expr->e.e_area))) dest->ty = TY_AREA; else dest->ty = TY_FAIL; @@ -1553,20 +1553,19 @@ void magic_eval (env_t * env, val_t * dest, expr_t * expr) case EXPR_FUNAPP: { val_t arguments[MAX_ARGS]; - int args_nr = expr->e.e_funapp.args_nr; - int i; + int args_nr = expr->e.e_funapp.args_nr; + int i; fun_t *f = functions + expr->e.e_funapp.id; for (i = 0; i < args_nr; ++i) - magic_eval (env, &arguments[i], expr->e.e_funapp.args[i]); - if (magic_signature_check - ("function", f->name, f->signature, args_nr, arguments, + magic_eval(env, &arguments[i], expr->e.e_funapp.args[i]); + if (magic_signature_check("function", f->name, f->signature, args_nr, arguments, expr->e.e_funapp.line_nr, expr->e.e_funapp.column) - || f->fun (env, args_nr, dest, arguments)) + || f->fun(env, args_nr, dest, arguments)) dest->ty = TY_FAIL; else { - int dest_ty = type_key (f->ret_ty); + int dest_ty = type_key(f->ret_ty); if (dest_ty != -1) dest->ty = dest_ty; @@ -1581,26 +1580,26 @@ void magic_eval (env_t * env, val_t * dest, expr_t * expr) } for (i = 0; i < args_nr; ++i) - magic_clear_var (&arguments[i]); + magic_clear_var(&arguments[i]); break; } case EXPR_ID: { - val_t v = VAR (expr->e.e_id); - magic_copy_var (dest, &v); + val_t v = VAR(expr->e.e_id); + magic_copy_var(dest, &v); break; } case EXPR_SPELLFIELD: { val_t v; - int id = expr->e.e_field.id; - magic_eval (env, &v, expr->e.e_field.expr); + int id = expr->e.e_field.id; + magic_eval(env, &v, expr->e.e_field.expr); if (v.ty == TY_INVOCATION) { - invocation_t *t = (invocation_t *) map_id2bl (v.v.v_int); + invocation_t *t = (invocation_t *) map_id2bl(v.v.v_int); if (!t) dest->ty = TY_UNDEF; @@ -1614,13 +1613,13 @@ void magic_eval (env_t * env, val_t * dest, expr_t * expr) #ifdef RECENT_GCC #pragma GCC diagnostic pop #endif - val_t val = VAR (id); - magic_copy_var (dest, &val); + val_t val = VAR(id); + magic_copy_var(dest, &val); } } else { - fprintf (stderr, + fprintf(stderr, "[magic] Attempt to access field %s on non-spell\n", env->base_env->var_name[id]); dest->ty = TY_FAIL; @@ -1629,7 +1628,7 @@ void magic_eval (env_t * env, val_t * dest, expr_t * expr) } default: - fprintf (stderr, + fprintf(stderr, "[magic] INTERNAL ERROR: Unknown expression type %d\n", expr->ty); break; @@ -1639,35 +1638,35 @@ void magic_eval (env_t * env, val_t * dest, expr_t * expr) #pragma GCC diagnostic pop #endif -int magic_eval_int (env_t * env, expr_t * expr) +int magic_eval_int(env_t * env, expr_t * expr) { val_t result; - magic_eval (env, &result, expr); + magic_eval(env, &result, expr); if (result.ty == TY_FAIL || result.ty == TY_UNDEF) return 0; - intify (&result); + intify(&result); return result.v.v_int; } -char *magic_eval_str (env_t * env, expr_t * expr) +char *magic_eval_str(env_t * env, expr_t * expr) { val_t result; - magic_eval (env, &result, expr); + magic_eval(env, &result, expr); if (result.ty == TY_FAIL || result.ty == TY_UNDEF) - return strdup ("?"); + return strdup("?"); - stringify (&result, 0); + stringify(&result, 0); return result.v.v_string; } -expr_t *magic_new_expr (int ty) +expr_t *magic_new_expr(int ty) { - expr_t *expr = (expr_t *) malloc (sizeof (expr_t)); + expr_t *expr = (expr_t *) malloc(sizeof(expr_t)); expr->ty = ty; return expr; } diff --git a/src/map/magic-expr.hpp b/src/map/magic-expr.hpp index 7a251df..bd38ea4 100644 --- a/src/map/magic-expr.hpp +++ b/src/map/magic-expr.hpp @@ -32,14 +32,14 @@ typedef struct fun const char *name; const char *signature; char ret_ty; - int (*fun) (env_t * env, int args_nr, val_t * result, val_t * args); + int(*fun)(env_t * env, int args_nr, val_t * result, val_t * args); } fun_t; typedef struct op { const char *name; const char *signature; - int (*op) (env_t * env, int args_nr, val_t * args); + int(*op)(env_t * env, int args_nr, val_t * args); } op_t; /** @@ -47,49 +47,49 @@ typedef struct op * @param name The name to look up * @return A function of that name, or NULL, and a function index */ -fun_t *magic_get_fun (const char *name, int *index); +fun_t *magic_get_fun(const char *name, int *index); /** * Retrieves an operation by name * @param name The name to look up * @return An operation of that name, or NULL, and a function index */ -op_t *magic_get_op (char *name, int *index); +op_t *magic_get_op(char *name, int *index); /** * Evaluates an expression and stores the result in `dest' */ -void magic_eval (env_t * env, val_t * dest, expr_t * expr); +void magic_eval(env_t * env, val_t * dest, expr_t * expr); /** * Evaluates an expression and coerces the result into an integer */ -int magic_eval_int (env_t * env, expr_t * expr); +int magic_eval_int(env_t * env, expr_t * expr); /** * Evaluates an expression and coerces the result into a string */ -char *magic_eval_str (env_t * env, expr_t * expr); +char *magic_eval_str(env_t * env, expr_t * expr); -int map_is_solid (int m, int x, int y); +int map_is_solid(int m, int x, int y); -expr_t *magic_new_expr (int ty); +expr_t *magic_new_expr(int ty); -void magic_clear_var (val_t * v); +void magic_clear_var(val_t * v); -void magic_copy_var (val_t * dest, val_t * src); +void magic_copy_var(val_t * dest, val_t * src); -void magic_random_location (location_t * dest, area_t * area); +void magic_random_location(location_t * dest, area_t * area); -int // ret -1: not a string, ret 1: no such item, ret 0: OK +int // ret -1: not a string, ret 1: no such item, ret 0: OK - magic_find_item (val_t * args, int index, struct item *item, int *stackable); + magic_find_item(val_t * args, int index, struct item *item, int *stackable); -#define GET_ARG_ITEM(index, dest, stackable) switch(magic_find_item(args, index, &dest, &stackable)) { case -1 : return 1; case 1 : return 0; } +#define GET_ARG_ITEM(index, dest, stackable) switch (magic_find_item(args, index, &dest, &stackable)) { case -1 : return 1; case 1 : return 0; } -int magic_location_in_area (int m, int x, int y, area_t * area); +int magic_location_in_area(int m, int x, int y, area_t * area); #endif /* !defined(MAGIC_EXPR_H_) */ diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp index 0305192..94e0a18 100644 --- a/src/map/magic-interpreter-base.cpp +++ b/src/map/magic-interpreter-base.cpp @@ -3,7 +3,7 @@ #include "magic-expr.hpp" #include "magic-interpreter-aux.hpp" -static void set_int_p (val_t * v, int i, int t) +static void set_int_p(val_t * v, int i, int t) { v->ty = t; v->v.v_int = i; @@ -14,21 +14,21 @@ static void set_int_p (val_t * v, int i, int t) #define SETTER(tty, dyn_ty, field) (val_t *v, tty x) { v->ty = dyn_ty; v->v.field = x; } -static void set_string SETTER (char *, TY_STRING, v_string); +static void set_string SETTER(char *, TY_STRING, v_string); -static void set_entity (val_t * v, entity_t * e) +static void set_entity(val_t * v, entity_t * e) { v->ty = TY_ENTITY; v->v.v_int = e->id; } -static void set_invocation (val_t * v, invocation_t * i) +static void set_invocation(val_t * v, invocation_t * i) { v->ty = TY_INVOCATION; v->v.v_int = i->bl.id; } -static void set_spell SETTER (spell_t *, TY_SPELL, v_spell); +static void set_spell SETTER(spell_t *, TY_SPELL, v_spell); #define setenv(f, v, x) f(&(env->vars[v]), x) @@ -48,22 +48,22 @@ static int spells_sorted = 0; const char *magic_find_invocation(const char *spellname) { - int i; + int i; - for (i = 0; i < abs (magic_conf.spells_nr); i++) - if (!strcmp (magic_conf.spells[i]->name, spellname)) + for (i = 0; i < abs(magic_conf.spells_nr); i++) + if (!strcmp(magic_conf.spells[i]->name, spellname)) return magic_conf.spells[i]->invocation; return NULL; } -static int spell_compare (const void *lhs, const void *rhs) +static int spell_compare(const void *lhs, const void *rhs) { - return strcmp ((*((spell_t **) lhs))->invocation, + return strcmp((*((spell_t **) lhs))->invocation, (*((spell_t **) rhs))->invocation); } -spell_t *magic_find_spell (char *invocation) +spell_t *magic_find_spell(char *invocation) { spell_t key; spell_t *keyp = &key; @@ -71,7 +71,7 @@ spell_t *magic_find_spell (char *invocation) if (!spells_sorted) { - qsort (magic_conf.spells, magic_conf.spells_nr, sizeof (spell_t *), + qsort(magic_conf.spells, magic_conf.spells_nr, sizeof(spell_t *), spell_compare); spells_sorted = 1; } @@ -80,8 +80,8 @@ spell_t *magic_find_spell (char *invocation) retval = ((spell_t **) - bsearch (&keyp, magic_conf.spells, magic_conf.spells_nr, - sizeof (spell_t *), spell_compare)); + bsearch(&keyp, magic_conf.spells, magic_conf.spells_nr, + sizeof(spell_t *), spell_compare)); if (!retval) return NULL; @@ -93,24 +93,24 @@ spell_t *magic_find_spell (char *invocation) /* Spell anchors */ /* -------------------------------------------------------------------------------- */ -static int compare_teleport_anchor (const void *lhs, const void *rhs) +static int compare_teleport_anchor(const void *lhs, const void *rhs) { - return strcmp ((*((teleport_anchor_t **) lhs))->invocation, + return strcmp((*((teleport_anchor_t **) lhs))->invocation, (*((teleport_anchor_t **) rhs))->invocation); } const char *magic_find_anchor_invocation(const char *anchor_name) { - int i; + int i; - for (i = 0; i < abs (magic_conf.anchors_nr); i++) - if (!strcmp (magic_conf.anchors[i]->name, anchor_name)) + for (i = 0; i < abs(magic_conf.anchors_nr); i++) + if (!strcmp(magic_conf.anchors[i]->name, anchor_name)) return magic_conf.anchors[i]->invocation; return NULL; } -teleport_anchor_t *magic_find_anchor (char *name) +teleport_anchor_t *magic_find_anchor(char *name) { teleport_anchor_t key; teleport_anchor_t *keyp = &key; @@ -118,17 +118,17 @@ teleport_anchor_t *magic_find_anchor (char *name) if (magic_conf.anchors_nr > 0) { /* unsorted */ - qsort (magic_conf.anchors, magic_conf.anchors_nr, - sizeof (teleport_anchor_t *), compare_teleport_anchor); + qsort(magic_conf.anchors, magic_conf.anchors_nr, + sizeof(teleport_anchor_t *), compare_teleport_anchor); magic_conf.anchors_nr = -magic_conf.anchors_nr; } key.invocation = name; - retval = (teleport_anchor_t **) bsearch (&keyp, + retval = (teleport_anchor_t **) bsearch(&keyp, magic_conf.anchors, -magic_conf.anchors_nr, - sizeof (teleport_anchor_t *), + sizeof(teleport_anchor_t *), compare_teleport_anchor); if (!retval) @@ -141,83 +141,83 @@ teleport_anchor_t *magic_find_anchor (char *name) /* Spell guard checks */ /* -------------------------------------------------------------------------------- */ -static env_t *alloc_env (magic_conf_t * conf) +static env_t *alloc_env(magic_conf_t * conf) { env_t *env; - CREATE (env, env_t, 1); - CREATE (env->vars, val_t, conf->vars_nr); + CREATE(env, env_t, 1); + CREATE(env->vars, val_t, conf->vars_nr); env->base_env = conf; return env; } -static env_t *clone_env (env_t * src) +static env_t *clone_env(env_t * src) { - env_t *retval = alloc_env (src->base_env); - int i; + env_t *retval = alloc_env(src->base_env); + int i; for (i = 0; i < src->base_env->vars_nr; i++) - magic_copy_var (&retval->vars[i], &src->vars[i]); + magic_copy_var(&retval->vars[i], &src->vars[i]); return retval; } -void magic_free_env (env_t * env) +void magic_free_env(env_t * env) { - int i; + int i; for (i = 0; i < env->base_env->vars_nr; i++) - magic_clear_var (&env->vars[i]); - free (env); + magic_clear_var(&env->vars[i]); + free(env); } -env_t *spell_create_env (magic_conf_t * conf, spell_t * spell, +env_t *spell_create_env(magic_conf_t * conf, spell_t * spell, character_t * caster, int spellpower, char *param) { - env_t *env = alloc_env (conf); + env_t *env = alloc_env(conf); switch (spell->spellarg_ty) { case SPELLARG_STRING: - set_env_string (spell->arg, param); + set_env_string(spell->arg, param); break; case SPELLARG_PC: { - character_t *subject = map_nick2sd (param); + character_t *subject = map_nick2sd(param); if (!subject) subject = caster; - set_env_entity (spell->arg, &subject->bl); - free (param); + set_env_entity(spell->arg, &subject->bl); + free(param); break; } case SPELLARG_NONE: - free (param); + free(param); break; default: - free (param); - fprintf (stderr, "Unexpected spellarg type %d\n", + free(param); + fprintf(stderr, "Unexpected spellarg type %d\n", spell->spellarg_ty); } - set_env_entity (VAR_CASTER, &caster->bl); - set_env_int (VAR_SPELLPOWER, spellpower); - set_env_spell (VAR_SPELL, spell); + set_env_entity(VAR_CASTER, &caster->bl); + set_env_int(VAR_SPELLPOWER, spellpower); + set_env_spell(VAR_SPELL, spell); return env; } -static void free_components (component_t ** component_holder) +static void free_components(component_t ** component_holder) { if (*component_holder == NULL) return; - free_components (&(*component_holder)->next); - free (*component_holder); + free_components(&(*component_holder)->next); + free(*component_holder); *component_holder = NULL; } -void magic_add_component (component_t ** component_holder, int id, int count) +void magic_add_component(component_t ** component_holder, int id, int count) { if (count <= 0) return; @@ -225,7 +225,7 @@ void magic_add_component (component_t ** component_holder, int id, int count) if (*component_holder == NULL) { component_t *component = - (component_t *) malloc (sizeof (component_t)); + (component_t *) malloc(sizeof(component_t)); component->next = NULL; component->item_id = id; component->count = count; @@ -240,33 +240,33 @@ void magic_add_component (component_t ** component_holder, int id, int count) return; } else - magic_add_component (&component->next, id, count); + magic_add_component(&component->next, id, count); /* Tail-recurse; gcc can optimise this. Not that it matters. */ } } static void -copy_components (component_t ** component_holder, component_t * component) +copy_components(component_t ** component_holder, component_t * component) { if (component == NULL) return; - magic_add_component (component_holder, component->item_id, + magic_add_component(component_holder, component->item_id, component->count); - copy_components (component_holder, component->next); + copy_components(component_holder, component->next); } typedef struct spellguard_check { component_t *catalysts, *components; - int mana, casttime; + int mana, casttime; } spellguard_check_t; -static int check_prerequisites (character_t * caster, component_t * component) +static int check_prerequisites(character_t * caster, component_t * component) { while (component) { - if (pc_count_all_items (caster, component->item_id) + if (pc_count_all_items(caster, component->item_id) < component->count) return 0; /* insufficient */ @@ -276,22 +276,22 @@ static int check_prerequisites (character_t * caster, component_t * component) return 1; } -static void consume_components (character_t * caster, component_t * component) +static void consume_components(character_t * caster, component_t * component) { while (component) { - pc_remove_items (caster, component->item_id, component->count); + pc_remove_items(caster, component->item_id, component->count); component = component->next; } } static int -spellguard_can_satisfy (spellguard_check_t * check, character_t * caster, +spellguard_can_satisfy(spellguard_check_t * check, character_t * caster, env_t * env, int *near_miss) { - unsigned int tick = gettick (); + unsigned int tick = gettick(); - int retval = check_prerequisites (caster, check->catalysts); + int retval = check_prerequisites(caster, check->catalysts); /* fprintf(stderr, "MC(%d/%s)? %d%d%d%d (%u <= %u)\n", @@ -308,25 +308,25 @@ spellguard_can_satisfy (spellguard_check_t * check, character_t * caster, retval = retval && caster->cast_tick <= tick /* Hasn't cast a spell too recently */ && check->mana <= caster->status.sp - && check_prerequisites (caster, check->components); + && check_prerequisites(caster, check->components); if (retval) { unsigned int casttime = (unsigned int) check->casttime; - if (VAR (VAR_MIN_CASTTIME).ty == TY_INT) - casttime = MAX (casttime, VAR (VAR_MIN_CASTTIME).v.v_int); + if (VAR(VAR_MIN_CASTTIME).ty == TY_INT) + casttime = MAX(casttime, VAR(VAR_MIN_CASTTIME).v.v_int); caster->cast_tick = tick + casttime; /* Make sure not to cast too frequently */ - consume_components (caster, check->components); - pc_heal (caster, 0, -check->mana); + consume_components(caster, check->components); + pc_heal(caster, 0, -check->mana); } return retval; } -static effect_set_t *spellguard_check_sub (spellguard_check_t * check, +static effect_set_t *spellguard_check_sub(spellguard_check_t * check, spellguard_t * guard, character_t * caster, env_t * env, int *near_miss) @@ -337,16 +337,16 @@ static effect_set_t *spellguard_check_sub (spellguard_check_t * check, switch (guard->ty) { case SPELLGUARD_CONDITION: - if (!magic_eval_int (env, guard->s.s_condition)) + if (!magic_eval_int(env, guard->s.s_condition)) return NULL; break; case SPELLGUARD_COMPONENTS: - copy_components (&check->components, guard->s.s_components); + copy_components(&check->components, guard->s.s_components); break; case SPELLGUARD_CATALYSTS: - copy_components (&check->catalysts, guard->s.s_catalysts); + copy_components(&check->catalysts, guard->s.s_catalysts); break; case SPELLGUARD_CHOICE: @@ -357,44 +357,44 @@ static effect_set_t *spellguard_check_sub (spellguard_check_t * check, altcheck.components = NULL; altcheck.catalysts = NULL; - copy_components (&altcheck.catalysts, check->catalysts); - copy_components (&altcheck.components, check->components); + copy_components(&altcheck.catalysts, check->catalysts); + copy_components(&altcheck.components, check->components); retval = - spellguard_check_sub (&altcheck, guard->next, caster, env, + spellguard_check_sub(&altcheck, guard->next, caster, env, near_miss); - free_components (&altcheck.catalysts); - free_components (&altcheck.components); + free_components(&altcheck.catalysts); + free_components(&altcheck.components); if (retval) return retval; else - return spellguard_check_sub (check, guard->s.s_alt, caster, + return spellguard_check_sub(check, guard->s.s_alt, caster, env, near_miss); } case SPELLGUARD_MANA: - check->mana += magic_eval_int (env, guard->s.s_mana); + check->mana += magic_eval_int(env, guard->s.s_mana); break; case SPELLGUARD_CASTTIME: - check->casttime += magic_eval_int (env, guard->s.s_mana); + check->casttime += magic_eval_int(env, guard->s.s_mana); break; case SPELLGUARD_EFFECT: - if (spellguard_can_satisfy (check, caster, env, near_miss)) + if (spellguard_can_satisfy(check, caster, env, near_miss)) return &guard->s.s_effect; else return NULL; default: - fprintf (stderr, "Unexpected spellguard type %d\n", guard->ty); + fprintf(stderr, "Unexpected spellguard type %d\n", guard->ty); return NULL; } - return spellguard_check_sub (check, guard->next, caster, env, near_miss); + return spellguard_check_sub(check, guard->next, caster, env, near_miss); } -static effect_set_t *check_spellguard (spellguard_t * guard, +static effect_set_t *check_spellguard(spellguard_t * guard, character_t * caster, env_t * env, int *near_miss) { @@ -404,10 +404,10 @@ static effect_set_t *check_spellguard (spellguard_t * guard, check.components = NULL; check.mana = check.casttime = 0; - retval = spellguard_check_sub (&check, guard, caster, env, near_miss); + retval = spellguard_check_sub(&check, guard, caster, env, near_miss); - free_components (&check.catalysts); - free_components (&check.components); + free_components(&check.catalysts); + free_components(&check.components); return retval; } @@ -416,81 +416,81 @@ static effect_set_t *check_spellguard (spellguard_t * guard, /* Public API */ /* -------------------------------------------------------------------------------- */ -effect_set_t *spell_trigger (spell_t * spell, character_t * caster, +effect_set_t *spell_trigger(spell_t * spell, character_t * caster, env_t * env, int *near_miss) { - int i; + int i; spellguard_t *guard = spell->spellguard; if (near_miss) *near_miss = 0; for (i = 0; i < spell->letdefs_nr; i++) - magic_eval (env, + magic_eval(env, &env->vars[spell->letdefs[i].id], spell->letdefs[i].expr); - return check_spellguard (guard, caster, env, near_miss); + return check_spellguard(guard, caster, env, near_miss); } -static void spell_set_location (invocation_t * invocation, entity_t * entity) +static void spell_set_location(invocation_t * invocation, entity_t * entity) { - magic_clear_var (&invocation->env->vars[VAR_LOCATION]); + magic_clear_var(&invocation->env->vars[VAR_LOCATION]); invocation->env->vars[VAR_LOCATION].ty = TY_LOCATION; invocation->env->vars[VAR_LOCATION].v.v_location.m = entity->m; invocation->env->vars[VAR_LOCATION].v.v_location.x = entity->x; invocation->env->vars[VAR_LOCATION].v.v_location.y = entity->y; } -void spell_update_location (invocation_t * invocation) +void spell_update_location(invocation_t * invocation) { if (invocation->spell->flags & SPELL_FLAG_LOCAL) return; else { - character_t *owner = (character_t *) map_id2bl (invocation->subject); + character_t *owner = (character_t *) map_id2bl(invocation->subject); if (!owner) return; - spell_set_location (invocation, (entity_t *) owner); + spell_set_location(invocation, (entity_t *) owner); } } -invocation_t *spell_instantiate (effect_set_t * effect_set, env_t * env) +invocation_t *spell_instantiate(effect_set_t * effect_set, env_t * env) { invocation_t *retval; - CREATE (retval, invocation_t, 1); + CREATE(retval, invocation_t, 1); entity_t *caster; retval->env = env; - retval->caster = VAR (VAR_CASTER).v.v_int; - retval->spell = VAR (VAR_SPELL).v.v_spell; + retval->caster = VAR(VAR_CASTER).v.v_int; + retval->spell = VAR(VAR_SPELL).v.v_spell; retval->stack_size = 0; retval->current_effect = effect_set->effect; retval->trigger_effect = effect_set->at_trigger; retval->end_effect = effect_set->at_end; - caster = map_id2bl (retval->caster); // must still exist - retval->bl.id = map_addobject (&retval->bl); + caster = map_id2bl(retval->caster); // must still exist + retval->bl.id = map_addobject(&retval->bl); retval->bl.type = BL_SPELL; retval->bl.m = caster->m; retval->bl.x = caster->x; retval->bl.y = caster->y; - map_addblock (&retval->bl); - set_env_invocation (VAR_INVOCATION, retval); + map_addblock(&retval->bl); + set_env_invocation(VAR_INVOCATION, retval); return retval; } -invocation_t *spell_clone_effect (invocation_t * base) +invocation_t *spell_clone_effect(invocation_t * base) { - invocation_t *retval = (invocation_t *) malloc (sizeof (invocation_t)); + invocation_t *retval = (invocation_t *) malloc(sizeof(invocation_t)); env_t *env; - memcpy (retval, base, sizeof (invocation_t)); + memcpy(retval, base, sizeof(invocation_t)); - retval->env = clone_env (retval->env); + retval->env = clone_env(retval->env); env = retval->env; retval->current_effect = retval->trigger_effect; retval->next_invocation = NULL; @@ -507,13 +507,13 @@ invocation_t *spell_clone_effect (invocation_t * base) retval->bl.prev = NULL; retval->bl.next = NULL; - retval->bl.id = map_addobject (&retval->bl); - set_env_invocation (VAR_INVOCATION, retval); + retval->bl.id = map_addobject(&retval->bl); + set_env_invocation(VAR_INVOCATION, retval); return retval; } -void spell_bind (character_t * subject, invocation_t * invocation) +void spell_bind(character_t * subject, invocation_t * invocation) { /* Only bind nonlocal spells */ @@ -523,7 +523,7 @@ void spell_bind (character_t * subject, invocation_t * invocation) || invocation->subject || invocation->next_invocation) { int *i = NULL; - fprintf (stderr, + fprintf(stderr, "[magic] INTERNAL ERROR: Attempt to re-bind spell invocation `%s'\n", invocation->spell->name); *i = 1; @@ -536,10 +536,10 @@ void spell_bind (character_t * subject, invocation_t * invocation) invocation->subject = subject->bl.id; } - spell_set_location (invocation, (entity_t *) subject); + spell_set_location(invocation, (entity_t *) subject); } -int spell_unbind (character_t * subject, invocation_t * invocation) +int spell_unbind(character_t * subject, invocation_t * invocation) { invocation_t **seeker = &subject->active_spells; diff --git a/src/map/magic-interpreter-lexer.lpp b/src/map/magic-interpreter-lexer.lpp index c7f9c09..632dbab 100644 --- a/src/map/magic-interpreter-lexer.lpp +++ b/src/map/magic-interpreter-lexer.lpp @@ -21,86 +21,86 @@ %% -"S" HEADING(0); -"SW" HEADING(1); -"W" HEADING(2); -"NW" HEADING(3); -"N" HEADING(4); -"NE" HEADING(5); -"E" HEADING(6); -"SE" HEADING(7); -"=" {FIXLOC; return '=';} -"==" {FIXLOC; return EQ;} -"<>" {FIXLOC; return NEQ;} -"!=" {FIXLOC; return NEQ;} -">" {FIXLOC; return '>';} -"<" {FIXLOC; return '<';} -">=" {FIXLOC; return GTE;} -"<=" {FIXLOC; return LTE;} -"(" {FIXLOC; return '(';} -")" {FIXLOC; return ')';} -"+" {FIXLOC; return '+';} -"-" {FIXLOC; return '-';} -"*" {FIXLOC; return '*';} -"/" {FIXLOC; return '/';} -"%" {FIXLOC; return '%';} -"&&" {FIXLOC; return ANDAND;} -"||" {FIXLOC; return OROR;} -";" {FIXLOC; return ';';} -":" {FIXLOC; return ':';} -"," {FIXLOC; return ',';} -"@" {FIXLOC; return '@';} -"|" {FIXLOC; return '|';} -"[" {FIXLOC; return '[';} -"]" {FIXLOC; return ']';} -"&" {FIXLOC; return '&';} -"^" {FIXLOC; return '^';} -"." {FIXLOC; return '.';} -"<<" {FIXLOC; return SHL;} -">>" {FIXLOC; return SHR;} -"PROCEDURE" {FIXLOC; return PROCEDURE;} -"CALL" {FIXLOC; return CALL;} -"OR" {FIXLOC; return OR;} -"TO" {FIXLOC; return TO;} -"TOWARDS" {FIXLOC; return TOWARDS;} -"TELEPORT-ANCHOR" {FIXLOC; return TELEPORT_ANCHOR;} -"SILENT" {FIXLOC; return SILENT;} -"LOCAL" {FIXLOC; return LOCAL;} -"NONMAGIC" {FIXLOC; return NONMAGIC;} -"SPELL" {FIXLOC; return SPELL;} -"LET" {FIXLOC; return LET;} -"IN" {FIXLOC; return IN;} -"END" {FIXLOC; return END;} -"=>" {FIXLOC; return DARROW;} -"STRING" {FIXLOC; return STRING_TY;} -"REQUIRE" {FIXLOC; return REQUIRE;} -"CATALYSTS" {FIXLOC; return CATALYSTS;} -"COMPONENTS" {FIXLOC; return COMPONENTS;} -"MANA" {FIXLOC; return MANA;} -"CASTTIME" {FIXLOC; return CASTTIME;} -"SKIP" {FIXLOC; return SKIP;} -"ABORT" {FIXLOC; return ABORT;} -"BREAK" {FIXLOC; return BREAK;} -"EFFECT" {FIXLOC; return EFFECT;} -"ATEND" {FIXLOC; return ATEND;} -"ATTRIGGER" {FIXLOC; return ATTRIGGER;} -"CONST" {FIXLOC; return CONST;} -"PC" {FIXLOC; return PC_F;} -"NPC" {FIXLOC; return NPC_F;} -"MOB" {FIXLOC; return MOB_F;} -"ENTITY" {FIXLOC; return ENTITY_F;} -"TARGET" {FIXLOC; return TARGET_F;} -"IF" {FIXLOC; return IF;} -"THEN" {FIXLOC; return THEN;} -"ELSE" {FIXLOC; return ELSE;} -"FOREACH" {FIXLOC; return FOREACH;} -"FOR" {FIXLOC; return FOR;} -"DO" {FIXLOC; return DO;} -"WAIT" {FIXLOC; return SLEEP;} +"S" HEADING(0); +"SW" HEADING(1); +"W" HEADING(2); +"NW" HEADING(3); +"N" HEADING(4); +"NE" HEADING(5); +"E" HEADING(6); +"SE" HEADING(7); +"=" {FIXLOC; return '=';} +"==" {FIXLOC; return EQ;} +"<>" {FIXLOC; return NEQ;} +"!=" {FIXLOC; return NEQ;} +">" {FIXLOC; return '>';} +"<" {FIXLOC; return '<';} +">=" {FIXLOC; return GTE;} +"<=" {FIXLOC; return LTE;} +"(" {FIXLOC; return '(';} +")" {FIXLOC; return ')';} +"+" {FIXLOC; return '+';} +"-" {FIXLOC; return '-';} +"*" {FIXLOC; return '*';} +"/" {FIXLOC; return '/';} +"%" {FIXLOC; return '%';} +"&&" {FIXLOC; return ANDAND;} +"||" {FIXLOC; return OROR;} +";" {FIXLOC; return ';';} +":" {FIXLOC; return ':';} +"," {FIXLOC; return ',';} +"@" {FIXLOC; return '@';} +"|" {FIXLOC; return '|';} +"[" {FIXLOC; return '[';} +"]" {FIXLOC; return ']';} +"&" {FIXLOC; return '&';} +"^" {FIXLOC; return '^';} +"." {FIXLOC; return '.';} +"<<" {FIXLOC; return SHL;} +">>" {FIXLOC; return SHR;} +"PROCEDURE" {FIXLOC; return PROCEDURE;} +"CALL" {FIXLOC; return CALL;} +"OR" {FIXLOC; return OR;} +"TO" {FIXLOC; return TO;} +"TOWARDS" {FIXLOC; return TOWARDS;} +"TELEPORT-ANCHOR" {FIXLOC; return TELEPORT_ANCHOR;} +"SILENT" {FIXLOC; return SILENT;} +"LOCAL" {FIXLOC; return LOCAL;} +"NONMAGIC" {FIXLOC; return NONMAGIC;} +"SPELL" {FIXLOC; return SPELL;} +"LET" {FIXLOC; return LET;} +"IN" {FIXLOC; return IN;} +"END" {FIXLOC; return END;} +"=>" {FIXLOC; return DARROW;} +"STRING" {FIXLOC; return STRING_TY;} +"REQUIRE" {FIXLOC; return REQUIRE;} +"CATALYSTS" {FIXLOC; return CATALYSTS;} +"COMPONENTS" {FIXLOC; return COMPONENTS;} +"MANA" {FIXLOC; return MANA;} +"CASTTIME" {FIXLOC; return CASTTIME;} +"SKIP" {FIXLOC; return SKIP;} +"ABORT" {FIXLOC; return ABORT;} +"BREAK" {FIXLOC; return BREAK;} +"EFFECT" {FIXLOC; return EFFECT;} +"ATEND" {FIXLOC; return ATEND;} +"ATTRIGGER" {FIXLOC; return ATTRIGGER;} +"CONST" {FIXLOC; return CONST;} +"PC" {FIXLOC; return PC_F;} +"NPC" {FIXLOC; return NPC_F;} +"MOB" {FIXLOC; return MOB_F;} +"ENTITY" {FIXLOC; return ENTITY_F;} +"TARGET" {FIXLOC; return TARGET_F;} +"IF" {FIXLOC; return IF;} +"THEN" {FIXLOC; return THEN;} +"ELSE" {FIXLOC; return ELSE;} +"FOREACH" {FIXLOC; return FOREACH;} +"FOR" {FIXLOC; return FOR;} +"DO" {FIXLOC; return DO;} +"WAIT" {FIXLOC; return SLEEP;} \{([^\}]|\\.)*\} { char *string = strdup(yytext); magic_frontend_lval.s = string; - FIXLOC; + FIXLOC; return SCRIPT_DATA; } @@ -115,26 +115,26 @@ *dst++ = *src++; *dst = '\0'; /* terminate */ magic_frontend_lval.s = string; - FIXLOC; + FIXLOC; return STRING; } -"-"?[0-9]+ { magic_frontend_lval.i = atoi(yytext); - FIXLOC; +"-"?[0-9]+ { magic_frontend_lval.i = atoi(yytext); + FIXLOC; return INT; } "0x"[0-9a-fA-F]+ { magic_frontend_lval.i = strtol(yytext + 2, NULL, 16); - FIXLOC; + FIXLOC; return INT; } [a-zA-Z][-_a-zA-Z0-9?!]* { magic_frontend_lval.s = strdup(yytext); - FIXLOC; + FIXLOC; return ID; } -"#".*$ /* Ignore comments */ -"//".*$ /* Ignore comments */ -[ \n\t\r] /* ignore whitespace */ -. fprintf(stderr, "%s: Unexpected character in line %d\n", MAGIC_CONFIG_FILE, magic_frontend_lineno); +"#".*$ /* Ignore comments */ +"//".*$ /* Ignore comments */ +[ \n\t\r] /* ignore whitespace */ +. fprintf(stderr, "%s: Unexpected character in line %d\n", MAGIC_CONFIG_FILE, magic_frontend_lineno); %% diff --git a/src/map/magic-interpreter-parser.ypp b/src/map/magic-interpreter-parser.ypp index 5fe2646..274819c 100644 --- a/src/map/magic-interpreter-parser.ypp +++ b/src/map/magic-interpreter-parser.ypp @@ -211,41 +211,41 @@ find_constant(char *name); %% -spellconf : /* empty */ +spellconf : /* empty */ {} | spellconf_option semicolons spellconf {} - ; + ; -semicolons : /* empty */ - {} +semicolons : /* empty */ + {} | semicolons ';' {} - ; + ; -proc_formals_list : /* empty */ - { CREATE ($$, proc_t, 1); } - | proc_formals_list_ne +proc_formals_list : /* empty */ + { CREATE($$, proc_t, 1); } + | proc_formals_list_ne { $$ = $1; } - ; + ; -proc_formals_list_ne : ID - { CREATE ($$, proc_t, 1); +proc_formals_list_ne : ID + { CREATE($$, proc_t, 1); $$->args_nr = 1; $$->args = (int*)malloc(sizeof(int)); $$->args[0] = intern_id($1); } - | proc_formals_list_ne ',' ID + | proc_formals_list_ne ',' ID { $$ = $1; $$->args = (int*)realloc($$->args, sizeof(int) * (1 + $$->args_nr)); $$->args[$$->args_nr++] = intern_id($3); } - ; + ; -spellconf_option : ID '=' expr - { +spellconf_option : ID '=' expr + { int var_id; if (find_constant($1)) { fail(@1.first_line, 0, "Attempt to redefine constant `%s' as global\n", $1); @@ -255,8 +255,8 @@ spellconf_option : ID '=' expr magic_eval(&magic_default_env, &magic_conf.vars[var_id], $3); } } - | CONST ID '=' expr - { + | CONST ID '=' expr + { val_t var; magic_eval(&magic_default_env, &var, $4); bind_constant($2, &var, @1.first_line); @@ -264,7 +264,7 @@ spellconf_option : ID '=' expr | TELEPORT_ANCHOR ID ':' expr '=' expr { teleport_anchor_t *anchor; - CREATE (anchor, teleport_anchor_t, 1); + CREATE(anchor, teleport_anchor_t, 1); anchor->name = $2; anchor->invocation = magic_eval_str(&magic_default_env, $4); anchor->location = $6; @@ -275,7 +275,7 @@ spellconf_option : ID '=' expr free(anchor); failed_flag = 0; } - | PROCEDURE ID '(' proc_formals_list ')' '=' effect_list + | PROCEDURE ID '(' proc_formals_list ')' '=' effect_list { proc_t *proc = $4; proc->name = $2; @@ -296,26 +296,26 @@ spellconf_option : ID '=' expr failed_flag = 0; } -spell_flags : /* empty */ - { $$ = 0; } - | LOCAL spell_flags - { if ($2 & SPELL_FLAG_LOCAL) +spell_flags : /* empty */ + { $$ = 0; } + | LOCAL spell_flags + { if ($2 & SPELL_FLAG_LOCAL) fail(@1.first_line, @1.first_column, "`LOCAL' specified more than once"); $$ = $2 | SPELL_FLAG_LOCAL; } - | NONMAGIC spell_flags - { if ($2 & SPELL_FLAG_NONMAGIC) + | NONMAGIC spell_flags + { if ($2 & SPELL_FLAG_NONMAGIC) fail(@1.first_line, @1.first_column, "`NONMAGIC' specified more than once"); $$ = $2 | SPELL_FLAG_NONMAGIC; } - | SILENT spell_flags - { if ($2 & SPELL_FLAG_SILENT) + | SILENT spell_flags + { if ($2 & SPELL_FLAG_SILENT) fail(@1.first_line, @1.first_column, "`SILENT' specified more than once"); $$ = $2 | SPELL_FLAG_SILENT; } -argopt : /* empty */ +argopt : /* empty */ { $$.ty = SPELLARG_NONE; } | '(' ID ':' arg_ty ')' { $$.id = intern_id($2); @@ -330,23 +330,23 @@ arg_ty : PC_F ; -value : DIR - { $$.ty = TY_DIR; +value : DIR + { $$.ty = TY_DIR; $$.v.v_int = $1; } - | INT - { $$.ty = TY_INT; + | INT + { $$.ty = TY_INT; $$.v.v_int = $1; } - | STRING - { $$.ty = TY_STRING; + | STRING + { $$.ty = TY_STRING; $$.v.v_string = $1; } - ; + ; -expr : value - { $$ = magic_new_expr(EXPR_VAL); +expr : value + { $$ = magic_new_expr(EXPR_VAL); $$->e.e_val = $1; } - | ID - { + | ID + { val_t *val; if ((val = find_constant($1))) { $$ = magic_new_expr(EXPR_VAL); @@ -356,128 +356,128 @@ expr : value $$->e.e_id = intern_id($1); } } - | area - { $$ = magic_new_expr(EXPR_AREA); + | area + { $$ = magic_new_expr(EXPR_AREA); $$->e.e_area = $1; } - | expr '+' expr - { BIN_EXPR($$, "+", $1, $3, @1.first_line, @1.first_column); } - | expr '-' expr - { BIN_EXPR($$, "-", $1, $3, @1.first_line, @1.first_column); } - | expr '*' expr - { BIN_EXPR($$, "*", $1, $3, @1.first_line, @1.first_column); } - | expr '%' expr - { BIN_EXPR($$, "%", $1, $3, @1.first_line, @1.first_column); } - | expr '/' expr - { BIN_EXPR($$, "/", $1, $3, @1.first_line, @1.first_column); } - | expr '<' expr - { BIN_EXPR($$, ">", $3, $1, @1.first_line, @1.first_column); } - | expr '>' expr - { BIN_EXPR($$, ">", $1, $3, @1.first_line, @1.first_column); } - | expr '&' expr - { BIN_EXPR($$, "&", $1, $3, @1.first_line, @1.first_column); } - | expr '^' expr - { BIN_EXPR($$, "^", $1, $3, @1.first_line, @1.first_column); } - | expr '|' expr - { BIN_EXPR($$, "|", $1, $3, @1.first_line, @1.first_column); } - | expr SHL expr - { BIN_EXPR($$, "<<", $1, $3, @1.first_line, @1.first_column); } - | expr SHR expr - { BIN_EXPR($$, ">>", $1, $3, @1.first_line, @1.first_column); } - | expr LTE expr - { BIN_EXPR($$, ">=", $3, $1, @1.first_line, @1.first_column); } - | expr GTE expr - { BIN_EXPR($$, ">=", $1, $3, @1.first_line, @1.first_column); } - | expr ANDAND expr - { BIN_EXPR($$, "&&", $1, $3, @1.first_line, @1.first_column); } - | expr OROR expr - { BIN_EXPR($$, "||", $1, $3, @1.first_line, @1.first_column); } - | expr EQ expr - { BIN_EXPR($$, "=", $1, $3, @1.first_line, @1.first_column); } - | expr '=' expr - { BIN_EXPR($$, "=", $1, $3, @1.first_line, @1.first_column); } - | expr NEQ expr - { BIN_EXPR($$, "=", $1, $3, @1.first_line, @1.first_column); + | expr '+' expr + { BIN_EXPR($$, "+", $1, $3, @1.first_line, @1.first_column); } + | expr '-' expr + { BIN_EXPR($$, "-", $1, $3, @1.first_line, @1.first_column); } + | expr '*' expr + { BIN_EXPR($$, "*", $1, $3, @1.first_line, @1.first_column); } + | expr '%' expr + { BIN_EXPR($$, "%", $1, $3, @1.first_line, @1.first_column); } + | expr '/' expr + { BIN_EXPR($$, "/", $1, $3, @1.first_line, @1.first_column); } + | expr '<' expr + { BIN_EXPR($$, ">", $3, $1, @1.first_line, @1.first_column); } + | expr '>' expr + { BIN_EXPR($$, ">", $1, $3, @1.first_line, @1.first_column); } + | expr '&' expr + { BIN_EXPR($$, "&", $1, $3, @1.first_line, @1.first_column); } + | expr '^' expr + { BIN_EXPR($$, "^", $1, $3, @1.first_line, @1.first_column); } + | expr '|' expr + { BIN_EXPR($$, "|", $1, $3, @1.first_line, @1.first_column); } + | expr SHL expr + { BIN_EXPR($$, "<<", $1, $3, @1.first_line, @1.first_column); } + | expr SHR expr + { BIN_EXPR($$, ">>", $1, $3, @1.first_line, @1.first_column); } + | expr LTE expr + { BIN_EXPR($$, ">=", $3, $1, @1.first_line, @1.first_column); } + | expr GTE expr + { BIN_EXPR($$, ">=", $1, $3, @1.first_line, @1.first_column); } + | expr ANDAND expr + { BIN_EXPR($$, "&&", $1, $3, @1.first_line, @1.first_column); } + | expr OROR expr + { BIN_EXPR($$, "||", $1, $3, @1.first_line, @1.first_column); } + | expr EQ expr + { BIN_EXPR($$, "=", $1, $3, @1.first_line, @1.first_column); } + | expr '=' expr + { BIN_EXPR($$, "=", $1, $3, @1.first_line, @1.first_column); } + | expr NEQ expr + { BIN_EXPR($$, "=", $1, $3, @1.first_line, @1.first_column); $$ = fun_expr("not", 1, &$$, @1.first_line, @1.first_column); } - | ID '(' arg_list ')' - { $$ = fun_expr($1, $3.args_nr, $3.args, @1.first_line, @1.first_column); + | ID '(' arg_list ')' + { $$ = fun_expr($1, $3.args_nr, $3.args, @1.first_line, @1.first_column); if ($3.args) free($3.args); free($1); } - | '(' expr ')' - { $$ = $2; } - | expr '.' ID - { $$ = dot_expr($1, intern_id($3)); } - ; + | '(' expr ')' + { $$ = $2; } + | expr '.' ID + { $$ = dot_expr($1, intern_id($3)); } + ; -arg_list : /* empty */ - { $$.args_nr = 0; } - | arg_list_ne - { $$ = $1; } - ; +arg_list : /* empty */ + { $$.args_nr = 0; } + | arg_list_ne + { $$ = $1; } + ; -arg_list_ne : expr - { CREATE($$.args, expr_t *, 1); +arg_list_ne : expr + { CREATE($$.args, expr_t *, 1); $$.args_nr = 1; $$.args[0] = $1; } - | arg_list_ne ',' expr - { RECREATE($$.args, expr_t *, 1 + $$.args_nr); + | arg_list_ne ',' expr + { RECREATE($$.args, expr_t *, 1 + $$.args_nr); $$.args[$$.args_nr++] = $3; } - ; + ; -location : '@' '(' expr ',' expr ',' expr ')' - { $$.m = $3; $$.x = $5; $$.y = $7; } - ; +location : '@' '(' expr ',' expr ',' expr ')' + { $$.m = $3; $$.x = $5; $$.y = $7; } + ; -area : location - { $$.ty = AREA_LOCATION; +area : location + { $$.ty = AREA_LOCATION; $$.a.a_loc = $1; - } - | location '@' '+' '(' expr ',' expr ')' - { $$.ty = AREA_RECT; + } + | location '@' '+' '(' expr ',' expr ')' + { $$.ty = AREA_RECT; $$.a.a_rect.loc = $1; $$.a.a_rect.width = $5; $$.a.a_rect.height = $7; } - | location TOWARDS expr ':' '(' expr ',' expr ')' - { $$.ty = AREA_BAR; + | location TOWARDS expr ':' '(' expr ',' expr ')' + { $$.ty = AREA_BAR; $$.a.a_bar.loc = $1; $$.a.a_bar.width = $6; $$.a.a_bar.depth = $8; $$.a.a_bar.dir = $3; } - ; + ; -spelldef : spellbody_list +spelldef : spellbody_list { $$ = new_spell($1); } - | LET defs IN spellbody_list + | LET defs IN spellbody_list { $$ = new_spell($4); $$->letdefs_nr = $2.letdefs_nr; $$->letdefs = $2.letdefs; $$->spellguard = $4; } - ; + ; -defs : semicolons - { $$.letdefs_nr = 0; +defs : semicolons + { $$.letdefs_nr = 0; CREATE($$.letdefs, letdef_t, 1); } - | defs def semicolons - { $$ = $1; + | defs def semicolons + { $$ = $1; $$.letdefs_nr++; - RECREATE ($$.letdefs, letdef_t, $$.letdefs_nr); + RECREATE($$.letdefs, letdef_t, $$.letdefs_nr); $$.letdefs[$1.letdefs_nr] = $2; } ; -def : ID '=' expr - { +def : ID '=' expr + { if (find_constant($1)) { fail(@1.first_line, @1.first_column, "Attempt to re-define constant `%s' as LET-bound variable.\n", $1); free($1); @@ -486,155 +486,155 @@ def : ID '=' expr $$.expr = $3; } } - ; + ; -spellbody_list : spellbody - { $$ = $1; } - | spellbody '|' spellbody_list - { spellguard_t *sg = new_spellguard(SPELLGUARD_CHOICE); +spellbody_list : spellbody + { $$ = $1; } + | spellbody '|' spellbody_list + { spellguard_t *sg = new_spellguard(SPELLGUARD_CHOICE); sg->next = $1; sg->s.s_alt = $3; $$ = sg; } - ; + ; -spellbody : spellguard DARROW spellbody - { $$ = spellguard_implication($1, $3); } - | '(' spellbody_list ')' - { $$ = $2; } - | EFFECT effect_list maybe_trigger maybe_end - { spellguard_t *sg = new_spellguard(SPELLGUARD_EFFECT); +spellbody : spellguard DARROW spellbody + { $$ = spellguard_implication($1, $3); } + | '(' spellbody_list ')' + { $$ = $2; } + | EFFECT effect_list maybe_trigger maybe_end + { spellguard_t *sg = new_spellguard(SPELLGUARD_EFFECT); sg->s.s_effect.effect = $2; sg->s.s_effect.at_trigger = $3; sg->s.s_effect.at_end = $4; $$ = sg; } - ; + ; -maybe_trigger : /* empty */ - { $$ = NULL; } - | ATTRIGGER effect_list - { $$ = $2; } - ; +maybe_trigger : /* empty */ + { $$ = NULL; } + | ATTRIGGER effect_list + { $$ = $2; } + ; -maybe_end : /* empty */ - { $$ = NULL; } - | ATEND effect_list - { $$ = $2; } - ; +maybe_end : /* empty */ + { $$ = NULL; } + | ATEND effect_list + { $$ = $2; } + ; -spellguard : prereq - { $$ = $1; } - | spellguard OR spellguard - { spellguard_t *sg = new_spellguard(SPELLGUARD_CHOICE); +spellguard : prereq + { $$ = $1; } + | spellguard OR spellguard + { spellguard_t *sg = new_spellguard(SPELLGUARD_CHOICE); sg->next = $1; sg->s.s_alt = $3; $$ = sg; } - | '(' spellguard_list ')' - { $$ = $2; } - ; + | '(' spellguard_list ')' + { $$ = $2; } + ; -spellguard_list : spellguard - { $$ = $1; } - | spellguard ',' spellguard_list - { $$ = spellguard_implication ($1, $3); } - ; +spellguard_list : spellguard + { $$ = $1; } + | spellguard ',' spellguard_list + { $$ = spellguard_implication($1, $3); } + ; -prereq : REQUIRE expr - { $$ = new_spellguard(SPELLGUARD_CONDITION); +prereq : REQUIRE expr + { $$ = new_spellguard(SPELLGUARD_CONDITION); $$->s.s_condition = $2; } - | CATALYSTS items - { $$ = new_spellguard(SPELLGUARD_CATALYSTS); + | CATALYSTS items + { $$ = new_spellguard(SPELLGUARD_CATALYSTS); $$->s.s_catalysts = $2; } - | COMPONENTS items - { $$ = new_spellguard(SPELLGUARD_COMPONENTS); + | COMPONENTS items + { $$ = new_spellguard(SPELLGUARD_COMPONENTS); $$->s.s_components = $2; } - | MANA expr - { $$ = new_spellguard(SPELLGUARD_MANA); + | MANA expr + { $$ = new_spellguard(SPELLGUARD_MANA); $$->s.s_mana = $2; } - | CASTTIME expr - { $$ = new_spellguard(SPELLGUARD_CASTTIME); + | CASTTIME expr + { $$ = new_spellguard(SPELLGUARD_CASTTIME); $$->s.s_casttime = $2; } - ; + ; -items : '[' item_list ']' - { $$ = $2; } - ; +items : '[' item_list ']' + { $$ = $2; } + ; -item_list : item - { $$ = NULL; +item_list : item + { $$ = NULL; magic_add_component(&$$, $1.id, $1.count); } - | item_list ',' item - { $$ = $1; + | item_list ',' item + { $$ = $1; magic_add_component(&$$, $3.id, $3.count); } - ; + ; -item : INT '*' item_name - { $$.id = $3; $$.count = $1; } - | item_name - { $$.id = $1; $$.count = 1; } - ; +item : INT '*' item_name + { $$.id = $3; $$.count = $1; } + | item_name + { $$.id = $1; $$.count = 1; } + ; -item_name : STRING - { struct item_data *item = itemdb_searchname($1); +item_name : STRING + { struct item_data *item = itemdb_searchname($1); if (!item) { - fail (@1.first_line, @1.first_column, "Unknown item `%s'\n", $1); + fail(@1.first_line, @1.first_column, "Unknown item `%s'\n", $1); $$ = 0; } else $$ = item->nameid; - free ($1); + free($1); } - | INT - { $$ = $1; } - ; - - -selection : PC_F - { $$ = FOREACH_FILTER_PC; } - | MOB_F - { $$ = FOREACH_FILTER_MOB; } - | ENTITY_F - { $$ = FOREACH_FILTER_ENTITY; } - | SPELL - { $$ = FOREACH_FILTER_SPELL; } - | TARGET_F - { $$ = FOREACH_FILTER_TARGET; } - | NPC_F - { $$ = FOREACH_FILTER_NPC; } - ; - - -effect : '(' effect_list ')' - { $$ = $2; } - | SKIP ';' - { $$ = new_effect(EFFECT_SKIP); } - | ABORT ';' - { $$ = new_effect(EFFECT_ABORT); } - | END ';' - { $$ = new_effect(EFFECT_END); } - | BREAK ';' - { $$ = new_effect(EFFECT_BREAK); } - | ID '=' expr ';' - { + | INT + { $$ = $1; } + ; + + +selection : PC_F + { $$ = FOREACH_FILTER_PC; } + | MOB_F + { $$ = FOREACH_FILTER_MOB; } + | ENTITY_F + { $$ = FOREACH_FILTER_ENTITY; } + | SPELL + { $$ = FOREACH_FILTER_SPELL; } + | TARGET_F + { $$ = FOREACH_FILTER_TARGET; } + | NPC_F + { $$ = FOREACH_FILTER_NPC; } + ; + + +effect : '(' effect_list ')' + { $$ = $2; } + | SKIP ';' + { $$ = new_effect(EFFECT_SKIP); } + | ABORT ';' + { $$ = new_effect(EFFECT_ABORT); } + | END ';' + { $$ = new_effect(EFFECT_END); } + | BREAK ';' + { $$ = new_effect(EFFECT_BREAK); } + | ID '=' expr ';' + { if (find_constant($1)) { fail(@1.first_line, @1.first_column, "Attempt to re-define constant `%s' in assignment.", $1); free($1); @@ -644,58 +644,58 @@ effect : '(' effect_list ')' $$->e.e_assign.expr = $3; } } - | FOREACH selection ID IN expr DO effect - { $$ = new_effect(EFFECT_FOREACH); + | FOREACH selection ID IN expr DO effect + { $$ = new_effect(EFFECT_FOREACH); $$->e.e_foreach.id = intern_id($3); $$->e.e_foreach.area = $5; $$->e.e_foreach.body = $7; $$->e.e_foreach.filter = $2; } - | FOR ID '=' expr TO expr DO effect - { $$ = new_effect(EFFECT_FOR); + | FOR ID '=' expr TO expr DO effect + { $$ = new_effect(EFFECT_FOR); $$->e.e_for.id = intern_id($2); $$->e.e_for.start = $4; $$->e.e_for.stop = $6; $$->e.e_for.body = $8; } - | IF expr THEN effect ELSE effect - { $$ = new_effect(EFFECT_IF); + | IF expr THEN effect ELSE effect + { $$ = new_effect(EFFECT_IF); $$->e.e_if.cond = $2; $$->e.e_if.true_branch = $4; $$->e.e_if.false_branch = $6; } - | IF expr THEN effect - { $$ = new_effect(EFFECT_IF); + | IF expr THEN effect + { $$ = new_effect(EFFECT_IF); $$->e.e_if.cond = $2; $$->e.e_if.true_branch = $4; $$->e.e_if.false_branch = new_effect(EFFECT_SKIP); } - | SLEEP expr ';' - { $$ = new_effect(EFFECT_SLEEP); + | SLEEP expr ';' + { $$ = new_effect(EFFECT_SLEEP); $$->e.e_sleep = $2; } - | ID '(' arg_list ')' ';' + | ID '(' arg_list ')' ';' { $$ = op_effect($1, $3.args_nr, $3.args, @1.first_line, @1.first_column); free($1); } - | SCRIPT_DATA - { $$ = new_effect(EFFECT_SCRIPT); + | SCRIPT_DATA + { $$ = new_effect(EFFECT_SCRIPT); $$->e.e_script = parse_script($1, @1.first_line); free($1); if ($$->e.e_script == NULL) fail(@1.first_line, @1.first_column, "Failed to compile script\n"); } - | CALL ID '(' arg_list ')' ';' - { $$ = call_proc($2, $4.args_nr, $4.args, @1.first_line, @1.first_column); + | CALL ID '(' arg_list ')' ';' + { $$ = call_proc($2, $4.args_nr, $4.args, @1.first_line, @1.first_column); free($2); } - ; + ; -effect_list : /* empty */ - { $$ = new_effect(EFFECT_SKIP); } - | effect semicolons effect_list - { $$ = set_effect_continuation($1, $3); } - ; +effect_list : /* empty */ + { $$ = new_effect(EFFECT_SKIP); } + | effect semicolons effect_list + { $$ = set_effect_continuation($1, $3); } + ; %% @@ -949,7 +949,7 @@ install_proc(proc_t *proc) procs = proc; procs_nr = 1; } else { - RECREATE (procs, proc_t, 1 + procs_nr); + RECREATE(procs, proc_t, 1 + procs_nr); procs[procs_nr++] = *proc; } } diff --git a/src/map/magic-interpreter.hpp b/src/map/magic-interpreter.hpp index 21e8d39..39a057c 100644 --- a/src/map/magic-interpreter.hpp +++ b/src/map/magic-interpreter.hpp @@ -30,33 +30,33 @@ #include "../common/timer.hpp" #include "../common/socket.hpp" -#define SPELLARG_NONE 0 /* No spell parameter */ -#define SPELLARG_PC 1 /* Spell parameter describes pc (defaults to self) */ -#define SPELLARG_STRING 2 /* Spell parameter describes pc (defaults to self) */ +#define SPELLARG_NONE 0 /* No spell parameter */ +#define SPELLARG_PC 1 /* Spell parameter describes pc (defaults to self) */ +#define SPELLARG_STRING 2 /* Spell parameter describes pc (defaults to self) */ /* ------ */ /* Values */ /* ------ */ -#define TY_UNDEF 0 -#define TY_INT 1 -#define TY_DIR 2 -#define TY_STRING 3 -#define TY_ENTITY 5 -#define TY_LOCATION 6 -#define TY_AREA 7 -#define TY_SPELL 8 -#define TY_INVOCATION 9 -#define TY_FAIL 127 - -#define DIR_S 0 -#define DIR_SW 1 -#define DIR_W 2 -#define DIR_NW 3 -#define DIR_N 4 -#define DIR_NE 5 -#define DIR_E 6 -#define DIR_SE 7 +#define TY_UNDEF 0 +#define TY_INT 1 +#define TY_DIR 2 +#define TY_STRING 3 +#define TY_ENTITY 5 +#define TY_LOCATION 6 +#define TY_AREA 7 +#define TY_SPELL 8 +#define TY_INVOCATION 9 +#define TY_FAIL 127 + +#define DIR_S 0 +#define DIR_SW 1 +#define DIR_W 2 +#define DIR_NW 3 +#define DIR_N 4 +#define DIR_NE 5 +#define DIR_E 6 +#define DIR_SE 7 struct expr; struct val; @@ -67,14 +67,14 @@ struct invocation; typedef struct location { - int m; - int x, y; + int m; + int x, y; } location_t; -#define AREA_LOCATION 0 -#define AREA_UNION 1 -#define AREA_RECT 2 -#define AREA_BAR 3 +#define AREA_LOCATION 0 +#define AREA_UNION 1 +#define AREA_RECT 2 +#define AREA_BAR 3 typedef struct area { @@ -84,16 +84,16 @@ typedef struct area struct { location_t loc; - int width, depth, dir; + int width, depth, dir; } a_bar; struct { location_t loc; - int width, height; + int width, height; } a_rect; struct area *a_union[2]; } a; - int size; + int size; unsigned char ty; } area_t; @@ -101,7 +101,7 @@ typedef struct val { union v { - int v_int; + int v_int; char *v_string; entity_t *v_entity; /* Used ONLY during operation/function invocation; otherwise we use v_int */ area_t *v_area; @@ -118,12 +118,12 @@ typedef struct val #define MAX_ARGS 7 /* Max. # of args used in builtin primitive functions */ -#define EXPR_VAL 0 -#define EXPR_LOCATION 1 -#define EXPR_AREA 2 -#define EXPR_FUNAPP 3 -#define EXPR_ID 4 -#define EXPR_SPELLFIELD 5 +#define EXPR_VAL 0 +#define EXPR_LOCATION 1 +#define EXPR_AREA 2 +#define EXPR_FUNAPP 3 +#define EXPR_ID 4 +#define EXPR_SPELLFIELD 5 typedef struct e_location { @@ -159,15 +159,15 @@ typedef struct expr e_area_t e_area; struct { - int id, line_nr, column; - int args_nr; + int id, line_nr, column; + int args_nr; struct expr *args[MAX_ARGS]; } e_funapp; - int e_id; + int e_id; struct { struct expr *expr; - int id; + int id; } e_field; } e; unsigned char ty; @@ -177,25 +177,25 @@ typedef struct expr /* Effects */ /* ------- */ -#define EFFECT_SKIP 0 -#define EFFECT_ABORT 1 -#define EFFECT_ASSIGN 2 -#define EFFECT_FOREACH 3 -#define EFFECT_FOR 4 -#define EFFECT_IF 5 -#define EFFECT_SLEEP 6 -#define EFFECT_SCRIPT 7 -#define EFFECT_BREAK 8 -#define EFFECT_OP 9 -#define EFFECT_END 10 -#define EFFECT_CALL 11 - -#define FOREACH_FILTER_MOB 1 -#define FOREACH_FILTER_PC 2 -#define FOREACH_FILTER_ENTITY 3 -#define FOREACH_FILTER_TARGET 4 -#define FOREACH_FILTER_SPELL 5 -#define FOREACH_FILTER_NPC 6 +#define EFFECT_SKIP 0 +#define EFFECT_ABORT 1 +#define EFFECT_ASSIGN 2 +#define EFFECT_FOREACH 3 +#define EFFECT_FOR 4 +#define EFFECT_IF 5 +#define EFFECT_SLEEP 6 +#define EFFECT_SCRIPT 7 +#define EFFECT_BREAK 8 +#define EFFECT_OP 9 +#define EFFECT_END 10 +#define EFFECT_CALL 11 + +#define FOREACH_FILTER_MOB 1 +#define FOREACH_FILTER_PC 2 +#define FOREACH_FILTER_ENTITY 3 +#define FOREACH_FILTER_TARGET 4 +#define FOREACH_FILTER_SPELL 5 +#define FOREACH_FILTER_NPC 6 typedef struct effect { @@ -204,19 +204,19 @@ typedef struct effect { struct { - int id; + int id; expr_t *expr; } e_assign; struct { - int id; + int id; expr_t *area; struct effect *body; unsigned char filter; } e_foreach; struct { - int id; + int id; expr_t *start, *stop; struct effect *body; } e_for; @@ -229,14 +229,14 @@ typedef struct effect const ScriptCode *e_script; struct { - int id; - int args_nr; - int line_nr, column; + int id; + int args_nr; + int line_nr, column; expr_t *args[MAX_ARGS]; } e_op; struct { - int args_nr, *formals; + int args_nr, *formals; expr_t **actuals; struct effect *body; } e_call; @@ -251,21 +251,21 @@ typedef struct effect typedef struct component { struct component *next; - int item_id; - int count; + int item_id; + int count; } component_t; /* ----------- */ /* Spellguards */ /* ----------- */ -#define SPELLGUARD_CONDITION 0 -#define SPELLGUARD_COMPONENTS 1 -#define SPELLGUARD_CATALYSTS 2 -#define SPELLGUARD_CHOICE 3 -#define SPELLGUARD_MANA 4 -#define SPELLGUARD_CASTTIME 5 -#define SPELLGUARD_EFFECT 6 +#define SPELLGUARD_CONDITION 0 +#define SPELLGUARD_COMPONENTS 1 +#define SPELLGUARD_CATALYSTS 2 +#define SPELLGUARD_CHOICE 3 +#define SPELLGUARD_MANA 4 +#define SPELLGUARD_CASTTIME 5 +#define SPELLGUARD_EFFECT 6 typedef struct effect_set { @@ -294,24 +294,24 @@ typedef struct spellguard typedef struct letdef { - int id; + int id; expr_t *expr; } letdef_t; -#define SPELL_FLAG_LOCAL (1 << 0) // spell associated not with caster but with place -#define SPELL_FLAG_SILENT (1 << 1) // spell invocation never uttered -#define SPELL_FLAG_NONMAGIC (1 << 2) // `magic word' only: don't require spellcasting ability +#define SPELL_FLAG_LOCAL (1 << 0) // spell associated not with caster but with place +#define SPELL_FLAG_SILENT (1 << 1) // spell invocation never uttered +#define SPELL_FLAG_NONMAGIC (1 << 2) // `magic word' only: don't require spellcasting ability typedef struct spell { char *name; char *invocation; - int index; // Relative location in the definitions file - int flags; - int arg; - int spellarg_ty; + int index; // Relative location in the definitions file + int flags; + int arg; + int spellarg_ty; - int letdefs_nr; + int letdefs_nr; letdef_t *letdefs; spellguard_t *spellguard; @@ -334,31 +334,31 @@ typedef struct teleport_anchor typedef struct { - int vars_nr; + int vars_nr; const char **var_name; val_t *vars; /* Initial assignments, if any, or NULL */ - int obscure_chance; - int min_casttime; + int obscure_chance; + int min_casttime; - int spells_nr; + int spells_nr; spell_t **spells; - int anchors_nr; /* NEGATIVE iff we have sorted the anchors */ + int anchors_nr; /* NEGATIVE iff we have sorted the anchors */ teleport_anchor_t **anchors; } magic_conf_t; /* Execution environment */ -#define VAR_MIN_CASTTIME 0 -#define VAR_OBSCURE_CHANCE 1 -#define VAR_CASTER 2 -#define VAR_SPELLPOWER 3 -#define VAR_SPELL 4 -#define VAR_INVOCATION 5 -#define VAR_TARGET 6 -#define VAR_SCRIPTTARGET 7 -#define VAR_LOCATION 8 +#define VAR_MIN_CASTTIME 0 +#define VAR_OBSCURE_CHANCE 1 +#define VAR_CASTER 2 +#define VAR_SPELLPOWER 3 +#define VAR_SPELL 4 +#define VAR_INVOCATION 5 +#define VAR_TARGET 6 +#define VAR_SCRIPTTARGET 7 +#define VAR_LOCATION 8 struct magic_config; @@ -370,9 +370,9 @@ typedef struct env #define MAX_STACK_SIZE 32 -#define CONT_STACK_FOREACH 0 -#define CONT_STACK_FOR 1 -#define CONT_STACK_PROC 2 +#define CONT_STACK_FOREACH 0 +#define CONT_STACK_FOR 1 +#define CONT_STACK_PROC 2 typedef struct cont_activation_record { @@ -381,22 +381,22 @@ typedef struct cont_activation_record { struct { - int id, ty; + int id, ty; effect_t *body; - int entities_nr; + int entities_nr; int *entities; - int index; + int index; } c_foreach; struct { - int id; + int id; effect_t *body; - int current; - int stop; + int current; + int stop; } c_for; struct { - int args_nr, *formals; + int args_nr, *formals; val_t *old_actuals; } c_proc; } c; @@ -405,38 +405,38 @@ typedef struct cont_activation_record typedef struct status_change_ref { - int sc_type; - int bl_id; + int sc_type; + int bl_id; } status_change_ref_t; -#define INVOCATION_FLAG_BOUND (1 << 0) /* Bound directly to the caster (i.e., ignore its location) */ -#define INVOCATION_FLAG_ABORTED (1 << 1) /* Used `abort' to terminate */ -#define INVOCATION_FLAG_STOPATTACK (1 << 2) /* On magical attacks: if we run out of steam, stop attacking altogether */ +#define INVOCATION_FLAG_BOUND (1 << 0) /* Bound directly to the caster (i.e., ignore its location) */ +#define INVOCATION_FLAG_ABORTED (1 << 1) /* Used `abort' to terminate */ +#define INVOCATION_FLAG_STOPATTACK (1 << 2) /* On magical attacks: if we run out of steam, stop attacking altogether */ typedef struct invocation { struct block_list bl; struct invocation *next_invocation; /* used for spells directly associated with a caster: they form a singly-linked list */ - int flags; + int flags; env_t *env; spell_t *spell; - int caster; /* this is the person who originally invoked the spell */ - int subject; /* when this person dies, the spell dies with it */ + int caster; /* this is the person who originally invoked the spell */ + int subject; /* when this person dies, the spell dies with it */ - int timer; /* spell timer, if any */ + int timer; /* spell timer, if any */ - int stack_size; + int stack_size; cont_activation_record_t stack[MAX_STACK_SIZE]; - int script_pos; /* Script position; if nonzero, resume the script we were running. */ + int script_pos; /* Script position; if nonzero, resume the script we were running. */ effect_t *current_effect; effect_t *trigger_effect; /* If non-NULL, this is used to spawn a cloned effect based on the same environment */ effect_t *end_effect; /* If non-NULL, this is executed when the spell terminates naturally, e.g. when all status changes have run out or all delays are over. */ /* Status change references: for status change updates, keep track of whom we updated where */ - int status_change_refs_nr; + int status_change_refs_nr; status_change_ref_t *status_change_refs; } invocation_t; @@ -447,58 +447,58 @@ extern env_t magic_default_env; /* Fake default environment */ /** * Adds a component selection to a component holder (which may initially be NULL) */ -void magic_add_component (component_t ** component_holder, int id, int count); +void magic_add_component(component_t ** component_holder, int id, int count); -teleport_anchor_t *magic_find_anchor (char *name); +teleport_anchor_t *magic_find_anchor(char *name); /** * The parameter `param' must have been dynamically allocated; ownership is transferred to the resultant env_t. */ -env_t *spell_create_env (magic_conf_t * conf, spell_t * spell, +env_t *spell_create_env(magic_conf_t * conf, spell_t * spell, character_t * caster, int spellpower, char *param); -void magic_free_env (env_t * env); +void magic_free_env(env_t * env); /** * near_miss is set to nonzero iff the spell only failed due to ephemereal issues (spell delay in effect, out of mana, out of components) */ -effect_set_t *spell_trigger (spell_t * spell, character_t * caster, +effect_set_t *spell_trigger(spell_t * spell, character_t * caster, env_t * env, int *near_miss); -invocation_t *spell_instantiate (effect_set_t * effect, env_t * env); +invocation_t *spell_instantiate(effect_set_t * effect, env_t * env); /** * Bind a spell to a subject (this is a no-op for `local' spells). */ -void spell_bind (character_t * subject, invocation_t * invocation); +void spell_bind(character_t * subject, invocation_t * invocation); -int // 1 on failure - spell_unbind (character_t * subject, invocation_t * invocation); +int // 1 on failure + spell_unbind(character_t * subject, invocation_t * invocation); /** * Clones a spell to run the at_effect field */ -invocation_t *spell_clone_effect (invocation_t * source); +invocation_t *spell_clone_effect(invocation_t * source); -spell_t *magic_find_spell (char *invocation); +spell_t *magic_find_spell(char *invocation); /* The following is used only by the parser: */ typedef struct args_rec { - int args_nr; + int args_nr; expr_t **args; } args_rec_t; typedef struct { char *name; - int args_nr; + int args_nr; int *args; effect_t *body; } proc_t; // must be called after itemdb initialisation int magic_init(const char *); -void spell_update_location (invocation_t * invocation); +void spell_update_location(invocation_t * invocation); #endif /* !defined (MAGIC_INTERPRETER_H) */ diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp index 2fcf60c..b98130e 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -8,85 +8,85 @@ //#define DEBUG #ifdef DEBUG -static void print_val (val_t * v) +static void print_val(val_t * v) { switch (v->ty) { case TY_UNDEF: - fprintf (stderr, "UNDEF"); + fprintf(stderr, "UNDEF"); break; case TY_INT: - fprintf (stderr, "%d", v->v.v_int); + fprintf(stderr, "%d", v->v.v_int); break; case TY_DIR: - fprintf (stderr, "dir%d", v->v.v_int); + fprintf(stderr, "dir%d", v->v.v_int); break; case TY_STRING: - fprintf (stderr, "`%s'", v->v.v_string); + fprintf(stderr, "`%s'", v->v.v_string); break; default: - fprintf (stderr, "ty%d", v->ty); + fprintf(stderr, "ty%d", v->ty); break; } } -static void dump_env (env_t * env) +static void dump_env(env_t * env) { - int i; + int i; for (i = 0; i < env->base_env->vars_nr; i++) { val_t *v = &env->vars[i]; val_t *bv = &env->base_env->vars[i]; - fprintf (stderr, "%02x %30s ", i, env->base_env->var_name[i]); - print_val (v); - fprintf (stderr, "\t("); - print_val (bv); - fprintf (stderr, ")\n"); + fprintf(stderr, "%02x %30s ", i, env->base_env->var_name[i]); + print_val(v); + fprintf(stderr, "\t("); + print_val(bv); + fprintf(stderr, ")\n"); } } #endif -static void clear_activation_record (cont_activation_record_t * ar) +static void clear_activation_record(cont_activation_record_t * ar) { switch (ar->ty) { case CONT_STACK_FOREACH: - free (ar->c.c_foreach.entities); + free(ar->c.c_foreach.entities); break; case CONT_STACK_PROC: - free (ar->c.c_proc.old_actuals); + free(ar->c.c_proc.old_actuals); break; } } static void -invocation_timer_callback (timer_id UNUSED, tick_t UNUSED, custom_id_t id, custom_data_t data) +invocation_timer_callback(timer_id UNUSED, tick_t UNUSED, custom_id_t id, custom_data_t data) { - invocation_t *invocation = (invocation_t *) map_id2bl (id); + invocation_t *invocation = (invocation_t *) map_id2bl(id); if (invocation) { invocation->timer = 0; - spell_execute (invocation); + spell_execute(invocation); } } -static void clear_stack (invocation_t * invocation) +static void clear_stack(invocation_t * invocation) { - int i; + int i; for (i = 0; i < invocation->stack_size; i++) - clear_activation_record (&invocation->stack[i]); + clear_activation_record(&invocation->stack[i]); invocation->stack_size = 0; } -void spell_free_invocation (invocation_t * invocation) +void spell_free_invocation(invocation_t * invocation) { if (invocation->status_change_refs) { - free (invocation->status_change_refs); + free(invocation->status_change_refs); /* The following cleanup shouldn't be necessary, but I've added it to help tracking a certain bug */ invocation->status_change_refs = NULL; invocation->status_change_refs_nr = 0; @@ -94,25 +94,25 @@ void spell_free_invocation (invocation_t * invocation) if (invocation->flags & INVOCATION_FLAG_BOUND) { - entity_t *e = map_id2bl (invocation->subject); + entity_t *e = map_id2bl(invocation->subject); if (e && e->type == BL_PC) - spell_unbind ((character_t *) e, invocation); + spell_unbind((character_t *) e, invocation); } - clear_stack (invocation); + clear_stack(invocation); if (invocation->timer) - delete_timer (invocation->timer, invocation_timer_callback); + delete_timer(invocation->timer, invocation_timer_callback); - magic_free_env (invocation->env); + magic_free_env(invocation->env); - map_delblock (&invocation->bl); - map_delobject (invocation->bl.id, BL_SPELL); // also frees the object + map_delblock(&invocation->bl); + map_delobject(invocation->bl.id, BL_SPELL); // also frees the object // free(invocation); } static void -char_set_weapon_icon (character_t * subject, int count, int icon, int look) +char_set_weapon_icon(character_t * subject, int count, int icon, int look) { const int old_icon = subject->attack_spell_icon_override; @@ -120,163 +120,163 @@ char_set_weapon_icon (character_t * subject, int count, int icon, int look) subject->attack_spell_look_override = look; if (old_icon && old_icon != icon) - clif_status_change (&subject->bl, old_icon, 0); + clif_status_change(&subject->bl, old_icon, 0); - clif_fixpcpos (subject); + clif_fixpcpos(subject); if (count) { - clif_changelook (&subject->bl, LOOK_WEAPON, look); + clif_changelook(&subject->bl, LOOK_WEAPON, look); if (icon) - clif_status_change (&subject->bl, icon, 1); + clif_status_change(&subject->bl, icon, 1); } else { /* Set it to `normal' */ - clif_changelook (&subject->bl, LOOK_WEAPON, subject->status.weapon); + clif_changelook(&subject->bl, LOOK_WEAPON, subject->status.weapon); } } -static void char_set_attack_info (character_t * subject, int speed, int range) +static void char_set_attack_info(character_t * subject, int speed, int range) { subject->attack_spell_delay = speed; subject->attack_spell_range = range; if (speed == 0) { - pc_calcstatus (subject, 1); - clif_updatestatus (subject, SP_ASPD); - clif_updatestatus (subject, SP_ATTACKRANGE); + pc_calcstatus(subject, 1); + clif_updatestatus(subject, SP_ASPD); + clif_updatestatus(subject, SP_ATTACKRANGE); } else { subject->aspd = speed; - clif_updatestatus (subject, SP_ASPD); - clif_updatestatus (subject, SP_ATTACKRANGE); + clif_updatestatus(subject, SP_ASPD); + clif_updatestatus(subject, SP_ATTACKRANGE); } } -void magic_stop_completely (character_t * c) +void magic_stop_completely(character_t * c) { - int i; + int i; // Zap all status change references to spells for (i = 0; i < MAX_STATUSCHANGE; i++) c->sc_data[i].spell_invocation = 0; while (c->active_spells) - spell_free_invocation (c->active_spells); + spell_free_invocation(c->active_spells); if (c->attack_spell_override) { invocation_t *attack_spell = - (invocation_t *) map_id2bl (c->attack_spell_override); + (invocation_t *) map_id2bl(c->attack_spell_override); if (attack_spell) - spell_free_invocation (attack_spell); + spell_free_invocation(attack_spell); c->attack_spell_override = 0; - char_set_weapon_icon (c, 0, 0, 0); - char_set_attack_info (c, 0, 0); + char_set_weapon_icon(c, 0, 0, 0); + char_set_attack_info(c, 0, 0); } } /* Spell execution has finished normally or we have been notified by a finished skill timer */ -static void try_to_finish_invocation (invocation_t * invocation) +static void try_to_finish_invocation(invocation_t * invocation) { if (invocation->status_change_refs_nr == 0 && !invocation->current_effect) { if (invocation->end_effect) { - clear_stack (invocation); + clear_stack(invocation); invocation->current_effect = invocation->end_effect; invocation->end_effect = NULL; - spell_execute (invocation); + spell_execute(invocation); } else - spell_free_invocation (invocation); + spell_free_invocation(invocation); } } -static int trigger_spell (int subject, int spell) +static int trigger_spell(int subject, int spell) { - invocation_t *invocation = (invocation_t *) map_id2bl (spell); + invocation_t *invocation = (invocation_t *) map_id2bl(spell); if (!invocation) return 0; - invocation = spell_clone_effect (invocation); + invocation = spell_clone_effect(invocation); - spell_bind ((character_t *) map_id2bl (subject), invocation); - magic_clear_var (&invocation->env->vars[VAR_CASTER]); + spell_bind((character_t *) map_id2bl(subject), invocation); + magic_clear_var(&invocation->env->vars[VAR_CASTER]); invocation->env->vars[VAR_CASTER].ty = TY_ENTITY; invocation->env->vars[VAR_CASTER].v.v_int = subject; return invocation->bl.id; } -static void entity_warp (entity_t * target, int destm, int destx, int desty); +static void entity_warp(entity_t * target, int destm, int destx, int desty); -static void char_update (character_t * character) +static void char_update(character_t * character) { - entity_warp ((entity_t *) character, character->bl.m, character->bl.x, + entity_warp((entity_t *) character, character->bl.m, character->bl.x, character->bl.y); } -static void timer_callback_effect (timer_id UNUSED, tick_t UNUSED, custom_id_t id, custom_data_t data) +static void timer_callback_effect(timer_id UNUSED, tick_t UNUSED, custom_id_t id, custom_data_t data) { - entity_t *target = map_id2bl (id); + entity_t *target = map_id2bl(id); if (target) - clif_misceffect (target, data); + clif_misceffect(target, data); } -static void entity_effect (entity_t * entity, int effect_nr, int delay) +static void entity_effect(entity_t * entity, int effect_nr, int delay) { - add_timer (gettick () + delay, + add_timer(gettick() + delay, &timer_callback_effect, entity->id, effect_nr); } -void magic_unshroud (character_t * other_char) +void magic_unshroud(character_t * other_char) { other_char->state.shroud_active = 0; // Now warp the caster out of and back into here to refresh everyone's display - char_update (other_char); - clif_displaymessage (other_char->fd, "Your shroud has been dispelled!"); + char_update(other_char); + clif_displaymessage(other_char->fd, "Your shroud has been dispelled!"); // entity_effect(&other_char->bl, MAGIC_EFFECT_REVEAL); } static void -timer_callback_effect_npc_delete (timer_id UNUSED, tick_t odelay, +timer_callback_effect_npc_delete(timer_id UNUSED, tick_t odelay, custom_id_t npc_id, custom_data_t UNUSED) { - struct npc_data *effect_npc = (struct npc_data *) map_id2bl (npc_id); - npc_free (effect_npc); + struct npc_data *effect_npc = (struct npc_data *) map_id2bl(npc_id); + npc_free(effect_npc); } -static struct npc_data *local_spell_effect (int m, int x, int y, int effect, +static struct npc_data *local_spell_effect(int m, int x, int y, int effect, int tdelay) { - int delay = 30000; /* 1 minute should be enough for all interesting spell effects, I hope */ - struct npc_data *effect_npc = npc_spawn_text (m, x, y, + int delay = 30000; /* 1 minute should be enough for all interesting spell effects, I hope */ + struct npc_data *effect_npc = npc_spawn_text(m, x, y, INVISIBLE_NPC, "", "?"); - int effect_npc_id = effect_npc->bl.id; + int effect_npc_id = effect_npc->bl.id; - entity_effect (&effect_npc->bl, effect, tdelay); - add_timer (gettick () + delay, + entity_effect(&effect_npc->bl, effect, tdelay); + add_timer(gettick() + delay, timer_callback_effect_npc_delete, effect_npc_id, 0); return effect_npc; } -static int op_sfx (env_t * env, int args_nr, val_t * args) +static int op_sfx(env_t * env, int args_nr, val_t * args) { - int delay = ARGINT (2); + int delay = ARGINT(2); - if (TY (0) == TY_ENTITY) + if (TY(0) == TY_ENTITY) { - entity_effect (ARGENTITY (0), ARGINT (1), delay); + entity_effect(ARGENTITY(0), ARGINT(1), delay); } - else if (TY (0) == TY_LOCATION) + else if (TY(0) == TY_LOCATION) { - local_spell_effect (ARGLOCATION (0).m, - ARGLOCATION (0).x, - ARGLOCATION (0).y, ARGINT (1), delay); + local_spell_effect(ARGLOCATION(0).m, + ARGLOCATION(0).x, + ARGLOCATION(0).y, ARGINT(1), delay); } else return 1; @@ -284,11 +284,11 @@ static int op_sfx (env_t * env, int args_nr, val_t * args) return 0; } -static int op_instaheal (env_t * env, int args_nr, val_t * args) +static int op_instaheal(env_t * env, int args_nr, val_t * args) { - entity_t *caster = (VAR (VAR_CASTER).ty == TY_ENTITY) - ? map_id2bl (VAR (VAR_CASTER).v.v_int) : NULL; - entity_t *subject = ARGENTITY (0); + entity_t *caster = (VAR(VAR_CASTER).ty == TY_ENTITY) + ? map_id2bl(VAR(VAR_CASTER).v.v_int) : NULL; + entity_t *subject = ARGENTITY(0); if (!caster) caster = subject; @@ -296,38 +296,38 @@ static int op_instaheal (env_t * env, int args_nr, val_t * args) { character_t *caster_pc = (character_t *) caster; character_t *subject_pc = (character_t *) subject; - MAP_LOG_PC (caster_pc, "SPELLHEAL-INSTA PC%d FOR %d", - subject_pc->status.char_id, ARGINT (1)); + MAP_LOG_PC(caster_pc, "SPELLHEAL-INSTA PC%d FOR %d", + subject_pc->status.char_id, ARGINT(1)); } - battle_heal (caster, subject, ARGINT (1), ARGINT (2), 0); + battle_heal(caster, subject, ARGINT(1), ARGINT(2), 0); return 0; } -static int op_itemheal (env_t * env, int args_nr, val_t * args) +static int op_itemheal(env_t * env, int args_nr, val_t * args) { - entity_t *subject = ARGENTITY (0); + entity_t *subject = ARGENTITY(0); if (subject->type == BL_PC) { - pc_itemheal ((struct map_session_data *) subject, - ARGINT (1), ARGINT (2)); + pc_itemheal((struct map_session_data *) subject, + ARGINT(1), ARGINT(2)); } else - return op_instaheal (env, args_nr, args); + return op_instaheal(env, args_nr, args); return 0; } -#define SHROUD_HIDE_NAME_TALKING_FLAG (1 << 0) -#define SHROUD_DISAPPEAR_ON_PICKUP_FLAG (1 << 1) -#define SHROUD_DISAPPEAR_ON_TALK_FLAG (1 << 2) +#define SHROUD_HIDE_NAME_TALKING_FLAG (1 << 0) +#define SHROUD_DISAPPEAR_ON_PICKUP_FLAG (1 << 1) +#define SHROUD_DISAPPEAR_ON_TALK_FLAG (1 << 2) #define ARGCHAR(n) (ARGENTITY(n)->type == BL_PC) ? (character_t *)(ARGENTITY(n)) : NULL -static int op_shroud (env_t * env, int args_nr, val_t * args) +static int op_shroud(env_t * env, int args_nr, val_t * args) { - character_t *subject = ARGCHAR (0); - int arg = ARGINT (1); + character_t *subject = ARGCHAR(0); + int arg = ARGINT(1); if (!subject) return 0; @@ -342,50 +342,50 @@ static int op_shroud (env_t * env, int args_nr, val_t * args) return 0; } -static int op_reveal (env_t * env, int args_nr, val_t * args) +static int op_reveal(env_t * env, int args_nr, val_t * args) { - character_t *subject = ARGCHAR (0); + character_t *subject = ARGCHAR(0); if (subject && subject->state.shroud_active) - magic_unshroud (subject); + magic_unshroud(subject); return 0; } -static int op_message (env_t * env, int args_nr, val_t * args) +static int op_message(env_t * env, int args_nr, val_t * args) { - character_t *subject = ARGCHAR (0); + character_t *subject = ARGCHAR(0); if (subject) - clif_displaymessage (subject->fd, ARGSTR (1)); + clif_displaymessage(subject->fd, ARGSTR(1)); return 0; } static void -timer_callback_kill_npc (timer_id UNUSED, tick_t odelay, custom_id_t npc_id, +timer_callback_kill_npc(timer_id UNUSED, tick_t odelay, custom_id_t npc_id, custom_data_t data) { - struct npc_data *npc = (struct npc_data *) map_id2bl (npc_id); + struct npc_data *npc = (struct npc_data *) map_id2bl(npc_id); if (npc) - npc_free (npc); + npc_free(npc); } -static int op_messenger_npc (env_t * env, int args_nr, val_t * args) +static int op_messenger_npc(env_t * env, int args_nr, val_t * args) { struct npc_data *npc; - location_t *loc = &ARGLOCATION (0); + location_t *loc = &ARGLOCATION(0); - npc = npc_spawn_text (loc->m, loc->x, loc->y, - ARGINT (1), ARGSTR (2), ARGSTR (3)); + npc = npc_spawn_text(loc->m, loc->x, loc->y, + ARGINT(1), ARGSTR(2), ARGSTR(3)); - add_timer (gettick () + ARGINT (4), + add_timer(gettick() + ARGINT(4), &timer_callback_kill_npc, npc->bl.id, 0); return 0; } -static void entity_warp (entity_t * target, int destm, int destx, int desty) +static void entity_warp(entity_t * target, int destm, int destx, int desty) { if (target->type == BL_PC || target->type == BL_MOB) { @@ -396,21 +396,21 @@ static void entity_warp (entity_t * target, int destm, int destx, int desty) { character_t *character = (character_t *) target; char *map_name; - clif_clearchar_area (&character->bl, 3); - map_delblock (&character->bl); + clif_clearchar_area(&character->bl, 3); + map_delblock(&character->bl); character->bl.x = destx; character->bl.y = desty; character->bl.m = destm; - pc_touch_all_relevant_npcs (character); + pc_touch_all_relevant_npcs(character); // Note that touching NPCs may have triggered warping and thereby updated x and y: map_name = map[character->bl.m].name; // Warp part #1: update relevant data, interrupt trading etc.: - pc_setpos (character, map_name, character->bl.x, character->bl.y, 0); + pc_setpos(character, map_name, character->bl.x, character->bl.y, 0); // Warp part #2: now notify the client - clif_changemap (character, map_name, + clif_changemap(character, map_name, character->bl.x, character->bl.y); break; } @@ -418,58 +418,58 @@ static void entity_warp (entity_t * target, int destm, int destx, int desty) target->x = destx; target->y = desty; target->m = destm; - clif_fixmobpos ((struct mob_data *) target); + clif_fixmobpos((struct mob_data *) target); break; } } } -static int op_move (env_t * env, int args_nr, val_t * args) +static int op_move(env_t * env, int args_nr, val_t * args) { - entity_t *subject = ARGENTITY (0); - int dir = ARGDIR (1); + entity_t *subject = ARGENTITY(0); + int dir = ARGDIR(1); - int newx = subject->x + heading_x[dir]; - int newy = subject->y + heading_y[dir]; + int newx = subject->x + heading_x[dir]; + int newy = subject->y + heading_y[dir]; - if (!map_is_solid (subject->m, newx, newy)) - entity_warp (subject, subject->m, newx, newy); + if (!map_is_solid(subject->m, newx, newy)) + entity_warp(subject, subject->m, newx, newy); return 0; } -static int op_warp (env_t * env, int args_nr, val_t * args) +static int op_warp(env_t * env, int args_nr, val_t * args) { - entity_t *subject = ARGENTITY (0); - location_t *loc = &ARGLOCATION (1); + entity_t *subject = ARGENTITY(0); + location_t *loc = &ARGLOCATION(1); - entity_warp (subject, loc->m, loc->x, loc->y); + entity_warp(subject, loc->m, loc->x, loc->y); return 0; } -static int op_banish (env_t * env, int args_nr, val_t * args) +static int op_banish(env_t * env, int args_nr, val_t * args) { - entity_t *subject = ARGENTITY (0); + entity_t *subject = ARGENTITY(0); if (subject->type == BL_MOB) { struct mob_data *mob = (struct mob_data *) subject; if (mob->mode & MOB_MODE_SUMMONED) - mob_catch_delete (mob, 3); + mob_catch_delete(mob, 3); } return 0; } static void -record_status_change (invocation_t * invocation, int bl_id, int sc_id) +record_status_change(invocation_t * invocation, int bl_id, int sc_id) { - int index = invocation->status_change_refs_nr++; + int index = invocation->status_change_refs_nr++; status_change_ref_t *cr; - RECREATE (invocation->status_change_refs, status_change_ref_t, invocation->status_change_refs_nr); + RECREATE(invocation->status_change_refs, status_change_ref_t, invocation->status_change_refs_nr); cr = &invocation->status_change_refs[index]; @@ -477,41 +477,41 @@ record_status_change (invocation_t * invocation, int bl_id, int sc_id) cr->bl_id = bl_id; } -static int op_status_change (env_t * env, int args_nr, val_t * args) +static int op_status_change(env_t * env, int args_nr, val_t * args) { - entity_t *subject = ARGENTITY (0); - int invocation_id = VAR (VAR_INVOCATION).ty == TY_INVOCATION - ? VAR (VAR_INVOCATION).v.v_int : 0; - invocation_t *invocation = (invocation_t *) map_id2bl (invocation_id); + entity_t *subject = ARGENTITY(0); + int invocation_id = VAR(VAR_INVOCATION).ty == TY_INVOCATION + ? VAR(VAR_INVOCATION).v.v_int : 0; + invocation_t *invocation = (invocation_t *) map_id2bl(invocation_id); - skill_status_effect (subject, ARGINT (1), ARGINT (2), ARGINT (3), - ARGINT (4), ARGINT (5), ARGINT (6), 0, + skill_status_effect(subject, ARGINT(1), ARGINT(2), ARGINT(3), + ARGINT(4), ARGINT(5), ARGINT(6), 0, invocation_id); if (invocation && subject->type == BL_PC) - record_status_change (invocation, subject->id, ARGINT (1)); + record_status_change(invocation, subject->id, ARGINT(1)); return 0; } -static int op_stop_status_change (env_t * env, int args_nr, val_t * args) +static int op_stop_status_change(env_t * env, int args_nr, val_t * args) { - entity_t *subject = ARGENTITY (0); + entity_t *subject = ARGENTITY(0); - skill_status_change_end (subject, ARGINT (1), -1); + skill_status_change_end(subject, ARGINT(1), -1); return 0; } -static int op_override_attack (env_t * env, int args_nr, val_t * args) +static int op_override_attack(env_t * env, int args_nr, val_t * args) { - entity_t *psubject = ARGENTITY (0); - int charges = ARGINT (1); - int attack_delay = ARGINT (2); - int attack_range = ARGINT (3); - int icon = ARGINT (4); - int look = ARGINT (5); - int stopattack = ARGINT (6); + entity_t *psubject = ARGENTITY(0); + int charges = ARGINT(1); + int attack_delay = ARGINT(2); + int attack_range = ARGINT(3); + int icon = ARGINT(4); + int look = ARGINT(5); + int stopattack = ARGINT(6); character_t *subject; if (psubject->type != BL_PC) @@ -522,36 +522,36 @@ static int op_override_attack (env_t * env, int args_nr, val_t * args) if (subject->attack_spell_override) { invocation_t *old_invocation = - (invocation_t *) map_id2bl (subject->attack_spell_override); + (invocation_t *) map_id2bl(subject->attack_spell_override); if (old_invocation) - spell_free_invocation (old_invocation); + spell_free_invocation(old_invocation); } subject->attack_spell_override = - trigger_spell (subject->bl.id, VAR (VAR_INVOCATION).v.v_int); + trigger_spell(subject->bl.id, VAR(VAR_INVOCATION).v.v_int); subject->attack_spell_charges = charges; if (subject->attack_spell_override) { invocation_t *attack_spell = - (invocation_t *) map_id2bl (subject->attack_spell_override); + (invocation_t *) map_id2bl(subject->attack_spell_override); if (attack_spell && stopattack) attack_spell->flags |= INVOCATION_FLAG_STOPATTACK; - char_set_weapon_icon (subject, charges, icon, look); - char_set_attack_info (subject, attack_delay, attack_range); + char_set_weapon_icon(subject, charges, icon, look); + char_set_attack_info(subject, attack_delay, attack_range); } return 0; } -static int op_create_item (env_t * env, int args_nr, val_t * args) +static int op_create_item(env_t * env, int args_nr, val_t * args) { struct item item; - entity_t *entity = ARGENTITY (0); + entity_t *entity = ARGENTITY(0); character_t *subject; - int stackable; - int count = ARGINT (2); + int stackable; + int count = ARGINT(2); if (count <= 0) return 0; @@ -560,25 +560,25 @@ static int op_create_item (env_t * env, int args_nr, val_t * args) else return 0; - GET_ARG_ITEM (1, item, stackable); + GET_ARG_ITEM(1, item, stackable); if (!stackable) while (count--) - pc_additem (subject, &item, 1); + pc_additem(subject, &item, 1); else - pc_additem (subject, &item, count); + pc_additem(subject, &item, count); return 0; } -#define AGGRAVATION_MODE_ATTACKS_CASTER(n) ((n) == 0 || (n) == 2) -#define AGGRAVATION_MODE_MAKES_AGGRESSIVE(n) ((n) > 0) +#define AGGRAVATION_MODE_ATTACKS_CASTER(n) ((n) == 0 || (n) == 2) +#define AGGRAVATION_MODE_MAKES_AGGRESSIVE(n) ((n) > 0) -static int op_aggravate (env_t * env, int args_nr, val_t * args) +static int op_aggravate(env_t * env, int args_nr, val_t * args) { - entity_t *victim = ARGENTITY (2); - int mode = ARGINT (1); - entity_t *target = ARGENTITY (0); + entity_t *victim = ARGENTITY(2); + int mode = ARGINT(1); + entity_t *target = ARGENTITY(0); struct mob_data *other; if (target->type == BL_MOB) @@ -586,12 +586,12 @@ static int op_aggravate (env_t * env, int args_nr, val_t * args) else return 0; - mob_target (other, victim, battle_get_range (victim)); + mob_target(other, victim, battle_get_range(victim)); - if (AGGRAVATION_MODE_MAKES_AGGRESSIVE (mode)) + if (AGGRAVATION_MODE_MAKES_AGGRESSIVE(mode)) other->mode = 0x85 | (other->mode & MOB_SENSIBLE_MASK); /* war */ - if (AGGRAVATION_MODE_ATTACKS_CASTER (mode)) + if (AGGRAVATION_MODE_ATTACKS_CASTER(mode)) { other->target_id = victim->id; other->attacked_id = victim->id; @@ -600,20 +600,20 @@ static int op_aggravate (env_t * env, int args_nr, val_t * args) return 0; } -#define MONSTER_ATTITUDE_HOSTILE 0 -#define MONSTER_ATTITUDE_FRIENDLY 1 -#define MONSTER_ATTITUDE_SERVANT 2 -#define MONSTER_ATTITUDE_FROZEN 3 +#define MONSTER_ATTITUDE_HOSTILE 0 +#define MONSTER_ATTITUDE_FRIENDLY 1 +#define MONSTER_ATTITUDE_SERVANT 2 +#define MONSTER_ATTITUDE_FROZEN 3 -static int op_spawn (env_t * env, int args_nr, val_t * args) +static int op_spawn(env_t * env, int args_nr, val_t * args) { - area_t *area = ARGAREA (0); - entity_t *owner_e = ARGENTITY (1); - int monster_id = ARGINT (2); - int monster_attitude = ARGINT (3); - int monster_count = ARGINT (4); - int monster_lifetime = ARGINT (5); - int i; + area_t *area = ARGAREA(0); + entity_t *owner_e = ARGENTITY(1); + int monster_id = ARGINT(2); + int monster_attitude = ARGINT(3); + int monster_count = ARGINT(4); + int monster_lifetime = ARGINT(5); + int i; character_t *owner = (monster_attitude == MONSTER_ATTITUDE_SERVANT && owner_e->type == @@ -622,15 +622,15 @@ static int op_spawn (env_t * env, int args_nr, val_t * args) for (i = 0; i < monster_count; i++) { location_t loc; - magic_random_location (&loc, area); + magic_random_location(&loc, area); - int mob_id; + int mob_id; struct mob_data *mob; - mob_id = mob_once_spawn (owner, map[loc.m].name, loc.x, loc.y, "--ja--", // Is that needed? + mob_id = mob_once_spawn(owner, map[loc.m].name, loc.x, loc.y, "--ja--", // Is that needed? monster_id, 1, ""); - mob = (struct mob_data *) map_id2bl (mob_id); + mob = (struct mob_data *) map_id2bl(mob_id); if (mob) { @@ -665,7 +665,7 @@ static int op_spawn (env_t * env, int args_nr, val_t * args) mob->mode |= MOB_MODE_SUMMONED | MOB_MODE_TURNS_AGAINST_BAD_MASTER; - mob->deletetimer = add_timer (gettick () + monster_lifetime, + mob->deletetimer = add_timer(gettick() + monster_lifetime, mob_timer_delete, mob_id, 0); if (owner) @@ -680,13 +680,13 @@ static int op_spawn (env_t * env, int args_nr, val_t * args) } static -const char *get_invocation_name (env_t * env) +const char *get_invocation_name(env_t * env) { invocation_t *invocation; - if (VAR (VAR_INVOCATION).ty != TY_INVOCATION) + if (VAR(VAR_INVOCATION).ty != TY_INVOCATION) return "?"; - invocation = (invocation_t *) map_id2bl (VAR (VAR_INVOCATION).v.v_int); + invocation = (invocation_t *) map_id2bl(VAR(VAR_INVOCATION).v.v_int); if (invocation) return invocation->spell->name; @@ -694,14 +694,14 @@ const char *get_invocation_name (env_t * env) return "??"; } -static int op_injure (env_t * env, int args_nr, val_t * args) +static int op_injure(env_t * env, int args_nr, val_t * args) { - entity_t *caster = ARGENTITY (0); - entity_t *target = ARGENTITY (1); - int damage_caused = ARGINT (2); - int mp_damage = ARGINT (3); - int target_hp = battle_get_hp (target); - int mdef = battle_get_mdef (target); + entity_t *caster = ARGENTITY(0); + entity_t *target = ARGENTITY(1); + int damage_caused = ARGINT(2); + int mp_damage = ARGINT(3); + int target_hp = battle_get_hp(target); + int mdef = battle_get_mdef(target); if (target->type == BL_PC && !map[target->m].flag.pvp && !((character_t *) target)->special_state.killable && (caster->type != BL_PC || !((character_t *) caster)->special_state.killer)) return 0; /* Cannot damage other players outside of pvp */ @@ -719,7 +719,7 @@ static int op_injure (env_t * env, int args_nr, val_t * args) damage_caused = 0; // display damage first, because dealing damage may deallocate the target. - clif_damage (caster, target, gettick (), 0, 0, damage_caused, 0, 0, 0); + clif_damage(caster, target, gettick(), 0, 0, damage_caused, 0, 0, 0); if (caster->type == BL_PC) { @@ -728,57 +728,57 @@ static int op_injure (env_t * env, int args_nr, val_t * args) { struct mob_data *mob = (struct mob_data *) target; - MAP_LOG_PC (caster_pc, "SPELLDMG MOB%d %d FOR %d BY %s", + MAP_LOG_PC(caster_pc, "SPELLDMG MOB%d %d FOR %d BY %s", mob->bl.id, mob->mob_class, damage_caused, - get_invocation_name (env)); + get_invocation_name(env)); } } - battle_damage (caster, target, damage_caused, mp_damage); + battle_damage(caster, target, damage_caused, mp_damage); return 0; } -static int op_emote (env_t * env, int args_nr, val_t * args) +static int op_emote(env_t * env, int args_nr, val_t * args) { - entity_t *victim = ARGENTITY (0); - int emotion = ARGINT (1); - clif_emotion (victim, emotion); + entity_t *victim = ARGENTITY(0); + int emotion = ARGINT(1); + clif_emotion(victim, emotion); return 0; } -static int op_set_script_variable (env_t * env, int args_nr, val_t * args) +static int op_set_script_variable(env_t * env, int args_nr, val_t * args) { - character_t *c = (ETY (0) == BL_PC) ? ARGPC (0) : NULL; + character_t *c = (ETY(0) == BL_PC) ? ARGPC(0) : NULL; if (!c) return 1; - pc_setglobalreg (c, ARGSTR (1), ARGINT (2)); + pc_setglobalreg(c, ARGSTR(1), ARGINT(2)); return 0; } -static int op_set_hair_colour (env_t * env, int args_nr, val_t * args) +static int op_set_hair_colour(env_t * env, int args_nr, val_t * args) { - character_t *c = (ETY (0) == BL_PC) ? ARGPC (0) : NULL; + character_t *c = (ETY(0) == BL_PC) ? ARGPC(0) : NULL; if (!c) return 1; - pc_changelook (c, LOOK_HAIR_COLOR, ARGINT (1)); + pc_changelook(c, LOOK_HAIR_COLOR, ARGINT(1)); return 0; } -static int op_set_hair_style (env_t * env, int args_nr, val_t * args) +static int op_set_hair_style(env_t * env, int args_nr, val_t * args) { - character_t *c = (ETY (0) == BL_PC) ? ARGPC (0) : NULL; + character_t *c = (ETY(0) == BL_PC) ? ARGPC(0) : NULL; if (!c) return 1; - pc_changelook (c, LOOK_HAIR, ARGINT (1)); + pc_changelook(c, LOOK_HAIR, ARGINT(1)); return 0; } @@ -786,36 +786,36 @@ static int op_set_hair_style (env_t * env, int args_nr, val_t * args) static int op_drop_item_for (env_t * env, int args_nr, val_t * args) { struct item item; - int stackable; - location_t *loc = &ARGLOCATION (0); - int count = ARGINT (2); - int time = ARGINT (3); - character_t *c = ((args_nr > 4) && (ETY (4) == BL_PC)) ? ARGPC (4) : NULL; - int delay = (args_nr > 5) ? ARGINT (5) : 0; - int delaytime[3] = { delay, delay, delay }; + int stackable; + location_t *loc = &ARGLOCATION(0); + int count = ARGINT(2); + int time = ARGINT(3); + character_t *c = ((args_nr > 4) && (ETY(4) == BL_PC)) ? ARGPC(4) : NULL; + int delay = (args_nr > 5) ? ARGINT(5) : 0; + int delaytime[3] = { delay, delay, delay }; character_t *owners[3] = { c, NULL, NULL }; - GET_ARG_ITEM (1, item, stackable); + GET_ARG_ITEM(1, item, stackable); if (stackable) - map_addflooritem_any (&item, count, loc->m, loc->x, loc->y, + map_addflooritem_any(&item, count, loc->m, loc->x, loc->y, owners, delaytime, time, 0); else while (count-- > 0) - map_addflooritem_any (&item, 1, loc->m, loc->x, loc->y, + map_addflooritem_any(&item, 1, loc->m, loc->x, loc->y, owners, delaytime, time, 0); return 0; } -static int op_gain_exp (env_t * env, int args_nr, val_t * args) +static int op_gain_exp(env_t * env, int args_nr, val_t * args) { - character_t *c = (ETY (0) == BL_PC) ? ARGPC (0) : NULL; + character_t *c = (ETY(0) == BL_PC) ? ARGPC(0) : NULL; if (!c) return 1; - pc_gainexp_reason (c, ARGINT (1), ARGINT (2), ARGINT (3)); + pc_gainexp_reason(c, ARGINT(1), ARGINT(2), ARGINT(3)); return 0; } @@ -851,12 +851,12 @@ static int operations_sorted = 0; static int operation_count; static -int compare_operations (const void *lhs, const void *rhs) +int compare_operations(const void *lhs, const void *rhs) { - return strcmp (((op_t *) lhs)->name, ((op_t *) rhs)->name); + return strcmp(((op_t *) lhs)->name, ((op_t *) rhs)->name); } -op_t *magic_get_op (char *name, int *index) +op_t *magic_get_op(char *name, int *index) { op_t key; @@ -869,13 +869,13 @@ op_t *magic_get_op (char *name, int *index) operation_count = opc - operations; - qsort (operations, operation_count, sizeof (op_t), + qsort(operations, operation_count, sizeof(op_t), compare_operations); operations_sorted = 1; } key.name = name; - op_t *op = (op_t *)bsearch (&key, operations, operation_count, sizeof (op_t), + op_t *op = (op_t *)bsearch(&key, operations, operation_count, sizeof(op_t), compare_operations); if (op && index) @@ -885,12 +885,12 @@ op_t *magic_get_op (char *name, int *index) } void -spell_effect_report_termination (int invocation_id, int bl_id, int sc_id, +spell_effect_report_termination(int invocation_id, int bl_id, int sc_id, int supplanted) { - int i; - int index = -1; - invocation_t *invocation = (invocation_t *) map_id2bl (invocation_id); + int i; + int index = -1; + invocation_t *invocation = (invocation_t *) map_id2bl(invocation_id); if (!invocation || invocation->bl.type != BL_SPELL) return; @@ -907,9 +907,9 @@ spell_effect_report_termination (int invocation_id, int bl_id, int sc_id, if (index == -1) { - entity_t *entity = map_id2bl (bl_id); + entity_t *entity = map_id2bl(bl_id); if (entity->type == BL_PC) - fprintf (stderr, + fprintf(stderr, "[magic] INTERNAL ERROR: spell-effect-report-termination: tried to terminate on unexpected bl %d, sc %d\n", bl_id, sc_id); return; @@ -922,10 +922,10 @@ spell_effect_report_termination (int invocation_id, int bl_id, int sc_id, invocation-> status_change_refs[--invocation->status_change_refs_nr]; - try_to_finish_invocation (invocation); + try_to_finish_invocation(invocation); } -static effect_t *return_to_stack (invocation_t * invocation) +static effect_t *return_to_stack(invocation_t * invocation) { if (!invocation->stack_size) return NULL; @@ -939,17 +939,17 @@ static effect_t *return_to_stack (invocation_t * invocation) case CONT_STACK_PROC: { effect_t *ret = ar->return_location; - int i; + int i; for (i = 0; i < ar->c.c_proc.args_nr; i++) { val_t *var = &invocation->env->vars[ar->c.c_proc.formals[i]]; - magic_clear_var (var); + magic_clear_var(var); *var = ar->c.c_proc.old_actuals[i]; } - clear_activation_record (ar); + clear_activation_record(ar); --invocation->stack_size; return ret; @@ -957,7 +957,7 @@ static effect_t *return_to_stack (invocation_t * invocation) case CONT_STACK_FOREACH: { - int entity_id; + int entity_id; val_t *var = &invocation->env->vars[ar->c.c_foreach.id]; do @@ -965,7 +965,7 @@ static effect_t *return_to_stack (invocation_t * invocation) if (ar->c.c_foreach.index >= ar->c.c_foreach.entities_nr) { effect_t *ret = ar->return_location; - clear_activation_record (ar); + clear_activation_record(ar); --invocation->stack_size; return ret; } @@ -973,9 +973,9 @@ static effect_t *return_to_stack (invocation_t * invocation) entity_id = ar->c.c_foreach.entities[ar->c.c_foreach.index++]; } - while (!entity_id || !map_id2bl (entity_id)); + while (!entity_id || !map_id2bl(entity_id)); - magic_clear_var (var); + magic_clear_var(var); var->ty = ar->c.c_foreach.ty; var->v.v_int = entity_id; @@ -986,12 +986,12 @@ static effect_t *return_to_stack (invocation_t * invocation) if (ar->c.c_for.current > ar->c.c_for.stop) { effect_t *ret = ar->return_location; - clear_activation_record (ar); + clear_activation_record(ar); --invocation->stack_size; return ret; } - magic_clear_var (&invocation->env->vars[ar->c.c_for.id]); + magic_clear_var(&invocation->env->vars[ar->c.c_for.id]); invocation->env->vars[ar->c.c_for.id].ty = TY_INT; invocation->env->vars[ar->c.c_for.id].v.v_int = ar->c.c_for.current++; @@ -999,7 +999,7 @@ static effect_t *return_to_stack (invocation_t * invocation) return ar->c.c_for.body; default: - fprintf (stderr, + fprintf(stderr, "[magic] INTERNAL ERROR: While executing spell `%s': stack corruption\n", invocation->spell->name); return NULL; @@ -1007,7 +1007,7 @@ static effect_t *return_to_stack (invocation_t * invocation) } } -static cont_activation_record_t *add_stack_entry (invocation_t * invocation, +static cont_activation_record_t *add_stack_entry(invocation_t * invocation, int ty, effect_t * return_location) { @@ -1015,7 +1015,7 @@ static cont_activation_record_t *add_stack_entry (invocation_t * invocation, invocation->stack + invocation->stack_size++; if (invocation->stack_size >= MAX_STACK_SIZE) { - fprintf (stderr, + fprintf(stderr, "[magic] Execution stack size exceeded in spell `%s'; truncating effect\n", invocation->spell->name); invocation->stack_size--; @@ -1028,19 +1028,19 @@ static cont_activation_record_t *add_stack_entry (invocation_t * invocation, } static -void find_entities_in_area_c (entity_t * target, va_list va) +void find_entities_in_area_c(entity_t * target, va_list va) { - int *entities_allocd_p = va_arg (va, int *); - int *entities_nr_p = va_arg (va, int *); - int **entities_p = va_arg (va, int **); - int filter = va_arg (va, int); + int *entities_allocd_p = va_arg(va, int *); + int *entities_nr_p = va_arg(va, int *); + int **entities_p = va_arg(va, int **); + int filter = va_arg(va, int); /* The following macro adds an entity to the result list: */ #define ADD_ENTITY(e) \ if (*entities_nr_p == *entities_allocd_p) { \ /* Need more space */ \ (*entities_allocd_p) += 32; \ - RECREATE (*entities_p, int, *entities_allocd_p); \ + RECREATE(*entities_p, int, *entities_allocd_p); \ } \ (*entities_p)[(*entities_nr_p)++] = e; @@ -1060,7 +1060,7 @@ void find_entities_in_area_c (entity_t * target, va_list va) while (invoc) { - ADD_ENTITY (invoc->bl.id); + ADD_ENTITY(invoc->bl.id); invoc = invoc->next_invocation; } } @@ -1079,7 +1079,7 @@ void find_entities_in_area_c (entity_t * target, va_list va) { invocation_t *invocation = (invocation_t *) target; - /* Check whether the spell is `bound'-- if so, we'll consider it iff we see the caster (case BL_PC). */ + /* Check whether the spell is `bound'-- if so, we'll consider it iff we see the caster(case BL_PC). */ if (invocation->flags & INVOCATION_FLAG_BOUND) return; else @@ -1098,28 +1098,28 @@ void find_entities_in_area_c (entity_t * target, va_list va) return; } - ADD_ENTITY (target->id); + ADD_ENTITY(target->id); #undef ADD_ENTITY } static void -find_entities_in_area (area_t * area, int *entities_allocd_p, +find_entities_in_area(area_t * area, int *entities_allocd_p, int *entities_nr_p, int **entities_p, int filter) { switch (area->ty) { case AREA_UNION: - find_entities_in_area (area->a.a_union[0], entities_allocd_p, + find_entities_in_area(area->a.a_union[0], entities_allocd_p, entities_nr_p, entities_p, filter); - find_entities_in_area (area->a.a_union[1], entities_allocd_p, + find_entities_in_area(area->a.a_union[1], entities_allocd_p, entities_nr_p, entities_p, filter); break; default: { - int m, x, y, width, height; - magic_area_rect (&m, &x, &y, &width, &height, area); - map_foreachinarea (find_entities_in_area_c, + int m, x, y, width, height; + magic_area_rect(&m, &x, &y, &width, &height, area); + map_foreachinarea(find_entities_in_area_c, m, x, y, x + width, y + height, 0 /* filter elsewhere */ , entities_allocd_p, entities_nr_p, entities_p, @@ -1128,20 +1128,20 @@ find_entities_in_area (area_t * area, int *entities_allocd_p, } } -static effect_t *run_foreach (invocation_t * invocation, effect_t * foreach, +static effect_t *run_foreach(invocation_t * invocation, effect_t * foreach, effect_t * return_location) { val_t area; - int filter = foreach->e.e_foreach.filter; - int id = foreach->e.e_foreach.id; + int filter = foreach->e.e_foreach.filter; + int id = foreach->e.e_foreach.id; effect_t *body = foreach->e.e_foreach.body; - magic_eval (invocation->env, &area, foreach->e.e_foreach.area); + magic_eval(invocation->env, &area, foreach->e.e_foreach.area); if (area.ty != TY_AREA) { - magic_clear_var (&area); - fprintf (stderr, + magic_clear_var(&area); + fprintf(stderr, "[magic] Error in spell `%s': FOREACH loop over non-area\n", invocation->spell->name); return return_location; @@ -1149,37 +1149,37 @@ static effect_t *run_foreach (invocation_t * invocation, effect_t * foreach, else { cont_activation_record_t *ar = - add_stack_entry (invocation, CONT_STACK_FOREACH, return_location); - int entities_allocd = 64; + add_stack_entry(invocation, CONT_STACK_FOREACH, return_location); + int entities_allocd = 64; int *entities_collect; int *entities; int *shuffle_board; - int entities_nr = 0; - int i; + int entities_nr = 0; + int i; if (!ar) return return_location; - CREATE (entities_collect, int, entities_allocd); + CREATE(entities_collect, int, entities_allocd); - find_entities_in_area (area.v.v_area, &entities_allocd, &entities_nr, + find_entities_in_area(area.v.v_area, &entities_allocd, &entities_nr, &entities_collect, filter); /* Now shuffle */ - CREATE (shuffle_board, int, entities_nr); - CREATE (entities, int, entities_nr); + CREATE(shuffle_board, int, entities_nr); + CREATE(entities, int, entities_nr); for (i = 0; i < entities_nr; i++) shuffle_board[i] = i; for (i = entities_nr - 1; i >= 0; i--) { - int random_index = rand () % (i + 1); + int random_index = rand() % (i + 1); entities[i] = entities_collect[shuffle_board[random_index]]; shuffle_board[random_index] = shuffle_board[i]; // thus, we are guaranteed only to use unused indices } - free (entities_collect); - free (shuffle_board); + free(entities_collect); + free(shuffle_board); /* Done shuffling */ ar->c.c_foreach.id = id; @@ -1190,9 +1190,9 @@ static effect_t *run_foreach (invocation_t * invocation, effect_t * foreach, ar->c.c_foreach.ty = (filter == FOREACH_FILTER_SPELL) ? TY_INVOCATION : TY_ENTITY; - magic_clear_var (&area); + magic_clear_var(&area); - return return_to_stack (invocation); + return return_to_stack(invocation); } } @@ -1200,24 +1200,24 @@ static effect_t *run_for (invocation_t * invocation, effect_t * for_, effect_t * return_location) { cont_activation_record_t *ar; - int id = for_->e.e_for.id; + int id = for_->e.e_for.id; val_t start; val_t stop; - magic_eval (invocation->env, &start, for_->e.e_for.start); - magic_eval (invocation->env, &stop, for_->e.e_for.stop); + magic_eval(invocation->env, &start, for_->e.e_for.start); + magic_eval(invocation->env, &stop, for_->e.e_for.stop); if (start.ty != TY_INT || stop.ty != TY_INT) { - magic_clear_var (&start); - magic_clear_var (&stop); - fprintf (stderr, + magic_clear_var(&start); + magic_clear_var(&stop); + fprintf(stderr, "[magic] Error in spell `%s': FOR loop start or stop point is not an integer\n", invocation->spell->name); return return_location; } - ar = add_stack_entry (invocation, CONT_STACK_FOR, return_location); + ar = add_stack_entry(invocation, CONT_STACK_FOR, return_location); if (!ar) return return_location; @@ -1227,21 +1227,21 @@ static effect_t *run_for (invocation_t * invocation, effect_t * for_, ar->c.c_for.stop = stop.v.v_int; ar->c.c_for.body = for_->e.e_for.body; - return return_to_stack (invocation); + return return_to_stack(invocation); } -static effect_t *run_call (invocation_t * invocation, +static effect_t *run_call(invocation_t * invocation, effect_t * return_location) { effect_t *current = invocation->current_effect; cont_activation_record_t *ar; - int args_nr = current->e.e_call.args_nr; + int args_nr = current->e.e_call.args_nr; int *formals = current->e.e_call.formals; val_t *old_actuals; - CREATE (old_actuals, val_t, args_nr); - int i; + CREATE(old_actuals, val_t, args_nr); + int i; - ar = add_stack_entry (invocation, CONT_STACK_PROC, return_location); + ar = add_stack_entry(invocation, CONT_STACK_PROC, return_location); ar->c.c_proc.args_nr = args_nr; ar->c.c_proc.formals = formals; ar->c.c_proc.old_actuals = old_actuals; @@ -1249,8 +1249,8 @@ static effect_t *run_call (invocation_t * invocation, { val_t *env_val = &invocation->env->vars[formals[i]]; val_t result; - magic_copy_var (&old_actuals[i], env_val); - magic_eval (invocation->env, &result, current->e.e_call.actuals[i]); + magic_copy_var(&old_actuals[i], env_val); + magic_eval(invocation->env, &result, current->e.e_call.actuals[i]); *env_val = result; } @@ -1258,67 +1258,67 @@ static effect_t *run_call (invocation_t * invocation, } #ifdef DEBUG -static void print_cfg (int i, effect_t * e) +static void print_cfg(int i, effect_t * e) { - int j; + int j; for (j = 0; j < i; j++) - printf (" "); + printf(" "); - printf ("%p: ", e); + printf("%p: ", e); if (!e) { - puts (" -- end --"); + puts(" -- end --"); return; } switch (e->ty) { case EFFECT_SKIP: - puts ("SKIP"); + puts("SKIP"); break; case EFFECT_END: - puts ("END"); + puts("END"); break; case EFFECT_ABORT: - puts ("ABORT"); + puts("ABORT"); break; case EFFECT_ASSIGN: - puts ("ASSIGN"); + puts("ASSIGN"); break; case EFFECT_FOREACH: - puts ("FOREACH"); - print_cfg (i + 1, e->e.e_foreach.body); + puts("FOREACH"); + print_cfg(i + 1, e->e.e_foreach.body); break; case EFFECT_FOR: - puts ("FOR"); - print_cfg (i + 1, e->e.e_for.body); + puts("FOR"); + print_cfg(i + 1, e->e.e_for.body); break; case EFFECT_IF: - puts ("IF"); + puts("IF"); for (j = 0; j < i; j++) - printf (" "); - puts ("THEN"); - print_cfg (i + 1, e->e.e_if.true_branch); + printf(" "); + puts("THEN"); + print_cfg(i + 1, e->e.e_if.true_branch); for (j = 0; j < i; j++) - printf (" "); - puts ("ELSE"); - print_cfg (i + 1, e->e.e_if.false_branch); + printf(" "); + puts("ELSE"); + print_cfg(i + 1, e->e.e_if.false_branch); break; case EFFECT_SLEEP: - puts ("SLEEP"); + puts("SLEEP"); break; case EFFECT_SCRIPT: - puts ("SCRIPT"); + puts("SCRIPT"); break; case EFFECT_BREAK: - puts ("BREAK"); + puts("BREAK"); break; case EFFECT_OP: - puts ("OP"); + puts("OP"); break; } - print_cfg (i, e->next); + print_cfg(i, e->next); } #endif @@ -1331,25 +1331,25 @@ static void print_cfg (int i, effect_t * e) * >1 if we hit `sleep'; the result is the number of ticks we should sleep for. * -1 if we paused to wait for a user action (via script interaction) */ -static int spell_run (invocation_t * invocation, int allow_delete) +static int spell_run(invocation_t * invocation, int allow_delete) { const int invocation_id = invocation->bl.id; #define REFRESH_INVOCATION invocation = (invocation_t *) map_id2bl(invocation_id); if (!invocation) return 0; #ifdef DEBUG - fprintf (stderr, "Resuming execution: invocation of `%s'\n", + fprintf(stderr, "Resuming execution: invocation of `%s'\n", invocation->spell->name); - print_cfg (1, invocation->current_effect); + print_cfg(1, invocation->current_effect); #endif while (invocation->current_effect) { effect_t *e = invocation->current_effect; effect_t *next = e->next; - int i; + int i; #ifdef DEBUG - fprintf (stderr, "Next step of type %d\n", e->ty); - dump_env (invocation->env); + fprintf(stderr, "Next step of type %d\n", e->ty); + dump_env(invocation->env); #endif switch (e->ty) @@ -1361,18 +1361,18 @@ static int spell_run (invocation_t * invocation, int allow_delete) invocation->flags |= INVOCATION_FLAG_ABORTED; invocation->end_effect = NULL; case EFFECT_END: - clear_stack (invocation); + clear_stack(invocation); next = NULL; break; case EFFECT_ASSIGN: - magic_eval (invocation->env, + magic_eval(invocation->env, &invocation->env->vars[e->e.e_assign.id], e->e.e_assign.expr); break; case EFFECT_FOREACH: - next = run_foreach (invocation, e, next); + next = run_foreach(invocation, e, next); break; case EFFECT_FOR: @@ -1380,7 +1380,7 @@ static int spell_run (invocation_t * invocation, int allow_delete) break; case EFFECT_IF: - if (magic_eval_int (invocation->env, e->e.e_if.cond)) + if (magic_eval_int(invocation->env, e->e.e_if.cond)) next = e->e.e_if.true_branch; else next = e->e.e_if.false_branch; @@ -1388,8 +1388,8 @@ static int spell_run (invocation_t * invocation, int allow_delete) case EFFECT_SLEEP: { - int sleeptime = - magic_eval_int (invocation->env, e->e.e_sleep); + int sleeptime = + magic_eval_int(invocation->env, e->e.e_sleep); invocation->current_effect = next; if (sleeptime > 0) return sleeptime; @@ -1399,37 +1399,37 @@ static int spell_run (invocation_t * invocation, int allow_delete) case EFFECT_SCRIPT: { character_t *caster = - (character_t *) map_id2bl (invocation->caster); + (character_t *) map_id2bl(invocation->caster); if (caster) { env_t *env = invocation->env; argrec_t arg[] = { {"@target", - VAR (VAR_TARGET).ty == - TY_ENTITY ? 0 : VAR (VAR_TARGET). + VAR(VAR_TARGET).ty == + TY_ENTITY ? 0 : VAR(VAR_TARGET). v.v_int} , {"@caster", invocation->caster} , {"@caster_name$", caster ? caster->status.name : ""} }; - int message_recipient = - VAR (VAR_SCRIPTTARGET).ty == - TY_ENTITY ? VAR (VAR_SCRIPTTARGET). + int message_recipient = + VAR(VAR_SCRIPTTARGET).ty == + TY_ENTITY ? VAR(VAR_SCRIPTTARGET). v.v_int : invocation->caster; character_t *recipient = - (character_t *) map_id2bl (message_recipient); + (character_t *) map_id2bl(message_recipient); if (recipient->npc_id && recipient->npc_id != invocation->bl.id) break; /* Don't send multiple message boxes at once */ if (!invocation->script_pos) // first time running this script? - clif_spawn_fake_npc_for_player (recipient, + clif_spawn_fake_npc_for_player(recipient, invocation->bl.id); // We have to do this or otherwise the client won't think that it's // dealing with an NPC - int newpos = run_script_l (e->e.e_script, + int newpos = run_script_l(e->e.e_script, invocation->script_pos, message_recipient, invocation->bl.id, @@ -1444,14 +1444,14 @@ static int spell_run (invocation_t * invocation, int allow_delete) } else invocation->script_pos = 0; - clif_clearchar_id (invocation->bl.id, 1, caster->fd); + clif_clearchar_id(invocation->bl.id, 1, caster->fd); } REFRESH_INVOCATION; // Script may have killed the caster break; } case EFFECT_BREAK: - next = return_to_stack (invocation); + next = return_to_stack(invocation); break; case EFFECT_OP: @@ -1460,111 +1460,111 @@ static int spell_run (invocation_t * invocation, int allow_delete) val_t args[MAX_ARGS]; for (i = 0; i < e->e.e_op.args_nr; i++) - magic_eval (invocation->env, &args[i], e->e.e_op.args[i]); + magic_eval(invocation->env, &args[i], e->e.e_op.args[i]); - if (!magic_signature_check ("effect", op->name, op->signature, + if (!magic_signature_check("effect", op->name, op->signature, e->e.e_op.args_nr, args, e->e.e_op.line_nr, e->e.e_op.column)) - op->op (invocation->env, e->e.e_op.args_nr, args); + op->op(invocation->env, e->e.e_op.args_nr, args); for (i = 0; i < e->e.e_op.args_nr; i++) - magic_clear_var (&args[i]); + magic_clear_var(&args[i]); REFRESH_INVOCATION; // Effect may have killed the caster break; } case EFFECT_CALL: - next = run_call (invocation, next); + next = run_call(invocation, next); break; default: - fprintf (stderr, + fprintf(stderr, "[magic] INTERNAL ERROR: Unknown effect %d\n", e->ty); } if (!next) - next = return_to_stack (invocation); + next = return_to_stack(invocation); invocation->current_effect = next; } if (allow_delete) - try_to_finish_invocation (invocation); + try_to_finish_invocation(invocation); return 0; #undef REFRESH_INVOCATION } static -void spell_execute_d (invocation_t * invocation, int allow_deletion) +void spell_execute_d(invocation_t * invocation, int allow_deletion) { - int delta; + int delta; - spell_update_location (invocation); - delta = spell_run (invocation, allow_deletion); + spell_update_location(invocation); + delta = spell_run(invocation, allow_deletion); if (delta > 0) { if (invocation->timer) { - fprintf (stderr, + fprintf(stderr, "[magic] FATAL ERROR: Trying to add multiple timers to the same spell! Already had timer: %d\n", invocation->timer); /* *((int *)0x0) = 0; */ } - invocation->timer = add_timer (gettick () + delta, + invocation->timer = add_timer(gettick() + delta, &invocation_timer_callback, invocation->bl.id, 0); } - /* If 0, the script cleaned itself. If -1 (wait-for-script), we must wait for the user. */ + /* If 0, the script cleaned itself. If -1(wait-for-script), we must wait for the user. */ } -void spell_execute (invocation_t * invocation) +void spell_execute(invocation_t * invocation) { - spell_execute_d (invocation, 1); + spell_execute_d(invocation, 1); } -void spell_execute_script (invocation_t * invocation) +void spell_execute_script(invocation_t * invocation) { if (invocation->script_pos) - spell_execute_d (invocation, 1); + spell_execute_d(invocation, 1); /* Otherwise the script-within-the-spell has been terminated by some other means. * In practice this happens when the script doesn't wait for user input: the client * may still notify the server that it's done. Without the above check, we'd be * running the same spell twice! */ } -int spell_attack (int caster_id, int target_id) +int spell_attack(int caster_id, int target_id) { - character_t *caster = (character_t *) map_id2bl (caster_id); + character_t *caster = (character_t *) map_id2bl(caster_id); invocation_t *invocation; - int stop_attack = 0; + int stop_attack = 0; if (!caster) return 0; - invocation = (invocation_t *) map_id2bl (caster->attack_spell_override); + invocation = (invocation_t *) map_id2bl(caster->attack_spell_override); if (invocation && invocation->flags & INVOCATION_FLAG_STOPATTACK) stop_attack = 1; if (invocation && caster->attack_spell_charges > 0) { - magic_clear_var (&invocation->env->vars[VAR_TARGET]); + magic_clear_var(&invocation->env->vars[VAR_TARGET]); invocation->env->vars[VAR_TARGET].ty = TY_ENTITY; invocation->env->vars[VAR_TARGET].v.v_int = target_id; invocation->current_effect = invocation->trigger_effect; invocation->flags &= ~INVOCATION_FLAG_ABORTED; - spell_execute_d (invocation, + spell_execute_d(invocation, 0 /* don't delete the invocation if done */ ); // If the caster died, we need to refresh here: invocation = - (invocation_t *) map_id2bl (caster->attack_spell_override); + (invocation_t *) map_id2bl(caster->attack_spell_override); if (invocation && !(invocation->flags & INVOCATION_FLAG_ABORTED)) // If we didn't abort: caster->attack_spell_charges--; @@ -1578,14 +1578,14 @@ int spell_attack (int caster_id, int target_id) else if (!invocation || caster->attack_spell_charges <= 0) { caster->attack_spell_override = 0; - char_set_weapon_icon (caster, 0, 0, 0); - char_set_attack_info (caster, 0, 0); + char_set_weapon_icon(caster, 0, 0, 0); + char_set_attack_info(caster, 0, 0); if (stop_attack) - pc_stopattack (caster); + pc_stopattack(caster); if (invocation) - spell_free_invocation (invocation); + spell_free_invocation(invocation); } return 1; diff --git a/src/map/magic.cpp b/src/map/magic.cpp index 4311f09..48010e6 100644 --- a/src/map/magic.cpp +++ b/src/map/magic.cpp @@ -7,19 +7,19 @@ #undef DEBUG -static char *magic_preprocess_message (character_t * character, char *start, +static char *magic_preprocess_message(character_t * character, char *start, char *end) { if (character->state.shroud_active && character->state.shroud_disappears_on_talk) - magic_unshroud (character); + magic_unshroud(character); if (character->state.shroud_active && character->state.shroud_hides_name_talking) { - int len = strlen (end); - strcpy (start, "? "); - memmove (start + 2, end, len + 1); + int len = strlen(end); + strcpy(start, "? "); + memmove(start + 2, end, len + 1); return start + 4; } else @@ -30,12 +30,12 @@ static char *magic_preprocess_message (character_t * character, char *start, /* Returns a dynamically allocated copy of `src'. * `*parameter' may point within that copy or be NULL. */ -static char *magic_tokenise (char *src, char **parameter) +static char *magic_tokenise(char *src, char **parameter) { - char *retval = strdup (src); + char *retval = strdup(src); char *seeker = retval; - while (*seeker && !ISBLANK (*seeker)) + while (*seeker && !ISBLANK(*seeker)) ++seeker; if (!*seeker) @@ -45,7 +45,7 @@ static char *magic_tokenise (char *src, char **parameter) *seeker = 0; /* Terminate invocation */ ++seeker; - while (ISBLANK (*seeker)) + while (ISBLANK(*seeker)) ++seeker; *parameter = seeker; @@ -54,15 +54,15 @@ static char *magic_tokenise (char *src, char **parameter) return retval; } -int magic_message (character_t * caster, char *spell_, size_t spell_len) +int magic_message(character_t * caster, char *spell_, size_t spell_len) { - if (pc_isdead (caster)) + if (pc_isdead(caster)) return 0; - int power = caster->matk1; + int power = caster->matk1; char *invocation_base = spell_ + 8; char *source_invocation = - 1 + invocation_base + strlen (caster->status.name); + 1 + invocation_base + strlen(caster->status.name); spell_t *spell; char *parameter; char *spell_invocation; @@ -72,57 +72,57 @@ int magic_message (character_t * caster, char *spell_, size_t spell_len) /* Pre-message filter in case some spell alters output */ source_invocation = - magic_preprocess_message (caster, invocation_base, source_invocation); + magic_preprocess_message(caster, invocation_base, source_invocation); - spell_invocation = magic_tokenise (source_invocation, ¶meter); - parameter = parameter ? strdup (parameter) : strdup (""); + spell_invocation = magic_tokenise(source_invocation, ¶meter); + parameter = parameter ? strdup(parameter) : strdup(""); - spell = magic_find_spell (spell_invocation); - free (spell_invocation); + spell = magic_find_spell(spell_invocation); + free(spell_invocation); if (spell) { - int near_miss; + int near_miss; env_t *env = - spell_create_env (&magic_conf, spell, caster, power, parameter); + spell_create_env(&magic_conf, spell, caster, power, parameter); effect_set_t *effects; if ((spell->flags & SPELL_FLAG_NONMAGIC) || (power >= 1)) - effects = spell_trigger (spell, caster, env, &near_miss); + effects = spell_trigger(spell, caster, env, &near_miss); else effects = NULL; #ifdef DEBUG - fprintf (stderr, "Found spell `%s', triggered = %d\n", spell_, + fprintf(stderr, "Found spell `%s', triggered = %d\n", spell_, effects != NULL); #endif if (caster->status.option & OPTION_HIDE) return 0; // No spellcasting while hidden - MAP_LOG_PC (caster, "CAST %s %s", + MAP_LOG_PC(caster, "CAST %s %s", spell->name, effects ? "SUCCESS" : "FAILURE"); if (effects) { - invocation_t *invocation = spell_instantiate (effects, env); + invocation_t *invocation = spell_instantiate(effects, env); - spell_bind (caster, invocation); - spell_execute (invocation); + spell_bind(caster, invocation); + spell_execute(invocation); return (spell->flags & SPELL_FLAG_SILENT) ? -1 : 1; } else - magic_free_env (env); + magic_free_env(env); return 1; } else - free (parameter); + free(parameter); return 0; /* Not a spell */ } -void do_init_magic (void) +void do_init_magic(void) { - magic_init (MAGIC_CONFIG_FILE); + magic_init(MAGIC_CONFIG_FILE); } diff --git a/src/map/magic.hpp b/src/map/magic.hpp index 168a05f..f7e832c 100644 --- a/src/map/magic.hpp +++ b/src/map/magic.hpp @@ -22,14 +22,14 @@ struct invocation; /* Spell invocation */ * \return 1 or -1 if the input message was magic and was handled by this function, 0 otherwise. -1 is returned when the * message should not be repeated. */ -int magic_message (character_t * caster, char *spell, size_t spell_len); +int magic_message(character_t * caster, char *spell, size_t spell_len); /** * Removes the shroud from a character * * \param character The character to remove the shroud from */ -void magic_unshroud (character_t * character); +void magic_unshroud(character_t * character); /** * Notifies a running spell that a status_change timer triggered by the spell has expired @@ -40,51 +40,51 @@ void magic_unshroud (character_t * character); * \param supplanted Whether the status_change finished normally (0) or was supplanted by a new status_change (1) */ void -spell_effect_report_termination (int invocation, int bl_id, int sc_id, +spell_effect_report_termination(int invocation, int bl_id, int sc_id, int supplanted); /** * Initialise all spells, read config data */ -void do_init_magic (void); +void do_init_magic(void); /** * Identifies the invocation used to trigger a spell * * Returns NULL if not found */ -const char *magic_find_invocation (const char *spellame); +const char *magic_find_invocation(const char *spellame); /** * Identifies the invocation used to denote a teleport location * * Returns NULL if not found */ -const char *magic_find_anchor_invocation (const char *teleport_location); +const char *magic_find_anchor_invocation(const char *teleport_location); /** * Execute a spell invocation and sets up timers to finish */ -void spell_execute (struct invocation *invocation); +void spell_execute(struct invocation *invocation); /** * Continue an NPC script embedded in a spell */ -void spell_execute_script (struct invocation *invocation); +void spell_execute_script(struct invocation *invocation); /** * Stops all magic bound to the specified character * */ -void magic_stop_completely (character_t * c); +void magic_stop_completely(character_t * c); /** * Attacks with a magical spell charged to the character * * Returns 0 if there is no charged spell or the spell is depleted. */ -int spell_attack (int caster, int target); +int spell_attack(int caster, int target); -void spell_free_invocation (struct invocation *invocation); +void spell_free_invocation(struct invocation *invocation); #endif /* !defined(MAGIC_H_) */ diff --git a/src/map/map.cpp b/src/map/map.cpp index c3d7233..a6b8b08 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -57,18 +57,18 @@ static struct block_list *bl_list[BL_LIST_MAX]; static int bl_list_count = 0; struct map_data map[MAX_MAP_PER_SERVER]; -int map_num = 0; +int map_num = 0; -int map_port = 0; +int map_port = 0; -int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; -int save_settings = 0xFFFF; -int night_flag = 0; // 0=day, 1=night [Yor] +int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; +int save_settings = 0xFFFF; +int night_flag = 0; // 0=day, 1=night [Yor] struct charid2nick { char nick[24]; - int req_id; + int req_id; }; char motd_txt[256] = "conf/motd.txt"; @@ -81,7 +81,7 @@ char wisp_server_name[24] = "Server"; // can be modified in char-server config * (char鯖から送られてくる) *------------------------------------------ */ -void map_setusers (int n) +void map_setusers(int n) { users = n; } @@ -90,7 +90,7 @@ void map_setusers (int n) * 全map鯖総計での接続数取得 (/wへの応答用) *------------------------------------------ */ -int map_getusers (void) +int map_getusers(void) { return users; } @@ -104,11 +104,11 @@ int map_getusers (void) * ロックされているときはバッファにためる *------------------------------------------ */ -int map_freeblock (void *bl) +int map_freeblock(void *bl) { if (block_free_lock == 0) { - free (bl); + free(bl); bl = NULL; } else @@ -116,8 +116,7 @@ int map_freeblock (void *bl) if (block_free_count >= block_free_max) { if (battle_config.error_log) - printf - ("map_freeblock: *WARNING* too many free block! %d %d\n", + printf("map_freeblock: *WARNING* too many free block! %d %d\n", block_free_count, block_free_lock); } else @@ -130,7 +129,7 @@ int map_freeblock (void *bl) * blockのfreeを一時的に禁止する *------------------------------------------ */ -int map_freeblock_lock (void) +int map_freeblock_lock(void) { return ++block_free_lock; } @@ -141,18 +140,18 @@ int map_freeblock_lock (void) * バッファにたまっていたblockを全部削除 *------------------------------------------ */ -int map_freeblock_unlock (void) +int map_freeblock_unlock(void) { if ((--block_free_lock) == 0) { - int i; + int i; // if(block_free_count>0) { // if(battle_config.error_log) // printf("map_freeblock_unlock: free %d object\n",block_free_count); // } for (i = 0; i < block_free_count; i++) { - free (block_free[i]); + free(block_free[i]); block_free[i] = NULL; } block_free_count = 0; @@ -160,7 +159,7 @@ int map_freeblock_unlock (void) else if (block_free_lock < 0) { if (battle_config.error_log) - printf ("map_freeblock_unlock: lock count < 0 !\n"); + printf("map_freeblock_unlock: lock count < 0 !\n"); } return block_free_lock; } @@ -182,16 +181,16 @@ static struct block_list bl_head; * 既にlink済みかの確認が無い。危険かも *------------------------------------------ */ -int map_addblock (struct block_list *bl) +int map_addblock(struct block_list *bl) { - int m, x, y; + int m, x, y; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->prev != NULL) { if (battle_config.error_log) - printf ("map_addblock error : bl->prev!=NULL\n"); + printf("map_addblock error : bl->prev!=NULL\n"); return 0; } @@ -234,10 +233,10 @@ int map_addblock (struct block_list *bl) * prevがNULLの場合listに繋がってない *------------------------------------------ */ -int map_delblock (struct block_list *bl) +int map_delblock(struct block_list *bl) { - int b; - nullpo_retr (0, bl); + int b; + nullpo_retr(0, bl); // 既にblocklistから抜けている if (bl->prev == NULL) @@ -246,7 +245,7 @@ int map_delblock (struct block_list *bl) { // prevがNULLでnextがNULLでないのは有ってはならない if (battle_config.error_log) - printf ("map_delblock error : bl->next!=NULL\n"); + printf("map_delblock error : bl->next!=NULL\n"); } return 0; } @@ -288,9 +287,9 @@ int map_delblock (struct block_list *bl) * 周囲のPC人数を数える (現在未使用) *------------------------------------------ */ -int map_countnearpc (int m, int x, int y) +int map_countnearpc(int m, int x, int y) { - int bx, by, c = 0; + int bx, by, c = 0; struct block_list *bl = NULL; if (map[m].users == 0) @@ -320,12 +319,12 @@ int map_countnearpc (int m, int x, int y) * セル上のPCとMOBの数を数える (グランドクロス用) *------------------------------------------ */ -int map_count_oncell (int m, int x, int y) +int map_count_oncell(int m, int x, int y) { - int bx, by; + int bx, by; struct block_list *bl = NULL; - int i, c; - int count = 0; + int i, c; + int count = 0; if (x < 0 || y < 0 || (x >= map[m].xs) || (y >= map[m].ys)) return 1; @@ -357,17 +356,17 @@ int map_count_oncell (int m, int x, int y) * type!=0 ならその種類のみ *------------------------------------------ */ -void map_foreachinarea (void (*func) (struct block_list *, va_list), int m, +void map_foreachinarea(void(*func)(struct block_list *, va_list), int m, int x0, int y0, int x1, int y1, int type, ...) { - int bx, by; + int bx, by; struct block_list *bl = NULL; va_list ap = NULL; - int blockcount = bl_list_count, i, c; + int blockcount = bl_list_count, i, c; if (m < 0) return; - va_start (ap, type); + va_start(ap, type); if (x0 < 0) x0 = 0; if (y0 < 0) @@ -412,18 +411,18 @@ void map_foreachinarea (void (*func) (struct block_list *, va_list), int m, if (bl_list_count >= BL_LIST_MAX) { if (battle_config.error_log) - printf ("map_foreachinarea: *WARNING* block count too many!\n"); + printf("map_foreachinarea: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // メモリからの解放を禁止する + map_freeblock_lock(); // メモリからの解放を禁止する for (i = blockcount; i < bl_list_count; i++) if (bl_list[i]->prev) // 有効かどうかチェック - func (bl_list[i], ap); + func(bl_list[i], ap); - map_freeblock_unlock (); // 解放を許可する + map_freeblock_unlock(); // 解放を許可する - va_end (ap); + va_end(ap); bl_list_count = blockcount; } @@ -435,16 +434,16 @@ void map_foreachinarea (void (*func) (struct block_list *, va_list), int m, * dx,dyは-1,0,1のみとする（どんな値でもいいっぽい？） *------------------------------------------ */ -void map_foreachinmovearea (void (*func) (struct block_list *, va_list), int m, +void map_foreachinmovearea(void(*func)(struct block_list *, va_list), int m, int x0, int y0, int x1, int y1, int dx, int dy, int type, ...) { - int bx, by; + int bx, by; struct block_list *bl = NULL; va_list ap = NULL; - int blockcount = bl_list_count, i, c; + int blockcount = bl_list_count, i, c; - va_start (ap, type); + va_start(ap, type); if (dx == 0 || dy == 0) { // 矩形領域の場合 @@ -567,18 +566,18 @@ void map_foreachinmovearea (void (*func) (struct block_list *, va_list), int m, if (bl_list_count >= BL_LIST_MAX) { if (battle_config.error_log) - printf ("map_foreachinarea: *WARNING* block count too many!\n"); + printf("map_foreachinarea: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // メモリからの解放を禁止する + map_freeblock_lock(); // メモリからの解放を禁止する for (i = blockcount; i < bl_list_count; i++) if (bl_list[i]->prev) // 有効かどうかチェック - func (bl_list[i], ap); + func(bl_list[i], ap); - map_freeblock_unlock (); // 解放を許可する + map_freeblock_unlock(); // 解放を許可する - va_end (ap); + va_end(ap); bl_list_count = blockcount; } @@ -586,15 +585,15 @@ void map_foreachinmovearea (void (*func) (struct block_list *, va_list), int m, // which only checks the exact single x/y passed to it rather than an // area radius - may be more useful in some instances) // -void map_foreachincell (void (*func) (struct block_list *, va_list), int m, +void map_foreachincell(void(*func)(struct block_list *, va_list), int m, int x, int y, int type, ...) { - int bx, by; + int bx, by; struct block_list *bl = NULL; va_list ap = NULL; - int blockcount = bl_list_count, i, c; + int blockcount = bl_list_count, i, c; - va_start (ap, type); + va_start(ap, type); by = y / BLOCK_SIZE; bx = x / BLOCK_SIZE; @@ -626,18 +625,18 @@ void map_foreachincell (void (*func) (struct block_list *, va_list), int m, if (bl_list_count >= BL_LIST_MAX) { if (battle_config.error_log) - printf ("map_foreachincell: *WARNING* block count too many!\n"); + printf("map_foreachincell: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // メモリからの解放を禁止する + map_freeblock_lock(); // メモリからの解放を禁止する for (i = blockcount; i < bl_list_count; i++) if (bl_list[i]->prev) // 有効かどうかチェック - func (bl_list[i], ap); + func(bl_list[i], ap); - map_freeblock_unlock (); // 解放を許可する + map_freeblock_unlock(); // 解放を許可する - va_end (ap); + va_end(ap); bl_list_count = blockcount; } @@ -648,12 +647,12 @@ void map_foreachincell (void (*func) (struct block_list *, va_list), int m, * bl->idもこの中で設定して問題無い? *------------------------------------------ */ -int map_addobject (struct block_list *bl) +int map_addobject(struct block_list *bl) { - int i; + int i; if (bl == NULL) { - printf ("map_addobject nullpo?\n"); + printf("map_addobject nullpo?\n"); return 0; } if (first_free_object_id < 2 || first_free_object_id >= MAX_FLOORITEM) @@ -664,36 +663,36 @@ int map_addobject (struct block_list *bl) if (i >= MAX_FLOORITEM) { if (battle_config.error_log) - printf ("no free object id\n"); + printf("no free object id\n"); return 0; } first_free_object_id = i; if (last_object_id < i) last_object_id = i; object[i] = bl; - numdb_insert (id_db, i, bl); + numdb_insert(id_db, i, bl); return i; } /*========================================== * 一時objectの解放 - * map_delobjectのfreeしないバージョン + * map_delobjectのfreeしないバージョン *------------------------------------------ */ -int map_delobjectnofree (int id, int type) +int map_delobjectnofree(int id, int type) { if (object[id] == NULL) return 0; if (object[id]->type != type) { - fprintf (stderr, "Incorrect type: expected %d, got %d\n", type, + fprintf(stderr, "Incorrect type: expected %d, got %d\n", type, object[id]->type); *((char *) 0) = 0; // break for backtrace } - map_delblock (object[id]); - numdb_erase (id_db, id); + map_delblock(object[id]); + numdb_erase(id_db, id); // map_freeblock(object[id]); object[id] = NULL; @@ -714,18 +713,18 @@ int map_delobjectnofree (int id, int type) * addとの対称性が無いのが気になる *------------------------------------------ */ -int map_delobject (int id, int type) +int map_delobject(int id, int type) { struct block_list *obj = object[id]; if (obj == NULL) return 0; - map_delobjectnofree (id, type); + map_delobjectnofree(id, type); if (obj->type == BL_PC) // [Fate] Not sure where else to put this... I'm not sure where delobject for PCs is called from - pc_cleanup ((struct map_session_data *) obj); + pc_cleanup((struct map_session_data *) obj); - map_freeblock (obj); + map_freeblock(obj); return 0; } @@ -735,14 +734,14 @@ int map_delobject (int id, int type) * *------------------------------------------ */ -void map_foreachobject (void (*func) (struct block_list *, va_list), int type, +void map_foreachobject(void(*func)(struct block_list *, va_list), int type, ...) { - int i; - int blockcount = bl_list_count; + int i; + int blockcount = bl_list_count; va_list ap = NULL; - va_start (ap, type); + va_start(ap, type); for (i = 2; i <= last_object_id; i++) { @@ -753,22 +752,22 @@ void map_foreachobject (void (*func) (struct block_list *, va_list), int type, if (bl_list_count >= BL_LIST_MAX) { if (battle_config.error_log) - printf ("map_foreachobject: too many block !\n"); + printf("map_foreachobject: too many block !\n"); } else bl_list[bl_list_count++] = object[i]; } } - map_freeblock_lock (); + map_freeblock_lock(); for (i = blockcount; i < bl_list_count; i++) if (bl_list[i]->prev || bl_list[i]->next) - func (bl_list[i], ap); + func(bl_list[i], ap); - map_freeblock_unlock (); + map_freeblock_unlock(); - va_end (ap); + va_end(ap); bl_list_count = blockcount; } @@ -782,7 +781,7 @@ void map_foreachobject (void (*func) (struct block_list *, va_list), int type, * map.h内で#defineしてある *------------------------------------------ */ -void map_clearflooritem_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void map_clearflooritem_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct flooritem_data *fitem = NULL; @@ -791,13 +790,13 @@ void map_clearflooritem_timer (timer_id tid, tick_t tick, custom_id_t id, custom || (!data && fitem->cleartimer != tid)) { if (battle_config.error_log) - printf ("map_clearflooritem_timer : error\n"); + printf("map_clearflooritem_timer : error\n"); return; } if (data) - delete_timer (fitem->cleartimer, map_clearflooritem_timer); - clif_clearflooritem (fitem, 0); - map_delobject (fitem->bl.id, BL_ITEM); + delete_timer(fitem->cleartimer, map_clearflooritem_timer); + clif_clearflooritem(fitem, 0); + map_delobject(fitem->bl.id, BL_ITEM); } /*========================================== @@ -807,9 +806,9 @@ void map_clearflooritem_timer (timer_id tid, tick_t tick, custom_id_t id, custom * 現状range=1でアイテムドロップ用途のみ *------------------------------------------ */ -int map_searchrandfreecell (int m, int x, int y, int range) +int map_searchrandfreecell(int m, int x, int y, int range) { - int free_cell, i, j, c; + int free_cell, i, j, c; for (free_cell = 0, i = -range; i <= range; i++) { @@ -819,14 +818,14 @@ int map_searchrandfreecell (int m, int x, int y, int range) { if (j + x < 0 || j + x >= map[m].xs) continue; - if ((c = read_gat (m, j + x, i + y)) == 1 || c == 5) + if ((c = read_gat(m, j + x, i + y)) == 1 || c == 5) continue; free_cell++; } } if (free_cell == 0) return -1; - free_cell = MRAND (free_cell); + free_cell = MRAND(free_cell); for (i = -range; i <= range; i++) { if (i + y < 0 || i + y >= map[m].ys) @@ -835,7 +834,7 @@ int map_searchrandfreecell (int m, int x, int y, int range) { if (j + x < 0 || j + x >= map[m].xs) continue; - if ((c = read_gat (m, j + x, i + y)) == 1 || c == 5) + if ((c = read_gat(m, j + x, i + y)) == 1 || c == 5) continue; if (free_cell == 0) { @@ -857,21 +856,21 @@ int map_searchrandfreecell (int m, int x, int y, int range) * item_dataはamount以外をcopyする *------------------------------------------ */ -int map_addflooritem_any (struct item *item_data, int amount, int m, int x, +int map_addflooritem_any(struct item *item_data, int amount, int m, int x, int y, struct map_session_data **owners, int *owner_protection, int lifetime, int dispersal) { - int xy, r; + int xy, r; unsigned int tick; struct flooritem_data *fitem = NULL; - nullpo_retr (0, item_data); + nullpo_retr(0, item_data); - if ((xy = map_searchrandfreecell (m, x, y, dispersal)) < 0) + if ((xy = map_searchrandfreecell(m, x, y, dispersal)) < 0) return 0; - r = mt_random (); + r = mt_random(); - CREATE (fitem, struct flooritem_data, 1); + CREATE(fitem, struct flooritem_data, 1); fitem->bl.type = BL_ITEM; fitem->bl.prev = fitem->bl.next = NULL; fitem->bl.m = m; @@ -884,14 +883,14 @@ int map_addflooritem_any (struct item *item_data, int amount, int m, int x, fitem->third_get_id = 0; fitem->third_get_tick = 0; - fitem->bl.id = map_addobject (&fitem->bl); + fitem->bl.id = map_addobject(&fitem->bl); if (fitem->bl.id == 0) { - free (fitem); + free(fitem); return 0; } - tick = gettick (); + tick = gettick(); if (owners[0]) fitem->first_get_id = owners[0]->bl.id; @@ -905,27 +904,27 @@ int map_addflooritem_any (struct item *item_data, int amount, int m, int x, fitem->third_get_id = owners[2]->bl.id; fitem->third_get_tick = tick + owner_protection[2]; - memcpy (&fitem->item_data, item_data, sizeof (*item_data)); + memcpy(&fitem->item_data, item_data, sizeof(*item_data)); fitem->item_data.amount = amount; fitem->subx = (r & 3) * 3 + 3; fitem->suby = ((r >> 2) & 3) * 3 + 3; fitem->cleartimer = - add_timer (gettick () + lifetime, map_clearflooritem_timer, + add_timer(gettick() + lifetime, map_clearflooritem_timer, fitem->bl.id, 0); - map_addblock (&fitem->bl); - clif_dropflooritem (fitem); + map_addblock(&fitem->bl); + clif_dropflooritem(fitem); return fitem->bl.id; } -int map_addflooritem (struct item *item_data, int amount, int m, int x, int y, +int map_addflooritem(struct item *item_data, int amount, int m, int x, int y, struct map_session_data *first_sd, struct map_session_data *second_sd, struct map_session_data *third_sd, int type) { struct map_session_data *owners[3] = { first_sd, second_sd, third_sd }; - int owner_protection[3]; + int owner_protection[3]; if (type) { @@ -944,99 +943,99 @@ int map_addflooritem (struct item *item_data, int amount, int m, int x, int y, owner_protection[1] + battle_config.item_third_get_time; } - return map_addflooritem_any (item_data, amount, m, x, y, + return map_addflooritem_any(item_data, amount, m, x, y, owners, owner_protection, battle_config.flooritem_lifetime, 1); } -/* int xy,r; */ -/* unsigned int tick; */ -/* struct flooritem_data *fitem=NULL; */ - -/* nullpo_retr(0, item_data); */ - -/* if((xy=map_searchrandfreecell(m,x,y,1))<0) */ -/* return 0; */ -/* r=rand(); */ - -/* fitem = (struct flooritem_data *)aCalloc(1,sizeof(*fitem)); */ -/* fitem->bl.type=BL_ITEM; */ -/* fitem->bl.prev = fitem->bl.next = NULL; */ -/* fitem->bl.m=m; */ -/* fitem->bl.x=xy&0xffff; */ -/* fitem->bl.y=(xy>>16)&0xffff; */ -/* fitem->first_get_id = 0; */ -/* fitem->first_get_tick = 0; */ -/* fitem->second_get_id = 0; */ -/* fitem->second_get_tick = 0; */ -/* fitem->third_get_id = 0; */ -/* fitem->third_get_tick = 0; */ - -/* fitem->bl.id = map_addobject(&fitem->bl); */ -/* if(fitem->bl.id==0){ */ -/* free(fitem); */ -/* return 0; */ -/* } */ - -/* tick = gettick(); */ -/* if(first_sd) { */ -/* fitem->first_get_id = first_sd->bl.id; */ -/* if(type) */ -/* fitem->first_get_tick = tick + battle_config.mvp_item_first_get_time; */ -/* else */ -/* fitem->first_get_tick = tick + battle_config.item_first_get_time; */ -/* } */ -/* if(second_sd) { */ -/* fitem->second_get_id = second_sd->bl.id; */ -/* if(type) */ -/* fitem->second_get_tick = tick + battle_config.mvp_item_first_get_time + battle_config.mvp_item_second_get_time; */ -/* else */ -/* fitem->second_get_tick = tick + battle_config.item_first_get_time + battle_config.item_second_get_time; */ -/* } */ -/* if(third_sd) { */ -/* fitem->third_get_id = third_sd->bl.id; */ -/* if(type) */ -/* fitem->third_get_tick = tick + battle_config.mvp_item_first_get_time + battle_config.mvp_item_second_get_time + battle_config.mvp_item_third_get_time; */ -/* else */ -/* fitem->third_get_tick = tick + battle_config.item_first_get_time + battle_config.item_second_get_time + battle_config.item_third_get_time; */ -/* } */ - -/* memcpy(&fitem->item_data,item_data,sizeof(*item_data)); */ -/* fitem->item_data.amount=amount; */ -/* fitem->subx=(r&3)*3+3; */ -/* fitem->suby=((r>>2)&3)*3+3; */ -/* fitem->cleartimer=add_timer(gettick()+battle_config.flooritem_lifetime,map_clearflooritem_timer,fitem->bl.id,0); */ - -/* map_addblock(&fitem->bl); */ -/* clif_dropflooritem(fitem); */ - -/* return fitem->bl.id; */ +/* int xy,r; */ +/* unsigned int tick; */ +/* struct flooritem_data *fitem=NULL; */ + +/* nullpo_retr(0, item_data); */ + +/* if ((xy=map_searchrandfreecell(m,x,y,1))<0) */ +/* return 0; */ +/* r=rand(); */ + +/* fitem = (struct flooritem_data *)aCalloc(1,sizeof(*fitem)); */ +/* fitem->bl.type=BL_ITEM; */ +/* fitem->bl.prev = fitem->bl.next = NULL; */ +/* fitem->bl.m=m; */ +/* fitem->bl.x=xy&0xffff; */ +/* fitem->bl.y= (xy>>16)&0xffff; */ +/* fitem->first_get_id = 0; */ +/* fitem->first_get_tick = 0; */ +/* fitem->second_get_id = 0; */ +/* fitem->second_get_tick = 0; */ +/* fitem->third_get_id = 0; */ +/* fitem->third_get_tick = 0; */ + +/* fitem->bl.id = map_addobject(&fitem->bl); */ +/* if (fitem->bl.id==0){ */ +/* free(fitem); */ +/* return 0; */ +/* } */ + +/* tick = gettick(); */ +/* if (first_sd) { */ +/* fitem->first_get_id = first_sd->bl.id; */ +/* if (type) */ +/* fitem->first_get_tick = tick + battle_config.mvp_item_first_get_time; */ +/* else */ +/* fitem->first_get_tick = tick + battle_config.item_first_get_time; */ +/* } */ +/* if (second_sd) { */ +/* fitem->second_get_id = second_sd->bl.id; */ +/* if (type) */ +/* fitem->second_get_tick = tick + battle_config.mvp_item_first_get_time + battle_config.mvp_item_second_get_time; */ +/* else */ +/* fitem->second_get_tick = tick + battle_config.item_first_get_time + battle_config.item_second_get_time; */ +/* } */ +/* if (third_sd) { */ +/* fitem->third_get_id = third_sd->bl.id; */ +/* if (type) */ +/* fitem->third_get_tick = tick + battle_config.mvp_item_first_get_time + battle_config.mvp_item_second_get_time + battle_config.mvp_item_third_get_time; */ +/* else */ +/* fitem->third_get_tick = tick + battle_config.item_first_get_time + battle_config.item_second_get_time + battle_config.item_third_get_time; */ +/* } */ + +/* memcpy(&fitem->item_data,item_data,sizeof(*item_data)); */ +/* fitem->item_data.amount=amount; */ +/* fitem->subx= (r&3)*3+3; */ +/* fitem->suby= ((r>>2)&3)*3+3; */ +/* fitem->cleartimer=add_timer(gettick()+battle_config.flooritem_lifetime,map_clearflooritem_timer,fitem->bl.id,0); */ + +/* map_addblock(&fitem->bl); */ +/* clif_dropflooritem(fitem); */ + +/* return fitem->bl.id; */ /* } */ /*========================================== * charid_dbへ追加(返信待ちがあれば返信) *------------------------------------------ */ -void map_addchariddb (int charid, const char *name) +void map_addchariddb(int charid, const char *name) { - struct charid2nick *p = (struct charid2nick *)numdb_search (charid_db, charid); + struct charid2nick *p = (struct charid2nick *)numdb_search(charid_db, charid); if (p == NULL) { // データベースにない - CREATE (p, struct charid2nick, 1); + CREATE(p, struct charid2nick, 1); p->req_id = 0; } else - numdb_erase (charid_db, charid); + numdb_erase(charid_db, charid); int req = p->req_id; - memcpy (p->nick, name, 24); + memcpy(p->nick, name, 24); p->req_id = 0; - numdb_insert (charid_db, charid, p); + numdb_insert(charid_db, charid, p); if (req) { // 返信待ちがあれば返信 - struct map_session_data *sd = map_id2sd (req); + struct map_session_data *sd = map_id2sd(req); if (sd != NULL) - clif_solved_charname (sd, charid); + clif_solved_charname(sd, charid); } } @@ -1044,16 +1043,16 @@ void map_addchariddb (int charid, const char *name) * charid_dbへ追加（返信要求のみ） *------------------------------------------ */ -int map_reqchariddb (struct map_session_data *sd, int charid) +int map_reqchariddb(struct map_session_data *sd, int charid) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); - struct charid2nick *p = (struct charid2nick *)numdb_search (charid_db, charid); + struct charid2nick *p = (struct charid2nick *)numdb_search(charid_db, charid); if (p != NULL) // データベースにすでにある return 0; - CREATE (p, struct charid2nick, 1); + CREATE(p, struct charid2nick, 1); p->req_id = sd->bl.id; - numdb_insert (charid_db, charid, p); + numdb_insert(charid_db, charid, p); return 0; } @@ -1061,33 +1060,33 @@ int map_reqchariddb (struct map_session_data *sd, int charid) * id_dbへblを追加 *------------------------------------------ */ -void map_addiddb (struct block_list *bl) +void map_addiddb(struct block_list *bl) { - nullpo_retv (bl); + nullpo_retv(bl); - numdb_insert (id_db, bl->id, bl); + numdb_insert(id_db, bl->id, bl); } /*========================================== * id_dbからblを削除 *------------------------------------------ */ -void map_deliddb (struct block_list *bl) +void map_deliddb(struct block_list *bl) { - nullpo_retv (bl); + nullpo_retv(bl); - numdb_erase (id_db, bl->id); + numdb_erase(id_db, bl->id); } /*========================================== * nick_dbへsdを追加 *------------------------------------------ */ -void map_addnickdb (struct map_session_data *sd) +void map_addnickdb(struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); - strdb_insert (nick_db, sd->status.name, sd); + strdb_insert(nick_db, sd->status.name, sd); } /*========================================== @@ -1096,61 +1095,61 @@ void map_addnickdb (struct map_session_data *sd) * quit処理の主体が違うような気もしてきた *------------------------------------------ */ -int map_quit (struct map_session_data *sd) +int map_quit(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->chatID) // チャットから出る - chat_leavechat (sd); + chat_leavechat(sd); if (sd->trade_partner) // 取引を中断する - trade_tradecancel (sd); + trade_tradecancel(sd); if (sd->party_invite > 0) // パーティ勧誘を拒否する - party_reply_invite (sd, sd->party_invite_account, 0); + party_reply_invite(sd, sd->party_invite_account, 0); - party_send_logout (sd); // パーティのログアウトメッセージ送信 + party_send_logout(sd); // パーティのログアウトメッセージ送信 - pc_cleareventtimer (sd); // イベントタイマを破棄する + pc_cleareventtimer(sd); // イベントタイマを破棄する - skill_castcancel (&sd->bl, 0); // 詠唱を中断する - skill_stop_dancing (&sd->bl, 1); // ダンス/演奏中断 + skill_castcancel(&sd->bl, 0); // 詠唱を中断する + skill_stop_dancing(&sd->bl, 1); // ダンス/演奏中断 if (sd->sc_data && sd->sc_data[SC_BERSERK].timer != -1) //バーサーク中の終了はHPを100に sd->status.hp = 100; - skill_status_change_clear (&sd->bl, 1); // ステータス異常を解除する - skill_clear_unitgroup (&sd->bl); // スキルユニットグループの削除 - skill_cleartimerskill (&sd->bl); - pc_stop_walking (sd, 0); - pc_stopattack (sd); - pc_delinvincibletimer (sd); - pc_delspiritball (sd, sd->spiritball, 1); - skill_gangsterparadise (sd, 0); + skill_status_change_clear(&sd->bl, 1); // ステータス異常を解除する + skill_clear_unitgroup(&sd->bl); // スキルユニットグループの削除 + skill_cleartimerskill(&sd->bl); + pc_stop_walking(sd, 0); + pc_stopattack(sd); + pc_delinvincibletimer(sd); + pc_delspiritball(sd, sd->spiritball, 1); + skill_gangsterparadise(sd, 0); - pc_calcstatus (sd, 4); + pc_calcstatus(sd, 4); - clif_clearchar_area (&sd->bl, 2); + clif_clearchar_area(&sd->bl, 2); - if (pc_isdead (sd)) - pc_setrestartvalue (sd, 2); - pc_makesavestatus (sd); + if (pc_isdead(sd)) + pc_setrestartvalue(sd, 2); + pc_makesavestatus(sd); //クローンスキルで覚えたスキルは消す //The storage closing routines will save the char if needed. [Skotlex] if (!sd->state.storage_open) - chrif_save (sd); + chrif_save(sd); else if (sd->state.storage_open) - storage_storage_quit (sd); + storage_storage_quit(sd); if (sd->npc_stackbuf && sd->npc_stackbuf != NULL) - free (sd->npc_stackbuf); + free(sd->npc_stackbuf); - map_delblock (&sd->bl); + map_delblock(&sd->bl); - numdb_erase (id_db, sd->bl.id); - strdb_erase (nick_db, sd->status.name); - numdb_erase (charid_db, sd->status.char_id); + numdb_erase(id_db, sd->bl.id); + strdb_erase(nick_db, sd->status.name); + numdb_erase(charid_db, sd->status.char_id); return 0; } @@ -1159,7 +1158,7 @@ int map_quit (struct map_session_data *sd) * id番号のPCを探す。居なければNULL *------------------------------------------ */ -struct map_session_data *map_id2sd (int id) +struct map_session_data *map_id2sd(int id) { // remove search from db, because: // 1 - all players, npc, items and mob are in this db (to search, it's not speed, and search in session is more sure) @@ -1168,14 +1167,14 @@ struct map_session_data *map_id2sd (int id) // replaced by searching in all session. // by searching in session, we are sure that fd, session, and account exist. /* - struct block_list *bl; + struct block_list *bl; - bl=numdb_search(id_db,id); - if(bl && bl->type==BL_PC) - return (struct map_session_data*)bl; - return NULL; + bl=numdb_search(id_db,id); + if (bl && bl->type==BL_PC) + return (struct map_session_data*)bl; + return NULL; */ - int i; + int i; struct map_session_data *sd = NULL; for (i = 0; i < fd_max; i++) @@ -1189,9 +1188,9 @@ struct map_session_data *map_id2sd (int id) * char_id番号の名前を探す *------------------------------------------ */ -char *map_charid2nick (int id) +char *map_charid2nick(int id) { - struct charid2nick *p = (struct charid2nick *)numdb_search (charid_db, id); + struct charid2nick *p = (struct charid2nick *)numdb_search(charid_db, id); if (p == NULL) return NULL; @@ -1203,7 +1202,7 @@ char *map_charid2nick (int id) /*========================================*/ /* [Fate] Operations to iterate over active map sessions */ -static struct map_session_data *map_get_session (int i) +static struct map_session_data *map_get_session(int i) { struct map_session_data *d; @@ -1214,12 +1213,12 @@ static struct map_session_data *map_get_session (int i) return NULL; } -static struct map_session_data *map_get_session_forward (int start) +static struct map_session_data *map_get_session_forward(int start) { - int i; + int i; for (i = start; i < fd_max; i++) { - struct map_session_data *d = map_get_session (i); + struct map_session_data *d = map_get_session(i); if (d) return d; } @@ -1227,12 +1226,12 @@ static struct map_session_data *map_get_session_forward (int start) return NULL; } -static struct map_session_data *map_get_session_backward (int start) +static struct map_session_data *map_get_session_backward(int start) { - int i; + int i; for (i = start; i >= 0; i--) { - struct map_session_data *d = map_get_session (i); + struct map_session_data *d = map_get_session(i); if (d) return d; } @@ -1240,24 +1239,24 @@ static struct map_session_data *map_get_session_backward (int start) return NULL; } -struct map_session_data *map_get_first_session (void) +struct map_session_data *map_get_first_session(void) { - return map_get_session_forward (0); + return map_get_session_forward(0); } -struct map_session_data *map_get_next_session (struct map_session_data *d) +struct map_session_data *map_get_next_session(struct map_session_data *d) { - return map_get_session_forward (d->fd + 1); + return map_get_session_forward(d->fd + 1); } -struct map_session_data *map_get_last_session (void) +struct map_session_data *map_get_last_session(void) { - return map_get_session_backward (fd_max); + return map_get_session_backward(fd_max); } -struct map_session_data *map_get_prev_session (struct map_session_data *d) +struct map_session_data *map_get_prev_session(struct map_session_data *d) { - return map_get_session_backward (d->fd - 1); + return map_get_session_backward(d->fd - 1); } /*========================================== @@ -1266,16 +1265,16 @@ struct map_session_data *map_get_prev_session (struct map_session_data *d) * return map_session_data pointer or NULL *------------------------------------------ */ -struct map_session_data *map_nick2sd (const char *nick) +struct map_session_data *map_nick2sd(const char *nick) { - int i, quantity = 0, nicklen; + int i, quantity = 0, nicklen; struct map_session_data *sd = NULL; struct map_session_data *pl_sd = NULL; if (nick == NULL) return NULL; - nicklen = strlen (nick); + nicklen = strlen(nick); for (i = 0; i < fd_max; i++) { @@ -1283,10 +1282,10 @@ struct map_session_data *map_nick2sd (const char *nick) && pl_sd->state.auth) { // Without case sensitive check (increase the number of similar character names found) - if (strncasecmp (pl_sd->status.name, nick, nicklen) == 0) + if (strncasecmp(pl_sd->status.name, nick, nicklen) == 0) { // Strict comparison (if found, we finish the function immediatly with correct value) - if (strcmp (pl_sd->status.name, nick) == 0) + if (strcmp(pl_sd->status.name, nick) == 0) return pl_sd; quantity++; sd = pl_sd; @@ -1307,13 +1306,13 @@ struct map_session_data *map_nick2sd (const char *nick) * 一時objectの場合は配列を引くのみ *------------------------------------------ */ -struct block_list *map_id2bl (int id) +struct block_list *map_id2bl(int id) { struct block_list *bl = NULL; - if (id < sizeof (object) / sizeof (object[0])) + if (id < sizeof(object) / sizeof(object[0])) bl = object[id]; else - bl = (struct block_list *)numdb_search (id_db, id); + bl = (struct block_list *)numdb_search(id_db, id); return bl; } @@ -1322,13 +1321,13 @@ struct block_list *map_id2bl (int id) * id_db内の全てにfuncを実行 *------------------------------------------ */ -int map_foreachiddb (db_func_t func, ...) +int map_foreachiddb(db_func_t func, ...) { va_list ap = NULL; - va_start (ap, func); - numdb_foreach (id_db, func, ap); - va_end (ap); + va_start(ap, func); + numdb_foreach(id_db, func, ap); + va_end(ap); return 0; } @@ -1336,9 +1335,9 @@ int map_foreachiddb (db_func_t func, ...) * map.npcへ追加 (warp等の領域持ちのみ) *------------------------------------------ */ -int map_addnpc (int m, struct npc_data *nd) +int map_addnpc(int m, struct npc_data *nd) { - int i; + int i; if (m < 0 || m >= map_num) return -1; for (i = 0; i < map[m].npc_num && i < MAX_NPC_PER_MAP; i++) @@ -1347,7 +1346,7 @@ int map_addnpc (int m, struct npc_data *nd) if (i == MAX_NPC_PER_MAP) { if (battle_config.error_log) - printf ("too many NPCs in one map %s\n", map[m].name); + printf("too many NPCs in one map %s\n", map[m].name); return -1; } if (i == map[m].npc_num) @@ -1355,19 +1354,19 @@ int map_addnpc (int m, struct npc_data *nd) map[m].npc_num++; } - nullpo_retr (0, nd); + nullpo_retr(0, nd); map[m].npc[i] = nd; nd->n = i; - numdb_insert (id_db, nd->bl.id, nd); + numdb_insert(id_db, nd->bl.id, nd); return i; } static -void map_removenpc (void) +void map_removenpc(void) { - int i, m, n = 0; + int i, m, n = 0; for (m = 0; m < map_num; m++) { @@ -1375,30 +1374,30 @@ void map_removenpc (void) { if (map[m].npc[i] != NULL) { - clif_clearchar_area (&map[m].npc[i]->bl, 2); - map_delblock (&map[m].npc[i]->bl); - numdb_erase (id_db, map[m].npc[i]->bl.id); + clif_clearchar_area(&map[m].npc[i]->bl, 2); + map_delblock(&map[m].npc[i]->bl); + numdb_erase(id_db, map[m].npc[i]->bl.id); if (map[m].npc[i]->bl.subtype == SCRIPT) { // free(map[m].npc[i]->u.scr.script); // free(map[m].npc[i]->u.scr.label_list); } - free (map[m].npc[i]); + free(map[m].npc[i]); map[m].npc[i] = NULL; n++; } } } - printf ("%d NPCs removed.\n", n); + printf("%d NPCs removed.\n", n); } /*========================================== * map名からmap番号へ変換 *------------------------------------------ */ -int map_mapname2mapid (const char *name) +int map_mapname2mapid(const char *name) { - struct map_data *md = (struct map_data *)strdb_search (map_db, name); + struct map_data *md = (struct map_data *)strdb_search(map_db, name); if (md == NULL || md->gat == NULL) return -1; return md->m; @@ -1408,9 +1407,9 @@ int map_mapname2mapid (const char *name) * 他鯖map名からip,port変換 *------------------------------------------ */ -int map_mapname2ipport (const char *name, struct in_addr *ip, int *port) +int map_mapname2ipport(const char *name, struct in_addr *ip, int *port) { - struct map_data_other_server *mdos = (struct map_data_other_server *)strdb_search (map_db, name); + struct map_data_other_server *mdos = (struct map_data_other_server *)strdb_search(map_db, name); if (mdos == NULL || mdos->gat) return -1; *ip = mdos->ip; @@ -1422,7 +1421,7 @@ int map_mapname2ipport (const char *name, struct in_addr *ip, int *port) * *------------------------------------------ */ -int map_check_dir (int s_dir, int t_dir) +int map_check_dir(int s_dir, int t_dir) { if (s_dir == t_dir) return 0; @@ -1468,12 +1467,12 @@ int map_check_dir (int s_dir, int t_dir) * 彼我の方向を計算 *------------------------------------------ */ -int map_calc_dir (struct block_list *src, int x, int y) +int map_calc_dir(struct block_list *src, int x, int y) { - int dir = 0; - int dx, dy; + int dir = 0; + int dx, dy; - nullpo_retr (0, src); + nullpo_retr(0, src); dx = x - src->x; dy = y - src->y; @@ -1521,7 +1520,7 @@ int map_calc_dir (struct block_list *src, int x, int y) * (m,x,y)の状態を調べる *------------------------------------------ */ -int map_getcell (int m, int x, int y) +int map_getcell(int m, int x, int y) { if (x < 0 || x >= map[m].xs - 1 || y < 0 || y >= map[m].ys - 1) return 1; @@ -1532,7 +1531,7 @@ int map_getcell (int m, int x, int y) * (m,x,y)の状態をtにする *------------------------------------------ */ -int map_setcell (int m, int x, int y, int t) +int map_setcell(int m, int x, int y, int t) { if (x < 0 || x >= map[m].xs || y < 0 || y >= map[m].ys) return t; @@ -1543,27 +1542,27 @@ int map_setcell (int m, int x, int y, int t) * 他鯖管理のマップをdbに追加 *------------------------------------------ */ -int map_setipport (const char *name, struct in_addr ip, int port) +int map_setipport(const char *name, struct in_addr ip, int port) { struct map_data_other_server *mdos = NULL; - struct map_data *md = (struct map_data *)strdb_search (map_db, name); + struct map_data *md = (struct map_data *)strdb_search(map_db, name); if (md == NULL) { // not exist -> add new data - CREATE (mdos, struct map_data_other_server, 1); - memcpy (mdos->name, name, 24); + CREATE(mdos, struct map_data_other_server, 1); + memcpy(mdos->name, name, 24); mdos->gat = NULL; mdos->ip = ip; mdos->port = port; - strdb_insert (map_db, mdos->name, mdos); + strdb_insert(map_db, mdos->name, mdos); } else { if (md->gat) { // local -> check data - if (ip.s_addr != clif_getip ().s_addr || port != clif_getport ()) + if (ip.s_addr != clif_getip().s_addr || port != clif_getport()) { - printf ("from char server : %s -> %s:%d\n", name, ip2str(ip), + printf("from char server : %s -> %s:%d\n", name, ip2str(ip), port); return 1; } @@ -1586,127 +1585,127 @@ int map_setipport (const char *name, struct in_addr ip, int port) static struct Waterlist { char mapname[24]; - int waterheight; + int waterheight; } *waterlist = NULL; #define NO_WATER 1000000 -static int map_waterheight (char *mapname) +static int map_waterheight(char *mapname) { if (waterlist) { - int i; + int i; for (i = 0; waterlist[i].mapname[0] && i < MAX_MAP_PER_SERVER; i++) - if (strcmp (waterlist[i].mapname, mapname) == 0) + if (strcmp(waterlist[i].mapname, mapname) == 0) return waterlist[i].waterheight; } return NO_WATER; } -static void map_readwater (char *watertxt) +static void map_readwater(char *watertxt) { char line[1024], w1[1024]; FILE *fp = NULL; - int n = 0; + int n = 0; - fp = fopen_ (watertxt, "r"); + fp = fopen_(watertxt, "r"); if (fp == NULL) { - printf ("file not found: %s\n", watertxt); + printf("file not found: %s\n", watertxt); return; } if (waterlist == NULL) { - CREATE (waterlist, struct Waterlist, MAX_MAP_PER_SERVER); + CREATE(waterlist, struct Waterlist, MAX_MAP_PER_SERVER); } - while (fgets (line, 1020, fp) && n < MAX_MAP_PER_SERVER) + while (fgets(line, 1020, fp) && n < MAX_MAP_PER_SERVER) { - int wh, count; + int wh, count; if (line[0] == '/' && line[1] == '/') continue; - if ((count = sscanf (line, "%s%d", w1, &wh)) < 1) + if ((count = sscanf(line, "%s%d", w1, &wh)) < 1) { continue; } - strcpy (waterlist[n].mapname, w1); + strcpy(waterlist[n].mapname, w1); if (count >= 2) waterlist[n].waterheight = wh; else waterlist[n].waterheight = 3; n++; } - fclose_ (fp); + fclose_(fp); } /*========================================== * マップ1枚読み込み *------------------------------------------ */ -static int map_readmap (int m, char *fn, char *alias) +static int map_readmap(int m, char *fn, char *alias) { - int s; - int x, y, xs, ys; + int s; + int x, y, xs, ys; struct gat_1cell { char type; } *p; - int wh; + int wh; size_t size; // read & convert fn - uint8_t *gat = (uint8_t *)grfio_read (fn); + uint8_t *gat = (uint8_t *)grfio_read(fn); if (gat == NULL) return -1; - printf ("\rLoading Maps [%d/%d]: %-50s ", m, map_num, fn); - fflush (stdout); + printf("\rLoading Maps [%d/%d]: %-50s ", m, map_num, fn); + fflush(stdout); map[m].m = m; - xs = map[m].xs = *(short *) (gat); - ys = map[m].ys = *(short *) (gat + 2); - printf ("\n%i %i\n", xs, ys); - map[m].gat = (uint8_t *)calloc (s = map[m].xs * map[m].ys, 1); + xs = map[m].xs = *(short *)(gat); + ys = map[m].ys = *(short *)(gat + 2); + printf("\n%i %i\n", xs, ys); + map[m].gat = (uint8_t *)calloc(s = map[m].xs * map[m].ys, 1); if (map[m].gat == NULL) { - printf ("out of memory : map_readmap gat\n"); - exit (1); + printf("out of memory : map_readmap gat\n"); + exit(1); } map[m].npc_num = 0; map[m].users = 0; - memset (&map[m].flag, 0, sizeof (map[m].flag)); + memset(&map[m].flag, 0, sizeof(map[m].flag)); if (battle_config.pk_mode) map[m].flag.pvp = 1; // make all maps pvp for pk_mode [Valaris] - wh = map_waterheight (map[m].name); + wh = map_waterheight(map[m].name); for (y = 0; y < ys; y++) { - p = (struct gat_1cell *) (gat + y * xs + 4); + p = (struct gat_1cell *)(gat + y * xs + 4); for (x = 0; x < xs; x++) { - /*if(wh!=NO_WATER && p->type==0){ + /*if (wh!=NO_WATER && p->type==0){ * // 水場判定 - * map[m].gat[x+y*xs]=(p->high[0]>wh || p->high[1]>wh || p->high[2]>wh || p->high[3]>wh) ? 3 : 0; + * map[m].gat[x+y*xs]= (p->high[0]>wh || p->high[1]>wh || p->high[2]>wh || p->high[3]>wh) ? 3 : 0; * } else { */ map[m].gat[x + y * xs] = p->type; //} p++; } } - free (gat); + free(gat); map[m].bxs = (xs + BLOCK_SIZE - 1) / BLOCK_SIZE; map[m].bys = (ys + BLOCK_SIZE - 1) / BLOCK_SIZE; size = map[m].bxs * map[m].bys; - CREATE (map[m].block, struct block_list *, size); + CREATE(map[m].block, struct block_list *, size); - CREATE (map[m].block_mob, struct block_list *, size); + CREATE(map[m].block_mob, struct block_list *, size); - CREATE (map[m].block_count, int, size); + CREATE(map[m].block_count, int, size); - CREATE (map[m].block_mob_count, int, size); + CREATE(map[m].block_mob_count, int, size); - strdb_insert (map_db, map[m].name, &map[m]); + strdb_insert(map_db, map[m].name, &map[m]); // printf("%s read done\n",fn); @@ -1718,57 +1717,57 @@ static int map_readmap (int m, char *fn, char *alias) *------------------------------------------ */ static -int map_readallmap (void) +int map_readallmap(void) { - int i, maps_removed = 0; + int i, maps_removed = 0; char fn[256] = ""; // 先に全部のャbプの存在を確認 for (i = 0; i < map_num; i++) { - if (strstr (map[i].name, ".gat") == NULL) + if (strstr(map[i].name, ".gat") == NULL) continue; - sprintf (fn, "data\\%s", map[i].name); + sprintf(fn, "data\\%s", map[i].name); // TODO - remove this, it is the last call to grfio_size, which is deprecated - if (!grfio_size (fn)) + if (!grfio_size(fn)) { - map_delmap (map[i].name); + map_delmap(map[i].name); maps_removed++; } } for (i = 0; i < map_num; i++) { - if (strstr (map[i].name, ".gat") != NULL) + if (strstr(map[i].name, ".gat") != NULL) { - char *p = strstr (map[i].name, ">"); // [MouseJstr] + char *p = strstr(map[i].name, ">"); // [MouseJstr] if (p != NULL) { char alias[64]; *p = '\0'; - strcpy (alias, map[i].name); - strcpy (map[i].name, p + 1); - sprintf (fn, "data\\%s", map[i].name); - if (map_readmap (i, fn, alias) == -1) + strcpy(alias, map[i].name); + strcpy(map[i].name, p + 1); + sprintf(fn, "data\\%s", map[i].name); + if (map_readmap(i, fn, alias) == -1) { - map_delmap (map[i].name); + map_delmap(map[i].name); maps_removed++; } } else { - sprintf (fn, "data\\%s", map[i].name); - if (map_readmap (i, fn, NULL) == -1) + sprintf(fn, "data\\%s", map[i].name); + if (map_readmap(i, fn, NULL) == -1) { - map_delmap (map[i].name); + map_delmap(map[i].name); maps_removed++; } } } } - free (waterlist); - printf ("\rMaps Loaded: %d %60s\n", map_num, ""); - printf ("\rMaps Removed: %d \n", maps_removed); + free(waterlist); + printf("\rMaps Loaded: %d %60s\n", map_num, ""); + printf("\rMaps Removed: %d \n", maps_removed); return 0; } @@ -1777,9 +1776,9 @@ int map_readallmap (void) *------------------------------------------ */ static -int map_addmap (char *mapname) +int map_addmap(char *mapname) { - if (strcasecmp (mapname, "clear") == 0) + if (strcasecmp(mapname, "clear") == 0) { map_num = 0; return 0; @@ -1787,10 +1786,10 @@ int map_addmap (char *mapname) if (map_num >= MAX_MAP_PER_SERVER - 1) { - printf ("too many map\n"); + printf("too many map\n"); return 1; } - memcpy (map[map_num].name, mapname, 24); + memcpy(map[map_num].name, mapname, 24); map_num++; return 0; } @@ -1799,11 +1798,11 @@ int map_addmap (char *mapname) * 読み込むmapを削除する *------------------------------------------ */ -int map_delmap (char *mapname) +int map_delmap(char *mapname) { - int i; + int i; - if (strcasecmp (mapname, "all") == 0) + if (strcasecmp(mapname, "all") == 0) { map_num = 0; return 0; @@ -1811,11 +1810,11 @@ int map_delmap (char *mapname) for (i = 0; i < map_num; i++) { - if (strcmp (map[i].name, mapname) == 0) + if (strcmp(map[i].name, mapname) == 0) { - printf ("Removing map [ %s ] from maplist\n", map[i].name); - memmove (map + i, map + i + 1, - sizeof (map[0]) * (map_num - i - 1)); + printf("Removing map [ %s ] from maplist\n", map[i].name); + memmove(map + i, map + i + 1, + sizeof(map[0]) * (map_num - i - 1)); map_num--; } } @@ -1830,65 +1829,65 @@ FILE *map_logfile = NULL; char *map_logfile_name = NULL; static long map_logfile_index; -static void map_close_logfile (void) +static void map_close_logfile(void) { if (map_logfile) { - char *filenameop_buf = (char*)malloc (strlen (map_logfile_name) + 50); - sprintf (filenameop_buf, "gzip -f %s.%ld", map_logfile_name, + char *filenameop_buf = (char*)malloc(strlen(map_logfile_name) + 50); + sprintf(filenameop_buf, "gzip -f %s.%ld", map_logfile_name, map_logfile_index); - fclose (map_logfile); + fclose(map_logfile); - if (!system (filenameop_buf)) - perror (filenameop_buf); + if (!system(filenameop_buf)) + perror(filenameop_buf); - free (filenameop_buf); + free(filenameop_buf); } } -static void map_start_logfile (long suffix) +static void map_start_logfile(long suffix) { - char *filename_buf = (char*)malloc (strlen (map_logfile_name) + 50); + char *filename_buf = (char*)malloc(strlen(map_logfile_name) + 50); map_logfile_index = suffix >> LOGFILE_SECONDS_PER_CHUNK_SHIFT; - sprintf (filename_buf, "%s.%ld", map_logfile_name, map_logfile_index); - map_logfile = fopen (filename_buf, "w+"); + sprintf(filename_buf, "%s.%ld", map_logfile_name, map_logfile_index); + map_logfile = fopen(filename_buf, "w+"); if (!map_logfile) - perror (map_logfile_name); + perror(map_logfile_name); - free (filename_buf); + free(filename_buf); } -static void map_set_logfile (const char *filename) +static void map_set_logfile(const char *filename) { struct timeval tv; - map_logfile_name = strdup (filename); - gettimeofday (&tv, NULL); + map_logfile_name = strdup(filename); + gettimeofday(&tv, NULL); - map_start_logfile (tv.tv_sec); + map_start_logfile(tv.tv_sec); - MAP_LOG ("log-start v3"); + MAP_LOG("log-start v3"); } -void map_write_log (const char *format, ...) +void map_write_log(const char *format, ...) { struct timeval tv; va_list args; - va_start (args, format); + va_start(args, format); - gettimeofday (&tv, NULL); + gettimeofday(&tv, NULL); if ((tv.tv_sec >> LOGFILE_SECONDS_PER_CHUNK_SHIFT) != map_logfile_index) { - map_close_logfile (); - map_start_logfile (tv.tv_sec); + map_close_logfile(); + map_start_logfile(tv.tv_sec); } - fprintf (map_logfile, "%ld.%06ld ", (long) tv.tv_sec, (long) tv.tv_usec); - vfprintf (map_logfile, format, args); - fputc ('\n', map_logfile); + fprintf(map_logfile, "%ld.%06ld ", (long) tv.tv_sec, (long) tv.tv_usec); + vfprintf(map_logfile, format, args); + fputc('\n', map_logfile); } /*========================================== @@ -1896,157 +1895,156 @@ void map_write_log (const char *format, ...) *------------------------------------------ */ static -int map_config_read (const char *cfgName) +int map_config_read(const char *cfgName) { char line[1024], w1[1024], w2[1024]; FILE *fp; struct hostent *h = NULL; - fp = fopen_ (cfgName, "r"); + fp = fopen_(cfgName, "r"); if (fp == NULL) { - printf ("Map configuration file not found at: %s\n", cfgName); - exit (1); + printf("Map configuration file not found at: %s\n", cfgName); + exit(1); } - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { if (line[0] == '/' && line[1] == '/') continue; - if (sscanf (line, "%[^:]: %[^\r\n]", w1, w2) == 2) + if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) == 2) { - if (strcasecmp (w1, "userid") == 0) + if (strcasecmp(w1, "userid") == 0) { - chrif_setuserid (w2); + chrif_setuserid(w2); } - else if (strcasecmp (w1, "passwd") == 0) + else if (strcasecmp(w1, "passwd") == 0) { - chrif_setpasswd (w2); + chrif_setpasswd(w2); } - else if (strcasecmp (w1, "char_ip") == 0) + else if (strcasecmp(w1, "char_ip") == 0) { - h = gethostbyname (w2); + h = gethostbyname(w2); if (h != NULL) { - printf - ("Character server IP address : %s -> %d.%d.%d.%d\n", + printf("Character server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char) h->h_addr[0], (unsigned char) h->h_addr[1], (unsigned char) h->h_addr[2], (unsigned char) h->h_addr[3]); - sprintf (w2, "%d.%d.%d.%d", (unsigned char) h->h_addr[0], + sprintf(w2, "%d.%d.%d.%d", (unsigned char) h->h_addr[0], (unsigned char) h->h_addr[1], (unsigned char) h->h_addr[2], (unsigned char) h->h_addr[3]); } - chrif_setip (w2); + chrif_setip(w2); } - else if (strcasecmp (w1, "char_port") == 0) + else if (strcasecmp(w1, "char_port") == 0) { - chrif_setport (atoi (w2)); + chrif_setport(atoi(w2)); } - else if (strcasecmp (w1, "map_ip") == 0) + else if (strcasecmp(w1, "map_ip") == 0) { - h = gethostbyname (w2); + h = gethostbyname(w2); if (h != NULL) { - printf ("Map server IP address : %s -> %d.%d.%d.%d\n", w2, + printf("Map server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char) h->h_addr[0], (unsigned char) h->h_addr[1], (unsigned char) h->h_addr[2], (unsigned char) h->h_addr[3]); - sprintf (w2, "%d.%d.%d.%d", (unsigned char) h->h_addr[0], + sprintf(w2, "%d.%d.%d.%d", (unsigned char) h->h_addr[0], (unsigned char) h->h_addr[1], (unsigned char) h->h_addr[2], (unsigned char) h->h_addr[3]); } - clif_setip (w2); + clif_setip(w2); } - else if (strcasecmp (w1, "map_port") == 0) + else if (strcasecmp(w1, "map_port") == 0) { - clif_setport (atoi (w2)); - map_port = (atoi (w2)); + clif_setport(atoi(w2)); + map_port = (atoi(w2)); } - else if (strcasecmp (w1, "water_height") == 0) + else if (strcasecmp(w1, "water_height") == 0) { - map_readwater (w2); + map_readwater(w2); } - else if (strcasecmp (w1, "map") == 0) + else if (strcasecmp(w1, "map") == 0) { - map_addmap (w2); + map_addmap(w2); } - else if (strcasecmp (w1, "delmap") == 0) + else if (strcasecmp(w1, "delmap") == 0) { - map_delmap (w2); + map_delmap(w2); } - else if (strcasecmp (w1, "npc") == 0) + else if (strcasecmp(w1, "npc") == 0) { - npc_addsrcfile (w2); + npc_addsrcfile(w2); } - else if (strcasecmp (w1, "delnpc") == 0) + else if (strcasecmp(w1, "delnpc") == 0) { - npc_delsrcfile (w2); + npc_delsrcfile(w2); } - else if (strcasecmp (w1, "autosave_time") == 0) + else if (strcasecmp(w1, "autosave_time") == 0) { - autosave_interval = atoi (w2) * 1000; + autosave_interval = atoi(w2) * 1000; if (autosave_interval <= 0) autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; } - else if (strcasecmp (w1, "motd_txt") == 0) + else if (strcasecmp(w1, "motd_txt") == 0) { - strcpy (motd_txt, w2); + strcpy(motd_txt, w2); } - else if (strcasecmp (w1, "help_txt") == 0) + else if (strcasecmp(w1, "help_txt") == 0) { - strcpy (help_txt, w2); + strcpy(help_txt, w2); } - else if (strcasecmp (w1, "mapreg_txt") == 0) + else if (strcasecmp(w1, "mapreg_txt") == 0) { - strcpy (mapreg_txt, w2); + strcpy(mapreg_txt, w2); } - else if (strcasecmp (w1, "gm_log") == 0) + else if (strcasecmp(w1, "gm_log") == 0) { - gm_logfile_name = strdup (w2); + gm_logfile_name = strdup(w2); } - else if (strcasecmp (w1, "log_file") == 0) + else if (strcasecmp(w1, "log_file") == 0) { - map_set_logfile (w2); + map_set_logfile(w2); } - else if (strcasecmp (w1, "import") == 0) + else if (strcasecmp(w1, "import") == 0) { - map_config_read (w2); + map_config_read(w2); } } } - fclose_ (fp); + fclose_(fp); return 0; } static -void cleanup_sub (struct block_list *bl, va_list ap) +void cleanup_sub(struct block_list *bl, va_list ap) { - nullpo_retv (bl); + nullpo_retv(bl); switch (bl->type) { case BL_PC: - map_delblock (bl); // There is something better... + map_delblock(bl); // There is something better... break; case BL_NPC: - npc_delete ((struct npc_data *) bl); + npc_delete((struct npc_data *) bl); break; case BL_MOB: - mob_delete ((struct mob_data *) bl); + mob_delete((struct mob_data *) bl); break; case BL_ITEM: - map_clearflooritem (bl->id); + map_clearflooritem(bl->id); break; case BL_SKILL: - skill_delunit ((struct skill_unit *) bl); + skill_delunit((struct skill_unit *) bl); break; case BL_SPELL: - spell_free_invocation ((struct invocation *) bl); + spell_free_invocation((struct invocation *) bl); break; } } @@ -2055,55 +2053,55 @@ void cleanup_sub (struct block_list *bl, va_list ap) * map鯖終了時処理 *------------------------------------------ */ -void term_func (void) +void term_func(void) { - map_close_logfile (); + map_close_logfile(); - int map_id, i; + int map_id, i; for (map_id = 0; map_id < map_num; map_id++) { if (map[map_id].m) - map_foreachinarea (cleanup_sub, map_id, 0, 0, map[map_id].xs, + map_foreachinarea(cleanup_sub, map_id, 0, 0, map[map_id].xs, map[map_id].ys, 0, 0); } for (i = 0; i < fd_max; i++) - delete_session (i); + delete_session(i); - map_removenpc (); + map_removenpc(); - numdb_final (id_db, NULL); - strdb_final (map_db, NULL); - strdb_final (nick_db, NULL); - numdb_final (charid_db, NULL); + numdb_final(id_db, NULL); + strdb_final(map_db, NULL); + strdb_final(nick_db, NULL); + numdb_final(charid_db, NULL); for (i = 0; i <= map_num; i++) { if (map[i].gat) - free (map[i].gat); + free(map[i].gat); if (map[i].block) - free (map[i].block); + free(map[i].block); if (map[i].block_mob) - free (map[i].block_mob); + free(map[i].block_mob); if (map[i].block_count) - free (map[i].block_count); + free(map[i].block_count); if (map[i].block_mob_count) - free (map[i].block_mob_count); + free(map[i].block_mob_count); } - do_final_script (); - do_final_itemdb (); - do_final_storage (); + do_final_script(); + do_final_itemdb(); + do_final_storage(); } /// --help was passed // FIXME this should produce output -void map_helpscreen (void) +void map_helpscreen(void) { - exit (1); + exit(1); } -int compare_item (struct item *a, struct item *b) +int compare_item(struct item *a, struct item *b) { return ((a->nameid == b->nameid) && (a->identify == b->identify) && @@ -2118,9 +2116,9 @@ int compare_item (struct item *a, struct item *b) * Map-Server Init and Command-line Arguments [Valaris] *------------------------------------------------------ */ -int do_init (int argc, char *argv[]) +int do_init(int argc, char *argv[]) { - int i; + int i; const char *MAP_CONF_NAME = "conf/map_athena.conf"; const char *BATTLE_CONF_FILENAME = "conf/battle_athena.conf"; @@ -2131,62 +2129,61 @@ int do_init (int argc, char *argv[]) for (i = 1; i < argc; i++) { - if (strcmp (argv[i], "--help") == 0 || strcmp (argv[i], "--h") == 0 - || strcmp (argv[i], "--?") == 0 || strcmp (argv[i], "/?") == 0) - map_helpscreen (); - else if (strcmp (argv[i], "--map_config") == 0) + if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "--h") == 0 + || strcmp(argv[i], "--?") == 0 || strcmp(argv[i], "/?") == 0) + map_helpscreen(); + else if (strcmp(argv[i], "--map_config") == 0) MAP_CONF_NAME = argv[i + 1]; - else if (strcmp (argv[i], "--battle_config") == 0) + else if (strcmp(argv[i], "--battle_config") == 0) BATTLE_CONF_FILENAME = argv[i + 1]; - else if (strcmp (argv[i], "--atcommand_config") == 0) + else if (strcmp(argv[i], "--atcommand_config") == 0) ATCOMMAND_CONF_FILENAME = argv[i + 1]; - else if (strcmp (argv[i], "--script_config") == 0) + else if (strcmp(argv[i], "--script_config") == 0) SCRIPT_CONF_NAME = argv[i + 1]; - else if (strcmp (argv[i], "--msg_config") == 0) + else if (strcmp(argv[i], "--msg_config") == 0) MSG_CONF_NAME = argv[i + 1]; } - map_config_read (MAP_CONF_NAME); - battle_config_read (BATTLE_CONF_FILENAME); - atcommand_config_read (ATCOMMAND_CONF_FILENAME); - script_config_read (SCRIPT_CONF_NAME); + map_config_read(MAP_CONF_NAME); + battle_config_read(BATTLE_CONF_FILENAME); + atcommand_config_read(ATCOMMAND_CONF_FILENAME); + script_config_read(SCRIPT_CONF_NAME); - id_db = numdb_init (); - map_db = strdb_init (16); - nick_db = strdb_init (24); - charid_db = numdb_init (); + id_db = numdb_init(); + map_db = strdb_init(16); + nick_db = strdb_init(24); + charid_db = numdb_init(); - map_readallmap (); + map_readallmap(); // add_timer_func_list (map_clearflooritem_timer, "map_clearflooritem_timer"); do_init_chrif (); do_init_clif (); - do_init_itemdb (); - do_init_mob (); // npcの初期化時内でmob_spawnして、mob_dbを参照するのでinit_npcより先 - do_init_script (); - do_init_npc (); - do_init_pc (); - do_init_party (); - do_init_storage (); - do_init_skill (); - do_init_magic (); - - npc_event_do_oninit (); // npcのOnInitイベント実行 + do_init_itemdb(); + do_init_mob(); // npcの初期化時内でmob_spawnして、mob_dbを参照するのでinit_npcより先 + do_init_script(); + do_init_npc(); + do_init_pc(); + do_init_party(); + do_init_storage(); + do_init_skill(); + do_init_magic(); + + npc_event_do_oninit(); // npcのOnInitイベント実行 if (battle_config.pk_mode == 1) - printf ("The server is running in \033[1;31mPK Mode\033[0m.\n"); + printf("The server is running in \033[1;31mPK Mode\033[0m.\n"); - printf - ("The map-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n", + printf("The map-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n", map_port); return 0; } -int map_scriptcont (struct map_session_data *sd, int id) +int map_scriptcont(struct map_session_data *sd, int id) { - struct block_list *bl = map_id2bl (id); + struct block_list *bl = map_id2bl(id); if (!bl) return 0; @@ -2194,9 +2191,9 @@ int map_scriptcont (struct map_session_data *sd, int id) switch (bl->type) { case BL_NPC: - return npc_scriptcont (sd, id); + return npc_scriptcont(sd, id); case BL_SPELL: - spell_execute_script ((struct invocation *) bl); + spell_execute_script((struct invocation *) bl); break; } diff --git a/src/map/map.hpp b/src/map/map.hpp index f52537b..a94b46f 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -50,20 +50,20 @@ // [Fate] status.option properties. These are persistent status changes. // IDs that are not listed are not used in the code (to the best of my knowledge) -#define OPTION_HIDE2 0x0002 // apparently some weaker non-GM hide -#define OPTION_CLOAK 0x0004 -#define OPTION_10 0x0010 -#define OPTION_20 0x0020 -#define OPTION_HIDE 0x0040 // [Fate] This is the GM `@hide' flag -#define OPTION_800 0x0800 -#define OPTION_INVISIBILITY 0x1000 // [Fate] Complete invisibility to other clients -#define OPTION_SCRIBE 0x2000 // [Fate] Auto-logging of nearby comments -#define OPTION_CHASEWALK 0x4000 +#define OPTION_HIDE2 0x0002 // apparently some weaker non-GM hide +#define OPTION_CLOAK 0x0004 +#define OPTION_10 0x0010 +#define OPTION_20 0x0020 +#define OPTION_HIDE 0x0040 // [Fate] This is the GM `@hide' flag +#define OPTION_800 0x0800 +#define OPTION_INVISIBILITY 0x1000 // [Fate] Complete invisibility to other clients +#define OPTION_SCRIBE 0x2000 // [Fate] Auto-logging of nearby comments +#define OPTION_CHASEWALK 0x4000 // Below are special clif_changestatus() IDs reserved for option updates -#define CLIF_OPTION_SC_BASE 0x1000 -#define CLIF_OPTION_SC_INVISIBILITY (CLIF_OPTION_SC_BASE) -#define CLIF_OPTION_SC_SCRIBE (CLIF_OPTION_SC_BASE + 1) +#define CLIF_OPTION_SC_BASE 0x1000 +#define CLIF_OPTION_SC_INVISIBILITY (CLIF_OPTION_SC_BASE) +#define CLIF_OPTION_SC_SCRIBE (CLIF_OPTION_SC_BASE + 1) enum { BL_NUL, BL_PC, BL_NPC, BL_MOB, BL_ITEM, BL_CHAT, BL_SKILL, BL_SPELL }; @@ -72,7 +72,7 @@ enum struct block_list { struct block_list *next, *prev; - int id; + int id; short m, x, y; unsigned char type; unsigned char subtype; @@ -85,19 +85,19 @@ struct walkpath_data }; struct script_reg { - int index; - int data; + int index; + int data; }; struct script_regstr { - int index; + int index; char data[256]; }; struct status_change { - int timer; - int val1, val2, val3, val4; - int spell_invocation; /* [Fate] If triggered by a spell, record here */ + int timer; + int val1, val2, val3, val4; + int spell_invocation; /* [Fate] If triggered by a spell, record here */ }; struct invocation; @@ -109,42 +109,42 @@ struct skill_unit struct skill_unit_group *group; - int limit; - int val1, val2; + int limit; + int val1, val2; short alive, range; }; struct skill_unit_group { - int src_id; - int party_id; - int map, range; - int target_flag; + int src_id; + int party_id; + int map, range; + int target_flag; unsigned int tick; - int limit, interval; + int limit, interval; - int skill_id, skill_lv; - int val1, val2; + int skill_id, skill_lv; + int val1, val2; char *valstr; - int unit_id; - int group_id; - int unit_count, alive_count; + int unit_id; + int group_id; + int unit_count, alive_count; struct skill_unit *unit; }; struct skill_unit_group_tickset { unsigned int tick; - int group_id; + int group_id; }; struct skill_timerskill { - int timer; - int src_id; - int target_id; - int map; + int timer; + int src_id; + int target_id; + int map; short x, y; short skill_id, skill_lv; - int type; - int flag; + int type; + int flag; }; struct npc_data; @@ -153,7 +153,7 @@ struct square; struct quick_regeneration { // [Fate] - int amount; // Amount of HP/SP left to regenerate + int amount; // Amount of HP/SP left to regenerate unsigned char speed; // less is faster (number of half-second ticks to wait between updates) unsigned char tickdelay; // number of ticks to next update }; @@ -204,27 +204,27 @@ struct map_session_data unsigned infinite_autospell:1; unsigned deaf:1; } special_state; - int char_id, login_id1, login_id2, sex; + int char_id, login_id1, login_id2, sex; unsigned char tmw_version; // tmw client version struct mmo_charstatus status; struct item_data *inventory_data[MAX_INVENTORY]; short equip_index[11]; - int weight, max_weight; - int cart_weight, cart_max_weight, cart_num, cart_max_num; + int weight, max_weight; + int cart_weight, cart_max_weight, cart_num, cart_max_num; char mapname[24]; - int fd, new_fd; + int fd, new_fd; short to_x, to_y; short speed, prev_speed; short opt1, opt2, opt3; char dir, head_dir; unsigned int client_tick, server_tick; struct walkpath_data walkpath; - int walktimer; - int npc_id, areanpc_id, npc_shopid; - int npc_pos; - int npc_menu; - int npc_amount; - int npc_stack, npc_stackmax; + int walktimer; + int npc_id, areanpc_id, npc_shopid; + int npc_pos; + int npc_menu; + int npc_amount; + int npc_stack, npc_stackmax; const ScriptCode *npc_script, *npc_scriptroot; char *npc_stackbuf; char npc_str[256]; @@ -235,17 +235,17 @@ struct map_session_data } npc_flags; unsigned int chatID; - int attacktimer; - int attacktarget; + int attacktimer; + int attacktarget; short attacktarget_lv; unsigned int attackabletime; - int followtimer; // [MouseJstr] - int followtarget; + int followtimer; // [MouseJstr] + int followtarget; unsigned int cast_tick; // [Fate] Next tick at which spellcasting is allowed struct invocation *active_spells; // [Fate] Singly-linked list of active spells linked to this PC - int attack_spell_override; // [Fate] When an attack spell is active for this player, they trigger it + int attack_spell_override; // [Fate] When an attack spell is active for this player, they trigger it // like a weapon. Check pc_attack_timer() for details. short attack_spell_icon_override; // Weapon equipment slot (slot 4) item override short attack_spell_look_override; // Weapon `look' (attack animation) override @@ -256,8 +256,8 @@ struct map_session_data //_current slowly approximates _target, and _target is determined by equipment. short attackrange, attackrange_; - int skilltimer; - int skilltarget; + int skilltimer; + int skilltarget; short skillx, skilly; short skillid, skilllv; short skillitem, skillitemlv; @@ -266,124 +266,124 @@ struct map_session_data struct skill_unit_group skillunit[MAX_SKILLUNITGROUP]; struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; struct skill_timerskill skilltimerskill[MAX_SKILLTIMERSKILL]; - int cloneskill_id, cloneskill_lv; - int potion_hp, potion_sp, potion_per_hp, potion_per_sp; + int cloneskill_id, cloneskill_lv; + int potion_hp, potion_sp, potion_per_hp, potion_per_sp; // [Fate] Used for gradual healing; amount of enqueued regeneration struct quick_regeneration quick_regeneration_hp, quick_regeneration_sp; // [Fate] XP that can be extracted from this player by healing - int heal_xp; // i.e., OTHER players (healers) can partake in this player's XP + int heal_xp; // i.e., OTHER players (healers) can partake in this player's XP - int invincible_timer; + int invincible_timer; unsigned int canact_tick; unsigned int canmove_tick; unsigned int canlog_tick; - int hp_sub, sp_sub; - int inchealhptick, inchealsptick, inchealspirithptick, + int hp_sub, sp_sub; + int inchealhptick, inchealsptick, inchealspirithptick, inchealspiritsptick; // -- moonsoul (new tick for berserk self-damage) - int berserkdamagetick; - int fame; + int berserkdamagetick; + int fame; short view_class; short weapontype1, weapontype2; short disguiseflag, disguise; // [Valaris] - int paramb[6], paramc[6], parame[6], paramcard[6]; - int hit, flee, flee2, aspd, amotion, dmotion; - int watk, watk2, atkmods[3]; - int def, def2, mdef, mdef2, critical, matk1, matk2; - int atk_ele, def_ele, star, overrefine; - int castrate, hprate, sprate, dsprate; - int addele[10], addrace[12], addsize[3], subele[10], subrace[12]; - int addeff[10], addeff2[10], reseff[10]; - int watk_, watk_2, atkmods_[3], addele_[10], addrace_[12], addsize_[3]; //二刀流のために追加 - int atk_ele_, star_, overrefine_; //二刀流のために追加 - int base_atk, atk_rate; - int arrow_atk, arrow_ele, arrow_cri, arrow_hit, arrow_range; - int arrow_addele[10], arrow_addrace[12], arrow_addsize[3], + int paramb[6], paramc[6], parame[6], paramcard[6]; + int hit, flee, flee2, aspd, amotion, dmotion; + int watk, watk2, atkmods[3]; + int def, def2, mdef, mdef2, critical, matk1, matk2; + int atk_ele, def_ele, star, overrefine; + int castrate, hprate, sprate, dsprate; + int addele[10], addrace[12], addsize[3], subele[10], subrace[12]; + int addeff[10], addeff2[10], reseff[10]; + int watk_, watk_2, atkmods_[3], addele_[10], addrace_[12], addsize_[3]; //二刀流のために追加 + int atk_ele_, star_, overrefine_; //二刀流のために追加 + int base_atk, atk_rate; + int arrow_atk, arrow_ele, arrow_cri, arrow_hit, arrow_range; + int arrow_addele[10], arrow_addrace[12], arrow_addsize[3], arrow_addeff[10], arrow_addeff2[10]; - int nhealhp, nhealsp, nshealhp, nshealsp, nsshealhp, nsshealsp; - int aspd_rate, speed_rate, hprecov_rate, sprecov_rate, critical_def, + int nhealhp, nhealsp, nshealhp, nshealsp, nsshealhp, nsshealsp; + int aspd_rate, speed_rate, hprecov_rate, sprecov_rate, critical_def, double_rate; - int near_attack_def_rate, long_attack_def_rate, magic_def_rate, + int near_attack_def_rate, long_attack_def_rate, magic_def_rate, misc_def_rate; - int matk_rate, ignore_def_ele, ignore_def_race, ignore_def_ele_, + int matk_rate, ignore_def_ele, ignore_def_race, ignore_def_ele_, ignore_def_race_; - int ignore_mdef_ele, ignore_mdef_race; - int magic_addele[10], magic_addrace[12], magic_subrace[12]; - int perfect_hit, get_zeny_num; - int critical_rate, hit_rate, flee_rate, flee2_rate, def_rate, def2_rate, + int ignore_mdef_ele, ignore_mdef_race; + int magic_addele[10], magic_addrace[12], magic_subrace[12]; + int perfect_hit, get_zeny_num; + int critical_rate, hit_rate, flee_rate, flee2_rate, def_rate, def2_rate, mdef_rate, mdef2_rate; - int def_ratio_atk_ele, def_ratio_atk_ele_, def_ratio_atk_race, + int def_ratio_atk_ele, def_ratio_atk_ele_, def_ratio_atk_race, def_ratio_atk_race_; - int add_damage_class_count, add_damage_class_count_, + int add_damage_class_count, add_damage_class_count_, add_magic_damage_class_count; short add_damage_classid[10], add_damage_classid_[10], add_magic_damage_classid[10]; - int add_damage_classrate[10], add_damage_classrate_[10], + int add_damage_classrate[10], add_damage_classrate_[10], add_magic_damage_classrate[10]; short add_def_class_count, add_mdef_class_count; short add_def_classid[10], add_mdef_classid[10]; - int add_def_classrate[10], add_mdef_classrate[10]; + int add_def_classrate[10], add_mdef_classrate[10]; short monster_drop_item_count; short monster_drop_itemid[10]; - int monster_drop_race[10], monster_drop_itemrate[10]; - int double_add_rate, speed_add_rate, aspd_add_rate, perfect_hit_add, + int monster_drop_race[10], monster_drop_itemrate[10]; + int double_add_rate, speed_add_rate, aspd_add_rate, perfect_hit_add, get_zeny_add_num; short splash_range, splash_add_range; short autospell_id, autospell_lv, autospell_rate; short hp_drain_rate, hp_drain_per, sp_drain_rate, sp_drain_per; short hp_drain_rate_, hp_drain_per_, sp_drain_rate_, sp_drain_per_; - int short_weapon_damage_return, long_weapon_damage_return; - int weapon_coma_ele[10], weapon_coma_race[12]; + int short_weapon_damage_return, long_weapon_damage_return; + int weapon_coma_ele[10], weapon_coma_race[12]; short break_weapon_rate, break_armor_rate; short add_steal_rate; short spiritball, spiritball_old; - int spirit_timer[MAX_SKILL_LEVEL]; - int magic_damage_return; // AppleGirl Was Here - int random_attack_increase_add, random_attack_increase_per; // [Valaris] - int perfect_hiding; // [Valaris] - int unbreakable; + int spirit_timer[MAX_SKILL_LEVEL]; + int magic_damage_return; // AppleGirl Was Here + int random_attack_increase_add, random_attack_increase_per; // [Valaris] + int perfect_hiding; // [Valaris] + int unbreakable; - int die_counter; + int die_counter; short doridori_counter; - int reg_num; + int reg_num; struct script_reg *reg; - int regstr_num; + int regstr_num; struct script_regstr *regstr; struct status_change sc_data[MAX_STATUSCHANGE]; short sc_count; struct square dev; - int trade_partner; - int deal_item_index[10]; - int deal_item_amount[10]; - int deal_zeny; + int trade_partner; + int deal_item_index[10]; + int deal_item_amount[10]; + int deal_zeny; short deal_locked; - int party_sended, party_invite, party_invite_account; - int party_hp, party_x, party_y; + int party_sended, party_invite, party_invite_account; + int party_hp, party_x, party_y; - int partyspy; // [Syrus22] + int partyspy; // [Syrus22] char message[80]; - int catch_target_class; + int catch_target_class; - int pvp_point, pvp_rank, pvp_timer, pvp_lastusers; + int pvp_point, pvp_rank, pvp_timer, pvp_lastusers; char eventqueue[MAX_EVENTQUEUE][50]; - int eventtimer[MAX_EVENTTIMER]; + int eventtimer[MAX_EVENTTIMER]; - int last_skillid, last_skilllv; // Added by RoVeRT + int last_skillid, last_skilllv; // Added by RoVeRT struct { char name[24]; } ignore[80]; - int ignoreAll; + int ignoreAll; short sg_count; struct @@ -393,8 +393,8 @@ struct map_session_data time_t chat_reset_due; time_t chat_repeat_reset_due; - int chat_lines_in; - int chat_total_repeats; + int chat_lines_in; + int chat_total_repeats; char chat_lastmsg[513]; unsigned int flood_rates[0x220]; @@ -406,16 +406,16 @@ struct map_session_data struct npc_timerevent_list { - int timer, pos; + int timer, pos; }; struct npc_label_list { char name[24]; - int pos; + int pos; }; struct npc_item_list { - int nameid, value; + int nameid, value; }; struct npc_data { @@ -425,7 +425,7 @@ struct npc_data short speed; char name[24]; char exname[24]; - int chat_id; + int chat_id; short opt1, opt2, opt3, option; short flag; union @@ -434,12 +434,12 @@ struct npc_data { const ScriptCode *script; short xs, ys; - int timer, timerid, timeramount, nexttimer; + int timer, timerid, timeramount, nexttimer; unsigned int timertick; struct npc_timerevent_list *timer_event; - int label_list_num; + int label_list_num; struct npc_label_list *label_list; - int src_id; + int src_id; } scr; struct npc_item_list shop_item[1]; struct @@ -453,12 +453,12 @@ struct npc_data // ここにメンバを追加してはならない(shop_itemが可変長の為) char eventqueue[MAX_EVENTQUEUE][50]; - int eventtimer[MAX_EVENTTIMER]; + int eventtimer[MAX_EVENTTIMER]; short arenaflag; }; -#define MOB_MODE_SUMMONED 0x1000 -#define MOB_MODE_TURNS_AGAINST_BAD_MASTER 0x2000 +#define MOB_MODE_SUMMONED 0x1000 +#define MOB_MODE_TURNS_AGAINST_BAD_MASTER 0x2000 #define MOB_SENSIBLE_MASK 0xf000 // fate: mob mode flags that I actually understand @@ -486,7 +486,7 @@ struct mob_data short base_class, mob_class, dir, mode; short m, x0, y0, xs, ys; char name[24]; - int spawndelay1, spawndelay2; + int spawndelay1, spawndelay2; struct { unsigned state:8; @@ -500,10 +500,10 @@ struct mob_data unsigned walk_easy:1; unsigned special_mob_ai:3; } state; - int timer; + int timer; short to_x, to_y; - int hp; - int target_id, attacked_id; + int hp; + int target_id, attacked_id; short target_lv; struct walkpath_data walkpath; unsigned int next_walktime; @@ -513,8 +513,8 @@ struct mob_data short move_fail_count; struct { - int id; - int dmg; + int id; + int dmg; } dmglog[DAMAGELOG_SIZE]; struct item *lootitem; short lootitem_count; @@ -524,16 +524,16 @@ struct mob_data short opt1, opt2, opt3, option; short min_chase; short sg_count; - int deletetimer; + int deletetimer; - int skilltimer; - int skilltarget; + int skilltimer; + int skilltarget; short skillx, skilly; short skillid, skilllv, skillidx; unsigned int skilldelay[MAX_MOBSKILL]; - int def_ele; - int master_id, master_dist; - int exclusion_src, exclusion_party; + int def_ele; + int master_id, master_dist; + int exclusion_src, exclusion_party; struct skill_timerskill skilltimerskill[MAX_MOBSKILLTIMERSKILL]; struct skill_unit_group skillunit[MAX_MOBSKILLUNITGROUP]; struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; @@ -559,11 +559,11 @@ struct map_data struct block_list **block; struct block_list **block_mob; int *block_count, *block_mob_count; - int m; + int m; short xs, ys; short bxs, bys; - int npc_num; - int users; + int npc_num; + int users; struct { unsigned alias:1; @@ -597,9 +597,9 @@ struct map_data struct npc_data *npc[MAX_NPC_PER_MAP]; struct { - int drop_id; - int drop_type; - int drop_per; + int drop_id; + int drop_type; + int drop_per; } drop_list[MAX_DROP_PER_MAP]; }; struct map_data_other_server @@ -616,8 +616,8 @@ struct flooritem_data { struct block_list bl; short subx, suby; - int cleartimer; - int first_get_id, second_get_id, third_get_id; + int cleartimer; + int first_get_id, second_get_id, third_get_id; unsigned int first_get_tick, second_get_tick, third_get_tick; struct item item_data; }; @@ -719,96 +719,96 @@ extern char talkie_mes[]; extern char wisp_server_name[]; // 鯖全体情報 -void map_setusers (int); -int map_getusers (void); +void map_setusers(int); +int map_getusers(void); // block削除関連 -int map_freeblock (void *bl); -int map_freeblock_lock (void); -int map_freeblock_unlock (void); +int map_freeblock(void *bl); +int map_freeblock_lock(void); +int map_freeblock_unlock(void); // block関連 -int map_addblock (struct block_list *); -int map_delblock (struct block_list *); -void map_foreachinarea (void (*)(struct block_list *, va_list), int, int, int, +int map_addblock(struct block_list *); +int map_delblock(struct block_list *); +void map_foreachinarea(void(*)(struct block_list *, va_list), int, int, int, int, int, int, ...); // -- moonsoul (added map_foreachincell) -void map_foreachincell (void (*)(struct block_list *, va_list), int, int, int, +void map_foreachincell(void(*)(struct block_list *, va_list), int, int, int, int, ...); -void map_foreachinmovearea (void (*)(struct block_list *, va_list), int, int, +void map_foreachinmovearea(void(*)(struct block_list *, va_list), int, int, int, int, int, int, int, int, ...); -int map_countnearpc (int, int, int); +int map_countnearpc(int, int, int); //block関連に追加 -int map_count_oncell (int m, int x, int y); +int map_count_oncell(int m, int x, int y); // 一時的object関連 -int map_addobject (struct block_list *); -int map_delobject (int, int type); -int map_delobjectnofree (int id, int type); -void map_foreachobject (void (*)(struct block_list *, va_list), int, ...); +int map_addobject(struct block_list *); +int map_delobject(int, int type); +int map_delobjectnofree(int id, int type); +void map_foreachobject(void(*)(struct block_list *, va_list), int, ...); // -int map_quit (struct map_session_data *); +int map_quit(struct map_session_data *); // npc -int map_addnpc (int, struct npc_data *); +int map_addnpc(int, struct npc_data *); extern FILE *map_logfile; __attribute__((format(printf, 1, 2))) -void map_write_log (const char *format, ...); +void map_write_log(const char *format, ...); #define MAP_LOG(format, args...) {if (map_logfile) map_write_log(format, ##args);} #define MAP_LOG_PC(sd, fmt, args...) MAP_LOG("PC%d %d:%d,%d " fmt, sd->status.char_id, sd->bl.m, sd->bl.x, sd->bl.y, ## args) // 床アイテム関連 -void map_clearflooritem_timer (timer_id, tick_t, custom_id_t, custom_data_t); +void map_clearflooritem_timer(timer_id, tick_t, custom_id_t, custom_data_t); #define map_clearflooritem(id) map_clearflooritem_timer(0,0,id,1) -int map_addflooritem_any (struct item *, int amount, int m, int x, int y, +int map_addflooritem_any(struct item *, int amount, int m, int x, int y, struct map_session_data **owners, int *owner_protection, int lifetime, int dispersal); -int map_addflooritem (struct item *, int, int, int, int, +int map_addflooritem(struct item *, int, int, int, int, struct map_session_data *, struct map_session_data *, struct map_session_data *, int); -int map_searchrandfreecell (int, int, int, int); +int map_searchrandfreecell(int, int, int, int); // キャラid＝＞キャラ名 変換関連 -void map_addchariddb (int charid, const char *name); -void map_delchariddb (int charid); -int map_reqchariddb (struct map_session_data *sd, int charid); -char *map_charid2nick (int); - -struct map_session_data *map_id2sd (int); -struct block_list *map_id2bl (int); -int map_mapname2mapid (const char *); -int map_mapname2ipport (const char *, struct in_addr *, int *); -int map_setipport (const char *name, struct in_addr ip, int port); -int map_eraseipport (const char *name, struct in_addr ip, int port); -void map_addiddb (struct block_list *); -void map_deliddb (struct block_list *bl); -int map_foreachiddb (db_func_t, ...); -void map_addnickdb (struct map_session_data *); -int map_scriptcont (struct map_session_data *sd, int id); /* Continues a script either on a spell or on an NPC */ -struct map_session_data *map_nick2sd (const char *); -int compare_item (struct item *a, struct item *b); - -struct map_session_data *map_get_first_session (void); -struct map_session_data *map_get_last_session (void); -struct map_session_data *map_get_next_session (struct map_session_data +void map_addchariddb(int charid, const char *name); +void map_delchariddb(int charid); +int map_reqchariddb(struct map_session_data *sd, int charid); +char *map_charid2nick(int); + +struct map_session_data *map_id2sd(int); +struct block_list *map_id2bl(int); +int map_mapname2mapid(const char *); +int map_mapname2ipport(const char *, struct in_addr *, int *); +int map_setipport(const char *name, struct in_addr ip, int port); +int map_eraseipport(const char *name, struct in_addr ip, int port); +void map_addiddb(struct block_list *); +void map_deliddb(struct block_list *bl); +int map_foreachiddb(db_func_t, ...); +void map_addnickdb(struct map_session_data *); +int map_scriptcont(struct map_session_data *sd, int id); /* Continues a script either on a spell or on an NPC */ +struct map_session_data *map_nick2sd(const char *); +int compare_item(struct item *a, struct item *b); + +struct map_session_data *map_get_first_session(void); +struct map_session_data *map_get_last_session(void); +struct map_session_data *map_get_next_session(struct map_session_data *current); -struct map_session_data *map_get_prev_session (struct map_session_data +struct map_session_data *map_get_prev_session(struct map_session_data *current); // gat関連 -int map_getcell (int, int, int); -int map_setcell (int, int, int, int); +int map_getcell(int, int, int); +int map_setcell(int, int, int, int); // その他 -int map_check_dir (int s_dir, int t_dir); -int map_calc_dir (struct block_list *src, int x, int y); +int map_check_dir(int s_dir, int t_dir); +int map_calc_dir(struct block_list *src, int x, int y); // path.cより -int path_search (struct walkpath_data *, int, int, int, int, int, int); -int path_blownpos (int m, int x0, int y0, int dx, int dy, int count); +int path_search(struct walkpath_data *, int, int, int, int, int, int); +int path_blownpos(int m, int x0, int y0, int dx, int dy, int count); -int map_who (int fd); +int map_who(int fd); -void map_helpscreen (void); // [Valaris] -int map_delmap (char *mapname); +void map_helpscreen(void); // [Valaris] +int map_delmap(char *mapname); #endif diff --git a/src/map/mob.cpp b/src/map/mob.cpp index def6851..8d58cb9 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -26,7 +26,7 @@ #endif #ifndef max -#define max( a, b ) ( ((a) > (b)) ? (a) : (b) ) +#define max( a, b ) (((a) > (b)) ? (a) : (b) ) #endif #define MIN_MOBTHINKTIME 100 @@ -40,29 +40,29 @@ struct mob_db mob_db[2001]; * Local prototype declaration (only required thing) *------------------------------------------ */ -static int distance (int, int, int, int); -static int mob_makedummymobdb (int); -static void mob_timer (timer_id, tick_t, custom_id_t, custom_data_t); -int mobskill_deltimer (struct mob_data *md); -int mob_skillid2skillidx (int mob_class, int skillid); -int mobskill_use_id (struct mob_data *md, struct block_list *target, +static int distance(int, int, int, int); +static int mob_makedummymobdb(int); +static void mob_timer(timer_id, tick_t, custom_id_t, custom_data_t); +int mobskill_deltimer(struct mob_data *md); +int mob_skillid2skillidx(int mob_class, int skillid); +int mobskill_use_id(struct mob_data *md, struct block_list *target, int skill_idx); -static int mob_unlocktarget (struct mob_data *md, int tick); +static int mob_unlocktarget(struct mob_data *md, int tick); /*========================================== * Mob is searched with a name. *------------------------------------------ */ -int mobdb_searchname (const char *str) +int mobdb_searchname(const char *str) { - int i; + int i; - for (i = 0; i < sizeof (mob_db) / sizeof (mob_db[0]); i++) + for (i = 0; i < sizeof(mob_db) / sizeof(mob_db[0]); i++) { - if (strcasecmp (mob_db[i].name, str) == 0 - || strcmp (mob_db[i].jname, str) == 0 - || memcmp (mob_db[i].name, str, 24) == 0 - || memcmp (mob_db[i].jname, str, 24) == 0) + if (strcasecmp(mob_db[i].name, str) == 0 + || strcmp(mob_db[i].jname, str) == 0 + || memcmp(mob_db[i].name, str, 24) == 0 + || memcmp(mob_db[i].jname, str, 24) == 0) return i; } @@ -73,45 +73,45 @@ int mobdb_searchname (const char *str) * Id Mob is checked. *------------------------------------------ */ -int mobdb_checkid (const int id) +int mobdb_checkid(const int id) { - if (id <= 0 || id >= (sizeof (mob_db) / sizeof (mob_db[0])) + if (id <= 0 || id >= (sizeof(mob_db) / sizeof(mob_db[0])) || mob_db[id].name[0] == '\0') return 0; return id; } -static void mob_init (struct mob_data *md); +static void mob_init(struct mob_data *md); /*========================================== * The minimum data set for MOB spawning *------------------------------------------ */ static -int mob_spawn_dataset (struct mob_data *md, const char *mobname, int mob_class) +int mob_spawn_dataset(struct mob_data *md, const char *mobname, int mob_class) { - nullpo_retr (0, md); + nullpo_retr(0, md); - if (strcmp (mobname, "--en--") == 0) - memcpy (md->name, mob_db[mob_class].name, 24); - else if (strcmp (mobname, "--ja--") == 0) - memcpy (md->name, mob_db[mob_class].jname, 24); + if (strcmp(mobname, "--en--") == 0) + memcpy(md->name, mob_db[mob_class].name, 24); + else if (strcmp(mobname, "--ja--") == 0) + memcpy(md->name, mob_db[mob_class].jname, 24); else - memcpy (md->name, mobname, 24); + memcpy(md->name, mobname, 24); md->bl.prev = NULL; md->bl.next = NULL; md->n = 0; md->base_class = md->mob_class = mob_class; - md->bl.id = npc_get_new_npc_id (); + md->bl.id = npc_get_new_npc_id(); - memset (&md->state, 0, sizeof (md->state)); + memset(&md->state, 0, sizeof(md->state)); md->timer = -1; md->target_id = 0; md->attacked_id = 0; - mob_init (md); + mob_init(md); return 0; } @@ -183,25 +183,25 @@ static int mutation_base[MOB_XP_BONUS] = { * Mutates a MOB. For large `direction' values, calling this multiple times will give bigger XP boni. *---------------------------------------- */ -static void mob_mutate (struct mob_data *md, int stat, int intensity) // intensity: positive: strengthen, negative: weaken. 256 = 100%. +static void mob_mutate(struct mob_data *md, int stat, int intensity) // intensity: positive: strengthen, negative: weaken. 256 = 100%. { - int old_stat; - int new_stat; - int real_intensity; // relative intensity + int old_stat; + int new_stat; + int real_intensity; // relative intensity const int mut_base = mutation_base[stat]; - int sign = 1; + int sign = 1; if (!md || stat < 0 || stat >= MOB_XP_BONUS || intensity == 0) return; while (intensity > mutation_scale[stat]) { - mob_mutate (md, stat, mutation_scale[stat]); // give better XP assignments + mob_mutate(md, stat, mutation_scale[stat]); // give better XP assignments intensity -= mutation_scale[stat]; } while (intensity < -mutation_scale[stat]) { - mob_mutate (md, stat, mutation_scale[stat]); // give better XP assignments + mob_mutate(md, stat, mutation_scale[stat]); // give better XP assignments intensity += mutation_scale[stat]; } @@ -228,7 +228,7 @@ static void mob_mutate (struct mob_data *md, int stat, int intensity) // inten { // Now compute the mutation intensity relative to an absolute value. // Take the lesser of the two effects. - int real_intensity2 = (((new_stat - old_stat) << 8) / mut_base); + int real_intensity2 = (((new_stat - old_stat) << 8) / mut_base); if (real_intensity < 0) if (real_intensity2 > real_intensity) @@ -251,7 +251,7 @@ static void mob_mutate (struct mob_data *md, int stat, int intensity) // inten // Sanitise if (md->stats[MOB_ATK1] > md->stats[MOB_ATK2]) { - int swap = md->stats[MOB_ATK2]; + int swap = md->stats[MOB_ATK2]; md->stats[MOB_ATK2] = md->stats[MOB_ATK1]; md->stats[MOB_ATK1] = swap; } @@ -259,7 +259,7 @@ static void mob_mutate (struct mob_data *md, int stat, int intensity) // inten // This calculates the exp of a given mob static -int mob_gen_exp (struct mob_db *mob) +int mob_gen_exp(struct mob_db *mob) { if (mob->max_hp <= 1) return 1; @@ -273,25 +273,25 @@ int mob_gen_exp (struct mob_db *mob) (mob->atk1 + mob->atk2 + mob->str / 3.0 + mob->dex / 2.0 + mob->luk) * (1872.0 / mob->adelay) / 4; double dodge_factor = - pow (mob->lv + mob->agi + mob->luk / 2.0, 4.0 / 3.0); + pow(mob->lv + mob->agi + mob->luk / 2.0, 4.0 / 3.0); double persuit_factor = (3 + mob->range) * (mob->mode % 2) * 1000 / mob->speed; double aggression_factor = (mob->mode & 4) == 4 ? 10.0 / 9.0 : 1.0; - int xp = - (int) floor (effective_hp * - pow (sqrt (attack_factor) + sqrt (dodge_factor) + - sqrt (persuit_factor) + 55, + int xp = + (int) floor(effective_hp * + pow(sqrt(attack_factor) + sqrt(dodge_factor) + + sqrt(persuit_factor) + 55, 3) * aggression_factor / 2000000.0 * (double) battle_config.base_exp_rate / 100.); if (xp < 1) xp = 1; - printf ("Exp for mob '%s' generated: %d\n", mob->name, xp); + printf("Exp for mob '%s' generated: %d\n", mob->name, xp); return xp; } -static void mob_init (struct mob_data *md) +static void mob_init(struct mob_data *md) { - int i; + int i; const int mob_class = md->mob_class; const int mutations_nr = mob_db[mob_class].mutations_nr; const int mutation_power = mob_db[mob_class].mutation_power; @@ -314,23 +314,23 @@ static void mob_init (struct mob_data *md) for (i = 0; i < mutations_nr; i++) { - int stat_nr = MRAND (MOB_XP_BONUS + 1); - int strength; + int stat_nr = MRAND(MOB_XP_BONUS + 1); + int strength; if (stat_nr >= MOB_XP_BONUS) stat_nr = MOB_MAX_HP; strength = - ((MRAND ((mutation_power >> 1)) + - (MRAND ((mutation_power >> 1))) + + ((MRAND((mutation_power >> 1)) + + (MRAND((mutation_power >> 1))) + 2) * mutation_scale[stat_nr]) / 100; - strength = MRAND (2) ? strength : -strength; + strength = MRAND(2) ? strength : -strength; if (strength < -240) strength = -240; /* Don't go too close to zero */ - mob_mutate (md, stat_nr, strength); + mob_mutate(md, stat_nr, strength); } } @@ -338,35 +338,35 @@ static void mob_init (struct mob_data *md) * The MOB appearance for one time (for scripts) *------------------------------------------ */ -int mob_once_spawn (struct map_session_data *sd, const char *mapname, +int mob_once_spawn(struct map_session_data *sd, const char *mapname, int x, int y, const char *mobname, int mob_class, int amount, const char *event) { struct mob_data *md = NULL; - int m, count, lv = 255, r = mob_class; + int m, count, lv = 255, r = mob_class; if (sd) lv = sd->status.base_level; - if (sd && strcmp (mapname, "this") == 0) + if (sd && strcmp(mapname, "this") == 0) m = sd->bl.m; else - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); if (m < 0 || amount <= 0 || (mob_class >= 0 && mob_class <= 1000) || mob_class > 2000) // 値が異常なら召喚を止める return 0; if (mob_class < 0) { // ランダムに召喚 - int i = 0; - int j = -mob_class - 1; - int k; + int i = 0; + int j = -mob_class - 1; + int k; if (j >= 0 && j < MAX_RANDOMMONSTER) { do { - mob_class = MPRAND (1001, 1000); - k = MRAND (1000000); + mob_class = MPRAND(1001, 1000); + k = MRAND(1000000); } while ((mob_db[mob_class].max_hp <= 0 || mob_db[mob_class].summonper[j] <= k @@ -394,19 +394,19 @@ int mob_once_spawn (struct map_session_data *sd, const char *mapname, } else if (x <= 0 || y <= 0) { - printf ("mob_once_spawn: ??\n"); + printf("mob_once_spawn: ??\n"); } for (count = 0; count < amount; count++) { - md = (struct mob_data *) calloc (1, sizeof (struct mob_data)); + md = (struct mob_data *) calloc(1, sizeof(struct mob_data)); if (mob_db[mob_class].mode & 0x02) md->lootitem = - (struct item *) calloc (LOOTITEM_SIZE, sizeof (struct item)); + (struct item *) calloc(LOOTITEM_SIZE, sizeof(struct item)); else md->lootitem = NULL; - mob_spawn_dataset (md, mobname, mob_class); + mob_spawn_dataset(md, mobname, mob_class); md->bl.m = m; md->bl.x = x; md->bl.y = y; @@ -420,11 +420,11 @@ int mob_once_spawn (struct map_session_data *sd, const char *mapname, md->spawndelay1 = -1; // Only once is a flag. md->spawndelay2 = -1; // Only once is a flag. - memcpy (md->npc_event, event, sizeof (md->npc_event)); + memcpy(md->npc_event, event, sizeof(md->npc_event)); md->bl.type = BL_MOB; - map_addiddb (&md->bl); - mob_spawn (md->bl.id); + map_addiddb(&md->bl); + mob_spawn(md->bl.id); } return (amount > 0) ? md->bl.id : 0; } @@ -433,18 +433,18 @@ int mob_once_spawn (struct map_session_data *sd, const char *mapname, * The MOB appearance for one time (& area specification for scripts) *------------------------------------------ */ -int mob_once_spawn_area (struct map_session_data *sd, const char *mapname, +int mob_once_spawn_area(struct map_session_data *sd, const char *mapname, int x0, int y0, int x1, int y1, const char *mobname, int mob_class, int amount, const char *event) { - int x, y, i, c, max, lx = -1, ly = -1, id = 0; - int m; + int x, y, i, c, max, lx = -1, ly = -1, id = 0; + int m; - if (strcmp (mapname, "this") == 0) + if (strcmp(mapname, "this") == 0) m = sd->bl.m; else - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); max = (y1 - y0 + 1) * (x1 - x0 + 1) * 3; if (max > 1000) @@ -455,13 +455,13 @@ int mob_once_spawn_area (struct map_session_data *sd, const char *mapname, for (i = 0; i < amount; i++) { - int j = 0; + int j = 0; do { - x = MPRAND (x0, (x1 - x0 + 1)); - y = MPRAND (y0, (y1 - y0 + 1)); + x = MPRAND(x0, (x1 - x0 + 1)); + y = MPRAND(y0, (y1 - y0 + 1)); } - while (((c = map_getcell (m, x, y)) == 1 || c == 5) && (++j) < max); + while (((c = map_getcell(m, x, y)) == 1 || c == 5) && (++j) < max); if (j >= max) { if (lx >= 0) @@ -472,7 +472,7 @@ int mob_once_spawn_area (struct map_session_data *sd, const char *mapname, else return 0; // Since reference of the place which boils first went wrong, it stops. } - id = mob_once_spawn (sd, mapname, x, y, mobname, mob_class, 1, event); + id = mob_once_spawn(sd, mapname, x, y, mobname, mob_class, 1, event); lx = x; ly = y; } @@ -483,20 +483,20 @@ int mob_once_spawn_area (struct map_session_data *sd, const char *mapname, * Summoning Guardians [Valaris] *------------------------------------------ */ -int mob_spawn_guardian (struct map_session_data *sd, const char *mapname, +int mob_spawn_guardian(struct map_session_data *sd, const char *mapname, int x, int y, const char *mobname, int mob_class, int amount, const char *event, int guardian) { struct mob_data *md = NULL; - int m, count = 1, lv = 255; + int m, count = 1, lv = 255; if (sd) lv = sd->status.base_level; - if (sd && strcmp (mapname, "this") == 0) + if (sd && strcmp(mapname, "this") == 0) m = sd->bl.m; else - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); if (m < 0 || amount <= 0 || (mob_class >= 0 && mob_class <= 1000) || mob_class > 2000) // 値が異常なら召喚を止める return 0; @@ -513,13 +513,13 @@ int mob_spawn_guardian (struct map_session_data *sd, const char *mapname, } else if (x <= 0 || y <= 0) - printf ("mob_spawn_guardian: ??\n"); + printf("mob_spawn_guardian: ??\n"); for (count = 0; count < amount; count++) { - CREATE (md, struct mob_data, 1); + CREATE(md, struct mob_data, 1); - mob_spawn_dataset (md, mobname, mob_class); + mob_spawn_dataset(md, mobname, mob_class); md->bl.m = m; md->bl.x = x; md->bl.y = y; @@ -531,11 +531,11 @@ int mob_spawn_guardian (struct map_session_data *sd, const char *mapname, md->spawndelay1 = -1; // Only once is a flag. md->spawndelay2 = -1; // Only once is a flag. - memcpy (md->npc_event, event, sizeof (md->npc_event)); + memcpy(md->npc_event, event, sizeof(md->npc_event)); md->bl.type = BL_MOB; - map_addiddb (&md->bl); - mob_spawn (md->bl.id); + map_addiddb(&md->bl); + mob_spawn(md->bl.id); } return (amount > 0) ? md->bl.id : 0; @@ -545,57 +545,57 @@ int mob_spawn_guardian (struct map_session_data *sd, const char *mapname, * Appearance income of mob *------------------------------------------ */ -int mob_get_viewclass (int mob_class) +int mob_get_viewclass(int mob_class) { return mob_db[mob_class].view_class; } -int mob_get_sex (int mob_class) +int mob_get_sex(int mob_class) { return mob_db[mob_class].sex; } -short mob_get_hair (int mob_class) +short mob_get_hair(int mob_class) { return mob_db[mob_class].hair; } -short mob_get_hair_color (int mob_class) +short mob_get_hair_color(int mob_class) { return mob_db[mob_class].hair_color; } -short mob_get_weapon (int mob_class) +short mob_get_weapon(int mob_class) { return mob_db[mob_class].weapon; } -short mob_get_shield (int mob_class) +short mob_get_shield(int mob_class) { return mob_db[mob_class].shield; } -short mob_get_head_top (int mob_class) +short mob_get_head_top(int mob_class) { return mob_db[mob_class].head_top; } -short mob_get_head_mid (int mob_class) +short mob_get_head_mid(int mob_class) { return mob_db[mob_class].head_mid; } -short mob_get_head_buttom (int mob_class) +short mob_get_head_buttom(int mob_class) { return mob_db[mob_class].head_buttom; } -short mob_get_clothes_color (int mob_class) // Add for player monster dye - Valaris +short mob_get_clothes_color(int mob_class) // Add for player monster dye - Valaris { return mob_db[mob_class].clothes_color; // End } -int mob_get_equip (int mob_class) // mob equip [Valaris] +int mob_get_equip(int mob_class) // mob equip [Valaris] { return mob_db[mob_class].equip; } @@ -605,11 +605,11 @@ int mob_get_equip (int mob_class) // mob equip [Valaris] *------------------------------------------ */ static -int mob_can_move (struct mob_data *md) +int mob_can_move(struct mob_data *md) { - nullpo_retr (0, md); + nullpo_retr(0, md); - if (md->canmove_tick > gettick () || (md->opt1 > 0 && md->opt1 != 6) + if (md->canmove_tick > gettick() || (md->opt1 > 0 && md->opt1 != 6) || md->option & 2) return 0; // アンクル中で動けないとか @@ -627,32 +627,32 @@ int mob_can_move (struct mob_data *md) * Time calculation concerning one step next to mob *------------------------------------------ */ -static int calc_next_walk_step (struct mob_data *md) +static int calc_next_walk_step(struct mob_data *md) { - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->walkpath.path_pos >= md->walkpath.path_len) return -1; if (md->walkpath.path[md->walkpath.path_pos] & 1) - return battle_get_speed (&md->bl) * 14 / 10; - return battle_get_speed (&md->bl); + return battle_get_speed(&md->bl) * 14 / 10; + return battle_get_speed(&md->bl); } -static int mob_walktoxy_sub (struct mob_data *md); +static int mob_walktoxy_sub(struct mob_data *md); /*========================================== * Mob Walk processing *------------------------------------------ */ -static int mob_walk (struct mob_data *md, unsigned int tick, int data) +static int mob_walk(struct mob_data *md, unsigned int tick, int data) { - int moveblock; - int i, ctype; + int moveblock; + int i, ctype; static int dirx[8] = { 0, -1, -1, -1, 0, 1, 1, 1 }; static int diry[8] = { 1, 1, 0, -1, -1, -1, 0, 1 }; - int x, y, dx, dy; + int x, y, dx, dy; - nullpo_retr (0, md); + nullpo_retr(0, md); md->state.state = MS_IDLE; if (md->walkpath.path_pos >= md->walkpath.path_len @@ -665,7 +665,7 @@ static int mob_walk (struct mob_data *md, unsigned int tick, int data) md->walkpath.path_pos++; if (md->state.change_walk_target) { - mob_walktoxy_sub (md); + mob_walktoxy_sub(md); return 0; } } @@ -676,20 +676,20 @@ static int mob_walk (struct mob_data *md, unsigned int tick, int data) x = md->bl.x; y = md->bl.y; - ctype = map_getcell (md->bl.m, x, y); + ctype = map_getcell(md->bl.m, x, y); if (ctype == 1 || ctype == 5) { - mob_stop_walking (md, 1); + mob_stop_walking(md, 1); return 0; } md->dir = md->walkpath.path[md->walkpath.path_pos]; dx = dirx[md->dir]; dy = diry[md->dir]; - ctype = map_getcell (md->bl.m, x + dx, y + dy); + ctype = map_getcell(md->bl.m, x + dx, y + dy); if (ctype == 1 || ctype == 5) { - mob_walktoxy_sub (md); + mob_walktoxy_sub(md); return 0; } @@ -697,7 +697,7 @@ static int mob_walk (struct mob_data *md, unsigned int tick, int data) || y / BLOCK_SIZE != (y + dy) / BLOCK_SIZE); md->state.state = MS_WALK; - map_foreachinmovearea (clif_moboutsight, md->bl.m, x - AREA_SIZE, + map_foreachinmovearea(clif_moboutsight, md->bl.m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, dx, dy, BL_PC, md); @@ -707,33 +707,33 @@ static int mob_walk (struct mob_data *md, unsigned int tick, int data) md->min_chase--; if (moveblock) - map_delblock (&md->bl); + map_delblock(&md->bl); md->bl.x = x; md->bl.y = y; if (moveblock) - map_addblock (&md->bl); + map_addblock(&md->bl); - map_foreachinmovearea (clif_mobinsight, md->bl.m, x - AREA_SIZE, + map_foreachinmovearea(clif_mobinsight, md->bl.m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, -dx, -dy, BL_PC, md); md->state.state = MS_IDLE; if (md->option & 4) - skill_check_cloaking (&md->bl); + skill_check_cloaking(&md->bl); - skill_unit_move (&md->bl, tick, 1); // Inspection of a skill unit + skill_unit_move(&md->bl, tick, 1); // Inspection of a skill unit } - if ((i = calc_next_walk_step (md)) > 0) + if ((i = calc_next_walk_step(md)) > 0) { i = i >> 1; if (i < 1 && md->walkpath.path_half == 0) i = 1; md->timer = - add_timer (tick + i, mob_timer, md->bl.id, md->walkpath.path_pos); + add_timer(tick + i, mob_timer, md->bl.id, md->walkpath.path_pos); md->state.state = MS_WALK; if (md->walkpath.path_pos >= md->walkpath.path_len) - clif_fixmobpos (md); // When mob stops, retransmission current of a position. + clif_fixmobpos(md); // When mob stops, retransmission current of a position. } return 0; } @@ -742,15 +742,15 @@ static int mob_walk (struct mob_data *md, unsigned int tick, int data) * Check if mob should be attempting to attack *------------------------------------------ */ -static int mob_check_attack (struct mob_data *md) +static int mob_check_attack(struct mob_data *md) { struct block_list *tbl = NULL; struct map_session_data *tsd = NULL; struct mob_data *tmd = NULL; - int mode, race, range; + int mode, race, range; - nullpo_retr (0, md); + nullpo_retr(0, md); md->min_chase = 13; md->state.state = MS_IDLE; @@ -768,7 +768,7 @@ static int mob_check_attack (struct mob_data *md) if (md->sc_data[SC_BLADESTOP].timer != -1) return 0; - if ((tbl = map_id2bl (md->target_id)) == NULL) + if ((tbl = map_id2bl(md->target_id)) == NULL) { md->target_id = 0; md->state.targettype = NONE_ATTACKABLE; @@ -784,9 +784,9 @@ static int mob_check_attack (struct mob_data *md) if (tsd) { - if (pc_isdead (tsd) || tsd->invincible_timer != -1 - || pc_isinvisible (tsd) || md->bl.m != tbl->m || tbl->prev == NULL - || distance (md->bl.x, md->bl.y, tbl->x, tbl->y) >= 13) + if (pc_isdead(tsd) || tsd->invincible_timer != -1 + || pc_isinvisible(tsd) || md->bl.m != tbl->m || tbl->prev == NULL + || distance(md->bl.x, md->bl.y, tbl->x, tbl->y) >= 13) { md->target_id = 0; md->state.targettype = NONE_ATTACKABLE; @@ -796,7 +796,7 @@ static int mob_check_attack (struct mob_data *md) if (tmd) { if (md->bl.m != tbl->m || tbl->prev == NULL - || distance (md->bl.x, md->bl.y, tbl->x, tbl->y) >= 13) + || distance(md->bl.x, md->bl.y, tbl->x, tbl->y) >= 13) { md->target_id = 0; md->state.targettype = NONE_ATTACKABLE; @@ -817,7 +817,7 @@ static int mob_check_attack (struct mob_data *md) return 0; } if (tsd && !(mode & 0x20) && (tsd->sc_data[SC_TRICKDEAD].timer != -1 || - ((pc_ishiding (tsd) + ((pc_ishiding(tsd) || tsd->state.gangsterparadise) && race != 4 && race != 6))) { @@ -829,7 +829,7 @@ static int mob_check_attack (struct mob_data *md) range = mob_db[md->mob_class].range; if (mode & 1) range++; - if (distance (md->bl.x, md->bl.y, tbl->x, tbl->y) > range) + if (distance(md->bl.x, md->bl.y, tbl->x, tbl->y) > range) return 0; return 1; @@ -849,28 +849,28 @@ void mob_ancillary_attack(struct block_list *bl, va_list ap) * Attack processing of mob *------------------------------------------ */ -static int mob_attack (struct mob_data *md, unsigned int tick, int data) +static int mob_attack(struct mob_data *md, unsigned int tick, int data) { struct block_list *tbl = NULL; - nullpo_retr (0, md); + nullpo_retr(0, md); - if ((tbl = map_id2bl (md->target_id)) == NULL) + if ((tbl = map_id2bl(md->target_id)) == NULL) return 0; - if (!mob_check_attack (md)) + if (!mob_check_attack(md)) return 0; if (battle_config.monster_attack_direction_change) - md->dir = map_calc_dir (&md->bl, tbl->x, tbl->y); // 向き設定 + md->dir = map_calc_dir(&md->bl, tbl->x, tbl->y); // 向き設定 //clif_fixmobpos(md); md->state.skillstate = MSS_ATTACK; - if (mobskill_use (md, tick, -2)) // スキル使用 + if (mobskill_use(md, tick, -2)) // スキル使用 return 0; - md->target_lv = battle_weapon_attack (&md->bl, tbl, tick, 0); + md->target_lv = battle_weapon_attack(&md->bl, tbl, tick, 0); // If you are reading this, please note: // it is highly platform-specific that this even works at all. int radius = battle_config.mob_splash_radius; @@ -882,11 +882,11 @@ static int mob_attack (struct mob_data *md, unsigned int tick, int data) if (!(battle_config.monster_cloak_check_type & 2) && md->sc_data[SC_CLOAKING].timer != -1) - skill_status_change_end (&md->bl, SC_CLOAKING, -1); + skill_status_change_end(&md->bl, SC_CLOAKING, -1); - md->attackabletime = tick + battle_get_adelay (&md->bl); + md->attackabletime = tick + battle_get_adelay(&md->bl); - md->timer = add_timer (md->attackabletime, mob_timer, md->bl.id, 0); + md->timer = add_timer(md->attackabletime, mob_timer, md->bl.id, 0); md->state.state = MS_ATTACK; return 0; @@ -898,16 +898,16 @@ static int mob_attack (struct mob_data *md, unsigned int tick, int data) *------------------------------------------ */ static -int mob_stopattacked (struct map_session_data *sd, va_list ap) +int mob_stopattacked(struct map_session_data *sd, va_list ap) { - int id; + int id; - nullpo_retr (0, sd); - nullpo_retr (0, ap); + nullpo_retr(0, sd); + nullpo_retr(0, ap); - id = va_arg (ap, int); + id = va_arg(ap, int); if (sd->attacktarget == id) - pc_stopattack (sd); + pc_stopattack(sd); return 0; } @@ -915,66 +915,66 @@ int mob_stopattacked (struct map_session_data *sd, va_list ap) * The timer in which the mob's states changes *------------------------------------------ */ -int mob_changestate (struct mob_data *md, int state, int type) +int mob_changestate(struct mob_data *md, int state, int type) { unsigned int tick; - int i; + int i; - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->timer != -1) - delete_timer (md->timer, mob_timer); + delete_timer(md->timer, mob_timer); md->timer = -1; md->state.state = state; switch (state) { case MS_WALK: - if ((i = calc_next_walk_step (md)) > 0) + if ((i = calc_next_walk_step(md)) > 0) { i = i >> 2; md->timer = - add_timer (gettick () + i, mob_timer, md->bl.id, 0); + add_timer(gettick() + i, mob_timer, md->bl.id, 0); } else md->state.state = MS_IDLE; break; case MS_ATTACK: - tick = gettick (); - i = DIFF_TICK (md->attackabletime, tick); + tick = gettick(); + i = DIFF_TICK(md->attackabletime, tick); if (i > 0 && i < 2000) md->timer = - add_timer (md->attackabletime, mob_timer, md->bl.id, 0); + add_timer(md->attackabletime, mob_timer, md->bl.id, 0); else if (type) { - md->attackabletime = tick + battle_get_amotion (&md->bl); + md->attackabletime = tick + battle_get_amotion(&md->bl); md->timer = - add_timer (md->attackabletime, mob_timer, md->bl.id, 0); + add_timer(md->attackabletime, mob_timer, md->bl.id, 0); } else { md->attackabletime = tick + 1; md->timer = - add_timer (md->attackabletime, mob_timer, md->bl.id, 0); + add_timer(md->attackabletime, mob_timer, md->bl.id, 0); } break; case MS_DELAY: md->timer = - add_timer (gettick () + type, mob_timer, md->bl.id, 0); + add_timer(gettick() + type, mob_timer, md->bl.id, 0); break; case MS_DEAD: - skill_castcancel (&md->bl, 0); + skill_castcancel(&md->bl, 0); // mobskill_deltimer(md); md->state.skillstate = MSS_DEAD; - md->last_deadtime = gettick (); + md->last_deadtime = gettick(); // Since it died, all aggressors' attack to this mob is stopped. - clif_foreachclient (mob_stopattacked, md->bl.id); - skill_unit_out_all (&md->bl, gettick (), 1); - skill_status_change_clear (&md->bl, 2); // The abnormalities in status are canceled. - skill_clear_unitgroup (&md->bl); // All skill unit groups are deleted. - skill_cleartimerskill (&md->bl); + clif_foreachclient(mob_stopattacked, md->bl.id); + skill_unit_out_all(&md->bl, gettick(), 1); + skill_status_change_clear(&md->bl, 2); // The abnormalities in status are canceled. + skill_clear_unitgroup(&md->bl); // All skill unit groups are deleted. + skill_cleartimerskill(&md->bl); if (md->deletetimer != -1) - delete_timer (md->deletetimer, mob_timer_delete); + delete_timer(md->deletetimer, mob_timer_delete); md->deletetimer = -1; md->hp = md->target_id = md->attacked_id = 0; md->state.targettype = NONE_ATTACKABLE; @@ -989,12 +989,12 @@ int mob_changestate (struct mob_data *md, int state, int type) * It branches to a walk and an attack. *------------------------------------------ */ -static void mob_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void mob_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct mob_data *md; struct block_list *bl; - if ((bl = map_id2bl (id)) == NULL) + if ((bl = map_id2bl(id)) == NULL) { //攻撃してきた敵がもういないのは正常のようだ return; } @@ -1002,7 +1002,7 @@ static void mob_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t if (!bl || !bl->type || bl->type != BL_MOB) return; - nullpo_retv (md = (struct mob_data *) bl); + nullpo_retv(md = (struct mob_data *) bl); if (!md->bl.type || md->bl.type != BL_MOB) return; @@ -1010,32 +1010,32 @@ static void mob_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t if (md->timer != tid) { if (battle_config.error_log == 1) - printf ("mob_timer %d != %d\n", md->timer, tid); + printf("mob_timer %d != %d\n", md->timer, tid); return; } md->timer = -1; if (md->bl.prev == NULL || md->state.state == MS_DEAD) return; - map_freeblock_lock (); + map_freeblock_lock(); switch (md->state.state) { case MS_WALK: - mob_check_attack (md); - mob_walk (md, tick, data); + mob_check_attack(md); + mob_walk(md, tick, data); break; case MS_ATTACK: - mob_attack (md, tick, data); + mob_attack(md, tick, data); break; case MS_DELAY: - mob_changestate (md, MS_IDLE, 0); + mob_changestate(md, MS_IDLE, 0); break; default: if (battle_config.error_log == 1) - printf ("mob_timer : %d ?\n", md->state.state); + printf("mob_timer : %d ?\n", md->state.state); break; } - map_freeblock_unlock (); + map_freeblock_unlock(); return; } @@ -1043,21 +1043,20 @@ static void mob_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t * *------------------------------------------ */ -static int mob_walktoxy_sub (struct mob_data *md) +static int mob_walktoxy_sub(struct mob_data *md) { struct walkpath_data wpd; - nullpo_retr (0, md); + nullpo_retr(0, md); - if (path_search - (&wpd, md->bl.m, md->bl.x, md->bl.y, md->to_x, md->to_y, + if (path_search(&wpd, md->bl.m, md->bl.x, md->bl.y, md->to_x, md->to_y, md->state.walk_easy)) return 1; - memcpy (&md->walkpath, &wpd, sizeof (wpd)); + memcpy(&md->walkpath, &wpd, sizeof(wpd)); md->state.change_walk_target = 0; - mob_changestate (md, MS_WALK, 0); - clif_movemob (md); + mob_changestate(md, MS_WALK, 0); + clif_movemob(md); return 0; } @@ -1066,14 +1065,14 @@ static int mob_walktoxy_sub (struct mob_data *md) * mob move start *------------------------------------------ */ -int mob_walktoxy (struct mob_data *md, int x, int y, int easy) +int mob_walktoxy(struct mob_data *md, int x, int y, int easy) { struct walkpath_data wpd; - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->state.state == MS_WALK - && path_search (&wpd, md->bl.m, md->bl.x, md->bl.y, x, y, easy)) + && path_search(&wpd, md->bl.m, md->bl.x, md->bl.y, x, y, easy)) return 1; md->state.walk_easy = easy; @@ -1085,7 +1084,7 @@ int mob_walktoxy (struct mob_data *md, int x, int y, int easy) } else { - return mob_walktoxy_sub (md); + return mob_walktoxy_sub(md); } return 0; @@ -1095,9 +1094,9 @@ int mob_walktoxy (struct mob_data *md, int x, int y, int easy) * mob spawn with delay (timer function) *------------------------------------------ */ -static void mob_delayspawn (timer_id tid, tick_t tick, custom_id_t m, custom_data_t n) +static void mob_delayspawn(timer_id tid, tick_t tick, custom_id_t m, custom_data_t n) { - mob_spawn (m); + mob_spawn(m); } /*========================================== @@ -1105,19 +1104,19 @@ static void mob_delayspawn (timer_id tid, tick_t tick, custom_id_t m, custom_dat *------------------------------------------ */ static -int mob_setdelayspawn (int id) +int mob_setdelayspawn(int id) { unsigned int spawntime, spawntime1, spawntime2, spawntime3; struct mob_data *md; struct block_list *bl; - if ((bl = map_id2bl (id)) == NULL) + if ((bl = map_id2bl(id)) == NULL) return -1; if (!bl || !bl->type || bl->type != BL_MOB) return -1; - nullpo_retr (-1, md = (struct mob_data *) bl); + nullpo_retr(-1, md = (struct mob_data *) bl); if (!md || md->bl.type != BL_MOB) return -1; @@ -1125,21 +1124,21 @@ int mob_setdelayspawn (int id) // Processing of MOB which is not revitalized if (md->spawndelay1 == -1 && md->spawndelay2 == -1 && md->n == 0) { - map_deliddb (&md->bl); + map_deliddb(&md->bl); if (md->lootitem) { - map_freeblock (md->lootitem); + map_freeblock(md->lootitem); md->lootitem = NULL; } - map_freeblock (md); // Instead of [ of free ] + map_freeblock(md); // Instead of [ of free ] return 0; } spawntime1 = md->last_spawntime + md->spawndelay1; spawntime2 = md->last_deadtime + md->spawndelay2; - spawntime3 = gettick () + 5000; + spawntime3 = gettick() + 5000; // spawntime = max(spawntime1,spawntime2,spawntime3); - if (DIFF_TICK (spawntime1, spawntime2) > 0) + if (DIFF_TICK(spawntime1, spawntime2) > 0) { spawntime = spawntime1; } @@ -1147,12 +1146,12 @@ int mob_setdelayspawn (int id) { spawntime = spawntime2; } - if (DIFF_TICK (spawntime3, spawntime) > 0) + if (DIFF_TICK(spawntime3, spawntime) > 0) { spawntime = spawntime3; } - add_timer (spawntime, mob_delayspawn, id, 0); + add_timer(spawntime, mob_delayspawn, id, 0); return 0; } @@ -1160,19 +1159,19 @@ int mob_setdelayspawn (int id) * Mob spawning. Initialization is also variously here. *------------------------------------------ */ -int mob_spawn (int id) +int mob_spawn(int id) { - int x = 0, y = 0, i = 0, c; - unsigned int tick = gettick (); + int x = 0, y = 0, i = 0, c; + unsigned int tick = gettick(); struct mob_data *md; struct block_list *bl; - nullpo_retr (-1, bl = map_id2bl (id)); + nullpo_retr(-1, bl = map_id2bl(id)); if (!bl || !bl->type || bl->type != BL_MOB) return -1; - nullpo_retr (-1, md = (struct mob_data *) bl); + nullpo_retr(-1, md = (struct mob_data *) bl); if (!md || !md->bl.type || md->bl.type != BL_MOB) return -1; @@ -1181,8 +1180,8 @@ int mob_spawn (int id) if (md->bl.prev != NULL) { // clif_clearchar_area(&md->bl,3); - skill_unit_out_all (&md->bl, gettick (), 1); - map_delblock (&md->bl); + skill_unit_out_all(&md->bl, gettick(), 1); + map_delblock(&md->bl); } else md->mob_class = md->base_class; @@ -1192,23 +1191,23 @@ int mob_spawn (int id) { if (md->x0 == 0 && md->y0 == 0) { - x = MPRAND (1, (map[md->bl.m].xs - 2)); - y = MPRAND (1, (map[md->bl.m].ys - 2)); + x = MPRAND(1, (map[md->bl.m].xs - 2)); + y = MPRAND(1, (map[md->bl.m].ys - 2)); } else { - x = MPRAND (md->x0, (md->xs + 1)) - md->xs / 2; - y = MPRAND (md->y0, (md->ys + 1)) - md->ys / 2; + x = MPRAND(md->x0, (md->xs + 1)) - md->xs / 2; + y = MPRAND(md->y0, (md->ys + 1)) - md->ys / 2; } i++; } - while (((c = map_getcell (md->bl.m, x, y)) == 1 || c == 5) && i < 50); + while (((c = map_getcell(md->bl.m, x, y)) == 1 || c == 5) && i < 50); if (i >= 50) { // if(battle_config.error_log==1) // printf("MOB spawn error %d @ %s\n",id,map[md->bl.m].name); - add_timer (tick + 5000, mob_delayspawn, id, 0); + add_timer(tick + 5000, mob_delayspawn, id, 0); return 1; } @@ -1216,13 +1215,13 @@ int mob_spawn (int id) md->to_y = md->bl.y = y; md->dir = 0; - map_addblock (&md->bl); + map_addblock(&md->bl); - memset (&md->state, 0, sizeof (md->state)); + memset(&md->state, 0, sizeof(md->state)); md->attacked_id = 0; md->target_id = 0; md->move_fail_count = 0; - mob_init (md); + mob_init(md); if (!md->stats[MOB_SPEED]) md->stats[MOB_SPEED] = mob_db[md->mob_class].speed; @@ -1234,7 +1233,7 @@ int mob_spawn (int id) md->state.skillstate = MSS_IDLE; md->timer = -1; md->last_thinktime = tick; - md->next_walktime = tick + MPRAND (5000, 50); + md->next_walktime = tick + MPRAND(5000, 50); md->attackabletime = tick; md->canmove_tick = tick; @@ -1247,9 +1246,9 @@ int mob_spawn (int id) md->skillid = 0; md->skilllv = 0; - memset (md->dmglog, 0, sizeof (md->dmglog)); + memset(md->dmglog, 0, sizeof(md->dmglog)); if (md->lootitem) - memset (md->lootitem, 0, sizeof (md->lootitem)); + memset(md->lootitem, 0, sizeof(md->lootitem)); md->lootitem_count = 0; for (i = 0; i < MAX_MOBSKILLTIMERSKILL; i++) @@ -1264,17 +1263,17 @@ int mob_spawn (int id) md->sc_count = 0; md->opt1 = md->opt2 = md->opt3 = md->option = 0; - memset (md->skillunit, 0, sizeof (md->skillunit)); - memset (md->skillunittick, 0, sizeof (md->skillunittick)); + memset(md->skillunit, 0, sizeof(md->skillunit)); + memset(md->skillunittick, 0, sizeof(md->skillunittick)); - md->hp = battle_get_max_hp (&md->bl); + md->hp = battle_get_max_hp(&md->bl); if (md->hp <= 0) { - mob_makedummymobdb (md->mob_class); - md->hp = battle_get_max_hp (&md->bl); + mob_makedummymobdb(md->mob_class); + md->hp = battle_get_max_hp(&md->bl); } - clif_spawnmob (md); + clif_spawnmob(md); return 0; } @@ -1283,12 +1282,12 @@ int mob_spawn (int id) * Distance calculation between two points *------------------------------------------ */ -static int distance (int x0, int y0, int x1, int y1) +static int distance(int x0, int y0, int x1, int y1) { - int dx, dy; + int dx, dy; - dx = abs (x0 - x1); - dy = abs (y0 - y1); + dx = abs(x0 - x1); + dy = abs(y0 - y1); return dx > dy ? dx : dy; } @@ -1296,7 +1295,7 @@ static int distance (int x0, int y0, int x1, int y1) * The stop of MOB's attack *------------------------------------------ */ -int mob_stopattack (struct mob_data *md) +int mob_stopattack(struct mob_data *md) { md->target_id = 0; md->state.targettype = NONE_ATTACKABLE; @@ -1308,13 +1307,13 @@ int mob_stopattack (struct mob_data *md) * The stop of MOB's walking *------------------------------------------ */ -int mob_stop_walking (struct mob_data *md, int type) +int mob_stop_walking(struct mob_data *md, int type) { - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->state.state == MS_WALK || md->state.state == MS_IDLE) { - int dx = 0, dy = 0; + int dx = 0, dy = 0; md->walkpath.path_len = 0; if (type & 4) @@ -1334,17 +1333,17 @@ int mob_stop_walking (struct mob_data *md, int type) md->to_y = md->bl.y + dy; if (dx != 0 || dy != 0) { - mob_walktoxy_sub (md); + mob_walktoxy_sub(md); return 0; } - mob_changestate (md, MS_IDLE, 0); + mob_changestate(md, MS_IDLE, 0); } if (type & 0x01) - clif_fixmobpos (md); + clif_fixmobpos(md); if (type & 0x02) { - int delay = battle_get_dmotion (&md->bl); - unsigned int tick = gettick (); + int delay = battle_get_dmotion(&md->bl); + unsigned int tick = gettick(); if (md->canmove_tick < tick) md->canmove_tick = tick + delay; } @@ -1357,22 +1356,22 @@ int mob_stop_walking (struct mob_data *md, int type) *------------------------------------------ */ static -int mob_can_reach (struct mob_data *md, struct block_list *bl, int range) +int mob_can_reach(struct mob_data *md, struct block_list *bl, int range) { - int dx, dy; + int dx, dy; struct walkpath_data wpd; - int i; + int i; - nullpo_retr (0, md); - nullpo_retr (0, bl); + nullpo_retr(0, md); + nullpo_retr(0, bl); - dx = abs (bl->x - md->bl.x); - dy = abs (bl->y - md->bl.y); + dx = abs(bl->x - md->bl.x); + dy = abs(bl->y - md->bl.y); if (bl && bl->type == BL_PC && battle_config.monsters_ignore_gm == 1) { // option to have monsters ignore GMs [Valaris] struct map_session_data *sd; - if ((sd = (struct map_session_data *) bl) != NULL && pc_isGM (sd)) + if ((sd = (struct map_session_data *) bl) != NULL && pc_isGM(sd)) return 0; } @@ -1389,7 +1388,7 @@ int mob_can_reach (struct mob_data *md, struct block_list *bl, int range) wpd.path_len = 0; wpd.path_pos = 0; wpd.path_half = 0; - if (path_search (&wpd, md->bl.m, md->bl.x, md->bl.y, bl->x, bl->y, 0) != + if (path_search(&wpd, md->bl.m, md->bl.x, md->bl.y, bl->x, bl->y, 0) != -1) return 1; @@ -1399,13 +1398,11 @@ int mob_can_reach (struct mob_data *md, struct block_list *bl, int range) // It judges whether it can adjoin or not. dx = (dx > 0) ? 1 : ((dx < 0) ? -1 : 0); dy = (dy > 0) ? 1 : ((dy < 0) ? -1 : 0); - if (path_search - (&wpd, md->bl.m, md->bl.x, md->bl.y, bl->x - dx, bl->y - dy, 0) != -1) + if (path_search(&wpd, md->bl.m, md->bl.x, md->bl.y, bl->x - dx, bl->y - dy, 0) != -1) return 1; for (i = 0; i < 9; i++) { - if (path_search - (&wpd, md->bl.m, md->bl.x, md->bl.y, bl->x - 1 + i / 3, + if (path_search(&wpd, md->bl.m, md->bl.x, md->bl.y, bl->x - 1 + i / 3, bl->y - 1 + i % 3, 0) != -1) return 1; } @@ -1416,18 +1413,18 @@ int mob_can_reach (struct mob_data *md, struct block_list *bl, int range) * Determination for an attack of a monster *------------------------------------------ */ -int mob_target (struct mob_data *md, struct block_list *bl, int dist) +int mob_target(struct mob_data *md, struct block_list *bl, int dist) { struct map_session_data *sd; struct status_change *sc_data; short *option; - int mode, race; + int mode, race; - nullpo_retr (0, md); - nullpo_retr (0, bl); + nullpo_retr(0, md); + nullpo_retr(0, bl); - sc_data = battle_get_sc_data (bl); - option = battle_get_option (bl); + sc_data = battle_get_sc_data(bl); + option = battle_get_option(bl); race = mob_db[md->mob_class].race; if (!md->mode) @@ -1445,7 +1442,7 @@ int mob_target (struct mob_data *md, struct block_list *bl, int dist) } // Nothing will be carried out if there is no mind of changing TAGE by TAGE ending. if ((md->target_id > 0 && md->state.targettype == ATTACKABLE) - && (!(mode & 0x04) || MRAND (100) > 25)) + && (!(mode & 0x04) || MRAND(100) > 25)) return 0; if (mode & 0x20 || // Coercion is exerted if it is MVPMOB. @@ -1454,8 +1451,8 @@ int mob_target (struct mob_data *md, struct block_list *bl, int dist) { if (bl->type == BL_PC) { - nullpo_retr (0, sd = (struct map_session_data *) bl); - if (sd->invincible_timer != -1 || pc_isinvisible (sd)) + nullpo_retr(0, sd = (struct map_session_data *) bl); + if (sd->invincible_timer != -1 || pc_isinvisible(sd)) return 0; if (!(mode & 0x20) && race != 4 && race != 6 && sd->state.gangsterparadise) @@ -1479,16 +1476,16 @@ int mob_target (struct mob_data *md, struct block_list *bl, int dist) *------------------------------------------ */ static -void mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) +void mob_ai_sub_hard_activesearch(struct block_list *bl, va_list ap) { struct map_session_data *tsd = NULL; struct mob_data *smd, *tmd = NULL; - int mode, race, dist, *pcc; + int mode, race, dist, *pcc; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (smd = va_arg (ap, struct mob_data *)); - nullpo_retv (pcc = va_arg (ap, int *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(smd = va_arg(ap, struct mob_data *)); + nullpo_retv(pcc = va_arg(ap, int *)); if (bl->type == BL_PC) tsd = (struct map_session_data *) bl; @@ -1498,7 +1495,7 @@ void mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) return; //敵味方判定 - if (battle_check_target (&smd->bl, bl, BCT_ENEMY) == 0) + if (battle_check_target(&smd->bl, bl, BCT_ENEMY) == 0) return; if (!smd->mode) @@ -1512,20 +1509,20 @@ void mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) race = mob_db[smd->mob_class].race; //対象がPCの場合 if (tsd && - !pc_isdead (tsd) && + !pc_isdead(tsd) && tsd->bl.m == smd->bl.m && tsd->invincible_timer == -1 && - !pc_isinvisible (tsd) && + !pc_isinvisible(tsd) && (dist = - distance (smd->bl.x, smd->bl.y, tsd->bl.x, tsd->bl.y)) < 9) + distance(smd->bl.x, smd->bl.y, tsd->bl.x, tsd->bl.y)) < 9) { if (mode & 0x20 || (tsd->sc_data[SC_TRICKDEAD].timer == -1 && - ((!pc_ishiding (tsd) && !tsd->state.gangsterparadise) + ((!pc_ishiding(tsd) && !tsd->state.gangsterparadise) || race == 4 || race == 6))) { // 妨害がないか判定 - if (mob_can_reach (smd, bl, 12) && // 到達可能性判定 - MRAND (1000) < 1000 / (++(*pcc))) + if (mob_can_reach(smd, bl, 12) && // 到達可能性判定 + MRAND(1000) < 1000 / (++(*pcc))) { // 範囲内PCで等確率にする smd->target_id = tsd->bl.id; smd->state.targettype = ATTACKABLE; @@ -1537,10 +1534,10 @@ void mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) else if (tmd && tmd->bl.m == smd->bl.m && (dist = - distance (smd->bl.x, smd->bl.y, tmd->bl.x, tmd->bl.y)) < 9) + distance(smd->bl.x, smd->bl.y, tmd->bl.x, tmd->bl.y)) < 9) { - if (mob_can_reach (smd, bl, 12) && // 到達可能性判定 - MRAND (1000) < 1000 / (++(*pcc))) + if (mob_can_reach(smd, bl, 12) && // 到達可能性判定 + MRAND(1000) < 1000 / (++(*pcc))) { // 範囲内で等確率にする smd->target_id = bl->id; smd->state.targettype = ATTACKABLE; @@ -1555,15 +1552,15 @@ void mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) *------------------------------------------ */ static -void mob_ai_sub_hard_lootsearch (struct block_list *bl, va_list ap) +void mob_ai_sub_hard_lootsearch(struct block_list *bl, va_list ap) { struct mob_data *md; - int mode, dist, *itc; + int mode, dist, *itc; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (md = va_arg (ap, struct mob_data *)); - nullpo_retv (itc = va_arg (ap, int *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(md = va_arg(ap, struct mob_data *)); + nullpo_retv(itc = va_arg(ap, int *)); if (!md->mode) { @@ -1581,10 +1578,10 @@ void mob_ai_sub_hard_lootsearch (struct block_list *bl, va_list ap) && md->lootitem_count >= LOOTITEM_SIZE)) return; if (bl->m == md->bl.m - && (dist = distance (md->bl.x, md->bl.y, bl->x, bl->y)) < 9) + && (dist = distance(md->bl.x, md->bl.y, bl->x, bl->y)) < 9) { - if (mob_can_reach (md, bl, 12) && // Reachability judging - MRAND (1000) < 1000 / (++(*itc))) + if (mob_can_reach(md, bl, 12) && // Reachability judging + MRAND(1000) < 1000 / (++(*itc))) { // It is made a probability, such as within the limits PC. md->target_id = bl->id; md->state.targettype = NONE_ATTACKABLE; @@ -1599,34 +1596,34 @@ void mob_ai_sub_hard_lootsearch (struct block_list *bl, va_list ap) *------------------------------------------ */ static -void mob_ai_sub_hard_linksearch (struct block_list *bl, va_list ap) +void mob_ai_sub_hard_linksearch(struct block_list *bl, va_list ap) { struct mob_data *tmd; struct mob_data *md; struct block_list *target; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (tmd = (struct mob_data *) bl); - nullpo_retv (md = va_arg (ap, struct mob_data *)); - nullpo_retv (target = va_arg (ap, struct block_list *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(tmd = (struct mob_data *) bl); + nullpo_retv(md = va_arg(ap, struct mob_data *)); + nullpo_retv(target = va_arg(ap, struct block_list *)); // same family free in a range at a link monster -- it will be made to lock if MOB is -/* if( (md->target_id > 0 && md->state.targettype == ATTACKABLE) && mob_db[md->mob_class].mode&0x08){ - if( tmd->mob_class==md->mob_class && (!tmd->target_id || md->state.targettype == NONE_ATTACKABLE) && tmd->bl.m == md->bl.m){ - if( mob_can_reach(tmd,target,12) ){ // Reachability judging - tmd->target_id=md->target_id; - tmd->state.targettype = ATTACKABLE; - tmd->min_chase=13; - } - } - }*/ +/* if ((md->target_id > 0 && md->state.targettype == ATTACKABLE) && mob_db[md->mob_class].mode&0x08){ + if ( tmd->mob_class==md->mob_class && (!tmd->target_id || md->state.targettype == NONE_ATTACKABLE) && tmd->bl.m == md->bl.m){ + if ( mob_can_reach(tmd,target,12) ){ // Reachability judging + tmd->target_id=md->target_id; + tmd->state.targettype = ATTACKABLE; + tmd->min_chase=13; + } + } + }*/ if (md->attacked_id > 0 && mob_db[md->mob_class].mode & 0x08) { if (tmd->mob_class == md->mob_class && tmd->bl.m == md->bl.m && (!tmd->target_id || md->state.targettype == NONE_ATTACKABLE)) { - if (mob_can_reach (tmd, target, 12)) + if (mob_can_reach(tmd, target, 12)) { // Reachability judging tmd->target_id = md->attacked_id; tmd->state.targettype = ATTACKABLE; @@ -1640,15 +1637,15 @@ void mob_ai_sub_hard_linksearch (struct block_list *bl, va_list ap) * Processing of slave monsters *------------------------------------------ */ -static int mob_ai_sub_hard_slavemob (struct mob_data *md, unsigned int tick) +static int mob_ai_sub_hard_slavemob(struct mob_data *md, unsigned int tick) { struct mob_data *mmd = NULL; struct block_list *bl; - int mode, race, old_dist; + int mode, race, old_dist; - nullpo_retr (0, md); + nullpo_retr(0, md); - if ((bl = map_id2bl (md->master_id)) != NULL) + if ((bl = map_id2bl(md->master_id)) != NULL) mmd = (struct mob_data *) bl; mode = mob_db[md->mob_class].mode; @@ -1660,30 +1657,30 @@ static int mob_ai_sub_hard_slavemob (struct mob_data *md, unsigned int tick) // Since it is in the map on which the master is not, teleport is carried out and it pursues. if (mmd->bl.m != md->bl.m) { - mob_warp (md, mmd->bl.m, mmd->bl.x, mmd->bl.y, 3); + mob_warp(md, mmd->bl.m, mmd->bl.x, mmd->bl.y, 3); md->state.master_check = 1; return 0; } // Distance with between slave and master is measured. old_dist = md->master_dist; - md->master_dist = distance (md->bl.x, md->bl.y, mmd->bl.x, mmd->bl.y); + md->master_dist = distance(md->bl.x, md->bl.y, mmd->bl.x, mmd->bl.y); // Since the master was in near immediately before, teleport is carried out and it pursues. if (old_dist < 10 && md->master_dist > 18) { - mob_warp (md, -1, mmd->bl.x, mmd->bl.y, 3); + mob_warp(md, -1, mmd->bl.x, mmd->bl.y, 3); md->state.master_check = 1; return 0; } // Although there is the master, since it is somewhat far, it approaches. if ((!md->target_id || md->state.targettype == NONE_ATTACKABLE) - && mob_can_move (md) + && mob_can_move(md) && (md->walkpath.path_pos >= md->walkpath.path_len || md->walkpath.path_len == 0) && md->master_dist < 15) { - int i = 0, dx, dy, ret; + int i = 0, dx, dy, ret; if (md->master_dist > 4) { do @@ -1693,21 +1690,21 @@ static int mob_ai_sub_hard_slavemob (struct mob_data *md, unsigned int tick) dx = mmd->bl.x - md->bl.x; dy = mmd->bl.y - md->bl.y; if (dx < 0) - dx += (MPRAND (1, ((dx < -3) ? 3 : -dx))); + dx += (MPRAND(1, ((dx < -3) ? 3 : -dx))); else if (dx > 0) - dx -= (MPRAND (1, ((dx > 3) ? 3 : dx))); + dx -= (MPRAND(1, ((dx > 3) ? 3 : dx))); if (dy < 0) - dy += (MPRAND (1, ((dy < -3) ? 3 : -dy))); + dy += (MPRAND(1, ((dy < -3) ? 3 : -dy))); else if (dy > 0) - dy -= (MPRAND (1, ((dy > 3) ? 3 : dy))); + dy -= (MPRAND(1, ((dy > 3) ? 3 : dy))); } else { - dx = mmd->bl.x - md->bl.x + MRAND (7) - 3; - dy = mmd->bl.y - md->bl.y + MRAND (7) - 3; + dx = mmd->bl.x - md->bl.x + MRAND(7) - 3; + dy = mmd->bl.y - md->bl.y + MRAND(7) - 3; } - ret = mob_walktoxy (md, md->bl.x + dx, md->bl.y + dy, 0); + ret = mob_walktoxy(md, md->bl.x + dx, md->bl.y + dy, 0); i++; } while (ret && i < 10); @@ -1716,17 +1713,17 @@ static int mob_ai_sub_hard_slavemob (struct mob_data *md, unsigned int tick) { do { - dx = MRAND (9) - 5; - dy = MRAND (9) - 5; + dx = MRAND(9) - 5; + dy = MRAND(9) - 5; if (dx == 0 && dy == 0) { - dx = (MRAND (1)) ? 1 : -1; - dy = (MRAND (1)) ? 1 : -1; + dx = (MRAND(1)) ? 1 : -1; + dy = (MRAND(1)) ? 1 : -1; } dx += mmd->bl.x; dy += mmd->bl.y; - ret = mob_walktoxy (md, mmd->bl.x + dx, mmd->bl.y + dy, 0); + ret = mob_walktoxy(md, mmd->bl.x + dx, mmd->bl.y + dy, 0); i++; } while (ret && i < 10); @@ -1740,44 +1737,44 @@ static int mob_ai_sub_hard_slavemob (struct mob_data *md, unsigned int tick) if ((mmd->target_id > 0 && mmd->state.targettype == ATTACKABLE) && (!md->target_id || md->state.targettype == NONE_ATTACKABLE)) { - struct map_session_data *sd = map_id2sd (mmd->target_id); - if (sd != NULL && !pc_isdead (sd) && sd->invincible_timer == -1 - && !pc_isinvisible (sd)) + struct map_session_data *sd = map_id2sd(mmd->target_id); + if (sd != NULL && !pc_isdead(sd) && sd->invincible_timer == -1 + && !pc_isinvisible(sd)) { race = mob_db[md->mob_class].race; if (mode & 0x20 || (sd->sc_data[SC_TRICKDEAD].timer == -1 && - ((!pc_ishiding (sd) && !sd->state.gangsterparadise) + ((!pc_ishiding(sd) && !sd->state.gangsterparadise) || race == 4 || race == 6))) { // 妨害がないか判定 md->target_id = sd->bl.id; md->state.targettype = ATTACKABLE; md->min_chase = - 5 + distance (md->bl.x, md->bl.y, sd->bl.x, sd->bl.y); + 5 + distance(md->bl.x, md->bl.y, sd->bl.x, sd->bl.y); md->state.master_check = 1; } } } // There is the master, the master locks a target and he does not lock. -/* if( (md->target_id>0 && mmd->state.targettype == ATTACKABLE) && (!mmd->target_id || mmd->state.targettype == NONE_ATTACKABLE) ){ - struct map_session_data *sd=map_id2sd(md->target_id); - if(sd!=NULL && !pc_isdead(sd) && sd->invincible_timer == -1 && !pc_isinvisible(sd)){ - - race=mob_db[mmd->mob_class].race; - if(mode&0x20 || - (sd->sc_data[SC_TRICKDEAD].timer == -1 && - (!(sd->status.option&0x06) || race==4 || race==6) - ) ){ // It judges whether there is any disturbance. - - mmd->target_id=sd->bl.id; - mmd->state.targettype = ATTACKABLE; - mmd->min_chase=5+distance(mmd->bl.x,mmd->bl.y,sd->bl.x,sd->bl.y); - } - } - }*/ +/* if ((md->target_id>0 && mmd->state.targettype == ATTACKABLE) && (!mmd->target_id || mmd->state.targettype == NONE_ATTACKABLE) ){ + struct map_session_data *sd=map_id2sd(md->target_id); + if (sd!=NULL && !pc_isdead(sd) && sd->invincible_timer == -1 && !pc_isinvisible(sd)){ + + race=mob_db[mmd->mob_class].race; + if (mode&0x20 || + (sd->sc_data[SC_TRICKDEAD].timer == -1 && + (!(sd->status.option&0x06) || race==4 || race==6) + ) ){ // It judges whether there is any disturbance. + + mmd->target_id=sd->bl.id; + mmd->state.targettype = ATTACKABLE; + mmd->min_chase=5+distance(mmd->bl.x,mmd->bl.y,sd->bl.x,sd->bl.y); + } + } + }*/ return 0; } @@ -1786,14 +1783,14 @@ static int mob_ai_sub_hard_slavemob (struct mob_data *md, unsigned int tick) * A lock of target is stopped and mob moves to a standby state. *------------------------------------------ */ -static int mob_unlocktarget (struct mob_data *md, int tick) +static int mob_unlocktarget(struct mob_data *md, int tick) { - nullpo_retr (0, md); + nullpo_retr(0, md); md->target_id = 0; md->state.targettype = NONE_ATTACKABLE; md->state.skillstate = MSS_IDLE; - md->next_walktime = tick + MPRAND (3000, 3000); + md->next_walktime = tick + MPRAND(3000, 3000); return 0; } @@ -1801,26 +1798,26 @@ static int mob_unlocktarget (struct mob_data *md, int tick) * Random walk *------------------------------------------ */ -static int mob_randomwalk (struct mob_data *md, int tick) +static int mob_randomwalk(struct mob_data *md, int tick) { const int retrycount = 20; - int speed; + int speed; - nullpo_retr (0, md); + nullpo_retr(0, md); - speed = battle_get_speed (&md->bl); - if (DIFF_TICK (md->next_walktime, tick) < 0) + speed = battle_get_speed(&md->bl); + if (DIFF_TICK(md->next_walktime, tick) < 0) { - int i, x, y, c, d = 12 - md->move_fail_count; + int i, x, y, c, d = 12 - md->move_fail_count; if (d < 5) d = 5; for (i = 0; i < retrycount; i++) { // Search of a movable place - int r = mt_random (); + int r = mt_random(); x = md->bl.x + r % (d * 2 + 1) - d; y = md->bl.y + r / (d * 2 + 1) % (d * 2 + 1) - d; - if ((c = map_getcell (md->bl.m, x, y)) != 1 && c != 5 - && mob_walktoxy (md, x, y, 1) == 0) + if ((c = map_getcell(md->bl.m, x, y)) != 1 && c != 5 + && mob_walktoxy(md, x, y, 1) == 0) { md->move_fail_count = 0; break; @@ -1831,11 +1828,10 @@ static int mob_randomwalk (struct mob_data *md, int tick) if (md->move_fail_count > 1000) { if (battle_config.error_log == 1) - printf - ("MOB cant move. random spawn %d, mob_class = %d\n", + printf("MOB cant move. random spawn %d, mob_class = %d\n", md->bl.id, md->mob_class); md->move_fail_count = 0; - mob_spawn (md->bl.id); + mob_spawn(md->bl.id); } } } @@ -1846,7 +1842,7 @@ static int mob_randomwalk (struct mob_data *md, int tick) else c += speed; } - md->next_walktime = tick + MPRAND (3000, 3000) + c; + md->next_walktime = tick + MPRAND(3000, 3000) + c; md->state.skillstate = MSS_WALK; return 1; } @@ -1858,30 +1854,30 @@ static int mob_randomwalk (struct mob_data *md, int tick) *------------------------------------------ */ static -void mob_ai_sub_hard (struct block_list *bl, va_list ap) +void mob_ai_sub_hard(struct block_list *bl, va_list ap) { struct mob_data *md, *tmd = NULL; struct map_session_data *tsd = NULL; struct block_list *tbl = NULL; struct flooritem_data *fitem; unsigned int tick; - int i, dx, dy, ret, dist; - int attack_type = 0; - int mode, race; + int i, dx, dy, ret, dist; + int attack_type = 0; + int mode, race; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (md = (struct mob_data *) bl); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(md = (struct mob_data *) bl); - tick = va_arg (ap, unsigned int); + tick = va_arg(ap, unsigned int); - if (DIFF_TICK (tick, md->last_thinktime) < MIN_MOBTHINKTIME) + if (DIFF_TICK(tick, md->last_thinktime) < MIN_MOBTHINKTIME) return; md->last_thinktime = tick; if (md->skilltimer != -1 || md->bl.prev == NULL) { // Under a skill aria and death - if (DIFF_TICK (tick, md->next_walktime) > MIN_MOBTHINKTIME) + if (DIFF_TICK(tick, md->next_walktime) > MIN_MOBTHINKTIME) md->next_walktime = tick; return; } @@ -1903,12 +1899,12 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) if (md->attacked_id > 0 && mode & 0x08) { // Link monster - struct map_session_data *asd = map_id2sd (md->attacked_id); + struct map_session_data *asd = map_id2sd(md->attacked_id); if (asd) { - if (asd->invincible_timer == -1 && !pc_isinvisible (asd)) + if (asd->invincible_timer == -1 && !pc_isinvisible(asd)) { - map_foreachinarea (mob_ai_sub_hard_linksearch, md->bl.m, + map_foreachinarea(mob_ai_sub_hard_linksearch, md->bl.m, md->bl.x - 13, md->bl.y - 13, md->bl.x + 13, md->bl.y + 13, BL_MOB, md, &asd->bl); @@ -1919,19 +1915,19 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) // It checks to see it was attacked first (if active, it is target change at 25% of probability). if (mode > 0 && md->attacked_id > 0 && (!md->target_id || md->state.targettype == NONE_ATTACKABLE - || (mode & 0x04 && MRAND (100) < 25))) + || (mode & 0x04 && MRAND(100) < 25))) { - struct block_list *abl = map_id2bl (md->attacked_id); + struct block_list *abl = map_id2bl(md->attacked_id); struct map_session_data *asd = NULL; if (abl) { if (abl->type == BL_PC) asd = (struct map_session_data *) abl; if (asd == NULL || md->bl.m != abl->m || abl->prev == NULL - || asd->invincible_timer != -1 || pc_isinvisible (asd) + || asd->invincible_timer != -1 || pc_isinvisible(asd) || (dist = - distance (md->bl.x, md->bl.y, abl->x, abl->y)) >= 32 - || battle_check_target (bl, abl, BCT_ENEMY) == 0) + distance(md->bl.x, md->bl.y, abl->x, abl->y)) >= 32 + || battle_check_target(bl, abl, BCT_ENEMY) == 0) md->attacked_id = 0; else { @@ -1949,7 +1945,7 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) md->state.master_check = 0; // Processing of slave monster if (md->master_id > 0 && md->state.special_mob_ai == 0) - mob_ai_sub_hard_slavemob (md, tick); + mob_ai_sub_hard_slavemob(md, tick); // アクティヴモンスターの策敵 (?? of a bitter taste TIVU monster) if ((!md->target_id || md->state.targettype == NONE_ATTACKABLE) @@ -1959,7 +1955,7 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) i = 0; if (md->state.special_mob_ai) { - map_foreachinarea (mob_ai_sub_hard_activesearch, md->bl.m, + map_foreachinarea(mob_ai_sub_hard_activesearch, md->bl.m, md->bl.x - AREA_SIZE * 2, md->bl.y - AREA_SIZE * 2, md->bl.x + AREA_SIZE * 2, @@ -1967,7 +1963,7 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) } else { - map_foreachinarea (mob_ai_sub_hard_activesearch, md->bl.m, + map_foreachinarea(mob_ai_sub_hard_activesearch, md->bl.m, md->bl.x - AREA_SIZE * 2, md->bl.y - AREA_SIZE * 2, md->bl.x + AREA_SIZE * 2, @@ -1979,7 +1975,7 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) if (!md->target_id && mode & 0x02 && !md->state.master_check) { i = 0; - map_foreachinarea (mob_ai_sub_hard_lootsearch, md->bl.m, + map_foreachinarea(mob_ai_sub_hard_lootsearch, md->bl.m, md->bl.x - AREA_SIZE * 2, md->bl.y - AREA_SIZE * 2, md->bl.x + AREA_SIZE * 2, md->bl.y + AREA_SIZE * 2, BL_ITEM, md, &i); @@ -1988,7 +1984,7 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) // It will attack, if the candidate for an attack is. if (md->target_id > 0) { - if ((tbl = map_id2bl (md->target_id))) + if ((tbl = map_id2bl(md->target_id))) { if (tbl->type == BL_PC) tsd = (struct map_session_data *) tbl; @@ -1998,38 +1994,36 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) { if (tbl->m != md->bl.m || tbl->prev == NULL || (dist = - distance (md->bl.x, md->bl.y, tbl->x, + distance(md->bl.x, md->bl.y, tbl->x, tbl->y)) >= md->min_chase) - mob_unlocktarget (md, tick); // 別マップか、視界外 + mob_unlocktarget(md, tick); // 別マップか、視界外 else if (tsd && !(mode & 0x20) && (tsd->sc_data[SC_TRICKDEAD].timer != -1 || - ((pc_ishiding (tsd) + ((pc_ishiding(tsd) || tsd->state.gangsterparadise) && race != 4 && race != 6))) - mob_unlocktarget (md, tick); // スキルなどによる策敵妨害 - else if (!battle_check_range - (&md->bl, tbl, mob_db[md->mob_class].range)) + mob_unlocktarget(md, tick); // スキルなどによる策敵妨害 + else if (!battle_check_range(&md->bl, tbl, mob_db[md->mob_class].range)) { // 攻撃範囲外なので移動 if (!(mode & 1)) { // 移動しないモード - mob_unlocktarget (md, tick); + mob_unlocktarget(md, tick); return; } - if (!mob_can_move (md)) // 動けない状態にある + if (!mob_can_move(md)) // 動けない状態にある return; md->state.skillstate = MSS_CHASE; // 突撃時スキル - mobskill_use (md, tick, -1); + mobskill_use(md, tick, -1); // if(md->timer != -1 && (DIFF_TICK(md->next_walktime,tick)<0 || distance(md->to_x,md->to_y,tsd->bl.x,tsd->bl.y)<2) ) if (md->timer != -1 && md->state.state != MS_ATTACK - && (DIFF_TICK (md->next_walktime, tick) < 0 - || distance (md->to_x, md->to_y, tbl->x, + && (DIFF_TICK(md->next_walktime, tick) < 0 + || distance(md->to_x, md->to_y, tbl->x, tbl->y) < 2)) return; // 既に移動中 - if (!mob_can_reach - (md, tbl, (md->min_chase > 13) ? md->min_chase : 13)) - mob_unlocktarget (md, tick); // 移動できないのでタゲ解除（IWとか？） + if (!mob_can_reach(md, tbl, (md->min_chase > 13) ? md->min_chase : 13)) + mob_unlocktarget(md, tick); // 移動できないのでタゲ解除（IWとか？） else { // 追跡 @@ -2052,19 +2046,19 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) } else { // だめならAthena式(ランダム) - dx = tbl->x - md->bl.x + MRAND (3) - 1; - dy = tbl->y - md->bl.y + MRAND (3) - 1; + dx = tbl->x - md->bl.x + MRAND(3) - 1; + dy = tbl->y - md->bl.y + MRAND(3) - 1; } - /* if(path_search(&md->walkpath,md->bl.m,md->bl.x,md->bl.y,md->bl.x+dx,md->bl.y+dy,0)){ + /* if (path_search(&md->walkpath,md->bl.m,md->bl.x,md->bl.y,md->bl.x+dx,md->bl.y+dy,0)){ * dx=tsd->bl.x - md->bl.x; * dy=tsd->bl.y - md->bl.y; - * if(dx<0) dx--; - * else if(dx>0) dx++; - * if(dy<0) dy--; - * else if(dy>0) dy++; + * if (dx<0) dx--; + * else if (dx>0) dx++; + * if (dy<0) dy--; + * else if (dy>0) dy++; * } */ ret = - mob_walktoxy (md, md->bl.x + dx, + mob_walktoxy(md, md->bl.x + dx, md->bl.y + dy, 0); i++; } @@ -2080,7 +2074,7 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) dy = 2; else if (dy > 0) dy = -2; - mob_walktoxy (md, md->bl.x + dx, md->bl.y + dy, + mob_walktoxy(md, md->bl.x + dx, md->bl.y + dy, 0); } } @@ -2089,17 +2083,17 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) { // 攻撃射程範囲内 md->state.skillstate = MSS_ATTACK; if (md->state.state == MS_WALK) - mob_stop_walking (md, 1); // 歩行中なら停止 + mob_stop_walking(md, 1); // 歩行中なら停止 if (md->state.state == MS_ATTACK) return; // 既に攻撃中 - mob_changestate (md, MS_ATTACK, attack_type); - -/* if(mode&0x08){ // リンクモンスター - map_foreachinarea(mob_ai_sub_hard_linksearch,md->bl.m, - md->bl.x-13,md->bl.y-13, - md->bl.x+13,md->bl.y+13, - BL_MOB,md,&tsd->bl); - }*/ + mob_changestate(md, MS_ATTACK, attack_type); + +/* if (mode&0x08){ // リンクモンスター + map_foreachinarea(mob_ai_sub_hard_linksearch,md->bl.m, + md->bl.x-13,md->bl.y-13, + md->bl.x+13,md->bl.y+13, + BL_MOB,md,&tsd->bl); + }*/ } return; } @@ -2107,100 +2101,100 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) { // ルートモンスター処理 if (tbl == NULL || tbl->type != BL_ITEM || tbl->m != md->bl.m || (dist = - distance (md->bl.x, md->bl.y, tbl->x, + distance(md->bl.x, md->bl.y, tbl->x, tbl->y)) >= md->min_chase || !md->lootitem) { // 遠すぎるかアイテムがなくなった - mob_unlocktarget (md, tick); + mob_unlocktarget(md, tick); if (md->state.state == MS_WALK) - mob_stop_walking (md, 1); // 歩行中なら停止 + mob_stop_walking(md, 1); // 歩行中なら停止 } else if (dist) { if (!(mode & 1)) { // 移動しないモード - mob_unlocktarget (md, tick); + mob_unlocktarget(md, tick); return; } - if (!mob_can_move (md)) // 動けない状態にある + if (!mob_can_move(md)) // 動けない状態にある return; md->state.skillstate = MSS_LOOT; // ルート時スキル使用 - mobskill_use (md, tick, -1); + mobskill_use(md, tick, -1); // if(md->timer != -1 && (DIFF_TICK(md->next_walktime,tick)<0 || distance(md->to_x,md->to_y,tbl->x,tbl->y)<2) ) if (md->timer != -1 && md->state.state != MS_ATTACK - && (DIFF_TICK (md->next_walktime, tick) < 0 - || distance (md->to_x, md->to_y, tbl->x, + && (DIFF_TICK(md->next_walktime, tick) < 0 + || distance(md->to_x, md->to_y, tbl->x, tbl->y) <= 0)) return; // 既に移動中 md->next_walktime = tick + 500; dx = tbl->x - md->bl.x; dy = tbl->y - md->bl.y; -/* if(path_search(&md->walkpath,md->bl.m,md->bl.x,md->bl.y,md->bl.x+dx,md->bl.y+dy,0)){ - dx=tbl->x - md->bl.x; - dy=tbl->y - md->bl.y; - }*/ - ret = mob_walktoxy (md, md->bl.x + dx, md->bl.y + dy, 0); +/* if (path_search(&md->walkpath,md->bl.m,md->bl.x,md->bl.y,md->bl.x+dx,md->bl.y+dy,0)){ + dx=tbl->x - md->bl.x; + dy=tbl->y - md->bl.y; + }*/ + ret = mob_walktoxy(md, md->bl.x + dx, md->bl.y + dy, 0); if (ret) - mob_unlocktarget (md, tick); // 移動できないのでタゲ解除（IWとか？） + mob_unlocktarget(md, tick); // 移動できないのでタゲ解除（IWとか？） } else { // アイテムまでたどり着いた if (md->state.state == MS_ATTACK) return; // 攻撃中 if (md->state.state == MS_WALK) - mob_stop_walking (md, 1); // 歩行中なら停止 + mob_stop_walking(md, 1); // 歩行中なら停止 fitem = (struct flooritem_data *) tbl; if (md->lootitem_count < LOOTITEM_SIZE) - memcpy (&md->lootitem[md->lootitem_count++], - &fitem->item_data, sizeof (md->lootitem[0])); + memcpy(&md->lootitem[md->lootitem_count++], + &fitem->item_data, sizeof(md->lootitem[0])); else if (battle_config.monster_loot_type == 1 && md->lootitem_count >= LOOTITEM_SIZE) { - mob_unlocktarget (md, tick); + mob_unlocktarget(md, tick); return; } else { for (i = 0; i < LOOTITEM_SIZE - 1; i++) - memcpy (&md->lootitem[i], &md->lootitem[i + 1], - sizeof (md->lootitem[0])); - memcpy (&md->lootitem[LOOTITEM_SIZE - 1], - &fitem->item_data, sizeof (md->lootitem[0])); + memcpy(&md->lootitem[i], &md->lootitem[i + 1], + sizeof(md->lootitem[0])); + memcpy(&md->lootitem[LOOTITEM_SIZE - 1], + &fitem->item_data, sizeof(md->lootitem[0])); } - map_clearflooritem (tbl->id); - mob_unlocktarget (md, tick); + map_clearflooritem(tbl->id); + mob_unlocktarget(md, tick); } return; } } else { - mob_unlocktarget (md, tick); + mob_unlocktarget(md, tick); if (md->state.state == MS_WALK) - mob_stop_walking (md, 4); // 歩行中なら停止 + mob_stop_walking(md, 4); // 歩行中なら停止 return; } } // It is skill use at the time of /standby at the time of a walk. - if (mobskill_use (md, tick, -1)) + if (mobskill_use(md, tick, -1)) return; // 歩行処理 - if (mode & 1 && mob_can_move (md) && // 移動可能MOB&動ける状態にある + if (mode & 1 && mob_can_move(md) && // 移動可能MOB&動ける状態にある (md->master_id == 0 || md->state.special_mob_ai || md->master_dist > 10)) { //取り巻きMOBじゃない - if (DIFF_TICK (md->next_walktime, tick) > +7000 && + if (DIFF_TICK(md->next_walktime, tick) > +7000 && (md->walkpath.path_len == 0 || md->walkpath.path_pos >= md->walkpath.path_len)) { - md->next_walktime = tick + 3000 * MRAND (2000); + md->next_walktime = tick + 3000 * MRAND(2000); } // Random movement - if (mob_randomwalk (md, tick)) + if (mob_randomwalk(md, tick)) return; } @@ -2214,14 +2208,14 @@ void mob_ai_sub_hard (struct block_list *bl, va_list ap) * Serious processing for mob in PC field of view (foreachclient) *------------------------------------------ */ -static int mob_ai_sub_foreachclient (struct map_session_data *sd, va_list ap) +static int mob_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) { unsigned int tick; - nullpo_retr (0, sd); - nullpo_retr (0, ap); + nullpo_retr(0, sd); + nullpo_retr(0, ap); - tick = va_arg (ap, unsigned int); - map_foreachinarea (mob_ai_sub_hard, sd->bl.m, + tick = va_arg(ap, unsigned int); + map_foreachinarea(mob_ai_sub_hard, sd->bl.m, sd->bl.x - AREA_SIZE * 2, sd->bl.y - AREA_SIZE * 2, sd->bl.x + AREA_SIZE * 2, sd->bl.y + AREA_SIZE * 2, BL_MOB, tick); @@ -2233,24 +2227,24 @@ static int mob_ai_sub_foreachclient (struct map_session_data *sd, va_list ap) * Serious processing for mob in PC field of view (interval timer function) *------------------------------------------ */ -static void mob_ai_hard (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void mob_ai_hard(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - clif_foreachclient (mob_ai_sub_foreachclient, tick); + clif_foreachclient(mob_ai_sub_foreachclient, tick); } /*========================================== * Negligent mode MOB AI (PC is not in near) *------------------------------------------ */ -static void mob_ai_sub_lazy (db_key_t key, db_val_t data, va_list app) +static void mob_ai_sub_lazy(db_key_t key, db_val_t data, va_list app) { struct mob_data *md = (struct mob_data *)data; unsigned int tick; va_list ap; - nullpo_retv (md); - nullpo_retv (app); - nullpo_retv (ap = va_arg (app, va_list)); + nullpo_retv(md); + nullpo_retv(app); + nullpo_retv(ap = va_arg(app, va_list)); if (md == NULL) return; @@ -2258,21 +2252,21 @@ static void mob_ai_sub_lazy (db_key_t key, db_val_t data, va_list app) if (!md->bl.type || md->bl.type != BL_MOB) return; - tick = va_arg (ap, unsigned int); + tick = va_arg(ap, unsigned int); - if (DIFF_TICK (tick, md->last_thinktime) < MIN_MOBTHINKTIME * 10) + if (DIFF_TICK(tick, md->last_thinktime) < MIN_MOBTHINKTIME * 10) return; md->last_thinktime = tick; if (md->bl.prev == NULL || md->skilltimer != -1) { - if (DIFF_TICK (tick, md->next_walktime) > MIN_MOBTHINKTIME * 10) + if (DIFF_TICK(tick, md->next_walktime) > MIN_MOBTHINKTIME * 10) md->next_walktime = tick; return; } - if (DIFF_TICK (md->next_walktime, tick) < 0 && - (mob_db[md->mob_class].mode & 1) && mob_can_move (md)) + if (DIFF_TICK(md->next_walktime, tick) < 0 && + (mob_db[md->mob_class].mode & 1) && mob_can_move(md)) { if (map[md->bl.m].users > 0) @@ -2280,14 +2274,14 @@ static void mob_ai_sub_lazy (db_key_t key, db_val_t data, va_list app) // Since PC is in the same map, somewhat better negligent processing is carried out. // It sometimes moves. - if (MRAND (1000) < MOB_LAZYMOVEPERC) - mob_randomwalk (md, tick); + if (MRAND(1000) < MOB_LAZYMOVEPERC) + mob_randomwalk(md, tick); // MOB which is not not the summons MOB but BOSS, either sometimes reboils. - else if (MRAND (1000) < MOB_LAZYWARPPERC && md->x0 <= 0 + else if (MRAND(1000) < MOB_LAZYWARPPERC && md->x0 <= 0 && md->master_id != 0 && mob_db[md->mob_class].mexp <= 0 && !(mob_db[md->mob_class].mode & 0x20)) - mob_spawn (md->bl.id); + mob_spawn(md->bl.id); } else @@ -2295,13 +2289,13 @@ static void mob_ai_sub_lazy (db_key_t key, db_val_t data, va_list app) // Since PC is not even in the same map, suitable processing is carried out even if it takes. // MOB which is not BOSS which is not Summons MOB, either -- a case -- sometimes -- leaping - if (MRAND (1000) < MOB_LAZYWARPPERC && md->x0 <= 0 + if (MRAND(1000) < MOB_LAZYWARPPERC && md->x0 <= 0 && md->master_id != 0 && mob_db[md->mob_class].mexp <= 0 && !(mob_db[md->mob_class].mode & 0x20)) - mob_warp (md, -1, -1, -1, -1); + mob_warp(md, -1, -1, -1, -1); } - md->next_walktime = tick + MPRAND (5000, 10000); + md->next_walktime = tick + MPRAND(5000, 10000); } } @@ -2309,9 +2303,9 @@ static void mob_ai_sub_lazy (db_key_t key, db_val_t data, va_list app) * Negligent processing for mob outside PC field of view (interval timer function) *------------------------------------------ */ -static void mob_ai_lazy (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void mob_ai_lazy(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - map_foreachiddb (mob_ai_sub_lazy, tick); + map_foreachiddb(mob_ai_sub_lazy, tick); } /*========================================== @@ -2322,14 +2316,14 @@ static void mob_ai_lazy (timer_id tid, tick_t tick, custom_id_t id, custom_data_ */ struct delay_item_drop { - int m, x, y; - int nameid, amount; + int m, x, y; + int nameid, amount; struct map_session_data *first_sd, *second_sd, *third_sd; }; struct delay_item_drop2 { - int m, x, y; + int m, x, y; struct item item_data; struct map_session_data *first_sd, *second_sd, *third_sd; }; @@ -2338,116 +2332,116 @@ struct delay_item_drop2 * item drop with delay (timer function) *------------------------------------------ */ -static void mob_delay_item_drop (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void mob_delay_item_drop(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct delay_item_drop *ditem; struct item temp_item; - int flag; + int flag; - nullpo_retv (ditem = (struct delay_item_drop *) id); + nullpo_retv(ditem = (struct delay_item_drop *) id); - memset (&temp_item, 0, sizeof (temp_item)); + memset(&temp_item, 0, sizeof(temp_item)); temp_item.nameid = ditem->nameid; temp_item.amount = ditem->amount; - temp_item.identify = !itemdb_isequip3 (temp_item.nameid); + temp_item.identify = !itemdb_isequip3(temp_item.nameid); if (battle_config.item_auto_get == 1) { if (ditem->first_sd && (flag = - pc_additem (ditem->first_sd, &temp_item, ditem->amount))) + pc_additem(ditem->first_sd, &temp_item, ditem->amount))) { - clif_additem (ditem->first_sd, 0, 0, flag); - map_addflooritem (&temp_item, 1, ditem->m, ditem->x, ditem->y, + clif_additem(ditem->first_sd, 0, 0, flag); + map_addflooritem(&temp_item, 1, ditem->m, ditem->x, ditem->y, ditem->first_sd, ditem->second_sd, ditem->third_sd, 0); } - free (ditem); + free(ditem); return; } - map_addflooritem (&temp_item, 1, ditem->m, ditem->x, ditem->y, + map_addflooritem(&temp_item, 1, ditem->m, ditem->x, ditem->y, ditem->first_sd, ditem->second_sd, ditem->third_sd, 0); - free (ditem); + free(ditem); } /*========================================== * item drop (timer function)-lootitem with delay *------------------------------------------ */ -static void mob_delay_item_drop2 (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void mob_delay_item_drop2(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct delay_item_drop2 *ditem; - int flag; + int flag; - nullpo_retv (ditem = (struct delay_item_drop2 *) id); + nullpo_retv(ditem = (struct delay_item_drop2 *) id); if (battle_config.item_auto_get == 1) { if (ditem->first_sd && (flag = - pc_additem (ditem->first_sd, &ditem->item_data, + pc_additem(ditem->first_sd, &ditem->item_data, ditem->item_data.amount))) { - clif_additem (ditem->first_sd, 0, 0, flag); - map_addflooritem (&ditem->item_data, ditem->item_data.amount, + clif_additem(ditem->first_sd, 0, 0, flag); + map_addflooritem(&ditem->item_data, ditem->item_data.amount, ditem->m, ditem->x, ditem->y, ditem->first_sd, ditem->second_sd, ditem->third_sd, 0); } - free (ditem); + free(ditem); return; } - map_addflooritem (&ditem->item_data, ditem->item_data.amount, ditem->m, + map_addflooritem(&ditem->item_data, ditem->item_data.amount, ditem->m, ditem->x, ditem->y, ditem->first_sd, ditem->second_sd, ditem->third_sd, 0); - free (ditem); + free(ditem); } /*========================================== * mob data is erased. *------------------------------------------ */ -int mob_delete (struct mob_data *md) +int mob_delete(struct mob_data *md) { - nullpo_retr (1, md); + nullpo_retr(1, md); if (md->bl.prev == NULL) return 1; - mob_changestate (md, MS_DEAD, 0); - clif_clearchar_area (&md->bl, 1); - map_delblock (&md->bl); - if (mob_get_viewclass (md->mob_class) <= 1000) - clif_clearchar_delay (gettick () + 3000, &md->bl, 0); - mob_deleteslave (md); - mob_setdelayspawn (md->bl.id); + mob_changestate(md, MS_DEAD, 0); + clif_clearchar_area(&md->bl, 1); + map_delblock(&md->bl); + if (mob_get_viewclass(md->mob_class) <= 1000) + clif_clearchar_delay(gettick() + 3000, &md->bl, 0); + mob_deleteslave(md); + mob_setdelayspawn(md->bl.id); return 0; } -int mob_catch_delete (struct mob_data *md, int type) +int mob_catch_delete(struct mob_data *md, int type) { - nullpo_retr (1, md); + nullpo_retr(1, md); if (md->bl.prev == NULL) return 1; - mob_changestate (md, MS_DEAD, 0); - clif_clearchar_area (&md->bl, type); - map_delblock (&md->bl); - mob_setdelayspawn (md->bl.id); + mob_changestate(md, MS_DEAD, 0); + clif_clearchar_area(&md->bl, type); + map_delblock(&md->bl); + mob_setdelayspawn(md->bl.id); return 0; } -void mob_timer_delete (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void mob_timer_delete(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - struct block_list *bl = map_id2bl (id); + struct block_list *bl = map_id2bl(id); struct mob_data *md; - nullpo_retv (bl); + nullpo_retv(bl); md = (struct mob_data *) bl; - mob_catch_delete (md, 3); + mob_catch_delete(md, 3); } /*========================================== @@ -2455,29 +2449,29 @@ void mob_timer_delete (timer_id tid, tick_t tick, custom_id_t id, custom_data_t *------------------------------------------ */ static -void mob_deleteslave_sub (struct block_list *bl, va_list ap) +void mob_deleteslave_sub(struct block_list *bl, va_list ap) { struct mob_data *md; - int id; + int id; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (md = (struct mob_data *) bl); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(md = (struct mob_data *) bl); - id = va_arg (ap, int); + id = va_arg(ap, int); if (md->master_id > 0 && md->master_id == id) - mob_damage (NULL, md, md->hp, 1); + mob_damage(NULL, md, md->hp, 1); } /*========================================== * *------------------------------------------ */ -int mob_deleteslave (struct mob_data *md) +int mob_deleteslave(struct mob_data *md) { - nullpo_retr (0, md); + nullpo_retr(0, md); - map_foreachinarea (mob_deleteslave_sub, md->bl.m, + map_foreachinarea(mob_deleteslave_sub, md->bl.m, 0, 0, map[md->bl.m].xs, map[md->bl.m].ys, BL_MOB, md->bl.id); return 0; @@ -2492,7 +2486,7 @@ const static double damage_bonus_factor[DAMAGE_BONUS_COUNT + 1] = { * It is the damage of sd to damage to md. *------------------------------------------ */ -int mob_damage (struct block_list *src, struct mob_data *md, int damage, +int mob_damage(struct block_list *src, struct mob_data *md, int damage, int type) { int count, minpos, mindmg; @@ -2500,19 +2494,19 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, struct { struct party *p; - int id, base_exp, job_exp; + int id, base_exp, job_exp; } pt[DAMAGELOG_SIZE]; - int pnum = 0; - int mvp_damage, max_hp; - unsigned int tick = gettick (); + int pnum = 0; + int mvp_damage, max_hp; + unsigned int tick = gettick(); struct map_session_data *mvp_sd = NULL, *second_sd = NULL, *third_sd = NULL; double dmg_rate, tdmg, temp; struct item item; - int ret; - int skill, sp; + int ret; + int skill, sp; - nullpo_retr (0, md); //srcはNULLで呼ばれる場合もあるので、他でチェック + nullpo_retr(0, md); //srcはNULLで呼ばれる場合もあるので、他でチェック if (src && src->id == md->master_id && md->mode & MOB_MODE_TURNS_AGAINST_BAD_MASTER) @@ -2524,7 +2518,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, md->attacked_id = src->id; } - max_hp = battle_get_max_hp (&md->bl); + max_hp = battle_get_max_hp(&md->bl); if (src && src->type == BL_PC) { @@ -2537,7 +2531,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, if (md->bl.prev == NULL) { if (battle_config.error_log == 1) - printf ("mob_damage : BlockError!!\n"); + printf("mob_damage : BlockError!!\n"); return 0; } @@ -2545,19 +2539,19 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, { if (md->bl.prev != NULL) { - mob_changestate (md, MS_DEAD, 0); - mobskill_use (md, tick, -1); // It is skill at the time of death. - clif_clearchar_area (&md->bl, 1); - map_delblock (&md->bl); - mob_setdelayspawn (md->bl.id); + mob_changestate(md, MS_DEAD, 0); + mobskill_use(md, tick, -1); // It is skill at the time of death. + clif_clearchar_area(&md->bl, 1); + map_delblock(&md->bl); + mob_setdelayspawn(md->bl.id); } return 0; } if (md->sc_data[SC_ENDURE].timer == -1) - mob_stop_walking (md, 3); + mob_stop_walking(md, 3); if (damage > max_hp >> 2) - skill_stop_dancing (&md->bl, 0); + skill_stop_dancing(&md->bl, 0); if (md->hp > max_hp) md->hp = max_hp; @@ -2602,16 +2596,16 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, && ((struct mob_data *) src)->state.special_mob_ai) { struct mob_data *md2 = (struct mob_data *) src; - struct block_list *master_bl = map_id2bl (md2->master_id); + struct block_list *master_bl = map_id2bl(md2->master_id); if (master_bl && master_bl->type == BL_PC) { - MAP_LOG_PC (((struct map_session_data *) master_bl), + MAP_LOG_PC(((struct map_session_data *) master_bl), "MOB-TO-MOB-DMG FROM MOB%d %d TO MOB%d %d FOR %d", md2->bl.id, md2->mob_class, md->bl.id, md->mob_class, damage); } - nullpo_retr (0, md2); + nullpo_retr(0, md2); int i; for (i = 0, minpos = 0, mindmg = 0x7fffffff; i < DAMAGELOG_SIZE; i++) @@ -2646,20 +2640,20 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, md->hp -= damage; if (md->option & 2) - skill_status_change_end (&md->bl, SC_HIDING, -1); + skill_status_change_end(&md->bl, SC_HIDING, -1); if (md->option & 4) - skill_status_change_end (&md->bl, SC_CLOAKING, -1); + skill_status_change_end(&md->bl, SC_CLOAKING, -1); if (md->state.special_mob_ai == 2) { //スフィアーマイン - int skillidx = 0; + int skillidx = 0; if ((skillidx = - mob_skillid2skillidx (md->mob_class, NPC_SELFDESTRUCTION2)) >= 0) + mob_skillid2skillidx(md->mob_class, NPC_SELFDESTRUCTION2)) >= 0) { md->mode |= 0x1; md->next_walktime = tick; - mobskill_use_id (md, &md->bl, skillidx); //自爆詠唱開始 + mobskill_use_id(md, &md->bl, skillidx); //自爆詠唱開始 md->state.special_mob_ai++; } } @@ -2669,31 +2663,31 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, return 0; } - MAP_LOG ("MOB%d DEAD", md->bl.id); + MAP_LOG("MOB%d DEAD", md->bl.id); // ----- ここから死亡処理 ----- - map_freeblock_lock (); - mob_changestate (md, MS_DEAD, 0); - mobskill_use (md, tick, -1); // 死亡時スキル + map_freeblock_lock(); + mob_changestate(md, MS_DEAD, 0); + mobskill_use(md, tick, -1); // 死亡時スキル - memset (tmpsd, 0, sizeof (tmpsd)); - memset (pt, 0, sizeof (pt)); + memset(tmpsd, 0, sizeof(tmpsd)); + memset(pt, 0, sizeof(pt)); - max_hp = battle_get_max_hp (&md->bl); + max_hp = battle_get_max_hp(&md->bl); if (src && src->type == BL_MOB) - mob_unlocktarget ((struct mob_data *) src, tick); + mob_unlocktarget((struct mob_data *) src, tick); /* ソウルドレイン */ - if (sd && (skill = pc_checkskill (sd, HW_SOULDRAIN)) > 0) + if (sd && (skill = pc_checkskill(sd, HW_SOULDRAIN)) > 0) { - clif_skill_nodamage (src, &md->bl, HW_SOULDRAIN, skill, 1); - sp = (battle_get_lv (&md->bl)) * (65 + 15 * skill) / 100; + clif_skill_nodamage(src, &md->bl, HW_SOULDRAIN, skill, 1); + sp = (battle_get_lv(&md->bl)) * (65 + 15 * skill) / 100; if (sd->status.sp + sp > sd->status.max_sp) sp = sd->status.max_sp - sd->status.sp; sd->status.sp += sp; - clif_heal (sd->fd, SP_SP, sp); + clif_heal(sd->fd, SP_SP, sp); } // map外に消えた人は計算から除くので @@ -2706,11 +2700,11 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, { if (md->dmglog[i].id == 0) continue; - tmpsd[i] = map_id2sd (md->dmglog[i].id); + tmpsd[i] = map_id2sd(md->dmglog[i].id); if (tmpsd[i] == NULL) continue; count++; - if (tmpsd[i]->bl.m != md->bl.m || pc_isdead (tmpsd[i])) + if (tmpsd[i]->bl.m != md->bl.m || pc_isdead(tmpsd[i])) continue; tdmg += (double) md->dmglog[i].dmg; @@ -2736,21 +2730,21 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, for (int i = 0; i < DAMAGELOG_SIZE; i++) { - int pid, base_exp, job_exp, flag = 1; + int pid, base_exp, job_exp, flag = 1; double per; struct party *p; if (tmpsd[i] == NULL || tmpsd[i]->bl.m != md->bl.m) continue; /* jAthena's exp formula - per = ((double)md->dmglog[i].dmg)*(9.+(double)((count > 6)? 6:count))/10./((double)max_hp) * dmg_rate; - temp = ((double)mob_db[md->mob_class].base_exp * (double)battle_config.base_exp_rate / 100. * per); - base_exp = (temp > 2147483647.)? 0x7fffffff:(int)temp; - if(mob_db[md->mob_class].base_exp > 0 && base_exp < 1) base_exp = 1; - if(base_exp < 0) base_exp = 0; - temp = ((double)mob_db[md->mob_class].job_exp * (double)battle_config.job_exp_rate / 100. * per); - job_exp = (temp > 2147483647.)? 0x7fffffff:(int)temp; - if(mob_db[md->mob_class].job_exp > 0 && job_exp < 1) job_exp = 1; - if(job_exp < 0) job_exp = 0; + per = ((double)md->dmglog[i].dmg)* (9.+(double)((count > 6)? 6:count))/10./((double)max_hp) * dmg_rate; + temp = ((double)mob_db[md->mob_class].base_exp * (double)battle_config.base_exp_rate / 100. * per); + base_exp = (temp > 2147483647.)? 0x7fffffff:(int)temp; + if (mob_db[md->mob_class].base_exp > 0 && base_exp < 1) base_exp = 1; + if (base_exp < 0) base_exp = 0; + temp = ((double)mob_db[md->mob_class].job_exp * (double)battle_config.job_exp_rate / 100. * per); + job_exp = (temp > 2147483647.)? 0x7fffffff:(int)temp; + if (mob_db[md->mob_class].job_exp > 0 && job_exp < 1) job_exp = 1; + if (job_exp < 0) job_exp = 0; */ //eAthena's exp formula rather than jAthena's // per=(double)md->dmglog[i].dmg*256*(9+(double)((count > 6)? 6:count))/10/(double)max_hp; @@ -2789,13 +2783,13 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, if ((pid = tmpsd[i]->status.party_id) > 0) { // パーティに入っている - int j = 0; + int j = 0; for (j = 0; j < pnum; j++) // 公平パーティリストにいるかどうか if (pt[j].id == pid) break; if (j == pnum) { // いないときは公平かどうか確認 - if ((p = party_search (pid)) != NULL && p->exp != 0) + if ((p = party_search(pid)) != NULL && p->exp != 0) { pt[pnum].id = pid; pt[pnum].p = p; @@ -2813,11 +2807,11 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, } } if (flag) // 各自所得 - pc_gainexp (tmpsd[i], base_exp, job_exp); + pc_gainexp(tmpsd[i], base_exp, job_exp); } // 公平分配 for (int i = 0; i < pnum; i++) - party_exp_share (pt[i].p, md->bl.m, pt[i].base_exp, + party_exp_share(pt[i].p, md->bl.m, pt[i].base_exp, pt[i].job_exp); // item drop @@ -2826,7 +2820,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, for (int i = 0; i < 8; i++) { struct delay_item_drop *ditem; - int drop_rate; + int drop_rate; if (md->state.special_mob_ai >= 1 && battle_config.alchemist_summon_reward != 1) // Added [Valaris] break; // End @@ -2841,11 +2835,11 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, if (sd && md && battle_config.pk_mode == 1 && (mob_db[md->mob_class].lv - sd->status.base_level >= 20)) drop_rate *= 1.25; // pk_mode increase drops if 20 level difference [Valaris] - if (drop_rate <= MRAND (10000)) + if (drop_rate <= MRAND(10000)) continue; ditem = (struct delay_item_drop *) - calloc (1, sizeof (struct delay_item_drop)); + calloc(1, sizeof(struct delay_item_drop)); ditem->nameid = mob_db[md->mob_class].dropitem[i].nameid; ditem->amount = 1; ditem->m = md->bl.m; @@ -2854,14 +2848,14 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, ditem->first_sd = mvp_sd; ditem->second_sd = second_sd; ditem->third_sd = third_sd; - add_timer (tick + 500 + i, mob_delay_item_drop, (int) ditem, 0); + add_timer(tick + 500 + i, mob_delay_item_drop, (int) ditem, 0); } if (sd && sd->state.attack_type == BF_WEAPON) { for (int i = 0; i < sd->monster_drop_item_count; i++) { struct delay_item_drop *ditem; - int race = battle_get_race (&md->bl); + int race = battle_get_race(&md->bl); if (sd->monster_drop_itemid[i] <= 0) continue; if (sd->monster_drop_race[i] & (1 << race) || @@ -2870,11 +2864,11 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, || (!(mob_db[md->mob_class].mode & 0x20) && sd->monster_drop_race[i] & 1 << 11)) { - if (sd->monster_drop_itemrate[i] <= MRAND (10000)) + if (sd->monster_drop_itemrate[i] <= MRAND(10000)) continue; ditem = (struct delay_item_drop *) - calloc (1, sizeof (struct delay_item_drop)); + calloc(1, sizeof(struct delay_item_drop)); ditem->nameid = sd->monster_drop_itemid[i]; ditem->amount = 1; ditem->m = md->bl.m; @@ -2883,14 +2877,14 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, ditem->first_sd = mvp_sd; ditem->second_sd = second_sd; ditem->third_sd = third_sd; - add_timer (tick + 520 + i, mob_delay_item_drop, + add_timer(tick + 520 + i, mob_delay_item_drop, (int) ditem, 0); } } if (sd->get_zeny_num > 0) - pc_getzeny (sd, + pc_getzeny(sd, mob_db[md->mob_class].lv * 10 + - MRAND ((sd->get_zeny_num + 1))); + MRAND((sd->get_zeny_num + 1))); } if (md->lootitem) { @@ -2899,16 +2893,16 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, struct delay_item_drop2 *ditem; ditem = (struct delay_item_drop2 *) - calloc (1, sizeof (struct delay_item_drop2)); - memcpy (&ditem->item_data, &md->lootitem[i], - sizeof (md->lootitem[0])); + calloc(1, sizeof(struct delay_item_drop2)); + memcpy(&ditem->item_data, &md->lootitem[i], + sizeof(md->lootitem[0])); ditem->m = md->bl.m; ditem->x = md->bl.x; ditem->y = md->bl.y; ditem->first_sd = mvp_sd; ditem->second_sd = second_sd; ditem->third_sd = third_sd; - add_timer (tick + 540 + i, mob_delay_item_drop2, + add_timer(tick + 540 + i, mob_delay_item_drop2, (int) ditem, 0); } } @@ -2917,20 +2911,20 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, // mvp処理 if (mvp_sd && mob_db[md->mob_class].mexp > 0) { - int j; - int mexp = battle_get_mexp (&md->bl); + int j; + int mexp = battle_get_mexp(&md->bl); temp = ((double) mexp * (double) battle_config.mvp_exp_rate * (9. + (double) count) / 1000.); mexp = (temp > 2147483647.) ? 0x7fffffff : (int) temp; if (mexp < 1) mexp = 1; - clif_mvp_effect (mvp_sd); // エフェクト - clif_mvp_exp (mvp_sd, mexp); - pc_gainexp (mvp_sd, mexp, 0); + clif_mvp_effect(mvp_sd); // エフェクト + clif_mvp_exp(mvp_sd, mexp); + pc_gainexp(mvp_sd, mexp, 0); for (j = 0; j < 3; j++) { - int i = MRAND (3); + int i = MRAND(3); if (mob_db[md->mob_class].mvpitem[i].nameid <= 0) continue; int drop_rate = mob_db[md->mob_class].mvpitem[i].p; @@ -2940,20 +2934,20 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, drop_rate = battle_config.item_drop_mvp_min; if (drop_rate > battle_config.item_drop_mvp_max) drop_rate = battle_config.item_drop_mvp_max; - if (drop_rate <= MRAND (10000)) + if (drop_rate <= MRAND(10000)) continue; - memset (&item, 0, sizeof (item)); + memset(&item, 0, sizeof(item)); item.nameid = mob_db[md->mob_class].mvpitem[i].nameid; - item.identify = !itemdb_isequip3 (item.nameid); - clif_mvp_item (mvp_sd, item.nameid); + item.identify = !itemdb_isequip3(item.nameid); + clif_mvp_item(mvp_sd, item.nameid); if (mvp_sd->weight * 2 > mvp_sd->max_weight) - map_addflooritem (&item, 1, mvp_sd->bl.m, mvp_sd->bl.x, + map_addflooritem(&item, 1, mvp_sd->bl.m, mvp_sd->bl.x, mvp_sd->bl.y, mvp_sd, second_sd, third_sd, 1); - else if ((ret = pc_additem (mvp_sd, &item, 1))) + else if ((ret = pc_additem(mvp_sd, &item, 1))) { - clif_additem (sd, 0, 0, ret); - map_addflooritem (&item, 1, mvp_sd->bl.m, mvp_sd->bl.x, + clif_additem(sd, 0, 0, ret); + map_addflooritem(&item, 1, mvp_sd->bl.m, mvp_sd->bl.x, mvp_sd->bl.y, mvp_sd, second_sd, third_sd, 1); } @@ -2973,7 +2967,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, else { struct map_session_data *tmp_sd; - int i; + int i; for (i = 0; i < fd_max; i++) { if (session[i] && (tmp_sd = (struct map_session_data *)session[i]->session_data) @@ -2989,16 +2983,16 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, } } if (sd) - npc_event (sd, md->npc_event, 0); + npc_event(sd, md->npc_event, 0); } - clif_clearchar_area (&md->bl, 1); - map_delblock (&md->bl); - if (mob_get_viewclass (md->mob_class) <= 1000) - clif_clearchar_delay (tick + 3000, &md->bl, 0); - mob_deleteslave (md); - mob_setdelayspawn (md->bl.id); - map_freeblock_unlock (); + clif_clearchar_area(&md->bl, 1); + map_delblock(&md->bl); + if (mob_get_viewclass(md->mob_class) <= 1000) + clif_clearchar_delay(tick + 3000, &md->bl, 0); + mob_deleteslave(md); + mob_setdelayspawn(md->bl.id); + map_freeblock_unlock(); return 0; } @@ -3007,13 +3001,13 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, * *------------------------------------------ */ -int mob_class_change (struct mob_data *md, int *value) +int mob_class_change(struct mob_data *md, int *value) { - unsigned int tick = gettick (); - int i, c, hp_rate, max_hp, mob_class, count = 0; + unsigned int tick = gettick(); + int i, c, hp_rate, max_hp, mob_class, count = 0; - nullpo_retr (0, md); - nullpo_retr (0, value); + nullpo_retr(0, md); + nullpo_retr(0, value); if (value[0] <= 1000 || value[0] > 2000) return 0; @@ -3025,19 +3019,19 @@ int mob_class_change (struct mob_data *md, int *value) if (count < 1) return 0; - mob_class = value[MRAND (count)]; + mob_class = value[MRAND(count)]; if (mob_class <= 1000 || mob_class > 2000) return 0; - max_hp = battle_get_max_hp (&md->bl); + max_hp = battle_get_max_hp(&md->bl); hp_rate = md->hp * 100 / max_hp; - clif_mob_class_change (md, mob_class); + clif_mob_class_change(md, mob_class); md->mob_class = mob_class; - max_hp = battle_get_max_hp (&md->bl); + max_hp = battle_get_max_hp(&md->bl); if (battle_config.monster_class_change_full_recover == 1) { md->hp = max_hp; - memset (md->dmglog, 0, sizeof (md->dmglog)); + memset(md->dmglog, 0, sizeof(md->dmglog)); } else md->hp = max_hp * hp_rate / 100; @@ -3046,8 +3040,8 @@ int mob_class_change (struct mob_data *md, int *value) else if (md->hp < 1) md->hp = 1; - memcpy (md->name, mob_db[mob_class].jname, 24); - memset (&md->state, 0, sizeof (md->state)); + memcpy(md->name, mob_db[mob_class].jname, 24); + memset(&md->state, 0, sizeof(md->state)); md->attacked_id = 0; md->target_id = 0; md->move_fail_count = 0; @@ -3055,11 +3049,11 @@ int mob_class_change (struct mob_data *md, int *value) md->stats[MOB_SPEED] = mob_db[md->mob_class].speed; md->def_ele = mob_db[md->mob_class].element; - mob_changestate (md, MS_IDLE, 0); - skill_castcancel (&md->bl, 0); + mob_changestate(md, MS_IDLE, 0); + skill_castcancel(&md->bl, 0); md->state.skillstate = MSS_IDLE; md->last_thinktime = tick; - md->next_walktime = tick + MPRAND (5000, 50); + md->next_walktime = tick + MPRAND(5000, 50); md->attackabletime = tick; md->canmove_tick = tick; md->sg_count = 0; @@ -3071,13 +3065,13 @@ int mob_class_change (struct mob_data *md, int *value) if (md->lootitem == NULL && mob_db[mob_class].mode & 0x02) md->lootitem = (struct item *) - calloc (LOOTITEM_SIZE, sizeof (struct item)); + calloc(LOOTITEM_SIZE, sizeof(struct item)); - skill_clear_unitgroup (&md->bl); - skill_cleartimerskill (&md->bl); + skill_clear_unitgroup(&md->bl); + skill_cleartimerskill(&md->bl); - clif_clearchar_area (&md->bl, 0); - clif_spawnmob (md); + clif_clearchar_area(&md->bl, 0); + clif_spawnmob(md); return 0; } @@ -3086,11 +3080,11 @@ int mob_class_change (struct mob_data *md, int *value) * mob回復 *------------------------------------------ */ -int mob_heal (struct mob_data *md, int heal) +int mob_heal(struct mob_data *md, int heal) { - int max_hp = battle_get_max_hp (&md->bl); + int max_hp = battle_get_max_hp(&md->bl); - nullpo_retr (0, md); + nullpo_retr(0, md); md->hp += heal; if (max_hp < md->hp) @@ -3104,16 +3098,16 @@ int mob_heal (struct mob_data *md, int heal) *------------------------------------------ */ static -void mob_warpslave_sub (struct block_list *bl, va_list ap) +void mob_warpslave_sub(struct block_list *bl, va_list ap) { struct mob_data *md = (struct mob_data *) bl; - int id, x, y; - id = va_arg (ap, int); - x = va_arg (ap, int); - y = va_arg (ap, int); + int id, x, y; + id = va_arg(ap, int); + x = va_arg(ap, int); + y = va_arg(ap, int); if (md->master_id == id) { - mob_warp (md, -1, x, y, 2); + mob_warp(md, -1, x, y, 2); } } @@ -3122,10 +3116,10 @@ void mob_warpslave_sub (struct block_list *bl, va_list ap) *------------------------------------------ */ static -int mob_warpslave (struct mob_data *md, int x, int y) +int mob_warpslave(struct mob_data *md, int x, int y) { //printf("warp slave\n"); - map_foreachinarea (mob_warpslave_sub, md->bl.m, + map_foreachinarea(mob_warpslave_sub, md->bl.m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, BL_MOB, md->bl.id, md->bl.x, md->bl.y); @@ -3136,11 +3130,11 @@ int mob_warpslave (struct mob_data *md, int x, int y) * mobワープ *------------------------------------------ */ -int mob_warp (struct mob_data *md, int m, int x, int y, int type) +int mob_warp(struct mob_data *md, int m, int x, int y, int type) { - int i = 0, c, xs = 0, ys = 0, bx = x, by = y; + int i = 0, c, xs = 0, ys = 0, bx = x, by = y; - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->bl.prev == NULL) return 0; @@ -3152,28 +3146,28 @@ int mob_warp (struct mob_data *md, int m, int x, int y, int type) { if (map[md->bl.m].flag.monster_noteleport) return 0; - clif_clearchar_area (&md->bl, type); + clif_clearchar_area(&md->bl, type); } - skill_unit_out_all (&md->bl, gettick (), 1); - map_delblock (&md->bl); + skill_unit_out_all(&md->bl, gettick(), 1); + map_delblock(&md->bl); if (bx > 0 && by > 0) { // 位置指定の場合周囲９セルを探索 xs = ys = 9; } - while ((x < 0 || y < 0 || ((c = read_gat (m, x, y)) == 1 || c == 5)) + while ((x < 0 || y < 0 || ((c = read_gat(m, x, y)) == 1 || c == 5)) && (i++) < 1000) { if (xs > 0 && ys > 0 && i < 250) { // 指定位置付近の探索 - x = MPRAND (bx, xs) - xs / 2; - y = MPRAND (by, ys) - ys / 2; + x = MPRAND(bx, xs) - xs / 2; + y = MPRAND(by, ys) - ys / 2; } else { // 完全ランダム探索 - x = MPRAND (1, (map[m].xs - 2)); - y = MPRAND (1, (map[m].ys - 2)); + x = MPRAND(1, (map[m].xs - 2)); + y = MPRAND(1, (map[m].ys - 2)); } } md->dir = 0; @@ -3187,27 +3181,27 @@ int mob_warp (struct mob_data *md, int m, int x, int y, int type) { m = md->bl.m; if (battle_config.error_log == 1) - printf ("MOB %d warp failed, mob_class = %d\n", md->bl.id, md->mob_class); + printf("MOB %d warp failed, mob_class = %d\n", md->bl.id, md->mob_class); } md->target_id = 0; // タゲを解除する md->state.targettype = NONE_ATTACKABLE; md->attacked_id = 0; md->state.skillstate = MSS_IDLE; - mob_changestate (md, MS_IDLE, 0); + mob_changestate(md, MS_IDLE, 0); if (type > 0 && i == 1000) { if (battle_config.battle_log == 1) - printf ("MOB %d warp to (%d,%d), mob_class = %d\n", md->bl.id, x, y, + printf("MOB %d warp to (%d,%d), mob_class = %d\n", md->bl.id, x, y, md->mob_class); } - map_addblock (&md->bl); + map_addblock(&md->bl); if (type > 0) { - clif_spawnmob (md); - mob_warpslave (md, md->bl.x, md->bl.y); + clif_spawnmob(md); + mob_warpslave(md, md->bl.x, md->bl.y); } return 0; @@ -3218,17 +3212,17 @@ int mob_warp (struct mob_data *md, int m, int x, int y, int type) *------------------------------------------ */ static -void mob_countslave_sub (struct block_list *bl, va_list ap) +void mob_countslave_sub(struct block_list *bl, va_list ap) { - int id, *c; + int id, *c; struct mob_data *md; - id = va_arg (ap, int); + id = va_arg(ap, int); - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (c = va_arg (ap, int *)); - nullpo_retv (md = (struct mob_data *) bl); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(c = va_arg(ap, int *)); + nullpo_retv(md = (struct mob_data *) bl); if (md->master_id == id) (*c)++; @@ -3239,13 +3233,13 @@ void mob_countslave_sub (struct block_list *bl, va_list ap) *------------------------------------------ */ static -int mob_countslave (struct mob_data *md) +int mob_countslave(struct mob_data *md) { - int c = 0; + int c = 0; - nullpo_retr (0, md); + nullpo_retr(0, md); - map_foreachinarea (mob_countslave_sub, md->bl.m, + map_foreachinarea(mob_countslave_sub, md->bl.m, 0, 0, map[md->bl.m].xs - 1, map[md->bl.m].ys - 1, BL_MOB, md->bl.id, &c); return c; @@ -3255,13 +3249,13 @@ int mob_countslave (struct mob_data *md) * 手下MOB召喚 *------------------------------------------ */ -int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) +int mob_summonslave(struct mob_data *md2, int *value, int amount, int flag) { struct mob_data *md; - int bx, by, m, count = 0, mob_class, k, a = amount; + int bx, by, m, count = 0, mob_class, k, a = amount; - nullpo_retr (0, md2); - nullpo_retr (0, value); + nullpo_retr(0, md2); + nullpo_retr(0, value); bx = md2->bl.x; by = md2->bl.y; @@ -3282,19 +3276,19 @@ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) continue; for (; amount > 0; amount--) { - int x = 0, y = 0, c = 0, i = 0; - md = (struct mob_data *) calloc (1, sizeof (struct mob_data)); + int x = 0, y = 0, c = 0, i = 0; + md = (struct mob_data *) calloc(1, sizeof(struct mob_data)); if (mob_db[mob_class].mode & 0x02) md->lootitem = (struct item *) - calloc (LOOTITEM_SIZE, sizeof (struct item)); + calloc(LOOTITEM_SIZE, sizeof(struct item)); else md->lootitem = NULL; - while ((x <= 0 || y <= 0 || (c = map_getcell (m, x, y)) == 1 + while ((x <= 0 || y <= 0 || (c = map_getcell(m, x, y)) == 1 || c == 5) && (i++) < 100) { - x = MPRAND (bx, 9) - 4; - y = MPRAND (by, 9) - 4; + x = MPRAND(bx, 9) - 4; + y = MPRAND(by, 9) - 4; } if (i >= 100) { @@ -3302,7 +3296,7 @@ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) y = by; } - mob_spawn_dataset (md, "--ja--", mob_class); + mob_spawn_dataset(md, "--ja--", mob_class); md->bl.prev = NULL; md->bl.next = NULL; md->bl.m = m; @@ -3318,11 +3312,11 @@ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) md->spawndelay1 = -1; // 一度のみフラグ md->spawndelay2 = -1; // 一度のみフラグ - memset (md->npc_event, 0, sizeof (md->npc_event)); + memset(md->npc_event, 0, sizeof(md->npc_event)); md->bl.type = BL_MOB; - map_addiddb (&md->bl); - mob_spawn (md->bl.id); - clif_skill_nodamage (&md->bl, &md->bl, + map_addiddb(&md->bl); + mob_spawn(md->bl.id); + clif_skill_nodamage(&md->bl, &md->bl, (flag) ? NPC_SUMMONSLAVE : NPC_SUMMONMONSTER, a, 1); @@ -3338,18 +3332,18 @@ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) *------------------------------------------ */ static -void mob_counttargeted_sub (struct block_list *bl, va_list ap) +void mob_counttargeted_sub(struct block_list *bl, va_list ap) { - int id, *c, target_lv; + int id, *c, target_lv; struct block_list *src; - id = va_arg (ap, int); - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (c = va_arg (ap, int *)); + id = va_arg(ap, int); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(c = va_arg(ap, int *)); - src = va_arg (ap, struct block_list *); - target_lv = va_arg (ap, int); + src = va_arg(ap, struct block_list *); + target_lv = va_arg(ap, int); if (id == bl->id || (src && id == src->id)) return; if (bl->type == BL_PC) @@ -3372,14 +3366,14 @@ void mob_counttargeted_sub (struct block_list *bl, va_list ap) * 自分をロックしているPCの数を数える *------------------------------------------ */ -int mob_counttargeted (struct mob_data *md, struct block_list *src, +int mob_counttargeted(struct mob_data *md, struct block_list *src, int target_lv) { - int c = 0; + int c = 0; - nullpo_retr (0, md); + nullpo_retr(0, md); - map_foreachinarea (mob_counttargeted_sub, md->bl.m, + map_foreachinarea(mob_counttargeted_sub, md->bl.m, md->bl.x - AREA_SIZE, md->bl.y - AREA_SIZE, md->bl.x + AREA_SIZE, md->bl.y + AREA_SIZE, 0, md->bl.id, &c, src, target_lv); @@ -3390,9 +3384,9 @@ int mob_counttargeted (struct mob_data *md, struct block_list *src, *MOBskillから該当skillidのskillidxを返す *------------------------------------------ */ -int mob_skillid2skillidx (int mob_class, int skillid) +int mob_skillid2skillidx(int mob_class, int skillid) { - int i; + int i; struct mob_skill *ms = mob_db[mob_class].skill; if (ms == NULL) @@ -3415,18 +3409,18 @@ int mob_skillid2skillidx (int mob_class, int skillid) * スキル使用（詠唱完了、ID指定） *------------------------------------------ */ -void mobskill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void mobskill_castend_id(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct mob_data *md = NULL; struct block_list *bl; struct block_list *mbl; - int range; + int range; - if ((mbl = map_id2bl (id)) == NULL) //詠唱したMobがもういないというのは良くある正常処理 + if ((mbl = map_id2bl(id)) == NULL) //詠唱したMobがもういないというのは良くある正常処理 return; if ((md = (struct mob_data *) mbl) == NULL) { - printf ("mobskill_castend_id nullpo mbl->id:%d\n", mbl->id); + printf("mobskill_castend_id nullpo mbl->id:%d\n", mbl->id); return; } if (md->bl.type != BL_MOB || md->bl.prev == NULL) @@ -3450,9 +3444,9 @@ void mobskill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data return; } if (md->skillid != NPC_EMOTION) - md->last_thinktime = tick + battle_get_adelay (&md->bl); + md->last_thinktime = tick + battle_get_adelay(&md->bl); - if ((bl = map_id2bl (md->skilltarget)) == NULL || bl->prev == NULL) + if ((bl = map_id2bl(md->skilltarget)) == NULL || bl->prev == NULL) { //スキルターゲットが存在しない //printf("mobskill_castend_id nullpo\n");//ターゲットがいないときはnullpoじゃなくて普通に終了 return; @@ -3462,7 +3456,7 @@ void mobskill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data if (md->skillid == PR_LEXAETERNA) { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); if (sc_data && (sc_data[SC_FREEZE].timer != -1 || (sc_data[SC_STONE].timer != -1 @@ -3471,47 +3465,47 @@ void mobskill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data } else if (md->skillid == RG_BACKSTAP) { - int dir = map_calc_dir (&md->bl, bl->x, bl->y), t_dir = - battle_get_dir (bl); - int dist = distance (md->bl.x, md->bl.y, bl->x, bl->y); - if (bl->type != BL_SKILL && (dist == 0 || map_check_dir (dir, t_dir))) + int dir = map_calc_dir(&md->bl, bl->x, bl->y), t_dir = + battle_get_dir(bl); + int dist = distance(md->bl.x, md->bl.y, bl->x, bl->y); + if (bl->type != BL_SKILL && (dist == 0 || map_check_dir(dir, t_dir))) return; } - if (((skill_get_inf (md->skillid) & 1) || (skill_get_inf2 (md->skillid) & 4)) && // 彼我敵対関係チェック - battle_check_target (&md->bl, bl, BCT_ENEMY) <= 0) + if (((skill_get_inf(md->skillid) & 1) || (skill_get_inf2(md->skillid) & 4)) && // 彼我敵対関係チェック + battle_check_target(&md->bl, bl, BCT_ENEMY) <= 0) return; - range = skill_get_range (md->skillid, md->skilllv); + range = skill_get_range(md->skillid, md->skilllv); if (range < 0) - range = battle_get_range (&md->bl) - (range + 1); + range = battle_get_range(&md->bl) - (range + 1); if (range + battle_config.mob_skill_add_range < - distance (md->bl.x, md->bl.y, bl->x, bl->y)) + distance(md->bl.x, md->bl.y, bl->x, bl->y)) return; md->skilldelay[md->skillidx] = tick; if (battle_config.mob_skill_log == 1) - printf ("MOB skill castend skill=%d, mob_class = %d\n", md->skillid, + printf("MOB skill castend skill=%d, mob_class = %d\n", md->skillid, md->mob_class); - mob_stop_walking (md, 0); + mob_stop_walking(md, 0); - switch (skill_get_nk (md->skillid)) + switch (skill_get_nk(md->skillid)) { // 攻撃系/吹き飛ばし系 case 0: case 2: - skill_castend_damage_id (&md->bl, bl, md->skillid, md->skilllv, + skill_castend_damage_id(&md->bl, bl, md->skillid, md->skilllv, tick, 0); break; case 1: // 支援系 if (!mob_db[md->mob_class].skill[md->skillidx].val[0] && (md->skillid == AL_HEAL || (md->skillid == ALL_RESURRECTION && bl->type != BL_PC)) - && battle_check_undead (battle_get_race (bl), - battle_get_elem_type (bl))) - skill_castend_damage_id (&md->bl, bl, md->skillid, + && battle_check_undead(battle_get_race(bl), + battle_get_elem_type(bl))) + skill_castend_damage_id(&md->bl, bl, md->skillid, md->skilllv, tick, 0); else - skill_castend_nodamage_id (&md->bl, bl, md->skillid, + skill_castend_nodamage_id(&md->bl, bl, md->skillid, md->skilllv, tick, 0); break; } @@ -3521,17 +3515,17 @@ void mobskill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data * スキル使用（詠唱完了、場所指定） *------------------------------------------ */ -void mobskill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void mobskill_castend_pos(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct mob_data *md = NULL; struct block_list *bl; - int range, maxcount; + int range, maxcount; //mobskill_castend_id同様詠唱したMobが詠唱完了時にもういないというのはありそうなのでnullpoから除外 - if ((bl = map_id2bl (id)) == NULL) + if ((bl = map_id2bl(id)) == NULL) return; - nullpo_retv (md = (struct mob_data *) bl); + nullpo_retv(md = (struct mob_data *) bl); if (md->bl.type != BL_MOB || md->bl.prev == NULL) return; @@ -3580,8 +3574,7 @@ void mobskill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_dat } if (range >= 0) { - if (skill_check_unit_range - (md->bl.m, md->skillx, md->skilly, range, md->skillid) > 0) + if (skill_check_unit_range(md->bl.m, md->skillx, md->skilly, range, md->skillid) > 0) return; } } @@ -3610,18 +3603,17 @@ void mobskill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_dat } if (range >= 0) { - if (skill_check_unit_range2 - (md->bl.m, md->skillx, md->skilly, range) > 0) + if (skill_check_unit_range2(md->bl.m, md->skillx, md->skilly, range) > 0) return; } } if (battle_config.monster_land_skill_limit == 1) { - maxcount = skill_get_maxcount (md->skillid); + maxcount = skill_get_maxcount(md->skillid); if (maxcount > 0) { - int i, c; + int i, c; for (i = c = 0; i < MAX_MOBSKILLUNITGROUP; i++) { if (md->skillunit[i].alive_count > 0 @@ -3633,20 +3625,20 @@ void mobskill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_dat } } - range = skill_get_range (md->skillid, md->skilllv); + range = skill_get_range(md->skillid, md->skilllv); if (range < 0) - range = battle_get_range (&md->bl) - (range + 1); + range = battle_get_range(&md->bl) - (range + 1); if (range + battle_config.mob_skill_add_range < - distance (md->bl.x, md->bl.y, md->skillx, md->skilly)) + distance(md->bl.x, md->bl.y, md->skillx, md->skilly)) return; md->skilldelay[md->skillidx] = tick; if (battle_config.mob_skill_log == 1) - printf ("MOB skill castend skill=%d, mob_class = %d\n", md->skillid, + printf("MOB skill castend skill=%d, mob_class = %d\n", md->skillid, md->mob_class); - mob_stop_walking (md, 0); + mob_stop_walking(md, 0); - skill_castend_pos2 (&md->bl, md->skillx, md->skilly, md->skillid, + skill_castend_pos2(&md->bl, md->skillx, md->skilly, md->skillid, md->skilllv, tick, 0); return; @@ -3656,17 +3648,17 @@ void mobskill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_dat * Skill use (an aria start, ID specification) *------------------------------------------ */ -int mobskill_use_id (struct mob_data *md, struct block_list *target, +int mobskill_use_id(struct mob_data *md, struct block_list *target, int skill_idx) { - int casttime, range; + int casttime, range; struct mob_skill *ms; - int skill_id, skill_lv, forcecast = 0; + int skill_id, skill_lv, forcecast = 0; - nullpo_retr (0, md); - nullpo_retr (0, ms = &mob_db[md->mob_class].skill[skill_idx]); + nullpo_retr(0, md); + nullpo_retr(0, ms = &mob_db[md->mob_class].skill[skill_idx]); - if (target == NULL && (target = map_id2bl (md->target_id)) == NULL) + if (target == NULL && (target = map_id2bl(md->target_id)) == NULL) return 0; if (target->prev == NULL || md->bl.prev == NULL) @@ -3696,34 +3688,34 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, && skill_id != RG_BACKSTAP && skill_id != RG_RAID) return 0; - if (skill_get_inf2 (skill_id) & 0x200 && md->bl.id == target->id) + if (skill_get_inf2(skill_id) & 0x200 && md->bl.id == target->id) return 0; // 射程と障害物チェック - range = skill_get_range (skill_id, skill_lv); + range = skill_get_range(skill_id, skill_lv); if (range < 0) - range = battle_get_range (&md->bl) - (range + 1); + range = battle_get_range(&md->bl) - (range + 1); - if (!battle_check_range (&md->bl, target, range)) + if (!battle_check_range(&md->bl, target, range)) return 0; // delay=skill_delayfix(&md->bl, skill_get_delay( skill_id,skill_lv) ); - casttime = skill_castfix (&md->bl, ms->casttime); + casttime = skill_castfix(&md->bl, ms->casttime); md->state.skillcastcancel = ms->cancel; - md->skilldelay[skill_idx] = gettick (); + md->skilldelay[skill_idx] = gettick(); switch (skill_id) { /* 何か特殊な処理が必要 */ case ALL_RESURRECTION: /* リザレクション */ if (target->type != BL_PC - && battle_check_undead (battle_get_race (target), - battle_get_elem_type (target))) + && battle_check_undead(battle_get_race(target), + battle_get_elem_type(target))) { /* 敵がアンデッドなら */ forcecast = 1; /* ターンアンデットと同じ詠唱時間 */ casttime = - skill_castfix (&md->bl, - skill_get_cast (PR_TURNUNDEAD, skill_lv)); + skill_castfix(&md->bl, + skill_get_cast(PR_TURNUNDEAD, skill_lv)); } break; case MO_EXTREMITYFIST: /*阿修羅覇鳳拳 */ @@ -3734,23 +3726,22 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, } if (battle_config.mob_skill_log == 1) - printf - ("MOB skill use target_id=%d skill=%d lv=%d cast=%d, mob_class = %d\n", + printf("MOB skill use target_id=%d skill=%d lv=%d cast=%d, mob_class = %d\n", target->id, skill_id, skill_lv, casttime, md->mob_class); if (casttime > 0 || forcecast) { // 詠唱が必要 // struct mob_data *md2; - clif_skillcasting (&md->bl, + clif_skillcasting(&md->bl, md->bl.id, target->id, 0, 0, skill_id, casttime); // 詠唱反応モンスター -/* if( target->type==BL_MOB && mob_db[(md2=(struct mob_data *)target)->mob_class].mode&0x10 && - md2->state.state!=MS_ATTACK){ - md2->target_id=md->bl.id; - md->state.targettype = ATTACKABLE; - md2->min_chase=13; - }*/ +/* if ( target->type==BL_MOB && mob_db[(md2= (struct mob_data *)target)->mob_class].mode&0x10 && + md2->state.state!=MS_ATTACK){ + md2->target_id=md->bl.id; + md->state.targettype = ATTACKABLE; + md2->min_chase=13; + }*/ } if (casttime <= 0) // 詠唱の無いものはキャンセルされない @@ -3765,18 +3756,18 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, if (!(battle_config.monster_cloak_check_type & 2) && md->sc_data[SC_CLOAKING].timer != -1 && md->skillid != AS_CLOAKING) - skill_status_change_end (&md->bl, SC_CLOAKING, -1); + skill_status_change_end(&md->bl, SC_CLOAKING, -1); if (casttime > 0) { md->skilltimer = - add_timer (gettick () + casttime, mobskill_castend_id, md->bl.id, + add_timer(gettick() + casttime, mobskill_castend_id, md->bl.id, 0); } else { md->skilltimer = -1; - mobskill_castend_id (md->skilltimer, gettick (), md->bl.id, 0); + mobskill_castend_id(md->skilltimer, gettick(), md->bl.id, 0); } return 1; @@ -3787,16 +3778,16 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, *------------------------------------------ */ static -int mobskill_use_pos (struct mob_data *md, +int mobskill_use_pos(struct mob_data *md, int skill_x, int skill_y, int skill_idx) { - int casttime = 0, range; + int casttime = 0, range; struct mob_skill *ms; struct block_list bl; - int skill_id, skill_lv; + int skill_id, skill_lv; - nullpo_retr (0, md); - nullpo_retr (0, ms = &mob_db[md->mob_class].skill[skill_idx]); + nullpo_retr(0, md); + nullpo_retr(0, ms = &mob_db[md->mob_class].skill[skill_idx]); if (md->bl.prev == NULL) return 0; @@ -3827,24 +3818,23 @@ int mobskill_use_pos (struct mob_data *md, bl.m = md->bl.m; bl.x = skill_x; bl.y = skill_y; - range = skill_get_range (skill_id, skill_lv); + range = skill_get_range(skill_id, skill_lv); if (range < 0) - range = battle_get_range (&md->bl) - (range + 1); - if (!battle_check_range (&md->bl, &bl, range)) + range = battle_get_range(&md->bl) - (range + 1); + if (!battle_check_range(&md->bl, &bl, range)) return 0; // delay=skill_delayfix(&sd->bl, skill_get_delay( skill_id,skill_lv) ); - casttime = skill_castfix (&md->bl, ms->casttime); - md->skilldelay[skill_idx] = gettick (); + casttime = skill_castfix(&md->bl, ms->casttime); + md->skilldelay[skill_idx] = gettick(); md->state.skillcastcancel = ms->cancel; if (battle_config.mob_skill_log == 1) - printf - ("MOB skill use target_pos=(%d,%d) skill=%d lv=%d cast=%d, mob_class = %d\n", + printf("MOB skill use target_pos= (%d,%d) skill=%d lv=%d cast=%d, mob_class = %d\n", skill_x, skill_y, skill_id, skill_lv, casttime, md->mob_class); if (casttime > 0) // A cast time is required. - clif_skillcasting (&md->bl, + clif_skillcasting(&md->bl, md->bl.id, 0, skill_x, skill_y, skill_id, casttime); @@ -3859,17 +3849,17 @@ int mobskill_use_pos (struct mob_data *md, md->skillidx = skill_idx; if (!(battle_config.monster_cloak_check_type & 2) && md->sc_data[SC_CLOAKING].timer != -1) - skill_status_change_end (&md->bl, SC_CLOAKING, -1); + skill_status_change_end(&md->bl, SC_CLOAKING, -1); if (casttime > 0) { md->skilltimer = - add_timer (gettick () + casttime, mobskill_castend_pos, md->bl.id, + add_timer(gettick() + casttime, mobskill_castend_pos, md->bl.id, 0); } else { md->skilltimer = -1; - mobskill_castend_pos (md->skilltimer, gettick (), md->bl.id, 0); + mobskill_castend_pos(md->skilltimer, gettick(), md->bl.id, 0); } return 1; @@ -3880,34 +3870,34 @@ int mobskill_use_pos (struct mob_data *md, *------------------------------------------ */ static -void mob_getfriendhpltmaxrate_sub (struct block_list *bl, va_list ap) +void mob_getfriendhpltmaxrate_sub(struct block_list *bl, va_list ap) { - int rate; + int rate; struct mob_data **fr, *md, *mmd; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (mmd = va_arg (ap, struct mob_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(mmd = va_arg(ap, struct mob_data *)); md = (struct mob_data *) bl; if (mmd->bl.id == bl->id) return; - rate = va_arg (ap, int); - fr = va_arg (ap, struct mob_data **); + rate = va_arg(ap, int); + fr = va_arg(ap, struct mob_data **); if (md->hp < mob_db[md->mob_class].max_hp * rate / 100) (*fr) = md; } static -struct mob_data *mob_getfriendhpltmaxrate (struct mob_data *md, int rate) +struct mob_data *mob_getfriendhpltmaxrate(struct mob_data *md, int rate) { struct mob_data *fr = NULL; const int r = 8; - nullpo_retr (NULL, md); + nullpo_retr(NULL, md); - map_foreachinarea (mob_getfriendhpltmaxrate_sub, md->bl.m, + map_foreachinarea(mob_getfriendhpltmaxrate_sub, md->bl.m, md->bl.x - r, md->bl.y - r, md->bl.x + r, md->bl.y + r, BL_MOB, md, rate, &fr); return fr; @@ -3918,25 +3908,25 @@ struct mob_data *mob_getfriendhpltmaxrate (struct mob_data *md, int rate) *------------------------------------------ */ static -void mob_getfriendstatus_sub (struct block_list *bl, va_list ap) +void mob_getfriendstatus_sub(struct block_list *bl, va_list ap) { - int cond1, cond2; + int cond1, cond2; struct mob_data **fr, *md, *mmd; - int flag = 0; + int flag = 0; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (md = (struct mob_data *) bl); - nullpo_retv (mmd = va_arg (ap, struct mob_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(md = (struct mob_data *) bl); + nullpo_retv(mmd = va_arg(ap, struct mob_data *)); if (mmd->bl.id == bl->id) return; - cond1 = va_arg (ap, int); - cond2 = va_arg (ap, int); - fr = va_arg (ap, struct mob_data **); + cond1 = va_arg(ap, int); + cond2 = va_arg(ap, int); + fr = va_arg(ap, struct mob_data **); if (cond2 == -1) { - int j; + int j; for (j = SC_STONE; j <= SC_BLIND && !flag; j++) { flag = (md->sc_data[j].timer != -1); @@ -3949,15 +3939,15 @@ void mob_getfriendstatus_sub (struct block_list *bl, va_list ap) } static -struct mob_data *mob_getfriendstatus (struct mob_data *md, int cond1, +struct mob_data *mob_getfriendstatus(struct mob_data *md, int cond1, int cond2) { struct mob_data *fr = NULL; const int r = 8; - nullpo_retr (0, md); + nullpo_retr(0, md); - map_foreachinarea (mob_getfriendstatus_sub, md->bl.m, + map_foreachinarea(mob_getfriendstatus_sub, md->bl.m, md->bl.x - r, md->bl.y - r, md->bl.x + r, md->bl.y + r, BL_MOB, md, cond1, cond2, &fr); return fr; @@ -3967,16 +3957,16 @@ struct mob_data *mob_getfriendstatus (struct mob_data *md, int cond1, * Skill use judging *------------------------------------------ */ -int mobskill_use (struct mob_data *md, unsigned int tick, int event) +int mobskill_use(struct mob_data *md, unsigned int tick, int event) { struct mob_skill *ms; // struct block_list *target=NULL; int max_hp; - nullpo_retr (0, md); - nullpo_retr (0, ms = mob_db[md->mob_class].skill); + nullpo_retr(0, md); + nullpo_retr(0, ms = mob_db[md->mob_class].skill); - max_hp = battle_get_max_hp (&md->bl); + max_hp = battle_get_max_hp(&md->bl); if (battle_config.mob_skill_use == 0 || md->skilltimer != -1) return 0; @@ -3989,11 +3979,11 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) for (int ii = 0; ii < mob_db[md->mob_class].maxskill; ii++) { - int c2 = ms[ii].cond2, flag = 0; + int c2 = ms[ii].cond2, flag = 0; struct mob_data *fmd = NULL; // ディレイ中 - if (DIFF_TICK (tick, md->skilldelay[ii]) < ms[ii].delay) + if (DIFF_TICK(tick, md->skilldelay[ii]) < ms[ii].delay) continue; // 状態判定 @@ -4016,7 +4006,7 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) case MSC_MYSTATUSOFF: // status[num] off if (ms[ii].cond2 == -1) { - int j; + int j; for (j = SC_STONE; j <= SC_BLIND && !flag; j++) { flag = (md->sc_data[j].timer != -1); @@ -4029,30 +4019,30 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) case MSC_FRIENDHPLTMAXRATE: // friend HP < maxhp% flag = ((fmd = - mob_getfriendhpltmaxrate (md, + mob_getfriendhpltmaxrate(md, ms[ii].cond2)) != NULL); break; case MSC_FRIENDSTATUSON: // friend status[num] on case MSC_FRIENDSTATUSOFF: // friend status[num] off flag = ((fmd = - mob_getfriendstatus (md, ms[ii].cond1, + mob_getfriendstatus(md, ms[ii].cond1, ms[ii].cond2)) != NULL); break; case MSC_NOTINTOWN: // Only outside of towns. flag = !map[md->bl.m].flag.town; break; case MSC_SLAVELT: // slave < num - flag = (mob_countslave (md) < c2); + flag = (mob_countslave(md) < c2); break; case MSC_ATTACKPCGT: // attack pc > num - flag = (mob_counttargeted (md, NULL, 0) > c2); + flag = (mob_counttargeted(md, NULL, 0) > c2); break; case MSC_SLAVELE: // slave <= num - flag = (mob_countslave (md) <= c2); + flag = (mob_countslave(md) <= c2); break; case MSC_ATTACKPCGE: // attack pc >= num - flag = (mob_counttargeted (md, NULL, 0) >= c2); + flag = (mob_counttargeted(md, NULL, 0) >= c2); break; case MSC_SKILLUSED: // specificated skill used flag = ((event & 0xffff) == MSC_SKILLUSED @@ -4062,27 +4052,27 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) } // 確率判定 - if (flag && MRAND (10000) < ms[ii].permillage) + if (flag && MRAND(10000) < ms[ii].permillage) { - if (skill_get_inf (ms[ii].skill_id) & 2) + if (skill_get_inf(ms[ii].skill_id) & 2) { // 場所指定 struct block_list *bl = NULL; - int x = 0, y = 0; + int x = 0, y = 0; if (ms[ii].target <= MST_AROUND) { if (ms[ii].target == MST_MASTER) { bl = &md->bl; if (md->master_id) - bl = map_id2bl (md->master_id); + bl = map_id2bl(md->master_id); } else { bl = ((ms[ii].target == MST_TARGET || ms[ii].target == - MST_AROUND5) ? map_id2bl (md-> + MST_AROUND5) ? map_id2bl(md-> target_id) : (ms[ii].target == MST_FRIEND) ? &fmd->bl : &md->bl); @@ -4099,16 +4089,16 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) // 自分の周囲 if (ms[ii].target >= MST_AROUND1) { - int bx = x, by = y, i = 0, c, m = bl->m, r = + int bx = x, by = y, i = 0, c, m = bl->m, r = ms[i].target - MST_AROUND1; do { - bx = x + MRAND ((r * 2 + 3)) - r; - by = y + MRAND ((r * 2 + 3)) - r; + bx = x + MRAND((r * 2 + 3)) - r; + by = y + MRAND((r * 2 + 3)) - r; } while ((bx <= 0 || by <= 0 || bx >= map[m].xs || by >= map[m].ys - || ((c = read_gat (m, bx, by)) == 1 || c == 5)) + || ((c = read_gat(m, bx, by)) == 1 || c == 5)) && (i++) < 1000); if (i < 1000) { @@ -4119,16 +4109,16 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) // 相手の周囲 if (ms[ii].target >= MST_AROUND5) { - int bx = x, by = y, i = 0, c, m = bl->m, r = + int bx = x, by = y, i = 0, c, m = bl->m, r = (ms[i].target - MST_AROUND5) + 1; do { - bx = x + MRAND ((r * 2 + 1)) - r; - by = y + MRAND ((r * 2 + 1)) - r; + bx = x + MRAND((r * 2 + 1)) - r; + by = y + MRAND((r * 2 + 1)) - r; } while ((bx <= 0 || by <= 0 || bx >= map[m].xs || by >= map[m].ys - || ((c = read_gat (m, bx, by)) == 1 || c == 5)) + || ((c = read_gat(m, bx, by)) == 1 || c == 5)) && (i++) < 1000); if (i < 1000) { @@ -4136,7 +4126,7 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) y = by; } } - if (!mobskill_use_pos (md, x, y, ii)) + if (!mobskill_use_pos(md, x, y, ii)) return 0; } @@ -4146,9 +4136,9 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) { struct block_list *bl = &md->bl; if (md->master_id) - bl = map_id2bl (md->master_id); + bl = map_id2bl(md->master_id); - if (bl && !mobskill_use_id (md, bl, ii)) + if (bl && !mobskill_use_id(md, bl, ii)) return 0; } // ID指定 @@ -4156,17 +4146,17 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) { struct block_list *bl = NULL; bl = ((ms[ii].target == - MST_TARGET) ? map_id2bl (md-> + MST_TARGET) ? map_id2bl(md-> target_id) : (ms[ii].target == MST_FRIEND) ? &fmd->bl : &md->bl); - if (bl && !mobskill_use_id (md, bl, ii)) + if (bl && !mobskill_use_id(md, bl, ii)) return 0; } } if (ms[ii].emotion >= 0) - clif_emotion (&md->bl, ms[ii].emotion); + clif_emotion(&md->bl, ms[ii].emotion); return 1; } } @@ -4178,17 +4168,17 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) * Skill use event processing *------------------------------------------ */ -int mobskill_event (struct mob_data *md, int flag) +int mobskill_event(struct mob_data *md, int flag) { - nullpo_retr (0, md); + nullpo_retr(0, md); - if (flag == -1 && mobskill_use (md, gettick (), MSC_CASTTARGETED)) + if (flag == -1 && mobskill_use(md, gettick(), MSC_CASTTARGETED)) return 1; if ((flag & BF_SHORT) - && mobskill_use (md, gettick (), MSC_CLOSEDATTACKED)) + && mobskill_use(md, gettick(), MSC_CLOSEDATTACKED)) return 1; if ((flag & BF_LONG) - && mobskill_use (md, gettick (), MSC_LONGRANGEATTACKED)) + && mobskill_use(md, gettick(), MSC_LONGRANGEATTACKED)) return 1; return 0; } @@ -4197,16 +4187,16 @@ int mobskill_event (struct mob_data *md, int flag) * スキル用タイマー削除 *------------------------------------------ */ -int mobskill_deltimer (struct mob_data *md) +int mobskill_deltimer(struct mob_data *md) { - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->skilltimer != -1) { - if (skill_get_inf (md->skillid) & 2) - delete_timer (md->skilltimer, mobskill_castend_pos); + if (skill_get_inf(md->skillid) & 2) + delete_timer(md->skilltimer, mobskill_castend_pos); else - delete_timer (md->skilltimer, mobskill_castend_id); + delete_timer(md->skilltimer, mobskill_castend_id); md->skilltimer = -1; } return 0; @@ -4219,12 +4209,12 @@ int mobskill_deltimer (struct mob_data *md) * Since un-setting [ mob ] up was used, it is an initial provisional value setup. *------------------------------------------ */ -static int mob_makedummymobdb (int mob_class) +static int mob_makedummymobdb(int mob_class) { - int i; + int i; - sprintf (mob_db[mob_class].name, "mob%d", mob_class); - sprintf (mob_db[mob_class].jname, "mob%d", mob_class); + sprintf(mob_db[mob_class].name, "mob%d", mob_class); + sprintf(mob_db[mob_class].jname, "mob%d", mob_class); mob_db[mob_class].lv = 1; mob_db[mob_class].max_hp = 1000; mob_db[mob_class].max_sp = 1; @@ -4275,27 +4265,27 @@ static int mob_makedummymobdb (int mob_class) * db/mob_db.txt reading *------------------------------------------ */ -static int mob_readdb (void) +static int mob_readdb(void) { FILE *fp; char line[1024]; const char *filename[] = { "db/mob_db.txt", "db/mob_db2.txt" }; - memset (mob_db, 0, sizeof (mob_db)); + memset(mob_db, 0, sizeof(mob_db)); for (int j = 0; j < 2; j++) { - fp = fopen_ (filename[j], "r"); + fp = fopen_(filename[j], "r"); if (fp == NULL) { if (j > 0) continue; return -1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { - int mob_class; + int mob_class; char *str[57], *p, *np; if (line[0] == '/' && line[1] == '/') @@ -4306,7 +4296,7 @@ static int mob_readdb (void) { while (*p == '\t' || *p == ' ') p++; - if ((np = strchr (p, ',')) != NULL) + if ((np = strchr(p, ',')) != NULL) { str[i] = p; *np = 0; @@ -4316,18 +4306,18 @@ static int mob_readdb (void) str[i] = p; } - mob_class = atoi (str[0]); + mob_class = atoi(str[0]); if (mob_class <= 1000 || mob_class > 2000) continue; mob_db[mob_class].view_class = mob_class; - memcpy (mob_db[mob_class].name, str[1], 24); - memcpy (mob_db[mob_class].jname, str[2], 24); - mob_db[mob_class].lv = atoi (str[3]); - mob_db[mob_class].max_hp = atoi (str[4]); - mob_db[mob_class].max_sp = atoi (str[5]); + memcpy(mob_db[mob_class].name, str[1], 24); + memcpy(mob_db[mob_class].jname, str[2], 24); + mob_db[mob_class].lv = atoi(str[3]); + mob_db[mob_class].max_hp = atoi(str[4]); + mob_db[mob_class].max_sp = atoi(str[5]); - mob_db[mob_class].base_exp = atoi (str[6]); + mob_db[mob_class].base_exp = atoi(str[6]); if (mob_db[mob_class].base_exp < 0) mob_db[mob_class].base_exp = 0; else if (mob_db[mob_class].base_exp > 0 @@ -4339,7 +4329,7 @@ static int mob_readdb (void) else mob_db[mob_class].base_exp *= battle_config.base_exp_rate / 100; - mob_db[mob_class].job_exp = atoi (str[7]); + mob_db[mob_class].job_exp = atoi(str[7]); if (mob_db[mob_class].job_exp < 0) mob_db[mob_class].job_exp = 0; else if (mob_db[mob_class].job_exp > 0 @@ -4351,33 +4341,33 @@ static int mob_readdb (void) else mob_db[mob_class].job_exp *= battle_config.job_exp_rate / 100; - mob_db[mob_class].range = atoi (str[8]); - mob_db[mob_class].atk1 = atoi (str[9]); - mob_db[mob_class].atk2 = atoi (str[10]); - mob_db[mob_class].def = atoi (str[11]); - mob_db[mob_class].mdef = atoi (str[12]); - mob_db[mob_class].str = atoi (str[13]); - mob_db[mob_class].agi = atoi (str[14]); - mob_db[mob_class].vit = atoi (str[15]); - mob_db[mob_class].int_ = atoi (str[16]); - mob_db[mob_class].dex = atoi (str[17]); - mob_db[mob_class].luk = atoi (str[18]); - mob_db[mob_class].range2 = atoi (str[19]); - mob_db[mob_class].range3 = atoi (str[20]); - mob_db[mob_class].size = atoi (str[21]); - mob_db[mob_class].race = atoi (str[22]); - mob_db[mob_class].element = atoi (str[23]); - mob_db[mob_class].mode = atoi (str[24]); - mob_db[mob_class].speed = atoi (str[25]); - mob_db[mob_class].adelay = atoi (str[26]); - mob_db[mob_class].amotion = atoi (str[27]); - mob_db[mob_class].dmotion = atoi (str[28]); + mob_db[mob_class].range = atoi(str[8]); + mob_db[mob_class].atk1 = atoi(str[9]); + mob_db[mob_class].atk2 = atoi(str[10]); + mob_db[mob_class].def = atoi(str[11]); + mob_db[mob_class].mdef = atoi(str[12]); + mob_db[mob_class].str = atoi(str[13]); + mob_db[mob_class].agi = atoi(str[14]); + mob_db[mob_class].vit = atoi(str[15]); + mob_db[mob_class].int_ = atoi(str[16]); + mob_db[mob_class].dex = atoi(str[17]); + mob_db[mob_class].luk = atoi(str[18]); + mob_db[mob_class].range2 = atoi(str[19]); + mob_db[mob_class].range3 = atoi(str[20]); + mob_db[mob_class].size = atoi(str[21]); + mob_db[mob_class].race = atoi(str[22]); + mob_db[mob_class].element = atoi(str[23]); + mob_db[mob_class].mode = atoi(str[24]); + mob_db[mob_class].speed = atoi(str[25]); + mob_db[mob_class].adelay = atoi(str[26]); + mob_db[mob_class].amotion = atoi(str[27]); + mob_db[mob_class].dmotion = atoi(str[28]); for (int i = 0; i < 8; i++) { - int rate = 0, type, ratemin, ratemax; - mob_db[mob_class].dropitem[i].nameid = atoi (str[29 + i * 2]); - type = itemdb_type (mob_db[mob_class].dropitem[i].nameid); + int rate = 0, type, ratemin, ratemax; + mob_db[mob_class].dropitem[i].nameid = atoi(str[29 + i * 2]); + type = itemdb_type(mob_db[mob_class].dropitem[i].nameid); if (type == 0) { // Added [Valaris] rate = battle_config.item_rate_heal; @@ -4408,7 +4398,7 @@ static int mob_readdb (void) ratemin = battle_config.item_drop_common_min; ratemax = battle_config.item_drop_common_max; } - rate = (rate / 100) * atoi (str[30 + i * 2]); + rate = (rate / 100) * atoi(str[30 + i * 2]); rate = (rate < ratemin) ? ratemin : (rate > ratemax) ? ratemax : rate; @@ -4416,17 +4406,17 @@ static int mob_readdb (void) } // Item1,Item2 mob_db[mob_class].mexp = - atoi (str[45]) * battle_config.mvp_exp_rate / 100; - mob_db[mob_class].mexpper = atoi (str[46]); + atoi(str[45]) * battle_config.mvp_exp_rate / 100; + mob_db[mob_class].mexpper = atoi(str[46]); for (int i = 0; i < 3; i++) { - mob_db[mob_class].mvpitem[i].nameid = atoi (str[47 + i * 2]); + mob_db[mob_class].mvpitem[i].nameid = atoi(str[47 + i * 2]); mob_db[mob_class].mvpitem[i].p = - atoi (str[48 + i * 2]) * battle_config.mvp_item_rate / + atoi(str[48 + i * 2]) * battle_config.mvp_item_rate / 100; } - mob_db[mob_class].mutations_nr = atoi (str[55]); - mob_db[mob_class].mutation_power = atoi (str[56]); + mob_db[mob_class].mutations_nr = atoi(str[55]); + mob_db[mob_class].mutation_power = atoi(str[56]); for (int i = 0; i < MAX_RANDOMMONSTER; i++) mob_db[mob_class].summonper[i] = 0; @@ -4443,10 +4433,10 @@ static int mob_readdb (void) mob_db[mob_class].clothes_color = 0; //Add for player monster dye - Valaris if (mob_db[mob_class].base_exp == 0) - mob_db[mob_class].base_exp = mob_gen_exp (&mob_db[mob_class]); + mob_db[mob_class].base_exp = mob_gen_exp(&mob_db[mob_class]); } - fclose_ (fp); - printf ("read %s done\n", filename[j]); + fclose_(fp); + printf("read %s done\n", filename[j]); } return 0; } @@ -4455,29 +4445,29 @@ static int mob_readdb (void) * MOB display graphic change data reading *------------------------------------------ */ -static int mob_readdb_mobavail (void) +static int mob_readdb_mobavail(void) { FILE *fp; char line[1024]; - int ln = 0; - int mob_class, j, k; + int ln = 0; + int mob_class, j, k; char *str[20], *p, *np; - if ((fp = fopen_ ("db/mob_avail.txt", "r")) == NULL) + if ((fp = fopen_("db/mob_avail.txt", "r")) == NULL) { - printf ("can't read db/mob_avail.txt\n"); + printf("can't read db/mob_avail.txt\n"); return -1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { if (line[0] == '/' && line[1] == '/') continue; - memset (str, 0, sizeof (str)); + memset(str, 0, sizeof(str)); for (j = 0, p = line; j < 12; j++) { - if ((np = strchr (p, ',')) != NULL) + if ((np = strchr(p, ',')) != NULL) { str[j] = p; *np = 0; @@ -4490,36 +4480,36 @@ static int mob_readdb_mobavail (void) if (str[0] == NULL) continue; - mob_class = atoi (str[0]); + mob_class = atoi(str[0]); if (mob_class <= 1000 || mob_class > 2000) // 値が異常なら処理しない。 continue; - k = atoi (str[1]); + k = atoi(str[1]); if (k >= 0) mob_db[mob_class].view_class = k; if ((mob_db[mob_class].view_class < 24) || (mob_db[mob_class].view_class > 4000)) { - mob_db[mob_class].sex = atoi (str[2]); - mob_db[mob_class].hair = atoi (str[3]); - mob_db[mob_class].hair_color = atoi (str[4]); - mob_db[mob_class].weapon = atoi (str[5]); - mob_db[mob_class].shield = atoi (str[6]); - mob_db[mob_class].head_top = atoi (str[7]); - mob_db[mob_class].head_mid = atoi (str[8]); - mob_db[mob_class].head_buttom = atoi (str[9]); - mob_db[mob_class].option = atoi (str[10]) & ~0x46; - mob_db[mob_class].clothes_color = atoi (str[11]); // Monster player dye option - Valaris + mob_db[mob_class].sex = atoi(str[2]); + mob_db[mob_class].hair = atoi(str[3]); + mob_db[mob_class].hair_color = atoi(str[4]); + mob_db[mob_class].weapon = atoi(str[5]); + mob_db[mob_class].shield = atoi(str[6]); + mob_db[mob_class].head_top = atoi(str[7]); + mob_db[mob_class].head_mid = atoi(str[8]); + mob_db[mob_class].head_buttom = atoi(str[9]); + mob_db[mob_class].option = atoi(str[10]) & ~0x46; + mob_db[mob_class].clothes_color = atoi(str[11]); // Monster player dye option - Valaris } - else if (atoi (str[2]) > 0) - mob_db[mob_class].equip = atoi (str[2]); // mob equipment [Valaris] + else if (atoi(str[2]) > 0) + mob_db[mob_class].equip = atoi(str[2]); // mob equipment [Valaris] ln++; } - fclose_ (fp); - printf ("read db/mob_avail.txt done (count=%d)\n", ln); + fclose_(fp); + printf("read db/mob_avail.txt done (count=%d)\n", ln); return 0; } @@ -4527,12 +4517,12 @@ static int mob_readdb_mobavail (void) * Reading of random monster data *------------------------------------------ */ -static int mob_read_randommonster (void) +static int mob_read_randommonster(void) { FILE *fp; char line[1024]; char *str[10], *p; - int i, j; + int i, j; const char *mobfile[] = { "db/mob_branch.txt", @@ -4543,22 +4533,22 @@ static int mob_read_randommonster (void) for (i = 0; i < MAX_RANDOMMONSTER; i++) { mob_db[0].summonper[i] = 1002; // 設定し忘れた場合はポリンが出るようにしておく - fp = fopen_ (mobfile[i], "r"); + fp = fopen_(mobfile[i], "r"); if (fp == NULL) { - printf ("can't read %s\n", mobfile[i]); + printf("can't read %s\n", mobfile[i]); return -1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { - int mob_class, per; + int mob_class, per; if (line[0] == '/' && line[1] == '/') continue; - memset (str, 0, sizeof (str)); + memset(str, 0, sizeof(str)); for (j = 0, p = line; j < 3 && p; j++) { str[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } @@ -4566,13 +4556,13 @@ static int mob_read_randommonster (void) if (str[0] == NULL || str[2] == NULL) continue; - mob_class = atoi (str[0]); - per = atoi (str[2]); + mob_class = atoi(str[0]); + per = atoi(str[2]); if ((mob_class > 1000 && mob_class <= 2000) || mob_class == 0) mob_db[mob_class].summonper[i] = per; } - fclose_ (fp); - printf ("read %s done\n", mobfile[i]); + fclose_(fp); + printf("read %s done\n", mobfile[i]); } return 0; } @@ -4581,16 +4571,16 @@ static int mob_read_randommonster (void) * db/mob_skill_db.txt reading *------------------------------------------ */ -static int mob_readskilldb (void) +static int mob_readskilldb(void) { FILE *fp; char line[1024]; - int i; + int i; const struct { char str[32]; - int id; + int id; } cond1[] = { { @@ -4693,43 +4683,43 @@ static int mob_readskilldb (void) { "around", MST_AROUND},}; - int x; + int x; const char *filename[] = { "db/mob_skill_db.txt", "db/mob_skill_db2.txt" }; for (x = 0; x < 2; x++) { - fp = fopen_ (filename[x], "r"); + fp = fopen_(filename[x], "r"); if (fp == NULL) { if (x == 0) - printf ("can't read %s\n", filename[x]); + printf("can't read %s\n", filename[x]); continue; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { char *sp[20], *p; - int mob_id; + int mob_id; struct mob_skill *ms; - int j = 0; + int j = 0; if (line[0] == '/' && line[1] == '/') continue; - memset (sp, 0, sizeof (sp)); + memset(sp, 0, sizeof(sp)); for (i = 0, p = line; i < 18 && p; i++) { sp[i] = p; - if ((p = strchr (p, ',')) != NULL) + if ((p = strchr(p, ',')) != NULL) *p++ = 0; } - if ((mob_id = atoi (sp[0])) <= 0) + if ((mob_id = atoi(sp[0])) <= 0) continue; - if (strcmp (sp[1], "clear") == 0) + if (strcmp(sp[1], "clear") == 0) { - memset (mob_db[mob_id].skill, 0, - sizeof (mob_db[mob_id].skill)); + memset(mob_db[mob_id].skill, 0, + sizeof(mob_db[mob_id].skill)); mob_db[mob_id].maxskill = 0; continue; } @@ -4739,63 +4729,62 @@ static int mob_readskilldb (void) break; if (i == MAX_MOBSKILL) { - printf - ("mob_skill: readdb: too many skill ! [%s] in %d[%s]\n", + printf("mob_skill: readdb: too many skill ! [%s] in %d[%s]\n", sp[1], mob_id, mob_db[mob_id].jname); continue; } - ms->state = atoi (sp[2]); - for (j = 0; j < sizeof (state) / sizeof (state[0]); j++) + ms->state = atoi(sp[2]); + for (j = 0; j < sizeof(state) / sizeof(state[0]); j++) { - if (strcmp (sp[2], state[j].str) == 0) + if (strcmp(sp[2], state[j].str) == 0) ms->state = state[j].id; } - ms->skill_id = atoi (sp[3]); - ms->skill_lv = atoi (sp[4]); - - ms->permillage = atoi (sp[5]); - ms->casttime = atoi (sp[6]); - ms->delay = atoi (sp[7]); - ms->cancel = atoi (sp[8]); - if (strcmp (sp[8], "yes") == 0) + ms->skill_id = atoi(sp[3]); + ms->skill_lv = atoi(sp[4]); + + ms->permillage = atoi(sp[5]); + ms->casttime = atoi(sp[6]); + ms->delay = atoi(sp[7]); + ms->cancel = atoi(sp[8]); + if (strcmp(sp[8], "yes") == 0) ms->cancel = 1; - ms->target = atoi (sp[9]); - for (j = 0; j < sizeof (target) / sizeof (target[0]); j++) + ms->target = atoi(sp[9]); + for (j = 0; j < sizeof(target) / sizeof(target[0]); j++) { - if (strcmp (sp[9], target[j].str) == 0) + if (strcmp(sp[9], target[j].str) == 0) ms->target = target[j].id; } ms->cond1 = -1; - for (j = 0; j < sizeof (cond1) / sizeof (cond1[0]); j++) + for (j = 0; j < sizeof(cond1) / sizeof(cond1[0]); j++) { - if (strcmp (sp[10], cond1[j].str) == 0) + if (strcmp(sp[10], cond1[j].str) == 0) ms->cond1 = cond1[j].id; } - ms->cond2 = atoi (sp[11]); - for (j = 0; j < sizeof (cond2) / sizeof (cond2[0]); j++) + ms->cond2 = atoi(sp[11]); + for (j = 0; j < sizeof(cond2) / sizeof(cond2[0]); j++) { - if (strcmp (sp[11], cond2[j].str) == 0) + if (strcmp(sp[11], cond2[j].str) == 0) ms->cond2 = cond2[j].id; } - ms->val[0] = atoi (sp[12]); - ms->val[1] = atoi (sp[13]); - ms->val[2] = atoi (sp[14]); - ms->val[3] = atoi (sp[15]); - ms->val[4] = atoi (sp[16]); - if (sp[17] != NULL && strlen (sp[17]) > 2) - ms->emotion = atoi (sp[17]); + ms->val[0] = atoi(sp[12]); + ms->val[1] = atoi(sp[13]); + ms->val[2] = atoi(sp[14]); + ms->val[3] = atoi(sp[15]); + ms->val[4] = atoi(sp[16]); + if (sp[17] != NULL && strlen(sp[17]) > 2) + ms->emotion = atoi(sp[17]); else ms->emotion = -1; mob_db[mob_id].maxskill = i + 1; } - fclose_ (fp); - printf ("read %s done\n", filename[x]); + fclose_(fp); + printf("read %s done\n", filename[x]); } return 0; } -void mob_reload (void) +void mob_reload(void) { /* * @@ -4804,24 +4793,24 @@ void mob_reload (void) * */ - do_init_mob (); + do_init_mob(); } /*========================================== * Circumference initialization of mob *------------------------------------------ */ -int do_init_mob (void) +int do_init_mob(void) { - mob_readdb (); + mob_readdb(); - mob_readdb_mobavail (); - mob_read_randommonster (); - mob_readskilldb (); + mob_readdb_mobavail(); + mob_read_randommonster(); + mob_readskilldb(); - add_timer_interval (gettick () + MIN_MOBTHINKTIME, mob_ai_hard, 0, 0, + add_timer_interval(gettick() + MIN_MOBTHINKTIME, mob_ai_hard, 0, 0, MIN_MOBTHINKTIME); - add_timer_interval (gettick () + MIN_MOBTHINKTIME * 10, mob_ai_lazy, 0, 0, + add_timer_interval(gettick() + MIN_MOBTHINKTIME * 10, mob_ai_lazy, 0, 0, MIN_MOBTHINKTIME * 10); return 0; diff --git a/src/map/mob.hpp b/src/map/mob.hpp index c657118..f1416d7 100644 --- a/src/map/mob.hpp +++ b/src/map/mob.hpp @@ -9,41 +9,41 @@ struct mob_skill short state; short skill_id, skill_lv; short permillage; - int casttime, delay; + int casttime, delay; short cancel; short cond1, cond2; short target; - int val[5]; + int val[5]; short emotion; }; struct mob_db { char name[24], jname[24]; - int lv; - int max_hp, max_sp; - int base_exp, job_exp; - int atk1, atk2; - int def, mdef; - int str, agi, vit, int_, dex, luk; - int range, range2, range3; - int size, race, element, mode; - int speed, adelay, amotion, dmotion; - int mexp, mexpper; - int mutations_nr, mutation_power; + int lv; + int max_hp, max_sp; + int base_exp, job_exp; + int atk1, atk2; + int def, mdef; + int str, agi, vit, int_, dex, luk; + int range, range2, range3; + int size, race, element, mode; + int speed, adelay, amotion, dmotion; + int mexp, mexpper; + int mutations_nr, mutation_power; struct { - int nameid, p; + int nameid, p; } dropitem[8]; struct { - int nameid, p; + int nameid, p; } mvpitem[3]; - int view_class, sex; + int view_class, sex; short hair, hair_color, weapon, shield, head_top, head_mid, head_buttom, option, clothes_color; // [Valaris] - int equip; // [Valaris] - int summonper[MAX_RANDOMMONSTER]; - int maxskill; + int equip; // [Valaris] + int summonper[MAX_RANDOMMONSTER]; + int maxskill; struct mob_skill skill[MAX_MOBSKILL]; }; extern struct mob_db mob_db[]; @@ -93,58 +93,58 @@ enum MSS_CHASE, // 突撃 }; -int mobdb_searchname (const char *str); -int mobdb_checkid (const int id); -int mob_once_spawn (struct map_session_data *sd, const char *mapname, +int mobdb_searchname(const char *str); +int mobdb_checkid(const int id); +int mob_once_spawn(struct map_session_data *sd, const char *mapname, int x, int y, const char *mobname, int class_, int amount, const char *event); -int mob_once_spawn_area (struct map_session_data *sd, const char *mapname, int x0, +int mob_once_spawn_area(struct map_session_data *sd, const char *mapname, int x0, int y0, int x1, int y1, const char *mobname, int class_, int amount, const char *event); -int mob_spawn_guardian (struct map_session_data *sd, const char *mapname, // Spawning Guardians [Valaris] +int mob_spawn_guardian(struct map_session_data *sd, const char *mapname, // Spawning Guardians [Valaris] int x, int y, const char *mobname, int class_, int amount, const char *event, int guardian); // Spawning Guardians [Valaris] -int mob_walktoxy (struct mob_data *md, int x, int y, int easy); - -int mob_target (struct mob_data *md, struct block_list *bl, int dist); -int mob_stop_walking (struct mob_data *md, int type); -int mob_stopattack (struct mob_data *); -int mob_spawn (int); -int mob_damage (struct block_list *, struct mob_data *, int, int); -int mob_changestate (struct mob_data *md, int state, int type); -int mob_heal (struct mob_data *, int); -int mob_get_viewclass (int); -int mob_get_sex (int); -short mob_get_hair (int); -short mob_get_hair_color (int); -short mob_get_weapon (int); -short mob_get_shield (int); -short mob_get_head_top (int); -short mob_get_head_mid (int); -short mob_get_head_buttom (int); -short mob_get_clothes_color (int); //player mob dye [Valaris] -int mob_get_equip (int); // mob equip [Valaris] -int do_init_mob (void); - -int mob_delete (struct mob_data *md); -int mob_catch_delete (struct mob_data *md, int type); -void mob_timer_delete (timer_id, tick_t, custom_id_t, custom_data_t); - -int mob_deleteslave (struct mob_data *md); - -int mob_counttargeted (struct mob_data *md, struct block_list *src, +int mob_walktoxy(struct mob_data *md, int x, int y, int easy); + +int mob_target(struct mob_data *md, struct block_list *bl, int dist); +int mob_stop_walking(struct mob_data *md, int type); +int mob_stopattack(struct mob_data *); +int mob_spawn(int); +int mob_damage(struct block_list *, struct mob_data *, int, int); +int mob_changestate(struct mob_data *md, int state, int type); +int mob_heal(struct mob_data *, int); +int mob_get_viewclass(int); +int mob_get_sex(int); +short mob_get_hair(int); +short mob_get_hair_color(int); +short mob_get_weapon(int); +short mob_get_shield(int); +short mob_get_head_top(int); +short mob_get_head_mid(int); +short mob_get_head_buttom(int); +short mob_get_clothes_color(int); //player mob dye [Valaris] +int mob_get_equip(int); // mob equip [Valaris] +int do_init_mob(void); + +int mob_delete(struct mob_data *md); +int mob_catch_delete(struct mob_data *md, int type); +void mob_timer_delete(timer_id, tick_t, custom_id_t, custom_data_t); + +int mob_deleteslave(struct mob_data *md); + +int mob_counttargeted(struct mob_data *md, struct block_list *src, int target_lv); -int mob_class_change (struct mob_data *md, int *value); -int mob_warp (struct mob_data *md, int m, int x, int y, int type); +int mob_class_change(struct mob_data *md, int *value); +int mob_warp(struct mob_data *md, int m, int x, int y, int type); -int mobskill_use (struct mob_data *md, unsigned int tick, int event); -int mobskill_event (struct mob_data *md, int flag); -void mobskill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data); -void mobskill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data); -int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag); +int mobskill_use(struct mob_data *md, unsigned int tick, int event); +int mobskill_event(struct mob_data *md, int flag); +void mobskill_castend_id(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data); +void mobskill_castend_pos(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data); +int mob_summonslave(struct mob_data *md2, int *value, int amount, int flag); -void mob_reload (void); +void mob_reload(void); #endif diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 15418b9..87d8aba 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -37,7 +37,7 @@ static struct npc_src_list *npc_src_first, *npc_src_last; static int npc_id = START_NPC_NUM; static int npc_warp, npc_shop, npc_script, npc_mob; -int npc_get_new_npc_id (void) +int npc_get_new_npc_id(void) { return npc_id++; } @@ -48,7 +48,7 @@ static struct dbt *npcname_db; struct event_data { struct npc_data *nd; - int pos; + int pos; }; static struct tm ev_tm_b; // 時計イベント用 @@ -59,60 +59,60 @@ static struct tm ev_tm_b; // 時計イベント用 *------------------------------------------ */ static -void npc_enable_sub (struct block_list *bl, va_list ap) +void npc_enable_sub(struct block_list *bl, va_list ap) { struct map_session_data *sd; struct npc_data *nd; - char *name = (char *) calloc (50, sizeof (char)); + char *name = (char *) calloc(50, sizeof(char)); - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (nd = va_arg (ap, struct npc_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(nd = va_arg(ap, struct npc_data *)); if (bl->type == BL_PC && (sd = (struct map_session_data *) bl)) { if (nd->flag & 1) // 無効化されている return; - memcpy (name, nd->name, sizeof(nd->name)); + memcpy(name, nd->name, sizeof(nd->name)); if (sd->areanpc_id == nd->bl.id) return; sd->areanpc_id = nd->bl.id; - npc_event (sd, strcat (name, "::OnTouch"), 0); + npc_event(sd, strcat(name, "::OnTouch"), 0); } - free (name); + free(name); } -int npc_enable (const char *name, int flag) +int npc_enable(const char *name, int flag) { - struct npc_data *nd = (struct npc_data *)strdb_search (npcname_db, name); + struct npc_data *nd = (struct npc_data *)strdb_search(npcname_db, name); if (nd == NULL) return 0; if (flag & 1) { // 有効化 nd->flag &= ~1; - clif_spawnnpc (nd); + clif_spawnnpc(nd); } else if (flag & 2) { nd->flag &= ~1; nd->option = 0x0000; - clif_changeoption (&nd->bl); + clif_changeoption(&nd->bl); } else if (flag & 4) { nd->flag |= 1; nd->option = 0x0002; - clif_changeoption (&nd->bl); + clif_changeoption(&nd->bl); } else { // 無効化 nd->flag |= 1; - clif_clearchar (&nd->bl, 0); + clif_clearchar(&nd->bl, 0); } if (flag & 3 && (nd->u.scr.xs > 0 || nd->u.scr.ys > 0)) - map_foreachinarea (npc_enable_sub, nd->bl.m, nd->bl.x - nd->u.scr.xs, + map_foreachinarea(npc_enable_sub, nd->bl.m, nd->bl.x - nd->u.scr.xs, nd->bl.y - nd->u.scr.ys, nd->bl.x + nd->u.scr.xs, nd->bl.y + nd->u.scr.ys, BL_PC, nd); @@ -123,18 +123,18 @@ int npc_enable (const char *name, int flag) * NPCを名前で探す *------------------------------------------ */ -struct npc_data *npc_name2id (const char *name) +struct npc_data *npc_name2id(const char *name) { - return (struct npc_data *)strdb_search (npcname_db, name); + return (struct npc_data *)strdb_search(npcname_db, name); } /*========================================== * イベントキューのイベント処理 *------------------------------------------ */ -int npc_event_dequeue (struct map_session_data *sd) +int npc_event_dequeue(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); sd->npc_id = 0; @@ -142,13 +142,13 @@ int npc_event_dequeue (struct map_session_data *sd) { if (!pc_addeventtimer(sd, 100, sd->eventqueue[0])) { - printf ("npc_event_dequeue(): Event timer is full.\n"); + printf("npc_event_dequeue(): Event timer is full.\n"); return 0; } if (MAX_EVENTQUEUE > 1) - memmove (sd->eventqueue[0], sd->eventqueue[1], - (MAX_EVENTQUEUE - 1) * sizeof (sd->eventqueue[0])); + memmove(sd->eventqueue[0], sd->eventqueue[1], + (MAX_EVENTQUEUE - 1) * sizeof(sd->eventqueue[0])); sd->eventqueue[MAX_EVENTQUEUE - 1][0] = '\0'; return 1; } @@ -156,15 +156,15 @@ int npc_event_dequeue (struct map_session_data *sd) return 0; } -int npc_delete (struct npc_data *nd) +int npc_delete(struct npc_data *nd) { - nullpo_retr (1, nd); + nullpo_retr(1, nd); if (nd->bl.prev == NULL) return 1; - clif_clearchar_area (&nd->bl, 1); - map_delblock (&nd->bl); + clif_clearchar_area(&nd->bl, 1); + map_delblock(&nd->bl); return 0; } @@ -172,76 +172,76 @@ int npc_delete (struct npc_data *nd) * イベントの遅延実行 *------------------------------------------ */ -void npc_event_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void npc_event_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - struct map_session_data *sd = map_id2sd (id); + struct map_session_data *sd = map_id2sd(id); if (sd == NULL) return; - npc_event (sd, (const char *) data, 0); - free ((void *) data); + npc_event(sd, (const char *) data, 0); + free((void *) data); } -int npc_timer_event (const char *eventname) // Added by RoVeRT +int npc_timer_event(const char *eventname) // Added by RoVeRT { - struct event_data *ev = (struct event_data *)strdb_search (ev_db, eventname); + struct event_data *ev = (struct event_data *)strdb_search(ev_db, eventname); struct npc_data *nd; // int xs,ys; if ((ev == NULL || (nd = ev->nd) == NULL)) { - printf ("npc_event: event not found [%s]\n", eventname); + printf("npc_event: event not found [%s]\n", eventname); return 0; } - run_script (nd->u.scr.script, ev->pos, nd->bl.id, nd->bl.id); + run_script(nd->u.scr.script, ev->pos, nd->bl.id, nd->bl.id); return 0; } /* -int npc_timer_sub_sub(void *key,void *data,va_list ap) // Added by RoVeRT +int npc_timer_sub_sub(void *key,void *data,va_list ap) // Added by RoVeRT { - char *p=(char *)key; - struct event_data *ev=(struct event_data *)data; - int *c=va_arg(ap,int *); - int tick=0,ctick=gettick(); - char temp[10]; - char event[100]; - - if(ev->nd->bl.id==(int)*c && (p=strchr(p,':')) && p && strncasecmp("::OnTimer",p,8)==0 ){ - sscanf(&p[9],"%s",temp); - tick=atoi(temp); - - strcpy( event, ev->nd->name); - strcat( event, p); - - if (ctick >= ev->nd->lastaction && ctick - ev->nd->timer >= tick) { - npc_timer_event(event); - ev->nd->lastaction = ctick; - } - } - return 0; + char *p= (char *)key; + struct event_data *ev= (struct event_data *)data; + int *c=va_arg(ap,int *); + int tick=0,ctick=gettick(); + char temp[10]; + char event[100]; + + if (ev->nd->bl.id== (int)*c && (p=strchr(p,':')) && p && strncasecmp("::OnTimer",p,8)==0 ){ + sscanf(&p[9],"%s",temp); + tick=atoi(temp); + + strcpy( event, ev->nd->name); + strcat( event, p); + + if (ctick >= ev->nd->lastaction && ctick - ev->nd->timer >= tick) { + npc_timer_event(event); + ev->nd->lastaction = ctick; + } + } + return 0; } -int npc_timer_sub(void *key,void *data,va_list ap) // Added by RoVeRT +int npc_timer_sub(void *key,void *data,va_list ap) // Added by RoVeRT { - struct npc_data *nd=(struct npc_data*)data; + struct npc_data *nd= (struct npc_data*)data; - if(nd->timer == -1) - return 0; + if (nd->timer == -1) + return 0; - strdb_foreach(ev_db,npc_timer_sub_sub,&nd->bl.id); + strdb_foreach(ev_db,npc_timer_sub_sub,&nd->bl.id); - return 0; + return 0; } -int npc_timer(int tid,unsigned int tick,int id,int data) // Added by RoVeRT +int npc_timer(int tid,unsigned int tick,int id,int data) // Added by RoVeRT { - strdb_foreach(npcname_db,npc_timer_sub); + strdb_foreach(npcname_db,npc_timer_sub); - free((void*)data); - return 0; + free((void*)data); + return 0; }*/ /*========================================== * イベント用ラベルのエクスポート @@ -249,34 +249,34 @@ int npc_timer(int tid,unsigned int tick,int id,int data) // Added by RoVeRT *------------------------------------------ */ static -int npc_event_export (void *key, void *data, va_list ap) +int npc_event_export(void *key, void *data, va_list ap) { char *lname = (char *) key; - int pos = (int) data; - struct npc_data *nd = va_arg (ap, struct npc_data *); + int pos = (int) data; + struct npc_data *nd = va_arg(ap, struct npc_data *); if ((lname[0] == 'O' || lname[0] == 'o') && (lname[1] == 'N' || lname[1] == 'n')) { struct event_data *ev; char *buf; - char *p = strchr (lname, ':'); + char *p = strchr(lname, ':'); // エクスポートされる - CREATE (ev, struct event_data, 1); - CREATE (buf, char, 50); + CREATE(ev, struct event_data, 1); + CREATE(buf, char, 50); if (p == NULL || (p - lname) > 24) { - printf ("npc_event_export: label name error !\n"); - exit (1); + printf("npc_event_export: label name error !\n"); + exit(1); } else { ev->nd = nd; ev->pos = pos; *p = '\0'; - sprintf (buf, "%s::%s", nd->exname, lname); + sprintf(buf, "%s::%s", nd->exname, lname); *p = ':'; - strdb_insert (ev_db, buf, ev); + strdb_insert(ev_db, buf, ev); // if (battle_config.etc_log) // printf("npc_event_export: export [%s]\n",buf); } @@ -289,80 +289,80 @@ int npc_event_export (void *key, void *data, va_list ap) *------------------------------------------ */ static -void npc_event_doall_sub (db_key_t key, db_val_t data, va_list ap) +void npc_event_doall_sub(db_key_t key, db_val_t data, va_list ap) { const char *p = key.s; - int rid, argc; + int rid, argc; argrec_t *argv; struct event_data *ev; int *c; const char *name; - nullpo_retv (ev = (struct event_data *) data); - nullpo_retv (ap); - nullpo_retv (c = va_arg (ap, int *)); + nullpo_retv(ev = (struct event_data *) data); + nullpo_retv(ap); + nullpo_retv(c = va_arg(ap, int *)); - name = va_arg (ap, const char *); - rid = va_arg (ap, int); - argc = va_arg (ap, int); - argv = va_arg (ap, argrec_t *); + name = va_arg(ap, const char *); + rid = va_arg(ap, int); + argc = va_arg(ap, int); + argv = va_arg(ap, argrec_t *); - if ((p = strchr (p, ':')) && p && strcasecmp (name, p) == 0) + if ((p = strchr(p, ':')) && p && strcasecmp(name, p) == 0) { - run_script_l (ev->nd->u.scr.script, ev->pos, rid, ev->nd->bl.id, argc, + run_script_l(ev->nd->u.scr.script, ev->pos, rid, ev->nd->bl.id, argc, argv); (*c)++; } } -int npc_event_doall_l (const char *name, int rid, int argc, argrec_t * args) +int npc_event_doall_l(const char *name, int rid, int argc, argrec_t * args) { - int c = 0; + int c = 0; char buf[64] = "::"; - strncpy (buf + 2, name, sizeof(buf)-3); + strncpy(buf + 2, name, sizeof(buf)-3); buf[sizeof(buf)-1] = '\0'; - strdb_foreach (ev_db, npc_event_doall_sub, &c, buf, rid, argc, args); + strdb_foreach(ev_db, npc_event_doall_sub, &c, buf, rid, argc, args); return c; } static -void npc_event_do_sub (db_key_t key, db_val_t data, va_list ap) +void npc_event_do_sub(db_key_t key, db_val_t data, va_list ap) { const char *p = key.s; struct event_data *ev; int *c; const char *name; - int rid, argc; + int rid, argc; argrec_t *argv; - nullpo_retv (ev = (struct event_data *) data); - nullpo_retv (ap); - nullpo_retv (c = va_arg (ap, int *)); + nullpo_retv(ev = (struct event_data *) data); + nullpo_retv(ap); + nullpo_retv(c = va_arg(ap, int *)); - name = va_arg (ap, const char *); - rid = va_arg (ap, int); - argc = va_arg (ap, int); - argv = va_arg (ap, argrec_t *); + name = va_arg(ap, const char *); + rid = va_arg(ap, int); + argc = va_arg(ap, int); + argv = va_arg(ap, argrec_t *); - if (p && strcasecmp (name, p) == 0) + if (p && strcasecmp(name, p) == 0) { - run_script_l (ev->nd->u.scr.script, ev->pos, rid, ev->nd->bl.id, argc, + run_script_l(ev->nd->u.scr.script, ev->pos, rid, ev->nd->bl.id, argc, argv); (*c)++; } } -int npc_event_do_l (const char *name, int rid, int argc, argrec_t * args) +int npc_event_do_l(const char *name, int rid, int argc, argrec_t * args) { - int c = 0; + int c = 0; if (*name == ':' && name[1] == ':') { - return npc_event_doall_l (name + 2, rid, argc, args); + return npc_event_doall_l(name + 2, rid, argc, args); } - strdb_foreach (ev_db, npc_event_do_sub, &c, name, rid, argc, args); + strdb_foreach(ev_db, npc_event_do_sub, &c, name, rid, argc, args); return c; } @@ -371,46 +371,46 @@ int npc_event_do_l (const char *name, int rid, int argc, argrec_t * args) *------------------------------------------ */ static -void npc_event_do_clock (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void npc_event_do_clock(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { time_t timer; struct tm *t; char buf[64]; - int c = 0; + int c = 0; - time (&timer); - t = gmtime (&timer); + time(&timer); + t = gmtime(&timer); if (t->tm_min != ev_tm_b.tm_min) { - sprintf (buf, "OnMinute%02d", t->tm_min); - c += npc_event_doall (buf); - sprintf (buf, "OnClock%02d%02d", t->tm_hour, t->tm_min); - c += npc_event_doall (buf); + sprintf(buf, "OnMinute%02d", t->tm_min); + c += npc_event_doall(buf); + sprintf(buf, "OnClock%02d%02d", t->tm_hour, t->tm_min); + c += npc_event_doall(buf); } if (t->tm_hour != ev_tm_b.tm_hour) { - sprintf (buf, "OnHour%02d", t->tm_hour); - c += npc_event_doall (buf); + sprintf(buf, "OnHour%02d", t->tm_hour); + c += npc_event_doall(buf); } if (t->tm_mday != ev_tm_b.tm_mday) { - sprintf (buf, "OnDay%02d%02d", t->tm_mon + 1, t->tm_mday); - c += npc_event_doall (buf); + sprintf(buf, "OnDay%02d%02d", t->tm_mon + 1, t->tm_mday); + c += npc_event_doall(buf); } - memcpy (&ev_tm_b, t, sizeof (ev_tm_b)); + memcpy(&ev_tm_b, t, sizeof(ev_tm_b)); } /*========================================== * OnInitイベント実行(&時計イベント開始) *------------------------------------------ */ -int npc_event_do_oninit (void) +int npc_event_do_oninit(void) { - int c = npc_event_doall ("OnInit"); - printf ("npc: OnInit Event done. (%d npc)\n", c); + int c = npc_event_doall("OnInit"); + printf("npc: OnInit Event done. (%d npc)\n", c); - add_timer_interval (gettick () + 100, npc_event_do_clock, 0, 0, 1000); + add_timer_interval(gettick() + 100, npc_event_do_clock, 0, 0, 1000); return 0; } @@ -420,38 +420,38 @@ int npc_event_do_oninit (void) *------------------------------------------ */ static -int npc_addeventtimer (struct npc_data *nd, int tick, const char *name) +int npc_addeventtimer(struct npc_data *nd, int tick, const char *name) { - int i; + int i; for (i = 0; i < MAX_EVENTTIMER; i++) if (nd->eventtimer[i] == -1) break; if (i < MAX_EVENTTIMER) { char *evname; - CREATE (evname, char, 24); - memcpy (evname, name, 24); - nd->eventtimer[i] = add_timer (gettick () + tick, + CREATE(evname, char, 24); + memcpy(evname, name, 24); + nd->eventtimer[i] = add_timer(gettick() + tick, npc_event_timer, nd->bl.id, (int) evname); } else - printf ("npc_addtimer: event timer is full !\n"); + printf("npc_addtimer: event timer is full !\n"); return 0; } static -int npc_deleventtimer (struct npc_data *nd, const char *name) +int npc_deleventtimer(struct npc_data *nd, const char *name) { - int i; + int i; for (i = 0; i < MAX_EVENTTIMER; i++) - if (nd->eventtimer[i] != -1 && strcmp ((char - *) (get_timer (nd->eventtimer + if (nd->eventtimer[i] != -1 && strcmp((char + *) (get_timer(nd->eventtimer [i])->data), name) == 0) { - delete_timer (nd->eventtimer[i], npc_event_timer); + delete_timer(nd->eventtimer[i], npc_event_timer); nd->eventtimer[i] = -1; break; } @@ -460,13 +460,13 @@ int npc_deleventtimer (struct npc_data *nd, const char *name) } static -int npc_cleareventtimer (struct npc_data *nd) +int npc_cleareventtimer(struct npc_data *nd) { - int i; + int i; for (i = 0; i < MAX_EVENTTIMER; i++) if (nd->eventtimer[i] != -1) { - delete_timer (nd->eventtimer[i], npc_event_timer); + delete_timer(nd->eventtimer[i], npc_event_timer); nd->eventtimer[i] = -1; } @@ -474,40 +474,40 @@ int npc_cleareventtimer (struct npc_data *nd) } static -void npc_do_ontimer_sub (db_key_t key, db_val_t data, va_list ap) +void npc_do_ontimer_sub(db_key_t key, db_val_t data, va_list ap) { const char *p = key.s; struct event_data *ev = (struct event_data *) data; - int *c = va_arg (ap, int *); + int *c = va_arg(ap, int *); // struct map_session_data *sd=va_arg(ap,struct map_session_data *); - int option = va_arg (ap, int); - int tick = 0; + int option = va_arg(ap, int); + int tick = 0; char temp[10]; char event[50]; - if (ev->nd->bl.id == (int) *c && (p = strchr (p, ':')) && p - && strncasecmp ("::OnTimer", p, 8) == 0) + if (ev->nd->bl.id == (int) *c && (p = strchr(p, ':')) && p + && strncasecmp("::OnTimer", p, 8) == 0) { - sscanf (&p[9], "%s", temp); - tick = atoi (temp); + sscanf(&p[9], "%s", temp); + tick = atoi(temp); - strcpy (event, ev->nd->name); - strcat (event, p); + strcpy(event, ev->nd->name); + strcat(event, p); if (option != 0) { - npc_addeventtimer (ev->nd, tick, event); + npc_addeventtimer(ev->nd, tick, event); } else { - npc_deleventtimer (ev->nd, event); + npc_deleventtimer(ev->nd, event); } } } -int npc_do_ontimer (int id, struct map_session_data *sd, int option) +int npc_do_ontimer(int id, struct map_session_data *sd, int option) { - strdb_foreach (ev_db, npc_do_ontimer_sub, &id, sd, option); + strdb_foreach(ev_db, npc_do_ontimer_sub, &id, sd, option); return 0; } @@ -517,26 +517,26 @@ int npc_do_ontimer (int id, struct map_session_data *sd, int option) *------------------------------------------ */ static -int npc_timerevent_import (void *key, void *data, va_list ap) +int npc_timerevent_import(void *key, void *data, va_list ap) { char *lname = (char *) key; - int pos = (int) data; - struct npc_data *nd = va_arg (ap, struct npc_data *); - int t = 0, i = 0; + int pos = (int) data; + struct npc_data *nd = va_arg(ap, struct npc_data *); + int t = 0, i = 0; - if (sscanf (lname, "OnTimer%d%n", &t, &i) == 1 && lname[i] == ':') + if (sscanf(lname, "OnTimer%d%n", &t, &i) == 1 && lname[i] == ':') { // タイマーイベント struct npc_timerevent_list *te = nd->u.scr.timer_event; - int j; + int j; i = nd->u.scr.timeramount; - RECREATE (te, struct npc_timerevent_list, i+1); + RECREATE(te, struct npc_timerevent_list, i+1); for (j = 0; j < i; j++) { if (te[j].timer > t) { - memmove (te + j + 1, te + j, - sizeof (struct npc_timerevent_list) * (i - j)); + memmove(te + j + 1, te + j, + sizeof(struct npc_timerevent_list) * (i - j)); break; } } @@ -553,14 +553,14 @@ int npc_timerevent_import (void *key, void *data, va_list ap) *------------------------------------------ */ static -void npc_timerevent (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void npc_timerevent(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - int next, t; - struct npc_data *nd = (struct npc_data *) map_id2bl (id); + int next, t; + struct npc_data *nd = (struct npc_data *) map_id2bl(id); struct npc_timerevent_list *te; if (nd == NULL || nd->u.scr.nexttimer < 0) { - printf ("npc_timerevent: ??\n"); + printf("npc_timerevent: ??\n"); return; } nd->u.scr.timertick = tick; @@ -572,21 +572,21 @@ void npc_timerevent (timer_id tid, tick_t tick, custom_id_t id, custom_data_t da if (nd->u.scr.timeramount > nd->u.scr.nexttimer) { next = nd->u.scr.timer_event[nd->u.scr.nexttimer].timer - t; - nd->u.scr.timerid = add_timer (tick + next, npc_timerevent, id, next); + nd->u.scr.timerid = add_timer(tick + next, npc_timerevent, id, next); } - run_script (nd->u.scr.script, te->pos, 0, nd->bl.id); + run_script(nd->u.scr.script, te->pos, 0, nd->bl.id); } /*========================================== * タイマーイベント開始 *------------------------------------------ */ -int npc_timerevent_start (struct npc_data *nd) +int npc_timerevent_start(struct npc_data *nd) { - int j, n, next; + int j, n, next; - nullpo_retr (0, nd); + nullpo_retr(0, nd); n = nd->u.scr.timeramount; if (nd->u.scr.nexttimer >= 0 || n == 0) @@ -598,14 +598,14 @@ int npc_timerevent_start (struct npc_data *nd) break; } nd->u.scr.nexttimer = j; - nd->u.scr.timertick = gettick (); + nd->u.scr.timertick = gettick(); if (j >= n) return 0; next = nd->u.scr.timer_event[j].timer - nd->u.scr.timer; nd->u.scr.timerid = - add_timer (gettick () + next, npc_timerevent, nd->bl.id, next); + add_timer(gettick() + next, npc_timerevent, nd->bl.id, next); return 0; } @@ -613,16 +613,16 @@ int npc_timerevent_start (struct npc_data *nd) * タイマーイベント終了 *------------------------------------------ */ -int npc_timerevent_stop (struct npc_data *nd) +int npc_timerevent_stop(struct npc_data *nd) { - nullpo_retr (0, nd); + nullpo_retr(0, nd); if (nd->u.scr.nexttimer >= 0) { nd->u.scr.nexttimer = -1; - nd->u.scr.timer += (int) (gettick () - nd->u.scr.timertick); + nd->u.scr.timer += (int)(gettick() - nd->u.scr.timertick); if (nd->u.scr.timerid != -1) - delete_timer (nd->u.scr.timerid, npc_timerevent); + delete_timer(nd->u.scr.timerid, npc_timerevent); nd->u.scr.timerid = -1; } return 0; @@ -632,16 +632,16 @@ int npc_timerevent_stop (struct npc_data *nd) * タイマー値の所得 *------------------------------------------ */ -int npc_gettimerevent_tick (struct npc_data *nd) +int npc_gettimerevent_tick(struct npc_data *nd) { - int tick; + int tick; - nullpo_retr (0, nd); + nullpo_retr(0, nd); tick = nd->u.scr.timer; if (nd->u.scr.nexttimer >= 0) - tick += (int) (gettick () - nd->u.scr.timertick); + tick += (int)(gettick() - nd->u.scr.timertick); return tick; } @@ -649,18 +649,18 @@ int npc_gettimerevent_tick (struct npc_data *nd) * タイマー値の設定 *------------------------------------------ */ -int npc_settimerevent_tick (struct npc_data *nd, int newtimer) +int npc_settimerevent_tick(struct npc_data *nd, int newtimer) { - int flag; + int flag; - nullpo_retr (0, nd); + nullpo_retr(0, nd); flag = nd->u.scr.nexttimer; - npc_timerevent_stop (nd); + npc_timerevent_stop(nd); nd->u.scr.timer = newtimer; if (flag >= 0) - npc_timerevent_start (nd); + npc_timerevent_start(nd); return 0; } @@ -668,41 +668,41 @@ int npc_settimerevent_tick (struct npc_data *nd, int newtimer) * イベント型のNPC処理 *------------------------------------------ */ -int npc_event (struct map_session_data *sd, const char *eventname, +int npc_event(struct map_session_data *sd, const char *eventname, int mob_kill) { - struct event_data *ev = (struct event_data *)strdb_search (ev_db, eventname); + struct event_data *ev = (struct event_data *)strdb_search(ev_db, eventname); struct npc_data *nd; - int xs, ys; + int xs, ys; char mobevent[100]; if (sd == NULL) { - printf ("npc_event nullpo?\n"); + printf("npc_event nullpo?\n"); } if (ev == NULL && eventname - && strcmp (((eventname) + strlen (eventname) - 9), "::OnTouch") == 0) + && strcmp(((eventname) + strlen(eventname) - 9), "::OnTouch") == 0) return 1; if (ev == NULL || (nd = ev->nd) == NULL) { if (mob_kill && (ev == NULL || (nd = ev->nd) == NULL)) { - strcpy (mobevent, eventname); - strcat (mobevent, "::OnMyMobDead"); - ev = (struct event_data *)strdb_search (ev_db, mobevent); + strcpy(mobevent, eventname); + strcat(mobevent, "::OnMyMobDead"); + ev = (struct event_data *)strdb_search(ev_db, mobevent); if (ev == NULL || (nd = ev->nd) == NULL) { - if (strncasecmp (eventname, "GM_MONSTER", 10) != 0) - printf ("npc_event: event not found [%s]\n", mobevent); + if (strncasecmp(eventname, "GM_MONSTER", 10) != 0) + printf("npc_event: event not found [%s]\n", mobevent); return 0; } } else { if (battle_config.error_log) - printf ("npc_event: event not found [%s]\n", eventname); + printf("npc_event: event not found [%s]\n", eventname); return 0; } } @@ -725,58 +725,58 @@ int npc_event (struct map_session_data *sd, const char *eventname, { // if (battle_config.error_log) // printf("npc_event: npc_id != 0\n"); - int i; + int i; for (i = 0; i < MAX_EVENTQUEUE; i++) if (!sd->eventqueue[i][0]) break; if (i == MAX_EVENTQUEUE) { if (battle_config.error_log) - printf ("npc_event: event queue is full !\n"); + printf("npc_event: event queue is full !\n"); } else { // if (battle_config.etc_log) // printf("npc_event: enqueue\n"); - strncpy (sd->eventqueue[i], eventname, 50); + strncpy(sd->eventqueue[i], eventname, 50); sd->eventqueue[i][49] = '\0'; } return 1; } if (nd->flag & 1) { // 無効化されている - npc_event_dequeue (sd); + npc_event_dequeue(sd); return 0; } sd->npc_id = nd->bl.id; sd->npc_pos = - run_script (nd->u.scr.script, ev->pos, sd->bl.id, nd->bl.id); + run_script(nd->u.scr.script, ev->pos, sd->bl.id, nd->bl.id); return 0; } static -void npc_command_sub (db_key_t key, db_val_t data, va_list ap) +void npc_command_sub(db_key_t key, db_val_t data, va_list ap) { const char *p = key.s; struct event_data *ev = (struct event_data *) data; - char *npcname = va_arg (ap, char *); - char *command = va_arg (ap, char *); + char *npcname = va_arg(ap, char *); + char *command = va_arg(ap, char *); char temp[100]; - if (strcmp (ev->nd->name, npcname) == 0 && (p = strchr (p, ':')) && p - && strncasecmp ("::OnCommand", p, 10) == 0) + if (strcmp(ev->nd->name, npcname) == 0 && (p = strchr(p, ':')) && p + && strncasecmp("::OnCommand", p, 10) == 0) { - sscanf (&p[11], "%s", temp); + sscanf(&p[11], "%s", temp); - if (strcmp (command, temp) == 0) - run_script (ev->nd->u.scr.script, ev->pos, 0, ev->nd->bl.id); + if (strcmp(command, temp) == 0) + run_script(ev->nd->u.scr.script, ev->pos, 0, ev->nd->bl.id); } } -int npc_command (struct map_session_data *sd, const char *npcname, const char *command) +int npc_command(struct map_session_data *sd, const char *npcname, const char *command) { - strdb_foreach (ev_db, npc_command_sub, npcname, command); + strdb_foreach(ev_db, npc_command_sub, npcname, command); return 0; } @@ -785,12 +785,12 @@ int npc_command (struct map_session_data *sd, const char *npcname, const char *c * 接触型のNPC処理 *------------------------------------------ */ -int npc_touch_areanpc (struct map_session_data *sd, int m, int x, int y) +int npc_touch_areanpc(struct map_session_data *sd, int m, int x, int y) { - int i, f = 1; - int xs, ys; + int i, f = 1; + int xs, ys; - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (sd->npc_id) return 1; @@ -828,29 +828,29 @@ int npc_touch_areanpc (struct map_session_data *sd, int m, int x, int y) if (f) { if (battle_config.error_log) - printf ("npc_touch_areanpc : some bug \n"); + printf("npc_touch_areanpc : some bug \n"); } return 1; } switch (map[m].npc[i]->bl.subtype) { case WARP: - skill_stop_dancing (&sd->bl, 0); - pc_setpos (sd, map[m].npc[i]->u.warp.name, + skill_stop_dancing(&sd->bl, 0); + pc_setpos(sd, map[m].npc[i]->u.warp.name, map[m].npc[i]->u.warp.x, map[m].npc[i]->u.warp.y, 0); break; case MESSAGE: case SCRIPT: { - char *name = (char *)malloc (50); + char *name = (char *)malloc(50); - memcpy (name, map[m].npc[i]->name, 50); + memcpy(name, map[m].npc[i]->name, 50); if (sd->areanpc_id == map[m].npc[i]->bl.id) return 1; sd->areanpc_id = map[m].npc[i]->bl.id; - if (npc_event (sd, strcat (name, "::OnTouch"), 0) > 0) - npc_click (sd, map[m].npc[i]->bl.id); - free (name); + if (npc_event(sd, strcat(name, "::OnTouch"), 0) > 0) + npc_click(sd, map[m].npc[i]->bl.id); + free(name); break; } } @@ -861,17 +861,17 @@ int npc_touch_areanpc (struct map_session_data *sd, int m, int x, int y) * 近くかどうかの判定 *------------------------------------------ */ -int npc_checknear (struct map_session_data *sd, int id) +int npc_checknear(struct map_session_data *sd, int id) { struct npc_data *nd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - nd = (struct npc_data *) map_id2bl (id); + nd = (struct npc_data *) map_id2bl(id); if (nd == NULL || nd->bl.type != BL_NPC) { if (battle_config.error_log) - printf ("no such npc : %d\n", id); + printf("no such npc : %d\n", id); return 1; } @@ -893,25 +893,25 @@ int npc_checknear (struct map_session_data *sd, int id) * クリック時のNPC処理 *------------------------------------------ */ -int npc_click (struct map_session_data *sd, int id) +int npc_click(struct map_session_data *sd, int id) { struct npc_data *nd; - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (sd->npc_id != 0) { if (battle_config.error_log) - printf ("npc_click: npc_id != 0\n"); + printf("npc_click: npc_id != 0\n"); return 1; } - if (npc_checknear (sd, id)) { - clif_scriptclose (sd, id); + if (npc_checknear(sd, id)) { + clif_scriptclose(sd, id); return 1; } - nd = (struct npc_data *) map_id2bl (id); + nd = (struct npc_data *) map_id2bl(id); if (nd->flag & 1) // 無効化されている return 1; @@ -920,17 +920,17 @@ int npc_click (struct map_session_data *sd, int id) switch (nd->bl.subtype) { case SHOP: - clif_npcbuysell (sd, id); - npc_event_dequeue (sd); + clif_npcbuysell(sd, id); + npc_event_dequeue(sd); break; case SCRIPT: - sd->npc_pos = run_script (nd->u.scr.script, 0, sd->bl.id, id); + sd->npc_pos = run_script(nd->u.scr.script, 0, sd->bl.id, id); break; case MESSAGE: if (nd->u.message) { - clif_scriptmes (sd, id, nd->u.message); - clif_scriptclose (sd, id); + clif_scriptmes(sd, id, nd->u.message); + clif_scriptclose(sd, id); } break; } @@ -942,29 +942,29 @@ int npc_click (struct map_session_data *sd, int id) * *------------------------------------------ */ -int npc_scriptcont (struct map_session_data *sd, int id) +int npc_scriptcont(struct map_session_data *sd, int id) { struct npc_data *nd; - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (id != sd->npc_id) return 1; - if (npc_checknear (sd, id)) { - clif_scriptclose (sd, id); + if (npc_checknear(sd, id)) { + clif_scriptclose(sd, id); return 1; } - nd = (struct npc_data *) map_id2bl (id); + nd = (struct npc_data *) map_id2bl(id); if (!nd /* NPC was disposed? */ || nd->bl.subtype == MESSAGE) { - clif_scriptclose (sd, id); - npc_event_dequeue (sd); + clif_scriptclose(sd, id); + npc_event_dequeue(sd); return 0; } - sd->npc_pos = run_script (nd->u.scr.script, sd->npc_pos, sd->bl.id, id); + sd->npc_pos = run_script(nd->u.scr.script, sd->npc_pos, sd->bl.id, id); return 0; } @@ -973,20 +973,20 @@ int npc_scriptcont (struct map_session_data *sd, int id) * *------------------------------------------ */ -int npc_buysellsel (struct map_session_data *sd, int id, int type) +int npc_buysellsel(struct map_session_data *sd, int id, int type) { struct npc_data *nd; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - if (npc_checknear (sd, id)) + if (npc_checknear(sd, id)) return 1; - nd = (struct npc_data *) map_id2bl (id); + nd = (struct npc_data *) map_id2bl(id); if (nd->bl.subtype != SHOP) { if (battle_config.error_log) - printf ("no such shop npc : %d\n", id); + printf("no such shop npc : %d\n", id); sd->npc_id = 0; return 1; } @@ -996,11 +996,11 @@ int npc_buysellsel (struct map_session_data *sd, int id, int type) sd->npc_shopid = id; if (type == 0) { - clif_buylist (sd, nd); + clif_buylist(sd, nd); } else { - clif_selllist (sd); + clif_selllist(sd); } return 0; } @@ -1009,20 +1009,20 @@ int npc_buysellsel (struct map_session_data *sd, int id, int type) * *------------------------------------------ */ -int npc_buylist (struct map_session_data *sd, int n, +int npc_buylist(struct map_session_data *sd, int n, unsigned short *item_list) { struct npc_data *nd; double z; - int i, j, w, skill, itemamount = 0, new_stacks = 0; + int i, j, w, skill, itemamount = 0, new_stacks = 0; - nullpo_retr (3, sd); - nullpo_retr (3, item_list); + nullpo_retr(3, sd); + nullpo_retr(3, item_list); - if (npc_checknear (sd, sd->npc_shopid)) + if (npc_checknear(sd, sd->npc_shopid)) return 3; - nd = (struct npc_data *) map_id2bl (sd->npc_shopid); + nd = (struct npc_data *) map_id2bl(sd->npc_shopid); if (nd->bl.subtype != SHOP) return 3; @@ -1036,20 +1036,20 @@ int npc_buylist (struct map_session_data *sd, int n, if (nd->u.shop_item[j].nameid == 0) return 3; - if (itemdb_value_notdc (nd->u.shop_item[j].nameid)) + if (itemdb_value_notdc(nd->u.shop_item[j].nameid)) z += (double) nd->u.shop_item[j].value * item_list[i * 2]; else - z += (double) pc_modifybuyvalue (sd, + z += (double) pc_modifybuyvalue(sd, nd->u.shop_item[j].value) * item_list[i * 2]; itemamount += item_list[i * 2]; - switch (pc_checkadditem (sd, item_list[i * 2 + 1], item_list[i * 2])) + switch (pc_checkadditem(sd, item_list[i * 2 + 1], item_list[i * 2])) { case ADDITEM_EXIST: break; case ADDITEM_NEW: - if (itemdb_isequip (item_list[i * 2 + 1])) + if (itemdb_isequip(item_list[i * 2 + 1])) new_stacks += item_list[i * 2]; else new_stacks++; @@ -1058,28 +1058,28 @@ int npc_buylist (struct map_session_data *sd, int n, return 2; } - w += itemdb_weight (item_list[i * 2 + 1]) * item_list[i * 2]; + w += itemdb_weight(item_list[i * 2 + 1]) * item_list[i * 2]; } if (z > (double) sd->status.zeny) return 1; // zeny不足 if (w + sd->weight > sd->max_weight) return 2; // 重量超過 - if (pc_inventoryblank (sd) < new_stacks) + if (pc_inventoryblank(sd) < new_stacks) return 3; // 種類数超過 if (sd->trade_partner != 0) return 4; // cant buy while trading - pc_payzeny (sd, (int) z); + pc_payzeny(sd, (int) z); for (i = 0; i < n; i++) { struct item_data *item_data; - if ((item_data = itemdb_exists (item_list[i * 2 + 1])) != NULL) + if ((item_data = itemdb_exists(item_list[i * 2 + 1])) != NULL) { - int amount = item_list[i * 2]; + int amount = item_list[i * 2]; struct item item_tmp; - memset (&item_tmp, 0, sizeof (item_tmp)); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = item_data->nameid; item_tmp.identify = 1; // npc販売アイテムは鑑定済み @@ -1090,31 +1090,31 @@ int npc_buylist (struct map_session_data *sd, int n, { for (j = 0; j < amount; j++) { - pc_additem (sd, &item_tmp, 1); + pc_additem(sd, &item_tmp, 1); } } else { - pc_additem (sd, &item_tmp, amount); + pc_additem(sd, &item_tmp, amount); } } } //商人経験値 -/* if ((sd->status.class == 5) || (sd->status.class == 10) || (sd->status.class == 18)) { - z = z * pc_checkskill(sd,MC_DISCOUNT) / ((1 + 300 / itemamount) * 4000) * battle_config.shop_exp; - pc_gainexp(sd,0,z); - }*/ +/* if ((sd->status.class == 5) || (sd->status.class == 10) || (sd->status.class == 18)) { + z = z * pc_checkskill(sd,MC_DISCOUNT) / ((1 + 300 / itemamount) * 4000) * battle_config.shop_exp; + pc_gainexp(sd,0,z); + }*/ if (battle_config.shop_exp > 0 && z > 0 - && (skill = pc_checkskill (sd, MC_DISCOUNT)) > 0) + && (skill = pc_checkskill(sd, MC_DISCOUNT)) > 0) { if (skill > 0) { - z = (log (z * (double) skill) * (double) battle_config.shop_exp / + z = (log(z * (double) skill) * (double) battle_config.shop_exp / 100.); if (z < 1) z = 1; - pc_gainexp (sd, 0, (int) z); + pc_gainexp(sd, 0, (int) z); } } @@ -1125,20 +1125,20 @@ int npc_buylist (struct map_session_data *sd, int n, * *------------------------------------------ */ -int npc_selllist (struct map_session_data *sd, int n, +int npc_selllist(struct map_session_data *sd, int n, unsigned short *item_list) { double z; - int i, skill, itemamount = 0; + int i, skill, itemamount = 0; - nullpo_retr (1, sd); - nullpo_retr (1, item_list); + nullpo_retr(1, sd); + nullpo_retr(1, item_list); - if (npc_checknear (sd, sd->npc_shopid)) + if (npc_checknear(sd, sd->npc_shopid)) return 1; for (i = 0, z = 0; i < n; i++) { - int nameid; + int nameid; if (item_list[i * 2] - 2 < 0 || item_list[i * 2] - 2 >= MAX_INVENTORY) return 1; nameid = sd->status.inventory[item_list[i * 2] - 2].nameid; @@ -1148,39 +1148,39 @@ int npc_selllist (struct map_session_data *sd, int n, return 1; if (sd->trade_partner != 0) return 2; // cant sell while trading - if (itemdb_value_notoc (nameid)) - z += (double) itemdb_value_sell (nameid) * item_list[i * 2 + 1]; + if (itemdb_value_notoc(nameid)) + z += (double) itemdb_value_sell(nameid) * item_list[i * 2 + 1]; else - z += (double) pc_modifysellvalue (sd, - itemdb_value_sell (nameid)) * + z += (double) pc_modifysellvalue(sd, + itemdb_value_sell(nameid)) * item_list[i * 2 + 1]; itemamount += item_list[i * 2 + 1]; } if (z > MAX_ZENY) z = MAX_ZENY; - pc_getzeny (sd, (int) z); + pc_getzeny(sd, (int) z); for (i = 0; i < n; i++) { - int item_id = item_list[i * 2] - 2; - pc_delitem (sd, item_id, item_list[i * 2 + 1], 0); + int item_id = item_list[i * 2] - 2; + pc_delitem(sd, item_id, item_list[i * 2 + 1], 0); } //商人経験値 -/* if ((sd->status.class == 5) || (sd->status.class == 10) || (sd->status.class == 18)) { - z = z * pc_checkskill(sd,MC_OVERCHARGE) / ((1 + 500 / itemamount) * 4000) * battle_config.shop_exp ; - pc_gainexp(sd,0,z); - }*/ +/* if ((sd->status.class == 5) || (sd->status.class == 10) || (sd->status.class == 18)) { + z = z * pc_checkskill(sd,MC_OVERCHARGE) / ((1 + 500 / itemamount) * 4000) * battle_config.shop_exp ; + pc_gainexp(sd,0,z); + }*/ if (battle_config.shop_exp > 0 && z > 0 - && (skill = pc_checkskill (sd, MC_OVERCHARGE)) > 0) + && (skill = pc_checkskill(sd, MC_OVERCHARGE)) > 0) { if (skill > 0) { - z = (log (z * (double) skill) * (double) battle_config.shop_exp / + z = (log(z * (double) skill) * (double) battle_config.shop_exp / 100.); if (z < 1) z = 1; - pc_gainexp (sd, 0, (int) z); + pc_gainexp(sd, 0, (int) z); } } @@ -1197,7 +1197,7 @@ int npc_selllist (struct map_session_data *sd, int n, *------------------------------------------ */ static -void npc_clearsrcfile (void) +void npc_clearsrcfile(void) { struct npc_src_list *p = npc_src_first; @@ -1205,7 +1205,7 @@ void npc_clearsrcfile (void) { struct npc_src_list *p2 = p; p = p->next; - free (p2); + free(p2); } npc_src_first = NULL; npc_src_last = NULL; @@ -1215,21 +1215,21 @@ void npc_clearsrcfile (void) * 読み込むnpcファイルの追加 *------------------------------------------ */ -void npc_addsrcfile (char *name) +void npc_addsrcfile(char *name) { struct npc_src_list *new_src; size_t len; - if (strcasecmp (name, "clear") == 0) + if (strcasecmp(name, "clear") == 0) { - npc_clearsrcfile (); + npc_clearsrcfile(); return; } - len = sizeof (*new_src) + strlen (name); - new_src = (struct npc_src_list *) calloc (1, len); + len = sizeof(*new_src) + strlen(name); + new_src = (struct npc_src_list *) calloc(1, len); new_src->next = NULL; - strncpy (new_src->name, name, strlen (name) + 1); + strncpy(new_src->name, name, strlen(name) + 1); if (npc_src_first == NULL) npc_src_first = new_src; if (npc_src_last) @@ -1242,24 +1242,24 @@ void npc_addsrcfile (char *name) * 読み込むnpcファイルの削除 *------------------------------------------ */ -void npc_delsrcfile (char *name) +void npc_delsrcfile(char *name) { struct npc_src_list *p = npc_src_first, *pp = NULL, **lp = &npc_src_first; - if (strcasecmp (name, "all") == 0) + if (strcasecmp(name, "all") == 0) { - npc_clearsrcfile (); + npc_clearsrcfile(); return; } for (; p; lp = &p->next, pp = p, p = p->next) { - if (strcmp (p->name, name) == 0) + if (strcmp(p->name, name) == 0) { *lp = p->next; if (npc_src_last == p) npc_src_last = pp; - free (p); + free(p); break; } } @@ -1269,27 +1269,27 @@ void npc_delsrcfile (char *name) * warp行解析 *------------------------------------------ */ -int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char *w4) +int npc_parse_warp(const char *w1, const char *w2, const char *w3, const char *w4) { - int x, y, xs, ys, to_x, to_y, m; - int i, j; + int x, y, xs, ys, to_x, to_y, m; + int i, j; char mapname[24], to_mapname[24]; struct npc_data *nd; // 引数の個数チェック - if (sscanf (w1, "%[^,],%d,%d", mapname, &x, &y) != 3 || - sscanf (w4, "%d,%d,%[^,],%d,%d", &xs, &ys, to_mapname, &to_x, + if (sscanf(w1, "%[^,],%d,%d", mapname, &x, &y) != 3 || + sscanf(w4, "%d,%d,%[^,],%d,%d", &xs, &ys, to_mapname, &to_x, &to_y) != 5) { - printf ("bad warp line : %s\n", w3); + printf("bad warp line : %s\n", w3); return 1; } - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); - nd = (struct npc_data *) calloc (1, sizeof (struct npc_data)); - nd->bl.id = npc_get_new_npc_id (); - nd->n = map_addnpc (m, nd); + nd = (struct npc_data *) calloc(1, sizeof(struct npc_data)); + nd->bl.id = npc_get_new_npc_id(); + nd->n = map_addnpc(m, nd); nd->bl.prev = nd->bl.next = NULL; nd->bl.m = m; @@ -1297,8 +1297,8 @@ int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char * nd->bl.y = y; nd->dir = 0; nd->flag = 0; - memcpy (nd->name, w3, 24); - memcpy (nd->exname, w3, 24); + memcpy(nd->name, w3, 24); + memcpy(nd->exname, w3, 24); nd->chat_id = 0; if (!battle_config.warp_point_debug) @@ -1310,7 +1310,7 @@ int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char * nd->opt1 = 0; nd->opt2 = 0; nd->opt3 = 0; - memcpy (nd->u.warp.name, to_mapname, 16); + memcpy(nd->u.warp.name, to_mapname, 16); xs += 2; ys += 2; nd->u.warp.x = to_x; @@ -1322,11 +1322,11 @@ int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char * { for (j = 0; j < xs; j++) { - int t; - t = map_getcell (m, x - xs / 2 + j, y - ys / 2 + i); + int t; + t = map_getcell(m, x - xs / 2 + j, y - ys / 2 + i); if (t == 1 || t == 5) continue; - map_setcell (m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80); + map_setcell(m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80); } } @@ -1334,9 +1334,9 @@ int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char * npc_warp++; nd->bl.type = BL_NPC; nd->bl.subtype = WARP; - map_addblock (&nd->bl); - clif_spawnnpc (nd); - strdb_insert (npcname_db, nd->name, nd); + map_addblock(&nd->bl); + clif_spawnnpc(nd); + strdb_insert(npcname_db, nd->name, nd); return 0; } @@ -1345,40 +1345,40 @@ int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char * * shop行解析 *------------------------------------------ */ -static int npc_parse_shop (char *w1, char *w2, char *w3, char *w4) +static int npc_parse_shop(char *w1, char *w2, char *w3, char *w4) { char *p; - int x, y, dir, m; - int max = 100, pos = 0; + int x, y, dir, m; + int max = 100, pos = 0; char mapname[24]; struct npc_data *nd; // 引数の個数チェック - if (sscanf (w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 || - strchr (w4, ',') == NULL) + if (sscanf(w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 || + strchr(w4, ',') == NULL) { - printf ("bad shop line : %s\n", w3); + printf("bad shop line : %s\n", w3); return 1; } - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); - nd = (struct npc_data *) calloc (1, sizeof (struct npc_data) + - sizeof (nd->u.shop_item[0]) * (max + + nd = (struct npc_data *) calloc(1, sizeof(struct npc_data) + + sizeof(nd->u.shop_item[0]) * (max + 1)); - p = strchr (w4, ','); + p = strchr(w4, ','); while (p && pos < max) { - int nameid, value; + int nameid, value; char name[24]; struct item_data *id = NULL; p++; - if (sscanf (p, "%d:%d", &nameid, &value) == 2) + if (sscanf(p, "%d:%d", &nameid, &value) == 2) { } - else if (sscanf (p, "%s :%d", name, &value) == 2) + else if (sscanf(p, "%s :%d", name, &value) == 2) { - id = itemdb_searchname (name); + id = itemdb_searchname(name); if (id == NULL) nameid = -1; else @@ -1393,18 +1393,18 @@ static int npc_parse_shop (char *w1, char *w2, char *w3, char *w4) if (value < 0) { if (id == NULL) - id = itemdb_search (nameid); - value = id->value_buy * abs (value); + id = itemdb_search(nameid); + value = id->value_buy * abs(value); } nd->u.shop_item[pos].value = value; pos++; } - p = strchr (p, ','); + p = strchr(p, ','); } if (pos == 0) { - free (nd); + free(nd); return 1; } nd->u.shop_item[pos++].nameid = 0; @@ -1413,11 +1413,11 @@ static int npc_parse_shop (char *w1, char *w2, char *w3, char *w4) nd->bl.m = m; nd->bl.x = x; nd->bl.y = y; - nd->bl.id = npc_get_new_npc_id (); + nd->bl.id = npc_get_new_npc_id(); nd->dir = dir; nd->flag = 0; - memcpy (nd->name, w3, 24); - nd->npc_class = atoi (w4); + memcpy(nd->name, w3, 24); + nd->npc_class = atoi(w4); nd->speed = 200; nd->chat_id = 0; nd->option = 0; @@ -1426,16 +1426,16 @@ static int npc_parse_shop (char *w1, char *w2, char *w3, char *w4) nd->opt3 = 0; nd = (struct npc_data *) - realloc (nd, sizeof (struct npc_data) + sizeof (nd->u.shop_item[0]) * pos); + realloc(nd, sizeof(struct npc_data) + sizeof(nd->u.shop_item[0]) * pos); //printf("shop npc %s %d read done\n",mapname,nd->bl.id); npc_shop++; nd->bl.type = BL_NPC; nd->bl.subtype = SHOP; - nd->n = map_addnpc (m, nd); - map_addblock (&nd->bl); - clif_spawnnpc (nd); - strdb_insert (npcname_db, nd->name, nd); + nd->n = map_addnpc(m, nd); + map_addblock(&nd->bl); + clif_spawnnpc(nd); + strdb_insert(npcname_db, nd->name, nd); return 0; } @@ -1445,34 +1445,34 @@ static int npc_parse_shop (char *w1, char *w2, char *w3, char *w4) *------------------------------------------ */ static -void npc_convertlabel_db (db_key_t key, db_val_t data, va_list ap) +void npc_convertlabel_db(db_key_t key, db_val_t data, va_list ap) { const char *lname = key.s; - int pos = (int) data; + int pos = (int) data; struct npc_data *nd; struct npc_label_list *lst; - int num; + int num; // this exists for evil purposes - char *p = const_cast<char *>(strchr (lname, ':')); + char *p = const_cast<char *>(strchr(lname, ':')); - nullpo_retv (ap); - nullpo_retv (nd = va_arg (ap, struct npc_data *)); + nullpo_retv(ap); + nullpo_retv(nd = va_arg(ap, struct npc_data *)); lst = nd->u.scr.label_list; num = nd->u.scr.label_list_num; if (!lst) { lst = (struct npc_label_list *) - calloc (1, sizeof (struct npc_label_list)); + calloc(1, sizeof(struct npc_label_list)); num = 0; } else lst = (struct npc_label_list *) - realloc (lst, sizeof (struct npc_label_list) * (num + 1)); + realloc(lst, sizeof(struct npc_label_list) * (num + 1)); *p = '\0'; // temporarily NUL-terminate lname - strncpy (lst[num].name, lname, sizeof(lst[num].name)-1); + strncpy(lst[num].name, lname, sizeof(lst[num].name)-1); lst[num].name[sizeof(lst[num].name)-1] = '\0'; *p = ':'; lst[num].pos = pos; @@ -1485,25 +1485,25 @@ void npc_convertlabel_db (db_key_t key, db_val_t data, va_list ap) *------------------------------------------ */ static -int npc_parse_script (char *w1, char *w2, char *w3, char *w4, +int npc_parse_script(char *w1, char *w2, char *w3, char *w4, const char *first_line, FILE * fp, int *lines) { - int x, y, dir = 0, m, xs = 0, ys = 0, npc_class = 0; // [Valaris] thanks to fov + int x, y, dir = 0, m, xs = 0, ys = 0, npc_class = 0; // [Valaris] thanks to fov char mapname[24]; char *srcbuf = NULL; const ScriptCode *script = NULL; - int srcsize = 65536; - int startline = 0; + int srcsize = 65536; + int startline = 0; char line[1024]; struct npc_data *nd; - int evflag = 0; + int evflag = 0; struct dbt *label_db; char *p; struct npc_label_list *label_dup = NULL; - int label_dupnum = 0; - int src_id = 0; + int label_dupnum = 0; + int src_id = 0; - if (strcmp (w1, "-") == 0) + if (strcmp(w1, "-") == 0) { x = 0; y = 0; @@ -1512,22 +1512,22 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, else { // 引数の個数チェック - if (sscanf (w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 || - (strcmp (w2, "script") == 0 && strchr (w4, ',') == NULL)) + if (sscanf(w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 || + (strcmp(w2, "script") == 0 && strchr(w4, ',') == NULL)) { - printf ("bad script line : %s\n", w3); + printf("bad script line : %s\n", w3); return 1; } - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); } - if (strcmp (w2, "script") == 0) + if (strcmp(w2, "script") == 0) { // スクリプトの解析 - srcbuf = (char *) calloc (srcsize, sizeof (char)); - if (strchr (first_line, '{')) + srcbuf = (char *) calloc(srcsize, sizeof(char)); + if (strchr(first_line, '{')) { - strcpy (srcbuf, strchr (first_line, '{')); + strcpy(srcbuf, strchr(first_line, '{')); startline = *lines; } else @@ -1535,36 +1535,36 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, while (1) { int i; - for (i = strlen (srcbuf) - 1; i >= 0 && isspace (srcbuf[i]); i--); + for (i = strlen(srcbuf) - 1; i >= 0 && isspace(srcbuf[i]); i--); if (i >= 0 && srcbuf[i] == '}') break; - if (!fgets (line, 1020, fp)) + if (!fgets(line, 1020, fp)) break; (*lines)++; - if (feof (fp)) + if (feof(fp)) break; - if (strlen (srcbuf) + strlen (line) + 1 >= srcsize) + if (strlen(srcbuf) + strlen(line) + 1 >= srcsize) { srcsize += 65536; - srcbuf = (char *) realloc (srcbuf, srcsize); - memset (srcbuf + srcsize - 65536, '\0', 65536); + srcbuf = (char *) realloc(srcbuf, srcsize); + memset(srcbuf + srcsize - 65536, '\0', 65536); } if (srcbuf[0] != '{') { - if (strchr (line, '{')) + if (strchr(line, '{')) { - strcpy (srcbuf, strchr (line, '{')); + strcpy(srcbuf, strchr(line, '{')); startline = *lines; } } else - strcat (srcbuf, line); + strcat(srcbuf, line); } - script = parse_script (srcbuf, startline); + script = parse_script(srcbuf, startline); if (script == NULL) { // script parse error? - free (srcbuf); + free(srcbuf); return 1; } @@ -1575,14 +1575,14 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, char srcname[128]; struct npc_data *nd2; - if (sscanf (w2, "duplicate(%[^)])", srcname) != 1) + if (sscanf(w2, "duplicate (%[^)])", srcname) != 1) { - printf ("bad duplicate name! : %s", w2); + printf("bad duplicate name! : %s", w2); return 0; } - if ((nd2 = npc_name2id (srcname)) == NULL) + if ((nd2 = npc_name2id(srcname)) == NULL) { - printf ("bad duplicate name! (not exist) : %s\n", srcname); + printf("bad duplicate name! (not exist) : %s\n", srcname); return 0; } script = nd2->u.scr.script; @@ -1592,17 +1592,17 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, } // end of スクリプト解析 - nd = (struct npc_data *) calloc (1, sizeof (struct npc_data)); + nd = (struct npc_data *) calloc(1, sizeof(struct npc_data)); if (m == -1) { // スクリプトコピー用のダミーNPC } - else if (sscanf (w4, "%d,%d,%d", &npc_class, &xs, &ys) == 3) + else if (sscanf(w4, "%d,%d,%d", &npc_class, &xs, &ys) == 3) { // 接触型NPC - int i, j; + int i, j; if (xs >= 0) xs = xs * 2 + 1; @@ -1616,11 +1616,11 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, { for (j = 0; j < xs; j++) { - int t; - t = map_getcell (m, x - xs / 2 + j, y - ys / 2 + i); + int t; + t = map_getcell(m, x - xs / 2 + j, y - ys / 2 + i); if (t == 1 || t == 5) continue; - map_setcell (m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80); + map_setcell(m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80); } } } @@ -1630,7 +1630,7 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, } else { // クリック型NPC - npc_class = atoi (w4); + npc_class = atoi(w4); nd->u.scr.xs = 0; nd->u.scr.ys = 0; } @@ -1640,7 +1640,7 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, evflag = 1; } - while ((p = strchr (w3, ':'))) + while ((p = strchr(w3, ':'))) { if (p[1] == ':') break; @@ -1648,20 +1648,20 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, if (p) { *p = 0; - memcpy (nd->name, w3, 24); - memcpy (nd->exname, p + 2, 24); + memcpy(nd->name, w3, 24); + memcpy(nd->exname, p + 2, 24); } else { - memcpy (nd->name, w3, 24); - memcpy (nd->exname, w3, 24); + memcpy(nd->name, w3, 24); + memcpy(nd->exname, w3, 24); } nd->bl.prev = nd->bl.next = NULL; nd->bl.m = m; nd->bl.x = x; nd->bl.y = y; - nd->bl.id = npc_get_new_npc_id (); + nd->bl.id = npc_get_new_npc_id(); nd->dir = dir; nd->flag = 0; nd->npc_class = npc_class; @@ -1680,21 +1680,21 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, nd->bl.subtype = SCRIPT; if (m >= 0) { - nd->n = map_addnpc (m, nd); - map_addblock (&nd->bl); + nd->n = map_addnpc(m, nd); + map_addblock(&nd->bl); if (evflag) { // イベント型 struct event_data *ev = - (struct event_data *) calloc (1, sizeof (struct event_data)); + (struct event_data *) calloc(1, sizeof(struct event_data)); ev->nd = nd; ev->pos = 0; - strdb_insert (ev_db, nd->exname, ev); + strdb_insert(ev_db, nd->exname, ev); } else - clif_spawnnpc (nd); + clif_spawnnpc(nd); } - strdb_insert (npcname_db, nd->exname, nd); + strdb_insert(npcname_db, nd->exname, nd); //----------------------------------------- // ラベルデータの準備 @@ -1703,11 +1703,11 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, // script本体がある場合の処理 // ラベルデータのコンバート - label_db = script_get_label_db (); - strdb_foreach (label_db, npc_convertlabel_db, nd); + label_db = script_get_label_db(); + strdb_foreach(label_db, npc_convertlabel_db, nd); // もう使わないのでバッファ解放 - free (srcbuf); + free(srcbuf); } else @@ -1726,7 +1726,7 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, for (int i = 0; i < nd->u.scr.label_list_num; i++) { char *lname = nd->u.scr.label_list[i].name; - int pos = nd->u.scr.label_list[i].pos; + int pos = nd->u.scr.label_list[i].pos; if ((lname[0] == 'O' || lname[0] == 'o') && (lname[1] == 'N' || lname[1] == 'n')) @@ -1734,20 +1734,20 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, struct event_data *ev; char *buf; // エクスポートされる - ev = (struct event_data *) calloc (1, - sizeof (struct event_data)); - buf = (char *) calloc (50, sizeof (char)); - if (strlen (lname) > 24) + ev = (struct event_data *) calloc(1, + sizeof(struct event_data)); + buf = (char *) calloc(50, sizeof(char)); + if (strlen(lname) > 24) { - printf ("npc_parse_script: label name error !\n"); - exit (1); + printf("npc_parse_script: label name error !\n"); + exit(1); } else { ev->nd = nd; ev->pos = pos; - sprintf (buf, "%s::%s", nd->exname, lname); - strdb_insert (ev_db, buf, ev); + sprintf(buf, "%s::%s", nd->exname, lname); + strdb_insert(ev_db, buf, ev); } } } @@ -1756,29 +1756,29 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, // ラベルデータからタイマーイベント取り込み for (int i = 0; i < nd->u.scr.label_list_num; i++) { - int t = 0, n = 0; + int t = 0, n = 0; char *lname = nd->u.scr.label_list[i].name; - int pos = nd->u.scr.label_list[i].pos; - if (sscanf (lname, "OnTimer%d%n", &t, &n) == 1 && lname[n] == '\0') + int pos = nd->u.scr.label_list[i].pos; + if (sscanf(lname, "OnTimer%d%n", &t, &n) == 1 && lname[n] == '\0') { // タイマーイベント struct npc_timerevent_list *te = nd->u.scr.timer_event; - int j, k = nd->u.scr.timeramount; + int j, k = nd->u.scr.timeramount; if (te == NULL) - te = (struct npc_timerevent_list *) calloc (1, - sizeof (struct + te = (struct npc_timerevent_list *) calloc(1, + sizeof(struct npc_timerevent_list)); else - te = (struct npc_timerevent_list *) realloc (te, - sizeof (struct + te = (struct npc_timerevent_list *) realloc(te, + sizeof(struct npc_timerevent_list) * (k + 1)); for (j = 0; j < k; j++) { if (te[j].timer > t) { - memmove (te + j + 1, te + j, - sizeof (struct npc_timerevent_list) * (k - j)); + memmove(te + j + 1, te + j, + sizeof(struct npc_timerevent_list) * (k - j)); break; } } @@ -1798,71 +1798,71 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, * function行解析 *------------------------------------------ */ -static int npc_parse_function (char *w1, char *w2, char *w3, char *w4, +static int npc_parse_function(char *w1, char *w2, char *w3, char *w4, char *first_line, FILE * fp, int *lines) { char *srcbuf = NULL; const ScriptCode *script; - int srcsize = 65536; - int startline = 0; + int srcsize = 65536; + int startline = 0; char line[1024]; - int i; + int i; // struct dbt *label_db; char *p; // スクリプトの解析 - srcbuf = (char *) calloc (srcsize, sizeof (char)); - if (strchr (first_line, '{')) + srcbuf = (char *) calloc(srcsize, sizeof(char)); + if (strchr(first_line, '{')) { - strcpy (srcbuf, strchr (first_line, '{')); + strcpy(srcbuf, strchr(first_line, '{')); startline = *lines; } else srcbuf[0] = 0; while (1) { - for (i = strlen (srcbuf) - 1; i >= 0 && isspace (srcbuf[i]); i--); + for (i = strlen(srcbuf) - 1; i >= 0 && isspace(srcbuf[i]); i--); if (i >= 0 && srcbuf[i] == '}') break; - if (!fgets (line, 1020, fp)) + if (!fgets(line, 1020, fp)) break; (*lines)++; - if (feof (fp)) + if (feof(fp)) break; - if (strlen (srcbuf) + strlen (line) + 1 >= srcsize) + if (strlen(srcbuf) + strlen(line) + 1 >= srcsize) { srcsize += 65536; - srcbuf = (char *) realloc (srcbuf, srcsize); - memset (srcbuf + srcsize - 65536, '\0', 65536); + srcbuf = (char *) realloc(srcbuf, srcsize); + memset(srcbuf + srcsize - 65536, '\0', 65536); } if (srcbuf[0] != '{') { - if (strchr (line, '{')) + if (strchr(line, '{')) { - strcpy (srcbuf, strchr (line, '{')); + strcpy(srcbuf, strchr(line, '{')); startline = *lines; } } else - strcat (srcbuf, line); + strcat(srcbuf, line); } - script = parse_script (srcbuf, startline); + script = parse_script(srcbuf, startline); if (script == NULL) { // script parse error? - free (srcbuf); + free(srcbuf); return 1; } - p = (char *) calloc (50, sizeof (char)); + p = (char *) calloc(50, sizeof(char)); - strncpy (p, w3, 49); - strdb_insert (script_get_userfunc_db (), p, script); + strncpy(p, w3, 49); + strdb_insert(script_get_userfunc_db(), p, script); // label_db=script_get_label_db(); // もう使わないのでバッファ解放 - free (srcbuf); + free(srcbuf); // printf("function %s => %p\n",p,script); @@ -1873,10 +1873,10 @@ static int npc_parse_function (char *w1, char *w2, char *w3, char *w4, * mob行解析 *------------------------------------------ */ -int npc_parse_mob (const char *w1, const char *w2, const char *w3, const char *w4) +int npc_parse_mob(const char *w1, const char *w2, const char *w3, const char *w4) { - int m, x, y, xs, ys, mob_class, num, delay1, delay2; - int i; + int m, x, y, xs, ys, mob_class, num, delay1, delay2; + int i; char mapname[24]; char eventname[24] = ""; struct mob_data *md; @@ -1884,15 +1884,15 @@ int npc_parse_mob (const char *w1, const char *w2, const char *w3, const char *w xs = ys = 0; delay1 = delay2 = 0; // 引数の個数チェック - if (sscanf (w1, "%[^,],%d,%d,%d,%d", mapname, &x, &y, &xs, &ys) < 3 || - sscanf (w4, "%d,%d,%d,%d,%s", &mob_class, &num, &delay1, &delay2, + if (sscanf(w1, "%[^,],%d,%d,%d,%d", mapname, &x, &y, &xs, &ys) < 3 || + sscanf(w4, "%d,%d,%d,%d,%s", &mob_class, &num, &delay1, &delay2, eventname) < 2) { - printf ("bad monster line : %s\n", w3); + printf("bad monster line : %s\n", w3); return 1; } - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); if (num > 1 && battle_config.mob_count_rate != 100) { @@ -1902,23 +1902,23 @@ int npc_parse_mob (const char *w1, const char *w2, const char *w3, const char *w for (i = 0; i < num; i++) { - md = (struct mob_data *) calloc (1, sizeof (struct mob_data)); + md = (struct mob_data *) calloc(1, sizeof(struct mob_data)); md->bl.prev = NULL; md->bl.next = NULL; md->bl.m = m; md->bl.x = x; md->bl.y = y; - if (strcmp (w3, "--en--") == 0) - memcpy (md->name, mob_db[mob_class].name, 24); - else if (strcmp (w3, "--ja--") == 0) - memcpy (md->name, mob_db[mob_class].jname, 24); + if (strcmp(w3, "--en--") == 0) + memcpy(md->name, mob_db[mob_class].name, 24); + else if (strcmp(w3, "--ja--") == 0) + memcpy(md->name, mob_db[mob_class].jname, 24); else - memcpy (md->name, w3, 24); + memcpy(md->name, w3, 24); md->n = i; md->base_class = md->mob_class = mob_class; - md->bl.id = npc_get_new_npc_id (); + md->bl.id = npc_get_new_npc_id(); md->m = m; md->x0 = x; md->y0 = y; @@ -1927,27 +1927,27 @@ int npc_parse_mob (const char *w1, const char *w2, const char *w3, const char *w md->spawndelay1 = delay1; md->spawndelay2 = delay2; - memset (&md->state, 0, sizeof (md->state)); + memset(&md->state, 0, sizeof(md->state)); md->timer = -1; md->target_id = 0; md->attacked_id = 0; if (mob_db[mob_class].mode & 0x02) md->lootitem = - (struct item *) calloc (LOOTITEM_SIZE, sizeof (struct item)); + (struct item *) calloc(LOOTITEM_SIZE, sizeof(struct item)); else md->lootitem = NULL; - if (strlen (eventname) >= 4) + if (strlen(eventname) >= 4) { - memcpy (md->npc_event, eventname, 24); + memcpy(md->npc_event, eventname, 24); } else - memset (md->npc_event, 0, 24); + memset(md->npc_event, 0, 24); md->bl.type = BL_MOB; - map_addiddb (&md->bl); - mob_spawn (md->bl.id); + map_addiddb(&md->bl); + mob_spawn(md->bl.id); npc_mob++; } @@ -1960,95 +1960,95 @@ int npc_parse_mob (const char *w1, const char *w2, const char *w3, const char *w * マップフラグ行の解析 *------------------------------------------ */ -static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4) +static int npc_parse_mapflag(char *w1, char *w2, char *w3, char *w4) { - int m; + int m; char mapname[24], savemap[16]; - int savex, savey; + int savex, savey; char drop_arg1[16], drop_arg2[16]; - int drop_id = 0, drop_type = 0, drop_per = 0; + int drop_id = 0, drop_type = 0, drop_per = 0; // 引数の個数チェック // if ( sscanf(w1,"%[^,],%d,%d,%d",mapname,&x,&y,&dir) != 4 ) - if (sscanf (w1, "%[^,]", mapname) != 1) + if (sscanf(w1, "%[^,]", mapname) != 1) return 1; - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); if (m < 0) return 1; //マップフラグ - if (strcasecmp (w3, "nosave") == 0) + if (strcasecmp(w3, "nosave") == 0) { - if (strcmp (w4, "SavePoint") == 0) + if (strcmp(w4, "SavePoint") == 0) { - memcpy (map[m].save.map, "SavePoint", 16); + memcpy(map[m].save.map, "SavePoint", 16); map[m].save.x = -1; map[m].save.y = -1; } - else if (sscanf (w4, "%[^,],%d,%d", savemap, &savex, &savey) == 3) + else if (sscanf(w4, "%[^,],%d,%d", savemap, &savex, &savey) == 3) { - memcpy (map[m].save.map, savemap, 16); + memcpy(map[m].save.map, savemap, 16); map[m].save.x = savex; map[m].save.y = savey; } map[m].flag.nosave = 1; } - else if (strcasecmp (w3, "nomemo") == 0) + else if (strcasecmp(w3, "nomemo") == 0) { map[m].flag.nomemo = 1; } - else if (strcasecmp (w3, "noteleport") == 0) + else if (strcasecmp(w3, "noteleport") == 0) { map[m].flag.noteleport = 1; } - else if (strcasecmp (w3, "nowarp") == 0) + else if (strcasecmp(w3, "nowarp") == 0) { map[m].flag.nowarp = 1; } - else if (strcasecmp (w3, "nowarpto") == 0) + else if (strcasecmp(w3, "nowarpto") == 0) { map[m].flag.nowarpto = 1; } - else if (strcasecmp (w3, "noreturn") == 0) + else if (strcasecmp(w3, "noreturn") == 0) { map[m].flag.noreturn = 1; } - else if (strcasecmp (w3, "monster_noteleport") == 0) + else if (strcasecmp(w3, "monster_noteleport") == 0) { map[m].flag.monster_noteleport = 1; } - else if (strcasecmp (w3, "nobranch") == 0) + else if (strcasecmp(w3, "nobranch") == 0) { map[m].flag.nobranch = 1; } - else if (strcasecmp (w3, "nopenalty") == 0) + else if (strcasecmp(w3, "nopenalty") == 0) { map[m].flag.nopenalty = 1; } - else if (strcasecmp (w3, "pvp") == 0) + else if (strcasecmp(w3, "pvp") == 0) { map[m].flag.pvp = 1; } - else if (strcasecmp (w3, "pvp_noparty") == 0) + else if (strcasecmp(w3, "pvp_noparty") == 0) { map[m].flag.pvp_noparty = 1; } - else if (strcasecmp (w3, "pvp_nightmaredrop") == 0) + else if (strcasecmp(w3, "pvp_nightmaredrop") == 0) { - if (sscanf (w4, "%[^,],%[^,],%d", drop_arg1, drop_arg2, &drop_per) == + if (sscanf(w4, "%[^,],%[^,],%d", drop_arg1, drop_arg2, &drop_per) == 3) { - int i; - if (strcmp (drop_arg1, "random") == 0) + int i; + if (strcmp(drop_arg1, "random") == 0) drop_id = -1; - else if (itemdb_exists ((drop_id = atoi (drop_arg1))) == NULL) + else if (itemdb_exists((drop_id = atoi(drop_arg1))) == NULL) drop_id = 0; - if (strcmp (drop_arg2, "inventory") == 0) + if (strcmp(drop_arg2, "inventory") == 0) drop_type = 1; - else if (strcmp (drop_arg2, "equip") == 0) + else if (strcmp(drop_arg2, "equip") == 0) drop_type = 2; - else if (strcmp (drop_arg2, "all") == 0) + else if (strcmp(drop_arg2, "all") == 0) drop_type = 3; if (drop_id != 0) @@ -2067,56 +2067,56 @@ static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4) } } } - else if (strcasecmp (w3, "pvp_nocalcrank") == 0) + else if (strcasecmp(w3, "pvp_nocalcrank") == 0) { map[m].flag.pvp_nocalcrank = 1; } - else if (strcasecmp (w3, "nozenypenalty") == 0) + else if (strcasecmp(w3, "nozenypenalty") == 0) { map[m].flag.nozenypenalty = 1; } - else if (strcasecmp (w3, "notrade") == 0) + else if (strcasecmp(w3, "notrade") == 0) { map[m].flag.notrade = 1; } - else if (strcasecmp (w3, "noskill") == 0) + else if (strcasecmp(w3, "noskill") == 0) { map[m].flag.noskill = 1; } - else if (battle_config.pk_mode && strcasecmp (w3, "nopvp") == 0) + else if (battle_config.pk_mode && strcasecmp(w3, "nopvp") == 0) { // nopvp for pk mode [Valaris] map[m].flag.nopvp = 1; map[m].flag.pvp = 0; } - else if (strcasecmp (w3, "noicewall") == 0) + else if (strcasecmp(w3, "noicewall") == 0) { // noicewall [Valaris] map[m].flag.noicewall = 1; } - else if (strcasecmp (w3, "snow") == 0) + else if (strcasecmp(w3, "snow") == 0) { // snow [Valaris] map[m].flag.snow = 1; } - else if (strcasecmp (w3, "fog") == 0) + else if (strcasecmp(w3, "fog") == 0) { // fog [Valaris] map[m].flag.fog = 1; } - else if (strcasecmp (w3, "sakura") == 0) + else if (strcasecmp(w3, "sakura") == 0) { // sakura [Valaris] map[m].flag.sakura = 1; } - else if (strcasecmp (w3, "leaves") == 0) + else if (strcasecmp(w3, "leaves") == 0) { // leaves [Valaris] map[m].flag.leaves = 1; } - else if (strcasecmp (w3, "rain") == 0) + else if (strcasecmp(w3, "rain") == 0) { // rain [Valaris] map[m].flag.rain = 1; } - else if (strcasecmp (w3, "no_player_drops") == 0) + else if (strcasecmp(w3, "no_player_drops") == 0) { // no player drops [Jaxad0127] map[m].flag.no_player_drops = 1; } - else if (strcasecmp (w3, "town") == 0) + else if (strcasecmp(w3, "town") == 0) { // town/safe zone [remoitnane] map[m].flag.town = 1; } @@ -2124,126 +2124,126 @@ static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4) return 0; } -static void ev_db_final (db_key_t key, db_val_t data, va_list ap) +static void ev_db_final(db_key_t key, db_val_t data, va_list ap) { - free (data); - if (strstr (key.s, "::") != NULL) - free ((char*)key.s); + free(data); + if (strstr(key.s, "::") != NULL) + free((char*)key.s); } -struct npc_data *npc_spawn_text (int m, int x, int y, +struct npc_data *npc_spawn_text(int m, int x, int y, int npc_class, const char *name, const char *message) { struct npc_data *retval = - (struct npc_data *) calloc (1, sizeof (struct npc_data)); - retval->bl.id = npc_get_new_npc_id (); + (struct npc_data *) calloc(1, sizeof(struct npc_data)); + retval->bl.id = npc_get_new_npc_id(); retval->bl.x = x; retval->bl.y = y; retval->bl.m = m; retval->bl.type = BL_NPC; retval->bl.subtype = MESSAGE; - strncpy (retval->name, name, 23); - strncpy (retval->exname, name, 23); + strncpy(retval->name, name, 23); + strncpy(retval->exname, name, 23); retval->name[15] = 0; retval->exname[15] = 0; - retval->u.message = message ? strdup (message) : NULL; + retval->u.message = message ? strdup(message) : NULL; retval->npc_class = npc_class; retval->speed = 200; - clif_spawnnpc (retval); - map_addblock (&retval->bl); - map_addiddb (&retval->bl); + clif_spawnnpc(retval); + map_addblock(&retval->bl); + map_addiddb(&retval->bl); if (retval->name && retval->name[0]) - strdb_insert (npcname_db, retval->name, retval); + strdb_insert(npcname_db, retval->name, retval); return retval; } -static void npc_free_internal (struct npc_data *nd) +static void npc_free_internal(struct npc_data *nd) { struct chat_data *cd; - if (nd->chat_id && (cd = (struct chat_data *) map_id2bl (nd->chat_id))) + if (nd->chat_id && (cd = (struct chat_data *) map_id2bl(nd->chat_id))) { - free (cd); + free(cd); cd = NULL; } if (nd->bl.subtype == SCRIPT) { if (nd->u.scr.timer_event) - free (nd->u.scr.timer_event); + free(nd->u.scr.timer_event); if (nd->u.scr.src_id == 0) { if (nd->u.scr.script) { - free (const_cast<ScriptCode *>(nd->u.scr.script)); + free(const_cast<ScriptCode *>(nd->u.scr.script)); nd->u.scr.script = NULL; } if (nd->u.scr.label_list) { - free (nd->u.scr.label_list); + free(nd->u.scr.label_list); nd->u.scr.label_list = NULL; } } } else if (nd->bl.subtype == MESSAGE && nd->u.message) { - free (nd->u.message); + free(nd->u.message); } - free (nd); + free(nd); } static -void npc_propagate_update (struct npc_data *nd) +void npc_propagate_update(struct npc_data *nd) { - map_foreachinarea (npc_enable_sub, + map_foreachinarea(npc_enable_sub, nd->bl.m, nd->bl.x - nd->u.scr.xs, nd->bl.y - nd->u.scr.ys, nd->bl.x + nd->u.scr.xs, nd->bl.y + nd->u.scr.ys, BL_PC, nd); } -void npc_free (struct npc_data *nd) +void npc_free(struct npc_data *nd) { - clif_clearchar (&nd->bl, 0); - npc_propagate_update (nd); - map_deliddb (&nd->bl); - map_delblock (&nd->bl); - npc_free_internal (nd); + clif_clearchar(&nd->bl, 0); + npc_propagate_update(nd); + map_deliddb(&nd->bl); + map_delblock(&nd->bl); + npc_free_internal(nd); } /*========================================== * 終了 *------------------------------------------ */ -int do_final_npc (void) +int do_final_npc(void) { - int i; + int i; struct block_list *bl; struct npc_data *nd; struct mob_data *md; if (ev_db) - strdb_final (ev_db, ev_db_final); + strdb_final(ev_db, ev_db_final); if (npcname_db) - strdb_final (npcname_db, NULL); + strdb_final(npcname_db, NULL); for (i = START_NPC_NUM; i < npc_id; i++) { - if ((bl = map_id2bl (i))) + if ((bl = map_id2bl(i))) { if (bl->type == BL_NPC && (nd = (struct npc_data *) bl)) - npc_free_internal (nd); + npc_free_internal(nd); else if (bl->type == BL_MOB && (md = (struct mob_data *) bl)) { if (md->lootitem) { - free (md->lootitem); + free(md->lootitem); md->lootitem = NULL; } - free (md); + free(md); md = NULL; } } @@ -2253,48 +2253,48 @@ int do_final_npc (void) } static -void ev_release (db_key_t key, db_val_t val) +void ev_release(db_key_t key, db_val_t val) { - free ((char*)key.s); - free (val); + free((char*)key.s); + free(val); } /*========================================== * npc初期化 *------------------------------------------ */ -int do_init_npc (void) +int do_init_npc(void) { struct npc_src_list *nsl; FILE *fp; char line[1024]; - int m, lines; + int m, lines; - ev_db = strdb_init (24); - npcname_db = strdb_init (24); + ev_db = strdb_init(24); + npcname_db = strdb_init(24); ev_db->release = ev_release; - memset (&ev_tm_b, -1, sizeof (ev_tm_b)); + memset(&ev_tm_b, -1, sizeof(ev_tm_b)); for (nsl = npc_src_first; nsl; nsl = nsl->next) { if (nsl->prev) { - free (nsl->prev); + free(nsl->prev); nsl->prev = NULL; } - fp = fopen_ (nsl->name, "r"); + fp = fopen_(nsl->name, "r"); if (fp == NULL) { - printf ("file not found : %s\n", nsl->name); - exit (1); + printf("file not found : %s\n", nsl->name); + exit(1); } lines = 0; - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { char w1[1024], w2[1024], w3[1024], w4[1024], mapname[1024]; - int i, j, w4pos, count; + int i, j, w4pos, count; lines++; if (line[0] == '/' && line[1] == '/') @@ -2306,7 +2306,7 @@ int do_init_npc (void) { if (! ((line[i + 1] - && (isspace (line[i + 1]) || line[i + 1] == ',')) + && (isspace(line[i + 1]) || line[i + 1] == ',')) || (j && line[j - 1] == ','))) line[j++] = ' '; } @@ -2320,67 +2320,67 @@ int do_init_npc (void) } // 最初はタブ区切りでチェックしてみて、ダメならスペース区切りで確認 if ((count = - sscanf (line, "%[^\t]\t%[^\t]\t%[^\t\r\n]\t%n%[^\t\r\n]", w1, + sscanf(line, "%[^\t]\t%[^\t]\t%[^\t\r\n]\t%n%[^\t\r\n]", w1, w2, w3, &w4pos, w4)) < 3 && (count = - sscanf (line, "%s%s%s%n%s", w1, w2, w3, &w4pos, w4)) < 3) + sscanf(line, "%s%s%s%n%s", w1, w2, w3, &w4pos, w4)) < 3) { continue; } // マップの存在確認 - if (strcmp (w1, "-") != 0 && strcasecmp (w1, "function") != 0) + if (strcmp(w1, "-") != 0 && strcasecmp(w1, "function") != 0) { - sscanf (w1, "%[^,]", mapname); - m = map_mapname2mapid (mapname); - if (strlen (mapname) > 16 || m < 0) + sscanf(w1, "%[^,]", mapname); + m = map_mapname2mapid(mapname); + if (strlen(mapname) > 16 || m < 0) { // "mapname" is not assigned to this server continue; } } - if (strcasecmp (w2, "warp") == 0 && count > 3) + if (strcasecmp(w2, "warp") == 0 && count > 3) { - npc_parse_warp (w1, w2, w3, w4); + npc_parse_warp(w1, w2, w3, w4); } - else if (strcasecmp (w2, "shop") == 0 && count > 3) + else if (strcasecmp(w2, "shop") == 0 && count > 3) { - npc_parse_shop (w1, w2, w3, w4); + npc_parse_shop(w1, w2, w3, w4); } - else if (strcasecmp (w2, "script") == 0 && count > 3) + else if (strcasecmp(w2, "script") == 0 && count > 3) { - if (strcasecmp (w1, "function") == 0) + if (strcasecmp(w1, "function") == 0) { - npc_parse_function (w1, w2, w3, w4, line + w4pos, fp, + npc_parse_function(w1, w2, w3, w4, line + w4pos, fp, &lines); } else { - npc_parse_script (w1, w2, w3, w4, line + w4pos, fp, + npc_parse_script(w1, w2, w3, w4, line + w4pos, fp, &lines); } } else if ((i = - 0, sscanf (w2, "duplicate%n", &i), (i > 0 + 0, sscanf(w2, "duplicate%n", &i), (i > 0 && w2[i] == '(')) && count > 3) { - npc_parse_script (w1, w2, w3, w4, line + w4pos, fp, &lines); + npc_parse_script(w1, w2, w3, w4, line + w4pos, fp, &lines); } - else if (strcasecmp (w2, "monster") == 0 && count > 3) + else if (strcasecmp(w2, "monster") == 0 && count > 3) { - npc_parse_mob (w1, w2, w3, w4); + npc_parse_mob(w1, w2, w3, w4); } - else if (strcasecmp (w2, "mapflag") == 0 && count >= 3) + else if (strcasecmp(w2, "mapflag") == 0 && count >= 3) { - npc_parse_mapflag (w1, w2, w3, w4); + npc_parse_mapflag(w1, w2, w3, w4); } } - fclose_ (fp); - printf ("\rLoading NPCs [%d]: %-54s", npc_id - START_NPC_NUM, + fclose_(fp); + printf("\rLoading NPCs [%d]: %-54s", npc_id - START_NPC_NUM, nsl->name); - fflush (stdout); + fflush(stdout); } - printf ("\rNPCs Loaded: %d [Warps:%d Shops:%d Scripts:%d Mobs:%d]\n", + printf("\rNPCs Loaded: %d [Warps:%d Shops:%d Scripts:%d Mobs:%d]\n", npc_id - START_NPC_NUM, npc_warp, npc_shop, npc_script, npc_mob); return 0; diff --git a/src/map/npc.hpp b/src/map/npc.hpp index 6204316..cea585b 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -8,57 +8,57 @@ #define WARP_DEBUG_CLASS 722 #define INVISIBLE_CLASS 32767 -int npc_event_dequeue (struct map_session_data *sd); -void npc_event_timer (timer_id, tick_t, custom_id_t, custom_data_t); -int npc_event (struct map_session_data *sd, const char *npcname, int); -int npc_timer_event (const char *eventname); // Added by RoVeRT -int npc_command (struct map_session_data *sd, const char *npcname, const char *command); -int npc_touch_areanpc (struct map_session_data *, int, int, int); -int npc_click (struct map_session_data *, int); -int npc_scriptcont (struct map_session_data *, int); -int npc_checknear (struct map_session_data *, int); -int npc_buysellsel (struct map_session_data *, int, int); -int npc_buylist (struct map_session_data *, int, unsigned short *); -int npc_selllist (struct map_session_data *, int, unsigned short *); -int npc_parse_mob (const char *w1, const char *w2, const char *w3, const char *w4); -int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char *w4); +int npc_event_dequeue(struct map_session_data *sd); +void npc_event_timer(timer_id, tick_t, custom_id_t, custom_data_t); +int npc_event(struct map_session_data *sd, const char *npcname, int); +int npc_timer_event(const char *eventname); // Added by RoVeRT +int npc_command(struct map_session_data *sd, const char *npcname, const char *command); +int npc_touch_areanpc(struct map_session_data *, int, int, int); +int npc_click(struct map_session_data *, int); +int npc_scriptcont(struct map_session_data *, int); +int npc_checknear(struct map_session_data *, int); +int npc_buysellsel(struct map_session_data *, int, int); +int npc_buylist(struct map_session_data *, int, unsigned short *); +int npc_selllist(struct map_session_data *, int, unsigned short *); +int npc_parse_mob(const char *w1, const char *w2, const char *w3, const char *w4); +int npc_parse_warp(const char *w1, const char *w2, const char *w3, const char *w4); -int npc_enable (const char *name, int flag); -struct npc_data *npc_name2id (const char *name); +int npc_enable(const char *name, int flag); +struct npc_data *npc_name2id(const char *name); -int npc_get_new_npc_id (void); +int npc_get_new_npc_id(void); /** * Spawns and installs a talk-only NPC * * \param message The message to speak. If message is NULL, the NPC will not do anything at all. */ -struct npc_data *npc_spawn_text (int m, int x, int y, int class_, const char *name, const char *message); // message is strdup'd within +struct npc_data *npc_spawn_text(int m, int x, int y, int class_, const char *name, const char *message); // message is strdup'd within /** * Uninstalls and frees an NPC */ -void npc_free (struct npc_data *npc); +void npc_free(struct npc_data *npc); -void npc_addsrcfile (char *); -void npc_delsrcfile (char *); -int do_final_npc (void); -int do_init_npc (void); -int npc_event_do_oninit (void); -int npc_do_ontimer (int, struct map_session_data *, int); +void npc_addsrcfile(char *); +void npc_delsrcfile(char *); +int do_final_npc(void); +int do_init_npc(void); +int npc_event_do_oninit(void); +int npc_do_ontimer(int, struct map_session_data *, int); struct argrec; -int npc_event_doall_l (const char *name, int rid, int argc, +int npc_event_doall_l(const char *name, int rid, int argc, struct argrec *argv); -int npc_event_do_l (const char *name, int rid, int argc, +int npc_event_do_l(const char *name, int rid, int argc, struct argrec *argv); #define npc_event_doall(name) npc_event_doall_l(name, 0, 0, NULL) #define npc_event_do(name) npc_event_do_l(name, 0, 0, NULL) -int npc_timerevent_start (struct npc_data *nd); -int npc_timerevent_stop (struct npc_data *nd); -int npc_gettimerevent_tick (struct npc_data *nd); -int npc_settimerevent_tick (struct npc_data *nd, int newtimer); -int npc_delete (struct npc_data *nd); +int npc_timerevent_start(struct npc_data *nd); +int npc_timerevent_stop(struct npc_data *nd); +int npc_gettimerevent_tick(struct npc_data *nd); +int npc_settimerevent_tick(struct npc_data *nd, int newtimer); +int npc_delete(struct npc_data *nd); #endif diff --git a/src/map/party.cpp b/src/map/party.cpp index c649ae5..c08c9fc 100644 --- a/src/map/party.cpp +++ b/src/map/party.cpp @@ -20,90 +20,90 @@ #include "memwatch.hpp" #endif -#define PARTY_SEND_XYHP_INVERVAL 1000 // 座標やＨＰ送信の間隔 +#define PARTY_SEND_XYHP_INVERVAL 1000 // 座標やＨＰ送信の間隔 static struct dbt *party_db; -void party_send_xyhp_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data); +void party_send_xyhp_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data); /*========================================== * 終了 *------------------------------------------ */ -static void party_db_final (db_key_t key, db_val_t data, va_list ap) +static void party_db_final(db_key_t key, db_val_t data, va_list ap) { - free (data); + free(data); } -void do_final_party (void) +void do_final_party(void) { if (party_db) - numdb_final (party_db, party_db_final); + numdb_final(party_db, party_db_final); } // 初期化 -void do_init_party (void) +void do_init_party(void) { - party_db = numdb_init (); - add_timer_interval (gettick () + PARTY_SEND_XYHP_INVERVAL, + party_db = numdb_init(); + add_timer_interval(gettick() + PARTY_SEND_XYHP_INVERVAL, party_send_xyhp_timer, 0, 0, PARTY_SEND_XYHP_INVERVAL); } // 検索 -struct party *party_search (int party_id) +struct party *party_search(int party_id) { - return (struct party *)numdb_search (party_db, party_id); + return (struct party *)numdb_search(party_db, party_id); } static -void party_searchname_sub (db_key_t key, db_val_t data, va_list ap) +void party_searchname_sub(db_key_t key, db_val_t data, va_list ap) { struct party *p = (struct party *) data, **dst; const char *str; - str = va_arg (ap, const char *); - dst = va_arg (ap, struct party **); - if (strcasecmp (p->name, str) == 0) + str = va_arg(ap, const char *); + dst = va_arg(ap, struct party **); + if (strcasecmp(p->name, str) == 0) *dst = p; } // パーティ名検索 -struct party *party_searchname (const char *str) +struct party *party_searchname(const char *str) { struct party *p = NULL; - numdb_foreach (party_db, party_searchname_sub, str, &p); + numdb_foreach(party_db, party_searchname_sub, str, &p); return p; } /* Process a party creation request. */ -int party_create (struct map_session_data *sd, const char *name) +int party_create(struct map_session_data *sd, const char *name) { char pname[24]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - strncpy (pname, name, 24); + strncpy(pname, name, 24); pname[23] = '\0'; - tmw_TrimStr (pname); + tmw_TrimStr(pname); /* The party name is empty/invalid. */ if (!*pname) - clif_party_created (sd, 1); + clif_party_created(sd, 1); /* Make sure the character isn't already in a party. */ if (sd->status.party_id == 0) - intif_create_party (sd, pname); + intif_create_party(sd, pname); else - clif_party_created (sd, 2); + clif_party_created(sd, 2); return 0; } /* Relay the result of a party creation request. */ -int party_created (int account_id, int fail, int party_id, const char *name) +int party_created(int account_id, int fail, int party_id, const char *name) { struct map_session_data *sd; - sd = map_id2sd (account_id); + sd = map_id2sd(account_id); - nullpo_retr (0, sd); + nullpo_retr(0, sd); /* The party name is valid and not already taken. */ if (!fail) @@ -111,41 +111,41 @@ int party_created (int account_id, int fail, int party_id, const char *name) struct party *p; sd->status.party_id = party_id; - if ((p = (struct party *)numdb_search (party_db, party_id)) != NULL) + if ((p = (struct party *)numdb_search(party_db, party_id)) != NULL) { - printf ("party_created(): ID already exists!\n"); - exit (1); + printf("party_created(): ID already exists!\n"); + exit(1); } - CREATE (p, struct party, 1); + CREATE(p, struct party, 1); p->party_id = party_id; - memcpy (p->name, name, 24); - numdb_insert (party_db, party_id, p); + memcpy(p->name, name, 24); + numdb_insert(party_db, party_id, p); /* The party was created successfully. */ - clif_party_created (sd, 0); + clif_party_created(sd, 0); } else - clif_party_created (sd, 1); + clif_party_created(sd, 1); return 0; } // 情報要求 -int party_request_info (int party_id) +int party_request_info(int party_id) { - return intif_request_partyinfo (party_id); + return intif_request_partyinfo(party_id); } // 所属キャラの確認 static -int party_check_member (struct party *p) +int party_check_member(struct party *p) { - int i; + int i; struct map_session_data *sd; - nullpo_retr (0, p); + nullpo_retr(0, p); for (i = 0; i < fd_max; i++) { @@ -153,12 +153,12 @@ int party_check_member (struct party *p) { if (sd->status.party_id == p->party_id) { - int j, f = 1; + int j, f = 1; for (j = 0; j < MAX_PARTY; j++) { // パーティにデータがあるか確認 if (p->member[j].account_id == sd->status.account_id) { - if (strcmp (p->member[j].name, sd->status.name) == 0) + if (strcmp(p->member[j].name, sd->status.name) == 0) f = 0; // データがある else p->member[j].sd = NULL; // 同垢別キャラだった @@ -168,7 +168,7 @@ int party_check_member (struct party *p) { sd->status.party_id = 0; if (battle_config.error_log) - printf ("party: check_member %d[%s] is not member\n", + printf("party: check_member %d[%s] is not member\n", sd->status.account_id, sd->status.name); } } @@ -178,9 +178,9 @@ int party_check_member (struct party *p) } // 情報所得失敗（そのIDのキャラを全部未所属にする） -int party_recv_noinfo (int party_id) +int party_recv_noinfo(int party_id) { - int i; + int i; struct map_session_data *sd; for (i = 0; i < fd_max; i++) { @@ -194,31 +194,31 @@ int party_recv_noinfo (int party_id) } // 情報所得 -int party_recv_info (struct party *sp) +int party_recv_info(struct party *sp) { struct party *p; - int i; + int i; - nullpo_retr (0, sp); + nullpo_retr(0, sp); - if ((p = (struct party *)numdb_search (party_db, sp->party_id)) == NULL) + if ((p = (struct party *)numdb_search(party_db, sp->party_id)) == NULL) { - CREATE (p, struct party, 1); - numdb_insert (party_db, sp->party_id, p); + CREATE(p, struct party, 1); + numdb_insert(party_db, sp->party_id, p); // 最初のロードなのでユーザーのチェックを行う - party_check_member (sp); + party_check_member(sp); } - memcpy (p, sp, sizeof (struct party)); + memcpy(p, sp, sizeof(struct party)); for (i = 0; i < MAX_PARTY; i++) { // sdの設定 - struct map_session_data *sd = map_id2sd (p->member[i].account_id); + struct map_session_data *sd = map_id2sd(p->member[i].account_id); p->member[i].sd = (sd != NULL && sd->status.party_id == p->party_id) ? sd : NULL; } - clif_party_info (p, -1); + clif_party_info(p, -1); for (i = 0; i < MAX_PARTY; i++) { // 設定情報の送信 @@ -226,7 +226,7 @@ int party_recv_info (struct party *sp) struct map_session_data *sd = p->member[i].sd; if (sd != NULL && sd->party_sended == 0) { - clif_party_option (p, sd, 0x100); + clif_party_option(p, sd, 0x100); sd->party_sended = 1; } } @@ -235,14 +235,14 @@ int party_recv_info (struct party *sp) } /* Process party invitation from sd to account_id. */ -int party_invite (struct map_session_data *sd, int account_id) +int party_invite(struct map_session_data *sd, int account_id) { - struct map_session_data *tsd = map_id2sd (account_id); - struct party *p = party_search (sd->status.party_id); - int i; - int full = 1; /* Indicates whether or not there's room for one more. */ + struct map_session_data *tsd = map_id2sd(account_id); + struct party *p = party_search(sd->status.party_id); + int i; + int full = 1; /* Indicates whether or not there's room for one more. */ - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (!tsd || !p || !tsd->fd) return 0; @@ -251,9 +251,9 @@ int party_invite (struct map_session_data *sd, int account_id) { /* Disallow the invitation under these conditions. */ if (tsd->trade_partner || tsd->npc_id - || tsd->npc_shopid || pc_checkskill (tsd, NV_PARTY) < 1) + || tsd->npc_shopid || pc_checkskill(tsd, NV_PARTY) < 1) { - clif_party_inviteack (sd, tsd->status.name, 1); + clif_party_inviteack(sd, tsd->status.name, 1); return 0; } } @@ -261,7 +261,7 @@ int party_invite (struct map_session_data *sd, int account_id) /* The target player is already in a party, or has a pending invitation. */ if (tsd->status.party_id > 0 || tsd->party_invite > 0) { - clif_party_inviteack (sd, tsd->status.name, 0); + clif_party_inviteack(sd, tsd->status.name, 0); return 0; } @@ -275,7 +275,7 @@ int party_invite (struct map_session_data *sd, int account_id) */ if (p->member[i].account_id == account_id) { - clif_party_inviteack (sd, tsd->status.name, 1); + clif_party_inviteack(sd, tsd->status.name, 1); return 0; } @@ -286,7 +286,7 @@ int party_invite (struct map_session_data *sd, int account_id) /* There isn't enough room for a new member. */ if (full) { - clif_party_inviteack (sd, tsd->status.name, 3); + clif_party_inviteack(sd, tsd->status.name, 3); return 0; } @@ -294,14 +294,14 @@ int party_invite (struct map_session_data *sd, int account_id) tsd->party_invite = sd->status.party_id; tsd->party_invite_account = sd->status.account_id; - clif_party_invite (sd, tsd); + clif_party_invite(sd, tsd); return 0; } /* Process response to party invitation. */ -int party_reply_invite (struct map_session_data *sd, int account_id, int flag) +int party_reply_invite(struct map_session_data *sd, int account_id, int flag) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); /* There is no pending invitation. */ if (!sd->party_invite || !sd->party_invite_account) @@ -316,7 +316,7 @@ int party_reply_invite (struct map_session_data *sd, int account_id, int flag) /* The invitation was accepted. */ if (flag == 1) - intif_party_addmember (sd->party_invite, sd->status.account_id); + intif_party_addmember(sd->party_invite, sd->status.account_id); /* The invitation was rejected. */ else { @@ -326,44 +326,44 @@ int party_reply_invite (struct map_session_data *sd, int account_id, int flag) sd->party_invite = 0; sd->party_invite_account = 0; - if ((tsd = map_id2sd (account_id))) - clif_party_inviteack (tsd, sd->status.name, 1); + if ((tsd = map_id2sd(account_id))) + clif_party_inviteack(tsd, sd->status.name, 1); } return 0; } // パーティが追加された -int party_member_added (int party_id, int account_id, int flag) +int party_member_added(int party_id, int account_id, int flag) { - struct map_session_data *sd = map_id2sd (account_id), *sd2; - struct party *p = party_search (party_id); + struct map_session_data *sd = map_id2sd(account_id), *sd2; + struct party *p = party_search(party_id); if (sd == NULL) { if (flag == 0) { if (battle_config.error_log) - printf ("party: member added error %d is not online\n", + printf("party: member added error %d is not online\n", account_id); - intif_party_leave (party_id, account_id); // キャラ側に登録できなかったため脱退要求を出す + intif_party_leave(party_id, account_id); // キャラ側に登録できなかったため脱退要求を出す } return 0; } - sd2 = map_id2sd (sd->party_invite_account); + sd2 = map_id2sd(sd->party_invite_account); sd->party_invite = 0; sd->party_invite_account = 0; if (p == NULL) { - printf ("party_member_added: party %d not found.\n", party_id); - intif_party_leave (party_id, account_id); + printf("party_member_added: party %d not found.\n", party_id); + intif_party_leave(party_id, account_id); return 0; } if (flag == 1) { // 失敗 if (sd2 != NULL) - clif_party_inviteack (sd2, sd->status.name, 0); + clif_party_inviteack(sd2, sd->status.name, 0); return 0; } @@ -372,26 +372,26 @@ int party_member_added (int party_id, int account_id, int flag) sd->status.party_id = party_id; if (sd2 != NULL) - clif_party_inviteack (sd2, sd->status.name, 2); + clif_party_inviteack(sd2, sd->status.name, 2); // いちおう競合確認 - party_check_conflict (sd); + party_check_conflict(sd); - party_send_xy_clear (p); + party_send_xy_clear(p); return 0; } // パーティ除名要求 -int party_removemember (struct map_session_data *sd, int account_id, +int party_removemember(struct map_session_data *sd, int account_id, const char *name) { struct party *p; - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if ((p = party_search (sd->status.party_id)) == NULL) + if ((p = party_search(sd->status.party_id)) == NULL) return 0; for (i = 0; i < MAX_PARTY; i++) @@ -405,7 +405,7 @@ int party_removemember (struct map_session_data *sd, int account_id, { // 所属しているか調べる if (p->member[i].account_id == account_id) { - intif_party_leave (p->party_id, account_id); + intif_party_leave(p->party_id, account_id); return 0; } } @@ -413,21 +413,21 @@ int party_removemember (struct map_session_data *sd, int account_id, } // パーティ脱退要求 -int party_leave (struct map_session_data *sd) +int party_leave(struct map_session_data *sd) { struct party *p; - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if ((p = party_search (sd->status.party_id)) == NULL) + if ((p = party_search(sd->status.party_id)) == NULL) return 0; for (i = 0; i < MAX_PARTY; i++) { // 所属しているか if (p->member[i].account_id == sd->status.account_id) { - intif_party_leave (p->party_id, sd->status.account_id); + intif_party_leave(p->party_id, sd->status.account_id); return 0; } } @@ -435,17 +435,17 @@ int party_leave (struct map_session_data *sd) } // パーティメンバが脱退した -int party_member_leaved (int party_id, int account_id, const char *name) +int party_member_leaved(int party_id, int account_id, const char *name) { - struct map_session_data *sd = map_id2sd (account_id); - struct party *p = party_search (party_id); + struct map_session_data *sd = map_id2sd(account_id); + struct party *p = party_search(party_id); if (p != NULL) { - int i; + int i; for (i = 0; i < MAX_PARTY; i++) if (p->member[i].account_id == account_id) { - clif_party_leaved (p, sd, account_id, name, 0x00); + clif_party_leaved(p, sd, account_id, name, 0x00); p->member[i].account_id = 0; p->member[i].sd = NULL; } @@ -459,79 +459,79 @@ int party_member_leaved (int party_id, int account_id, const char *name) } // パーティ解散通知 -int party_broken (int party_id) +int party_broken(int party_id) { struct party *p; - int i; - if ((p = party_search (party_id)) == NULL) + int i; + if ((p = party_search(party_id)) == NULL) return 0; for (i = 0; i < MAX_PARTY; i++) { if (p->member[i].sd != NULL) { - clif_party_leaved (p, p->member[i].sd, + clif_party_leaved(p, p->member[i].sd, p->member[i].account_id, p->member[i].name, 0x10); p->member[i].sd->status.party_id = 0; p->member[i].sd->party_sended = 0; } } - numdb_erase (party_db, party_id); + numdb_erase(party_db, party_id); return 0; } // パーティの設定変更要求 -int party_changeoption (struct map_session_data *sd, int exp, int item) +int party_changeoption(struct map_session_data *sd, int exp, int item) { struct party *p; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.party_id == 0 - || (p = party_search (sd->status.party_id)) == NULL) + || (p = party_search(sd->status.party_id)) == NULL) return 0; - intif_party_changeoption (sd->status.party_id, sd->status.account_id, exp, + intif_party_changeoption(sd->status.party_id, sd->status.account_id, exp, item); return 0; } // パーティの設定変更通知 -int party_optionchanged (int party_id, int account_id, int exp, int item, +int party_optionchanged(int party_id, int account_id, int exp, int item, int flag) { struct party *p; - struct map_session_data *sd = map_id2sd (account_id); - if ((p = party_search (party_id)) == NULL) + struct map_session_data *sd = map_id2sd(account_id); + if ((p = party_search(party_id)) == NULL) return 0; if (!(flag & 0x01)) p->exp = exp; if (!(flag & 0x10)) p->item = item; - clif_party_option (p, sd, flag); + clif_party_option(p, sd, flag); return 0; } // パーティメンバの移動通知 -int party_recv_movemap (int party_id, int account_id, const char *map, int online, +int party_recv_movemap(int party_id, int account_id, const char *map, int online, int lv) { struct party *p; - int i; - if ((p = party_search (party_id)) == NULL) + int i; + if ((p = party_search(party_id)) == NULL) return 0; for (i = 0; i < MAX_PARTY; i++) { struct party_member *m = &p->member[i]; if (m == NULL) { - printf ("party_recv_movemap nullpo?\n"); + printf("party_recv_movemap nullpo?\n"); return 0; } if (m->account_id == account_id) { - memcpy (m->map, map, 16); + memcpy(m->map, map, 16); m->online = online; m->lv = lv; break; @@ -540,49 +540,49 @@ int party_recv_movemap (int party_id, int account_id, const char *map, int onlin if (i == MAX_PARTY) { if (battle_config.error_log) - printf ("party: not found member %d on %d[%s]", account_id, + printf("party: not found member %d on %d[%s]", account_id, party_id, p->name); return 0; } for (i = 0; i < MAX_PARTY; i++) { // sd再設定 - struct map_session_data *sd = map_id2sd (p->member[i].account_id); + struct map_session_data *sd = map_id2sd(p->member[i].account_id); p->member[i].sd = (sd != NULL && sd->status.party_id == p->party_id) ? sd : NULL; } - party_send_xy_clear (p); // 座標再通知要請 + party_send_xy_clear(p); // 座標再通知要請 - clif_party_info (p, -1); + clif_party_info(p, -1); return 0; } // パーティメンバの移動 -int party_send_movemap (struct map_session_data *sd) +int party_send_movemap(struct map_session_data *sd) { struct party *p; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.party_id == 0) return 0; - intif_party_changemap (sd, 1); + intif_party_changemap(sd, 1); if (sd->party_sended != 0) // もうパーティデータは送信済み return 0; // 競合確認 - party_check_conflict (sd); + party_check_conflict(sd); // あるならパーティ情報送信 - if ((p = party_search (sd->status.party_id)) != NULL) + if ((p = party_search(sd->status.party_id)) != NULL) { - party_check_member (p); // 所属を確認する + party_check_member(p); // 所属を確認する if (sd->status.party_id == p->party_id) { - clif_party_info (p, sd->fd); - clif_party_option (p, sd, 0x100); + clif_party_info(p, sd->fd); + clif_party_option(p, sd, 0x100); sd->party_sended = 1; } } @@ -591,19 +591,19 @@ int party_send_movemap (struct map_session_data *sd) } // パーティメンバのログアウト -int party_send_logout (struct map_session_data *sd) +int party_send_logout(struct map_session_data *sd) { struct party *p; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.party_id > 0) - intif_party_changemap (sd, 0); + intif_party_changemap(sd, 0); // sdが無効になるのでパーティ情報から削除 - if ((p = party_search (sd->status.party_id)) != NULL) + if ((p = party_search(sd->status.party_id)) != NULL) { - int i; + int i; for (i = 0; i < MAX_PARTY; i++) if (p->member[i].sd == sd) p->member[i].sd = NULL; @@ -613,43 +613,43 @@ int party_send_logout (struct map_session_data *sd) } // パーティメッセージ送信 -int party_send_message (struct map_session_data *sd, const char *mes, int len) +int party_send_message(struct map_session_data *sd, const char *mes, int len) { if (sd->status.party_id == 0) return 0; - intif_party_message (sd->status.party_id, sd->status.account_id, mes, + intif_party_message(sd->status.party_id, sd->status.account_id, mes, len); return 0; } // パーティメッセージ受信 -int party_recv_message (int party_id, int account_id, const char *mes, int len) +int party_recv_message(int party_id, int account_id, const char *mes, int len) { struct party *p; - if ((p = party_search (party_id)) == NULL) + if ((p = party_search(party_id)) == NULL) return 0; - clif_party_message (p, account_id, mes, len); + clif_party_message(p, account_id, mes, len); return 0; } // パーティ競合確認 -int party_check_conflict (struct map_session_data *sd) +int party_check_conflict(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); - intif_party_checkconflict (sd->status.party_id, sd->status.account_id, + intif_party_checkconflict(sd->status.party_id, sd->status.account_id, sd->status.name); return 0; } // 位置やＨＰ通知用 static -void party_send_xyhp_timer_sub (db_key_t key, db_val_t data, va_list ap) +void party_send_xyhp_timer_sub(db_key_t key, db_val_t data, va_list ap) { struct party *p = (struct party *) data; - int i; + int i; - nullpo_retv (p); + nullpo_retv(p); for (i = 0; i < MAX_PARTY; i++) { @@ -659,14 +659,14 @@ void party_send_xyhp_timer_sub (db_key_t key, db_val_t data, va_list ap) // 座標通知 if (sd->party_x != sd->bl.x || sd->party_y != sd->bl.y) { - clif_party_xy (p, sd); + clif_party_xy(p, sd); sd->party_x = sd->bl.x; sd->party_y = sd->bl.y; } // ＨＰ通知 if (sd->party_hp != sd->status.hp) { - clif_party_hp (p, sd); + clif_party_hp(p, sd); sd->party_hp = sd->status.hp; } @@ -675,17 +675,17 @@ void party_send_xyhp_timer_sub (db_key_t key, db_val_t data, va_list ap) } // 位置やＨＰ通知 -void party_send_xyhp_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void party_send_xyhp_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - numdb_foreach (party_db, party_send_xyhp_timer_sub, tick); + numdb_foreach(party_db, party_send_xyhp_timer_sub, tick); } // 位置通知クリア -int party_send_xy_clear (struct party *p) +int party_send_xy_clear(struct party *p) { - int i; + int i; - nullpo_retr (0, p); + nullpo_retr(0, p); for (i = 0; i < MAX_PARTY; i++) { @@ -701,18 +701,18 @@ int party_send_xy_clear (struct party *p) } // HP通知の必要性検査用（map_foreachinmoveareaから呼ばれる） -void party_send_hp_check (struct block_list *bl, va_list ap) +void party_send_hp_check(struct block_list *bl, va_list ap) { - int party_id; + int party_id; int *flag; struct map_session_data *sd; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd = (struct map_session_data *) bl); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd = (struct map_session_data *) bl); - party_id = va_arg (ap, int); - flag = va_arg (ap, int *); + party_id = va_arg(ap, int); + flag = va_arg(ap, int *); if (sd->status.party_id == party_id) { @@ -722,12 +722,12 @@ void party_send_hp_check (struct block_list *bl, va_list ap) } // 経験値公平分配 -int party_exp_share (struct party *p, int map, int base_exp, int job_exp) +int party_exp_share(struct party *p, int map, int base_exp, int job_exp) { struct map_session_data *sd; - int i, c; + int i, c; - nullpo_retr (0, p); + nullpo_retr(0, p); for (i = c = 0; i < MAX_PARTY; i++) if ((sd = p->member[i].sd) != NULL && sd->bl.m == map) @@ -736,26 +736,26 @@ int party_exp_share (struct party *p, int map, int base_exp, int job_exp) return 0; for (i = 0; i < MAX_PARTY; i++) if ((sd = p->member[i].sd) != NULL && sd->bl.m == map) - pc_gainexp (sd, base_exp / c + 1, job_exp / c + 1); + pc_gainexp(sd, base_exp / c + 1, job_exp / c + 1); return 0; } // 同じマップのパーティメンバー全体に処理をかける // type==0 同じマップ // !=0 画面内 -void party_foreachsamemap (void (*func) (struct block_list *, va_list), +void party_foreachsamemap(void(*func)(struct block_list *, va_list), struct map_session_data *sd, int type, ...) { struct party *p; va_list ap; - int i; - int x0, y0, x1, y1; + int i; + int x0, y0, x1, y1; struct block_list *list[MAX_PARTY]; - int blockcount = 0; + int blockcount = 0; - nullpo_retv (sd); + nullpo_retv(sd); - if ((p = party_search (sd->status.party_id)) == NULL) + if ((p = party_search(sd->status.party_id)) == NULL) return; x0 = sd->bl.x - AREA_SIZE; @@ -763,7 +763,7 @@ void party_foreachsamemap (void (*func) (struct block_list *, va_list), x1 = sd->bl.x + AREA_SIZE; y1 = sd->bl.y + AREA_SIZE; - va_start (ap, type); + va_start(ap, type); for (i = 0; i < MAX_PARTY; i++) { @@ -780,13 +780,13 @@ void party_foreachsamemap (void (*func) (struct block_list *, va_list), } } - map_freeblock_lock (); // メモリからの解放を禁止する + map_freeblock_lock(); // メモリからの解放を禁止する for (i = 0; i < blockcount; i++) if (list[i]->prev) // 有効かどうかチェック - func (list[i], ap); + func(list[i], ap); - map_freeblock_unlock (); // 解放を許可する + map_freeblock_unlock(); // 解放を許可する - va_end (ap); + va_end(ap); } diff --git a/src/map/party.hpp b/src/map/party.hpp index f00d1dd..6ab5979 100644 --- a/src/map/party.hpp +++ b/src/map/party.hpp @@ -8,45 +8,45 @@ struct party; struct map_session_data; struct block_list; -void do_init_party (void); -void do_final_party (void); -struct party *party_search (int party_id); -struct party *party_searchname (const char *str); - -int party_create (struct map_session_data *sd, const char *name); -int party_created (int account_id, int fail, int party_id, const char *name); -int party_request_info (int party_id); -int party_invite (struct map_session_data *sd, int account_id); -int party_member_added (int party_id, int account_id, int flag); -int party_leave (struct map_session_data *sd); -int party_removemember (struct map_session_data *sd, int account_id, +void do_init_party(void); +void do_final_party(void); +struct party *party_search(int party_id); +struct party *party_searchname(const char *str); + +int party_create(struct map_session_data *sd, const char *name); +int party_created(int account_id, int fail, int party_id, const char *name); +int party_request_info(int party_id); +int party_invite(struct map_session_data *sd, int account_id); +int party_member_added(int party_id, int account_id, int flag); +int party_leave(struct map_session_data *sd); +int party_removemember(struct map_session_data *sd, int account_id, const char *name); -int party_member_leaved (int party_id, int account_id, const char *name); -int party_reply_invite (struct map_session_data *sd, int account_id, +int party_member_leaved(int party_id, int account_id, const char *name); +int party_reply_invite(struct map_session_data *sd, int account_id, int flag); -int party_recv_noinfo (int party_id); -int party_recv_info (struct party *sp); -int party_recv_movemap (int party_id, int account_id, const char *map, int online, +int party_recv_noinfo(int party_id); +int party_recv_info(struct party *sp); +int party_recv_movemap(int party_id, int account_id, const char *map, int online, int lv); -int party_broken (int party_id); -int party_optionchanged (int party_id, int account_id, int exp, int item, +int party_broken(int party_id); +int party_optionchanged(int party_id, int account_id, int exp, int item, int flag); -int party_changeoption (struct map_session_data *sd, int exp, int item); +int party_changeoption(struct map_session_data *sd, int exp, int item); -int party_send_movemap (struct map_session_data *sd); -int party_send_logout (struct map_session_data *sd); +int party_send_movemap(struct map_session_data *sd); +int party_send_logout(struct map_session_data *sd); -int party_send_message (struct map_session_data *sd, const char *mes, int len); -int party_recv_message (int party_id, int account_id, const char *mes, int len); +int party_send_message(struct map_session_data *sd, const char *mes, int len); +int party_recv_message(int party_id, int account_id, const char *mes, int len); -int party_check_conflict (struct map_session_data *sd); +int party_check_conflict(struct map_session_data *sd); -int party_send_xy_clear (struct party *p); -void party_send_hp_check (struct block_list *bl, va_list ap); +int party_send_xy_clear(struct party *p); +void party_send_hp_check(struct block_list *bl, va_list ap); -int party_exp_share (struct party *p, int map, int base_exp, int job_exp); +int party_exp_share(struct party *p, int map, int base_exp, int job_exp); -void party_foreachsamemap (void (*func) (struct block_list *, va_list), +void party_foreachsamemap(void(*func)(struct block_list *, va_list), struct map_session_data *sd, int type, ...); #endif diff --git a/src/map/path.cpp b/src/map/path.cpp index b68dae6..a5662c6 100644 --- a/src/map/path.cpp +++ b/src/map/path.cpp @@ -25,13 +25,13 @@ struct tmp_path * 経路探索補助heap push *------------------------------------------ */ -static void push_heap_path (int *heap, struct tmp_path *tp, int index) +static void push_heap_path(int *heap, struct tmp_path *tp, int index) { - int i, h; + int i, h; if (heap == NULL || tp == NULL) { - printf ("push_heap_path nullpo\n"); + printf("push_heap_path nullpo\n"); return; } @@ -48,20 +48,20 @@ static void push_heap_path (int *heap, struct tmp_path *tp, int index) * costが減ったので根の方へ移動 *------------------------------------------ */ -static void update_heap_path (int *heap, struct tmp_path *tp, int index) +static void update_heap_path(int *heap, struct tmp_path *tp, int index) { - int i, h; + int i, h; - nullpo_retv (heap); - nullpo_retv (tp); + nullpo_retv(heap); + nullpo_retv(tp); for (h = 0; h < heap[0]; h++) if (heap[h + 1] == index) break; if (h == heap[0]) { - fprintf (stderr, "update_heap_path bug\n"); - exit (1); + fprintf(stderr, "update_heap_path bug\n"); + exit(1); } for (i = (h - 1) / 2; h > 0 && tp[index].cost < tp[heap[i + 1]].cost; i = (h - 1) / 2) @@ -73,13 +73,13 @@ static void update_heap_path (int *heap, struct tmp_path *tp, int index) * 経路探索補助heap pop *------------------------------------------ */ -static int pop_heap_path (int *heap, struct tmp_path *tp) +static int pop_heap_path(int *heap, struct tmp_path *tp) { - int i, h, k; - int ret, last; + int i, h, k; + int ret, last; - nullpo_retr (-1, heap); - nullpo_retr (-1, tp); + nullpo_retr(-1, heap); + nullpo_retr(-1, tp); if (heap[0] <= 0) return -1; @@ -108,11 +108,11 @@ static int pop_heap_path (int *heap, struct tmp_path *tp) * 現在の点のcost計算 *------------------------------------------ */ -static int calc_cost (struct tmp_path *p, int x1, int y1) +static int calc_cost(struct tmp_path *p, int x1, int y1) { - int xd, yd; + int xd, yd; - nullpo_retr (0, p); + nullpo_retr(0, p); xd = x1 - p->x; if (xd < 0) @@ -127,15 +127,15 @@ static int calc_cost (struct tmp_path *p, int x1, int y1) * 必要ならpathを追加/修正する *------------------------------------------ */ -static int add_path (int *heap, struct tmp_path *tp, int x, int y, int dist, +static int add_path(int *heap, struct tmp_path *tp, int x, int y, int dist, int dir, int before, int x1, int y1) { - int i; + int i; - nullpo_retr (0, heap); - nullpo_retr (0, tp); + nullpo_retr(0, heap); + nullpo_retr(0, tp); - i = calc_index (x, y); + i = calc_index(x, y); if (tp[i].x == x && tp[i].y == y) { @@ -144,11 +144,11 @@ static int add_path (int *heap, struct tmp_path *tp, int x, int y, int dist, tp[i].dist = dist; tp[i].dir = dir; tp[i].before = before; - tp[i].cost = calc_cost (&tp[i], x1, y1); + tp[i].cost = calc_cost(&tp[i], x1, y1); if (tp[i].flag) - push_heap_path (heap, tp, i); + push_heap_path(heap, tp, i); else - update_heap_path (heap, tp, i); + update_heap_path(heap, tp, i); tp[i].flag = 0; } return 0; @@ -162,9 +162,9 @@ static int add_path (int *heap, struct tmp_path *tp, int x, int y, int dist, tp[i].dist = dist; tp[i].dir = dir; tp[i].before = before; - tp[i].cost = calc_cost (&tp[i], x1, y1); + tp[i].cost = calc_cost(&tp[i], x1, y1); tp[i].flag = 0; - push_heap_path (heap, tp, i); + push_heap_path(heap, tp, i); return 0; } @@ -174,13 +174,13 @@ static int add_path (int *heap, struct tmp_path *tp, int x, int y, int dist, * flag 0x10000 遠距離攻撃判定 *------------------------------------------ */ -static int can_place (struct map_data *m, int x, int y, int flag) +static int can_place(struct map_data *m, int x, int y, int flag) { - int c; + int c; - nullpo_retr (0, m); + nullpo_retr(0, m); - c = read_gatp (m, x, y); + c = read_gatp(m, x, y); if (c == 1) return 0; @@ -193,22 +193,22 @@ static int can_place (struct map_data *m, int x, int y, int flag) * (x0,y0)から(x1,y1)へ1歩で移動可能か計算 *------------------------------------------ */ -static int can_move (struct map_data *m, int x0, int y0, int x1, int y1, +static int can_move(struct map_data *m, int x0, int y0, int x1, int y1, int flag) { - nullpo_retr (0, m); + nullpo_retr(0, m); if (x0 - x1 < -1 || x0 - x1 > 1 || y0 - y1 < -1 || y0 - y1 > 1) return 0; if (x1 < 0 || y1 < 0 || x1 >= m->xs || y1 >= m->ys) return 0; - if (!can_place (m, x0, y0, flag)) + if (!can_place(m, x0, y0, flag)) return 0; - if (!can_place (m, x1, y1, flag)) + if (!can_place(m, x1, y1, flag)) return 0; if (x0 == x1 || y0 == y1) return 1; - if (!can_place (m, x0, y1, flag) || !can_place (m, x1, y0, flag)) + if (!can_place(m, x0, y1, flag) || !can_place(m, x1, y0, flag)) return 0; return 1; } @@ -218,7 +218,7 @@ static int can_move (struct map_data *m, int x0, int y0, int x1, int y1, * 吹き飛ばしたあとの座標を所得 *------------------------------------------ */ -int path_blownpos (int m, int x0, int y0, int dx, int dy, int count) +int path_blownpos(int m, int x0, int y0, int dx, int dy, int count) { struct map_data *md; @@ -229,26 +229,26 @@ int path_blownpos (int m, int x0, int y0, int dx, int dy, int count) if (count > 15) { // 最大10マスに制限 if (battle_config.error_log) - printf ("path_blownpos: count too many %d !\n", count); + printf("path_blownpos: count too many %d !\n", count); count = 15; } if (dx > 1 || dx < -1 || dy > 1 || dy < -1) { if (battle_config.error_log) - printf ("path_blownpos: illeagal dx=%d or dy=%d !\n", dx, dy); + printf("path_blownpos: illeagal dx=%d or dy=%d !\n", dx, dy); dx = (dx >= 0) ? 1 : ((dx < 0) ? -1 : 0); dy = (dy >= 0) ? 1 : ((dy < 0) ? -1 : 0); } while ((count--) > 0 && (dx != 0 || dy != 0)) { - if (!can_move (md, x0, y0, x0 + dx, y0 + dy, 0)) + if (!can_move(md, x0, y0, x0 + dx, y0 + dy, 0)) { - int fx = (dx != 0 && can_move (md, x0, y0, x0 + dx, y0, 0)); - int fy = (dy != 0 && can_move (md, x0, y0, x0, y0 + dy, 0)); + int fx = (dx != 0 && can_move(md, x0, y0, x0 + dx, y0, 0)); + int fy = (dy != 0 && can_move(md, x0, y0, x0, y0 + dy, 0)); if (fx && fy) { - if (rand () & 1) + if (rand() & 1) dx = 0; else dy = 0; @@ -268,22 +268,22 @@ int path_blownpos (int m, int x0, int y0, int dx, int dy, int count) * path探索 (x0,y0)->(x1,y1) *------------------------------------------ */ -int path_search (struct walkpath_data *wpd, int m, int x0, int y0, int x1, +int path_search(struct walkpath_data *wpd, int m, int x0, int y0, int x1, int y1, int flag) { - int heap[MAX_HEAP + 1]; + int heap[MAX_HEAP + 1]; struct tmp_path tp[MAX_WALKPATH * MAX_WALKPATH]; - int i, rp, x, y; + int i, rp, x, y; struct map_data *md; - int dx, dy; + int dx, dy; - nullpo_retr (0, wpd); + nullpo_retr(0, wpd); if (!map[m].gat) return -1; md = &map[m]; if (x1 < 0 || x1 >= md->xs || y1 < 0 || y1 >= md->ys - || (i = read_gatp (md, x1, y1)) == 1 || i == 5) + || (i = read_gatp(md, x1, y1)) == 1 || i == 5) return -1; // easy @@ -291,11 +291,11 @@ int path_search (struct walkpath_data *wpd, int m, int x0, int y0, int x1, dy = (y1 - y0 < 0) ? -1 : 1; for (x = x0, y = y0, i = 0; x != x1 || y != y1;) { - if (i >= sizeof (wpd->path)) + if (i >= sizeof(wpd->path)) return -1; if (x != x1 && y != y1) { - if (!can_move (md, x, y, x + dx, y + dy, flag)) + if (!can_move(md, x, y, x + dx, y + dy, flag)) break; x += dx; y += dy; @@ -304,14 +304,14 @@ int path_search (struct walkpath_data *wpd, int m, int x0, int y0, int x1, } else if (x != x1) { - if (!can_move (md, x, y, x + dx, y, flag)) + if (!can_move(md, x, y, x + dx, y, flag)) break; x += dx; wpd->path[i++] = (dx < 0) ? 2 : 6; } else { // y!=y1 - if (!can_move (md, x, y, x, y + dy, flag)) + if (!can_move(md, x, y, x, y + dy, flag)) break; y += dy; wpd->path[i++] = (dy > 0) ? 0 : 4; @@ -327,34 +327,34 @@ int path_search (struct walkpath_data *wpd, int m, int x0, int y0, int x1, if (flag & 1) return -1; - memset (tp, 0, sizeof (tp)); + memset(tp, 0, sizeof(tp)); - i = calc_index (x0, y0); + i = calc_index(x0, y0); tp[i].x = x0; tp[i].y = y0; tp[i].dist = 0; tp[i].dir = 0; tp[i].before = 0; - tp[i].cost = calc_cost (&tp[i], x1, y1); + tp[i].cost = calc_cost(&tp[i], x1, y1); tp[i].flag = 0; heap[0] = 0; - push_heap_path (heap, tp, calc_index (x0, y0)); + push_heap_path(heap, tp, calc_index(x0, y0)); while (1) { - int e = 0, fromdir; + int e = 0, fromdir; if (heap[0] == 0) return -1; - rp = pop_heap_path (heap, tp); + rp = pop_heap_path(heap, tp); x = tp[rp].x; y = tp[rp].y; if (x == x1 && y == y1) { - int len, j; + int len, j; - for (len = 0, i = rp; len < 100 && i != calc_index (x0, y0); + for (len = 0, i = rp; len < 100 && i != calc_index(x0, y0); i = tp[i].before, len++); - if (len == 100 || len >= sizeof (wpd->path)) + if (len == 100 || len >= sizeof(wpd->path)) return -1; wpd->path_len = len; wpd->path_pos = 0; @@ -365,29 +365,29 @@ int path_search (struct walkpath_data *wpd, int m, int x0, int y0, int x1, return 0; } fromdir = tp[rp].dir; - if (can_move (md, x, y, x + 1, y - 1, flag)) - e += add_path (heap, tp, x + 1, y - 1, tp[rp].dist + 14, 5, rp, + if (can_move(md, x, y, x + 1, y - 1, flag)) + e += add_path(heap, tp, x + 1, y - 1, tp[rp].dist + 14, 5, rp, x1, y1); - if (can_move (md, x, y, x + 1, y, flag)) - e += add_path (heap, tp, x + 1, y, tp[rp].dist + 10, 6, rp, x1, + if (can_move(md, x, y, x + 1, y, flag)) + e += add_path(heap, tp, x + 1, y, tp[rp].dist + 10, 6, rp, x1, y1); - if (can_move (md, x, y, x + 1, y + 1, flag)) - e += add_path (heap, tp, x + 1, y + 1, tp[rp].dist + 14, 7, rp, + if (can_move(md, x, y, x + 1, y + 1, flag)) + e += add_path(heap, tp, x + 1, y + 1, tp[rp].dist + 14, 7, rp, x1, y1); - if (can_move (md, x, y, x, y + 1, flag)) - e += add_path (heap, tp, x, y + 1, tp[rp].dist + 10, 0, rp, x1, + if (can_move(md, x, y, x, y + 1, flag)) + e += add_path(heap, tp, x, y + 1, tp[rp].dist + 10, 0, rp, x1, y1); - if (can_move (md, x, y, x - 1, y + 1, flag)) - e += add_path (heap, tp, x - 1, y + 1, tp[rp].dist + 14, 1, rp, + if (can_move(md, x, y, x - 1, y + 1, flag)) + e += add_path(heap, tp, x - 1, y + 1, tp[rp].dist + 14, 1, rp, x1, y1); - if (can_move (md, x, y, x - 1, y, flag)) - e += add_path (heap, tp, x - 1, y, tp[rp].dist + 10, 2, rp, x1, + if (can_move(md, x, y, x - 1, y, flag)) + e += add_path(heap, tp, x - 1, y, tp[rp].dist + 10, 2, rp, x1, y1); - if (can_move (md, x, y, x - 1, y - 1, flag)) - e += add_path (heap, tp, x - 1, y - 1, tp[rp].dist + 14, 3, rp, + if (can_move(md, x, y, x - 1, y - 1, flag)) + e += add_path(heap, tp, x - 1, y - 1, tp[rp].dist + 14, 3, rp, x1, y1); - if (can_move (md, x, y, x, y - 1, flag)) - e += add_path (heap, tp, x, y - 1, tp[rp].dist + 10, 4, rp, x1, + if (can_move(md, x, y, x, y - 1, flag)) + e += add_path(heap, tp, x, y - 1, tp[rp].dist + 10, 4, rp, x1, y1); tp[rp].flag = 1; if (e || heap[0] >= MAX_HEAP - 5) @@ -411,7 +411,7 @@ struct map_data map[1]; * 経路探索ルーチン単体テスト用main関数 *------------------------------------------ */ -void main (int argc, char *argv[]) +void main(int argc, char *argv[]) { struct walkpath_data wpd; @@ -419,27 +419,27 @@ void main (int argc, char *argv[]) map[0].xs = 64; map[0].ys = 64; - path_search (&wpd, 0, 3, 4, 5, 4); - path_search (&wpd, 0, 5, 4, 3, 4); - path_search (&wpd, 0, 6, 4, 3, 4); - path_search (&wpd, 0, 7, 4, 3, 4); - path_search (&wpd, 0, 4, 3, 4, 5); - path_search (&wpd, 0, 4, 2, 4, 5); - path_search (&wpd, 0, 4, 1, 4, 5); - path_search (&wpd, 0, 4, 5, 4, 3); - path_search (&wpd, 0, 4, 6, 4, 3); - path_search (&wpd, 0, 4, 7, 4, 3); - path_search (&wpd, 0, 7, 4, 3, 4); - path_search (&wpd, 0, 8, 4, 3, 4); - path_search (&wpd, 0, 9, 4, 3, 4); - path_search (&wpd, 0, 10, 4, 3, 4); - path_search (&wpd, 0, 11, 4, 3, 4); - path_search (&wpd, 0, 12, 4, 3, 4); - path_search (&wpd, 0, 13, 4, 3, 4); - path_search (&wpd, 0, 14, 4, 3, 4); - path_search (&wpd, 0, 15, 4, 3, 4); - path_search (&wpd, 0, 16, 4, 3, 4); - path_search (&wpd, 0, 17, 4, 3, 4); - path_search (&wpd, 0, 18, 4, 3, 4); + path_search(&wpd, 0, 3, 4, 5, 4); + path_search(&wpd, 0, 5, 4, 3, 4); + path_search(&wpd, 0, 6, 4, 3, 4); + path_search(&wpd, 0, 7, 4, 3, 4); + path_search(&wpd, 0, 4, 3, 4, 5); + path_search(&wpd, 0, 4, 2, 4, 5); + path_search(&wpd, 0, 4, 1, 4, 5); + path_search(&wpd, 0, 4, 5, 4, 3); + path_search(&wpd, 0, 4, 6, 4, 3); + path_search(&wpd, 0, 4, 7, 4, 3); + path_search(&wpd, 0, 7, 4, 3, 4); + path_search(&wpd, 0, 8, 4, 3, 4); + path_search(&wpd, 0, 9, 4, 3, 4); + path_search(&wpd, 0, 10, 4, 3, 4); + path_search(&wpd, 0, 11, 4, 3, 4); + path_search(&wpd, 0, 12, 4, 3, 4); + path_search(&wpd, 0, 13, 4, 3, 4); + path_search(&wpd, 0, 14, 4, 3, 4); + path_search(&wpd, 0, 15, 4, 3, 4); + path_search(&wpd, 0, 16, 4, 3, 4); + path_search(&wpd, 0, 17, 4, 3, 4); + path_search(&wpd, 0, 18, 4, 3, 4); } #endif diff --git a/src/map/pc.cpp b/src/map/pc.cpp index fef0af6..c3f4533 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -44,23 +44,23 @@ #define MAGIC_SKILL_THRESHOLD 200 // [fate] At this threshold, the Astral Soul skill kicks in #endif -#define MAP_LOG_STATS(sd, suffix) \ +#define MAP_LOG_STATS(sd, suffix) \ MAP_LOG_PC(sd, "STAT %d %d %d %d %d %d " suffix, \ sd->status.str, sd->status.agi, sd->status.vit, sd->status.int_, sd->status.dex, sd->status.luk) -#define MAP_LOG_XP(sd, suffix) \ - MAP_LOG_PC(sd, "XP %d %d JOB %d %d %d ZENY %d + %d " suffix, \ +#define MAP_LOG_XP(sd, suffix) \ + MAP_LOG_PC(sd, "XP %d %d JOB %d %d %d ZENY %d + %d " suffix, \ sd->status.base_level, sd->status.base_exp, sd->status.job_level, sd->status.job_exp, sd->status.skill_point, sd->status.zeny, pc_readaccountreg(sd, "BankAccount")) -#define MAP_LOG_MAGIC(sd, suffix) \ - MAP_LOG_PC(sd, "MAGIC %d %d %d %d %d %d EXP %d %d " suffix, \ +#define MAP_LOG_MAGIC(sd, suffix) \ + MAP_LOG_PC(sd, "MAGIC %d %d %d %d %d %d EXP %d %d " suffix, \ sd->status.skill[TMW_MAGIC].lv, \ - sd->status.skill[TMW_MAGIC_LIFE].lv, \ - sd->status.skill[TMW_MAGIC_WAR].lv, \ - sd->status.skill[TMW_MAGIC_TRANSMUTE].lv, \ + sd->status.skill[TMW_MAGIC_LIFE].lv, \ + sd->status.skill[TMW_MAGIC_WAR].lv, \ + sd->status.skill[TMW_MAGIC_TRANSMUTE].lv, \ sd->status.skill[TMW_MAGIC_NATURE].lv, \ sd->status.skill[TMW_MAGIC_ETHER].lv, \ - pc_readglobalreg(sd, "MAGIC_EXPERIENCE") & 0xffff, \ + pc_readglobalreg(sd, "MAGIC_EXPERIENCE") & 0xffff, \ (pc_readglobalreg(sd, "MAGIC_EXPERIENCE") >> 24) & 0xff) timer_id day_timer_tid; @@ -77,8 +77,8 @@ static int exp_table[14][MAX_LEVEL]; static char statp[255][7]; static struct { - int id; - int max; + int id; + int max; struct { short id, lv; @@ -101,17 +101,17 @@ static unsigned int equip_pos[11] = static struct gm_account *gm_account = NULL; static int GM_num = 0; -int pc_isGM (struct map_session_data *sd) +int pc_isGM(struct map_session_data *sd) { // struct gm_account *p; - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); -/* p = numdb_search(gm_account_db, sd->status.account_id); - if (p == NULL) - return 0; - return p->level;*/ +/* p = numdb_search(gm_account_db, sd->status.account_id); + if (p == NULL) + return 0; + return p->level;*/ for (i = 0; i < GM_num; i++) if (gm_account[i].account_id == sd->status.account_id) @@ -120,10 +120,10 @@ int pc_isGM (struct map_session_data *sd) } -int pc_iskiller (struct map_session_data *src, +int pc_iskiller(struct map_session_data *src, struct map_session_data *target) { - nullpo_retr (0, src); + nullpo_retr(0, src); if (src->bl.type != BL_PC) return 0; @@ -138,9 +138,9 @@ int pc_iskiller (struct map_session_data *src, return 0; } -int pc_set_gm_level (int account_id, int level) +int pc_set_gm_level(int account_id, int level) { - int i; + int i; for (i = 0; i < GM_num; i++) { if (account_id == gm_account[i].account_id) @@ -151,81 +151,81 @@ int pc_set_gm_level (int account_id, int level) } GM_num++; - RECREATE (gm_account, struct gm_account, GM_num); + RECREATE(gm_account, struct gm_account, GM_num); gm_account[GM_num - 1].account_id = account_id; gm_account[GM_num - 1].level = level; return 0; } -int pc_getrefinebonus (int lv, int type) +int pc_getrefinebonus(int lv, int type) { if (lv >= 0 && lv < 5 && type >= 0 && type < 3) return refinebonus[lv][type]; return 0; } -static int distance (int x0, int y0, int x1, int y1) +static int distance(int x0, int y0, int x1, int y1) { - int dx, dy; + int dx, dy; - dx = abs (x0 - x1); - dy = abs (y0 - y1); + dx = abs(x0 - x1); + dy = abs(y0 - y1); return dx > dy ? dx : dy; } -static void pc_invincible_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void pc_invincible_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct map_session_data *sd; - if ((sd = (struct map_session_data *) map_id2sd (id)) == NULL + if ((sd = (struct map_session_data *) map_id2sd(id)) == NULL || sd->bl.type != BL_PC) return; if (sd->invincible_timer != tid) { if (battle_config.error_log) - printf ("invincible_timer %d != %d\n", sd->invincible_timer, tid); + printf("invincible_timer %d != %d\n", sd->invincible_timer, tid); return; } sd->invincible_timer = -1; } -int pc_setinvincibletimer (struct map_session_data *sd, int val) +int pc_setinvincibletimer(struct map_session_data *sd, int val) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->invincible_timer != -1) - delete_timer (sd->invincible_timer, pc_invincible_timer); + delete_timer(sd->invincible_timer, pc_invincible_timer); sd->invincible_timer = - add_timer (gettick () + val, pc_invincible_timer, sd->bl.id, 0); + add_timer(gettick() + val, pc_invincible_timer, sd->bl.id, 0); return 0; } -int pc_delinvincibletimer (struct map_session_data *sd) +int pc_delinvincibletimer(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->invincible_timer != -1) { - delete_timer (sd->invincible_timer, pc_invincible_timer); + delete_timer(sd->invincible_timer, pc_invincible_timer); sd->invincible_timer = -1; } return 0; } -static void pc_spiritball_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void pc_spiritball_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct map_session_data *sd; - int i; + int i; - if ((sd = (struct map_session_data *) map_id2sd (id)) == NULL + if ((sd = (struct map_session_data *) map_id2sd(id)) == NULL || sd->bl.type != BL_PC) return; if (sd->spirit_timer[0] != tid) { if (battle_config.error_log) - printf ("spirit_timer %d != %d\n", sd->spirit_timer[0], tid); + printf("spirit_timer %d != %d\n", sd->spirit_timer[0], tid); return; } sd->spirit_timer[0] = -1; @@ -237,14 +237,14 @@ static void pc_spiritball_timer (timer_id tid, tick_t tick, custom_id_t id, cust sd->spiritball--; if (sd->spiritball < 0) sd->spiritball = 0; - clif_spiritball (sd); + clif_spiritball(sd); } -int pc_addspiritball (struct map_session_data *sd, int interval, int max) +int pc_addspiritball(struct map_session_data *sd, int interval, int max) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (max > MAX_SKILL_LEVEL) max = MAX_SKILL_LEVEL; @@ -255,7 +255,7 @@ int pc_addspiritball (struct map_session_data *sd, int interval, int max) { if (sd->spirit_timer[0] != -1) { - delete_timer (sd->spirit_timer[0], pc_spiritball_timer); + delete_timer(sd->spirit_timer[0], pc_spiritball_timer); sd->spirit_timer[0] = -1; } for (i = 1; i < max; i++) @@ -268,17 +268,17 @@ int pc_addspiritball (struct map_session_data *sd, int interval, int max) sd->spiritball++; sd->spirit_timer[sd->spiritball - 1] = - add_timer (gettick () + interval, pc_spiritball_timer, sd->bl.id, 0); - clif_spiritball (sd); + add_timer(gettick() + interval, pc_spiritball_timer, sd->bl.id, 0); + clif_spiritball(sd); return 0; } -int pc_delspiritball (struct map_session_data *sd, int count, int type) +int pc_delspiritball(struct map_session_data *sd, int count, int type) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->spiritball <= 0) { @@ -296,7 +296,7 @@ int pc_delspiritball (struct map_session_data *sd, int count, int type) { if (sd->spirit_timer[i] != -1) { - delete_timer (sd->spirit_timer[i], pc_spiritball_timer); + delete_timer(sd->spirit_timer[i], pc_spiritball_timer); sd->spirit_timer[i] = -1; } } @@ -307,19 +307,19 @@ int pc_delspiritball (struct map_session_data *sd, int count, int type) } if (!type) - clif_spiritball (sd); + clif_spiritball(sd); return 0; } -int pc_setrestartvalue (struct map_session_data *sd, int type) +int pc_setrestartvalue(struct map_session_data *sd, int type) { //転生や養子の場合の元の職業を算出する struct pc_base_job s_class; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); //----------------------- // 死亡した @@ -348,30 +348,30 @@ int pc_setrestartvalue (struct map_session_data *sd, int type) } if (battle_config.restart_sp_rate > 0) { - int sp = sd->status.max_sp * battle_config.restart_sp_rate / 100; + int sp = sd->status.max_sp * battle_config.restart_sp_rate / 100; if (sd->status.sp < sp) sd->status.sp = sp; } } if (type & 1) - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); if (type & 1) - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); /* removed exp penalty on spawn [Valaris] */ if (type & 2 && sd->status.pc_class != 0 && battle_config.zeny_penalty > 0 && !map[sd->bl.m].flag.nozenypenalty) { - int zeny = - (int) ((double) sd->status.zeny * + int zeny = + (int)((double) sd->status.zeny * (double) battle_config.zeny_penalty / 10000.); if (zeny < 1) zeny = 1; sd->status.zeny -= zeny; if (sd->status.zeny < 0) sd->status.zeny = 0; - clif_updatestatus (sd, SP_ZENY); + clif_updatestatus(sd, SP_ZENY); } sd->heal_xp = 0; // [Fate] Set gainable xp for healing this player to 0 @@ -383,20 +383,20 @@ int pc_setrestartvalue (struct map_session_data *sd, int type) *------------------------------------------ */ static -void pc_counttargeted_sub (struct block_list *bl, va_list ap) +void pc_counttargeted_sub(struct block_list *bl, va_list ap) { - int id, *c, target_lv; + int id, *c, target_lv; struct block_list *src; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); - id = va_arg (ap, int); + id = va_arg(ap, int); - nullpo_retv (c = va_arg (ap, int *)); + nullpo_retv(c = va_arg(ap, int *)); - src = va_arg (ap, struct block_list *); - target_lv = va_arg (ap, int); + src = va_arg(ap, struct block_list *); + target_lv = va_arg(ap, int); if (id == bl->id || (src && id == src->id)) return; if (bl->type == BL_PC) @@ -417,11 +417,11 @@ void pc_counttargeted_sub (struct block_list *bl, va_list ap) } } -int pc_counttargeted (struct map_session_data *sd, struct block_list *src, +int pc_counttargeted(struct map_session_data *sd, struct block_list *src, int target_lv) { - int c = 0; - map_foreachinarea (pc_counttargeted_sub, sd->bl.m, + int c = 0; + map_foreachinarea(pc_counttargeted_sub, sd->bl.m, sd->bl.x - AREA_SIZE, sd->bl.y - AREA_SIZE, sd->bl.x + AREA_SIZE, sd->bl.y + AREA_SIZE, 0, sd->bl.id, &c, src, target_lv); @@ -432,30 +432,30 @@ int pc_counttargeted (struct map_session_data *sd, struct block_list *src, * ローカルプロトタイプ宣言 (必要な物のみ) *------------------------------------------ */ -static int pc_walktoxy_sub (struct map_session_data *); +static int pc_walktoxy_sub(struct map_session_data *); /*========================================== * saveに必要なステータス修正を行なう *------------------------------------------ */ -int pc_makesavestatus (struct map_session_data *sd) +int pc_makesavestatus(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); // 服の色は色々弊害が多いので保存対象にはしない if (!battle_config.save_clothcolor) sd->status.clothes_color = 0; // 死亡状態だったのでhpを1、位置をセーブ場所に変更 - if (pc_isdead (sd)) + if (pc_isdead(sd)) { - pc_setrestartvalue (sd, 0); - memcpy (&sd->status.last_point, &sd->status.save_point, - sizeof (sd->status.last_point)); + pc_setrestartvalue(sd, 0); + memcpy(&sd->status.last_point, &sd->status.save_point, + sizeof(sd->status.last_point)); } else { - memcpy (sd->status.last_point.map, sd->mapname, 24); + memcpy(sd->status.last_point.map, sd->mapname, 24); sd->status.last_point.x = sd->bl.x; sd->status.last_point.y = sd->bl.y; } @@ -464,12 +464,12 @@ int pc_makesavestatus (struct map_session_data *sd) if (map[sd->bl.m].flag.nosave) { struct map_data *m = &map[sd->bl.m]; - if (strcmp (m->save.map, "SavePoint") == 0) - memcpy (&sd->status.last_point, &sd->status.save_point, - sizeof (sd->status.last_point)); + if (strcmp(m->save.map, "SavePoint") == 0) + memcpy(&sd->status.last_point, &sd->status.save_point, + sizeof(sd->status.last_point)); else - memcpy (&sd->status.last_point, &m->save, - sizeof (sd->status.last_point)); + memcpy(&sd->status.last_point, &m->save, + sizeof(sd->status.last_point)); } //マナーポイントがプラスだった場合0に @@ -482,10 +482,10 @@ int pc_makesavestatus (struct map_session_data *sd) * 接続時の初期化 *------------------------------------------ */ -int pc_setnewpc (struct map_session_data *sd, int account_id, int char_id, +int pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int login_id1, int client_tick, int sex, int fd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); sd->bl.id = account_id; sd->char_id = char_id; @@ -495,31 +495,31 @@ int pc_setnewpc (struct map_session_data *sd, int account_id, int char_id, sd->sex = sex; sd->state.auth = 0; sd->bl.type = BL_PC; - sd->canact_tick = sd->canmove_tick = gettick (); - sd->canlog_tick = gettick (); + sd->canact_tick = sd->canmove_tick = gettick(); + sd->canlog_tick = gettick(); sd->state.waitingdisconnect = 0; return 0; } -int pc_equippoint (struct map_session_data *sd, int n) +int pc_equippoint(struct map_session_data *sd, int n) { - int ep = 0; + int ep = 0; //転生や養子の場合の元の職業を算出する struct pc_base_job s_class; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (!sd->inventory_data[n]) return 0; - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); ep = sd->inventory_data[n]->equip; if ((sd->inventory_data[n]->look == 1 || sd->inventory_data[n]->look == 2 || sd->inventory_data[n]->look == 6) && (ep == 2 && - (pc_checkskill (sd, AS_LEFT) + (pc_checkskill(sd, AS_LEFT) > 0 || s_class.job == 12))) { return 34; @@ -529,24 +529,24 @@ int pc_equippoint (struct map_session_data *sd, int n) } static -int pc_setinventorydata (struct map_session_data *sd) +int pc_setinventorydata(struct map_session_data *sd) { - int i, id; + int i, id; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < MAX_INVENTORY; i++) { id = sd->status.inventory[i].nameid; - sd->inventory_data[i] = itemdb_search (id); + sd->inventory_data[i] = itemdb_search(id); } return 0; } static -int pc_calcweapontype (struct map_session_data *sd) +int pc_calcweapontype(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->weapontype1 != 0 && sd->weapontype2 == 0) sd->status.weapon = sd->weapontype1; @@ -571,11 +571,11 @@ int pc_calcweapontype (struct map_session_data *sd) } static -int pc_setequipindex (struct map_session_data *sd) +int pc_setequipindex(struct map_session_data *sd) { - int i, j; + int i, j; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < 11; i++) sd->equip_index[i] = -1; @@ -615,25 +615,25 @@ int pc_setequipindex (struct map_session_data *sd) } } } - pc_calcweapontype (sd); + pc_calcweapontype(sd); return 0; } -int pc_isequip (struct map_session_data *sd, int n) +int pc_isequip(struct map_session_data *sd, int n) { struct item_data *item; struct status_change *sc_data; //転生や養子の場合の元の職業を算出する - nullpo_retr (0, sd); + nullpo_retr(0, sd); item = sd->inventory_data[n]; - sc_data = battle_get_sc_data (&sd->bl); + sc_data = battle_get_sc_data(&sd->bl); //s_class = pc_calc_base_job(sd->status.class); if (battle_config.gm_allequip > 0 - && pc_isGM (sd) >= battle_config.gm_allequip) + && pc_isGM(sd) >= battle_config.gm_allequip) return 1; if (item == NULL) @@ -663,15 +663,15 @@ int pc_isequip (struct map_session_data *sd, int n) * Weapon Breaking [Valaris] *------------------------------------------ */ -int pc_breakweapon (struct map_session_data *sd) +int pc_breakweapon(struct map_session_data *sd) { struct item_data *item; char output[255]; - int i; + int i; if (sd == NULL) return -1; - if (sd->unbreakable >= MRAND (100)) + if (sd->unbreakable >= MRAND(100)) return 0; if (sd->sc_data && sd->sc_data[SC_CP_WEAPON].timer != -1) return 0; @@ -689,11 +689,11 @@ int pc_breakweapon (struct map_session_data *sd) && sd->status.inventory[i].equip & 0x0002 && sd->status.inventory[i].broken == 1) { - sprintf (output, "%s has broken.", item->jname); - clif_emotion (&sd->bl, 23); - clif_displaymessage (sd->fd, output); - clif_equiplist (sd); - skill_status_change_start (&sd->bl, SC_BROKNWEAPON, 0, 0, 0, + sprintf(output, "%s has broken.", item->jname); + clif_emotion(&sd->bl, 23); + clif_displaymessage(sd->fd, output); + clif_equiplist(sd); + skill_status_change_start(&sd->bl, SC_BROKNWEAPON, 0, 0, 0, 0, 0, 0); } } @@ -708,15 +708,15 @@ int pc_breakweapon (struct map_session_data *sd) * Armor Breaking [Valaris] *------------------------------------------ */ -int pc_breakarmor (struct map_session_data *sd) +int pc_breakarmor(struct map_session_data *sd) { struct item_data *item; char output[255]; - int i; + int i; if (sd == NULL) return -1; - if (sd->unbreakable >= MRAND (100)) + if (sd->unbreakable >= MRAND(100)) return 0; if (sd->sc_data && sd->sc_data[SC_CP_ARMOR].timer != -1) return 0; @@ -734,11 +734,11 @@ int pc_breakarmor (struct map_session_data *sd) && sd->status.inventory[i].equip & 0x0010 && sd->status.inventory[i].broken == 1) { - sprintf (output, "%s has broken.", item->jname); - clif_emotion (&sd->bl, 23); - clif_displaymessage (sd->fd, output); - clif_equiplist (sd); - skill_status_change_start (&sd->bl, SC_BROKNARMOR, 0, 0, 0, 0, + sprintf(output, "%s has broken.", item->jname); + clif_emotion(&sd->bl, 23); + clif_displaymessage(sd->fd, output); + clif_equiplist(sd); + skill_status_change_start(&sd->bl, SC_BROKNARMOR, 0, 0, 0, 0, 0, 0); } } @@ -753,36 +753,36 @@ int pc_breakarmor (struct map_session_data *sd) * char鯖から送られてきたステータスを設定 *------------------------------------------ */ -int pc_authok (int id, int login_id2, time_t connect_until_time, +int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_version, struct mmo_charstatus *st) { struct map_session_data *sd = NULL; struct party *p; - unsigned long tick = gettick (); + unsigned long tick = gettick(); struct sockaddr_in sai; socklen_t sa_len = sizeof(struct sockaddr); - sd = map_id2sd (id); + sd = map_id2sd(id); if (sd == NULL) return 1; sd->login_id2 = login_id2; sd->tmw_version = tmw_version; - memcpy (&sd->status, st, sizeof (*st)); + memcpy(&sd->status, st, sizeof(*st)); if (sd->status.sex != sd->sex) { - clif_authfail_fd (sd->fd, 0); + clif_authfail_fd(sd->fd, 0); return 1; } - MAP_LOG_STATS (sd, "LOGIN"); - MAP_LOG_XP (sd, "LOGIN"); - MAP_LOG_MAGIC (sd, "LOGIN"); + MAP_LOG_STATS(sd, "LOGIN"); + MAP_LOG_XP(sd, "LOGIN"); + MAP_LOG_MAGIC(sd, "LOGIN"); - memset (&sd->state, 0, sizeof (sd->state)); + memset(&sd->state, 0, sizeof(sd->state)); // 基本的な初期化 sd->state.connect_new = 1; sd->bl.prev = sd->bl.next = NULL; @@ -832,7 +832,7 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, for (int i = 0; i < MAX_SKILLTIMERSKILL; i++) sd->skilltimerskill[i].timer = -1; - memset (&sd->dev, 0, sizeof (struct square)); + memset(&sd->dev, 0, sizeof(struct square)); for (int i = 0; i < 5; i++) { sd->dev.val1[i] = 0; @@ -840,11 +840,11 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, } // アカウント変数の送信要求 - intif_request_accountreg (sd); + intif_request_accountreg(sd); // アイテムチェック - pc_setinventorydata (sd); - pc_checkitem (sd); + pc_setinventorydata(sd); + pc_checkitem(sd); // ステータス異常の初期化 for (int i = 0; i < MAX_STATUSCHANGE; i++) @@ -854,18 +854,18 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, sd->sc_data[i].val4 = 0; } sd->sc_count = 0; - if ((battle_config.atc_gmonly == 0 || pc_isGM (sd)) && - (pc_isGM (sd) >= get_atcommand_level (AtCommand_Hide))) + if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && + (pc_isGM(sd) >= get_atcommand_level(AtCommand_Hide))) sd->status.option &= (OPTION_MASK | OPTION_HIDE); else sd->status.option &= OPTION_MASK; // スキルユニット関係の初期化 - memset (sd->skillunit, 0, sizeof (sd->skillunit)); - memset (sd->skillunittick, 0, sizeof (sd->skillunittick)); + memset(sd->skillunit, 0, sizeof(sd->skillunit)); + memset(sd->skillunittick, 0, sizeof(sd->skillunittick)); // init ignore list - memset (sd->ignore, 0, sizeof (sd->ignore)); + memset(sd->ignore, 0, sizeof(sd->ignore)); // パーティー関係の初期化 sd->party_sended = 0; @@ -875,18 +875,18 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, sd->party_hp = -1; // イベント関係の初期化 - memset (sd->eventqueue, 0, sizeof (sd->eventqueue)); + memset(sd->eventqueue, 0, sizeof(sd->eventqueue)); for (int i = 0; i < MAX_EVENTTIMER; i++) sd->eventtimer[i] = -1; // 位置の設定 - pc_setpos (sd, sd->status.last_point.map, sd->status.last_point.x, + pc_setpos(sd, sd->status.last_point.map, sd->status.last_point.x, sd->status.last_point.y, 0); // パーティ、ギルドデータの要求 if (sd->status.party_id > 0 - && (p = party_search (sd->status.party_id)) == NULL) - party_request_info (sd->status.party_id); + && (p = party_search(sd->status.party_id)) == NULL) + party_request_info(sd->status.party_id); // pvpの設定 sd->pvp_rank = 0; @@ -895,44 +895,43 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, // 通知 - clif_authok (sd); - map_addnickdb (sd); - if (map_charid2nick (sd->status.char_id) == NULL) - map_addchariddb (sd->status.char_id, sd->status.name); + clif_authok(sd); + map_addnickdb(sd); + if (map_charid2nick(sd->status.char_id) == NULL) + map_addchariddb(sd->status.char_id, sd->status.name); //スパノビ用死にカウンターのスクリプト変数からの読み出しとsdへのセット - sd->die_counter = pc_readglobalreg (sd, "PC_DIE_COUNTER"); + sd->die_counter = pc_readglobalreg(sd, "PC_DIE_COUNTER"); if (night_flag == 1) { char tmpstr[1024]; - strcpy (tmpstr, "Actually, it's the night..."); - clif_wis_message (sd->fd, wisp_server_name, tmpstr, - strlen (tmpstr) + 1); + strcpy(tmpstr, "Actually, it's the night..."); + clif_wis_message(sd->fd, wisp_server_name, tmpstr, + strlen(tmpstr) + 1); sd->opt2 |= STATE_BLIND; } // ステータス初期計算など - pc_calcstatus (sd, 1); + pc_calcstatus(sd, 1); - if (pc_isGM (sd)) + if (pc_isGM(sd)) { - printf - ("Connection accepted: character '%s' (account: %d; GM level %d).\n", - sd->status.name, sd->status.account_id, pc_isGM (sd)); - clif_updatestatus (sd, SP_GM); + printf("Connection accepted: character '%s' (account: %d; GM level %d).\n", + sd->status.name, sd->status.account_id, pc_isGM(sd)); + clif_updatestatus(sd, SP_GM); } else - printf ("Connection accepted: Character '%s' (account: %d).\n", + printf("Connection accepted: Character '%s' (account: %d).\n", sd->status.name, sd->status.account_id); // Message of the Dayの送信 { char buf[256]; FILE *fp; - if ((fp = fopen_ (motd_txt, "r")) != NULL) + if ((fp = fopen_(motd_txt, "r")) != NULL) { - while (fgets (buf, sizeof (buf) - 1, fp) != NULL) + while (fgets(buf, sizeof(buf) - 1, fp) != NULL) { for (int i = 0; buf[i]; i++) { @@ -942,9 +941,9 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, break; } } - clif_displaymessage (sd->fd, buf); + clif_displaymessage(sd->fd, buf); } - fclose_ (fp); + fclose_(fp); } } @@ -966,11 +965,11 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, if (connect_until_time != 0) { // don't display if it's unlimited or unknow value char tmpstr[1024]; - strftime (tmpstr, sizeof (tmpstr) - 1, "Your account time limit is: %d-%m-%Y %H:%M:%S.", gmtime (&connect_until_time)); - clif_wis_message (sd->fd, wisp_server_name, tmpstr, - strlen (tmpstr) + 1); + strftime(tmpstr, sizeof(tmpstr) - 1, "Your account time limit is: %d-%m-%Y %H:%M:%S.", gmtime(&connect_until_time)); + clif_wis_message(sd->fd, wisp_server_name, tmpstr, + strlen(tmpstr) + 1); } - pc_calcstatus (sd, 1); + pc_calcstatus(sd, 1); return 0; } @@ -979,24 +978,24 @@ int pc_authok (int id, int login_id2, time_t connect_until_time, * session idに問題ありなので後始末 *------------------------------------------ */ -int pc_authfail (int id) +int pc_authfail(int id) { struct map_session_data *sd; - sd = map_id2sd (id); + sd = map_id2sd(id); if (sd == NULL) return 1; - clif_authfail_fd (sd->fd, 0); + clif_authfail_fd(sd->fd, 0); return 0; } -static int pc_calc_skillpoint (struct map_session_data *sd) +static int pc_calc_skillpoint(struct map_session_data *sd) { - int i, skill_points = 0; + int i, skill_points = 0; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < skill_pool_skills_size; i++) { int lv = sd->status.skill[skill_pool_skills[i]].lv; @@ -1012,16 +1011,16 @@ static int pc_calc_skillpoint (struct map_session_data *sd) *------------------------------------------ */ static -int pc_calc_skilltree (struct map_session_data *sd) +int pc_calc_skilltree(struct map_session_data *sd) { - int i, id = 0, flag; - int c = 0, s = 0; + int i, id = 0, flag; + int c = 0, s = 0; //転生や養子の場合の元の職業を算出する struct pc_base_job s_class; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); c = s_class.job; s = (s_class.upper == 1) ? 1 : 0; //ｿ転生以外は通常のスキル？ @@ -1029,7 +1028,7 @@ int pc_calc_skilltree (struct map_session_data *sd) && ((c >= 0 && c < 23) || (c >= 4001 && c < 4023) || (c >= 4023 && c < 4045))) { - int skill_point = pc_calc_skillpoint (sd); + int skill_point = pc_calc_skillpoint(sd); if (skill_point < 9) c = 0; else if ((sd->status.skill_point >= sd->status.job_level @@ -1120,18 +1119,18 @@ int pc_calc_skilltree (struct map_session_data *sd) } /*Comment this out for now, as we manage skills differently - * for(i=0;i<MAX_SKILL;i++) + * for (i=0;i<MAX_SKILL;i++) * if (i < TMW_MAGIC || i > TMW_MAGIC_END){ // [Fate] This hack gets TMW magic working and persisted without bothering about the skill tree. * if (sd->status.skill[i].flag != 13) sd->status.skill[i].id=0; * if (sd->status.skill[i].flag && sd->status.skill[i].flag != 13){ // cardスキルなら、 - * sd->status.skill[i].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // 本当のlvに + * sd->status.skill[i].lv= (sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // 本当のlvに * sd->status.skill[i].flag=0; // flagは0にしておく * } * } */ if (battle_config.gm_allskill > 0 - && pc_isGM (sd) >= battle_config.gm_allskill) + && pc_isGM(sd) >= battle_config.gm_allskill) { // 全てのスキル for (i = 1; i < 158; i++) @@ -1153,15 +1152,15 @@ int pc_calc_skilltree (struct map_session_data *sd) do { flag = 0; - for (i = 0; (id = skill_tree[s][c][i].id) > 0; i++) + for (i = 0;(id = skill_tree[s][c][i].id) > 0; i++) { - int j, f = 1; + int j, f = 1; if (!battle_config.skillfree) { for (j = 0; j < 5; j++) { if (skill_tree[s][c][i].need[j].id && - pc_checkskill (sd, + pc_checkskill(sd, skill_tree[s][c][i].need[j].id) < skill_tree[s][c][i].need[j].lv) f = 0; @@ -1185,11 +1184,11 @@ int pc_calc_skilltree (struct map_session_data *sd) * 重量アイコンの確認 *------------------------------------------ */ -int pc_checkweighticon (struct map_session_data *sd) +int pc_checkweighticon(struct map_session_data *sd) { - int flag = 0; + int flag = 0; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->weight * 2 >= sd->max_weight && sd->sc_data[SC_FLYING_BACKPACK].timer == -1) @@ -1200,34 +1199,34 @@ int pc_checkweighticon (struct map_session_data *sd) if (flag == 1) { if (sd->sc_data[SC_WEIGHT50].timer == -1) - skill_status_change_start (&sd->bl, SC_WEIGHT50, 0, 0, 0, 0, 0, + skill_status_change_start(&sd->bl, SC_WEIGHT50, 0, 0, 0, 0, 0, 0); } else { - skill_status_change_end (&sd->bl, SC_WEIGHT50, -1); + skill_status_change_end(&sd->bl, SC_WEIGHT50, -1); } if (flag == 2) { if (sd->sc_data[SC_WEIGHT90].timer == -1) - skill_status_change_start (&sd->bl, SC_WEIGHT90, 0, 0, 0, 0, 0, + skill_status_change_start(&sd->bl, SC_WEIGHT90, 0, 0, 0, 0, 0, 0); } else { - skill_status_change_end (&sd->bl, SC_WEIGHT90, -1); + skill_status_change_end(&sd->bl, SC_WEIGHT90, -1); } return 0; } static -void pc_set_weapon_look (struct map_session_data *sd) +void pc_set_weapon_look(struct map_session_data *sd) { if (sd->attack_spell_override) - clif_changelook (&sd->bl, LOOK_WEAPON, + clif_changelook(&sd->bl, LOOK_WEAPON, sd->attack_spell_look_override); else - clif_changelook (&sd->bl, LOOK_WEAPON, sd->status.weapon); + clif_changelook(&sd->bl, LOOK_WEAPON, sd->status.weapon); } /*========================================== @@ -1237,23 +1236,23 @@ void pc_set_weapon_look (struct map_session_data *sd) * 能動的に変化させたパラメータは自前でsendするように *------------------------------------------ */ -int pc_calcstatus (struct map_session_data *sd, int first) +int pc_calcstatus(struct map_session_data *sd, int first) { - int b_speed, b_max_hp, b_max_sp, b_hp, b_sp, b_weight, b_max_weight, + int b_speed, b_max_hp, b_max_sp, b_hp, b_sp, b_weight, b_max_weight, b_paramb[6], b_parame[6], b_hit, b_flee; - int b_aspd, b_watk, b_def, b_watk2, b_def2, b_flee2, b_critical, + int b_aspd, b_watk, b_def, b_watk2, b_def2, b_flee2, b_critical, b_attackrange, b_matk1, b_matk2, b_mdef, b_mdef2, b_class; - int b_base_atk; + int b_base_atk; struct skill b_skill[MAX_SKILL]; - int i, bl, index; - int skill, aspd_rate, wele, wele_, def_ele, refinedef = 0; - int str, dstr, dex; + int i, bl, index; + int skill, aspd_rate, wele, wele_, def_ele, refinedef = 0; + int str, dstr, dex; struct pc_base_job s_class; - nullpo_retr (0, sd); + nullpo_retr(0, sd); //転生や養子の場合の元の職業を算出する - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); b_speed = sd->speed; b_max_hp = sd->status.max_hp; @@ -1262,9 +1261,9 @@ int pc_calcstatus (struct map_session_data *sd, int first) b_sp = sd->status.sp; b_weight = sd->weight; b_max_weight = sd->max_weight; - memcpy (b_paramb, &sd->paramb, sizeof (b_paramb)); - memcpy (b_parame, &sd->paramc, sizeof (b_parame)); - memcpy (b_skill, &sd->status.skill, sizeof (b_skill)); + memcpy(b_paramb, &sd->paramb, sizeof(b_paramb)); + memcpy(b_parame, &sd->paramc, sizeof(b_parame)); + memcpy(b_skill, &sd->status.skill, sizeof(b_skill)); b_hit = sd->hit; b_flee = sd->flee; b_aspd = sd->aspd; @@ -1283,7 +1282,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->view_class = sd->status.pc_class; b_base_atk = sd->base_atk; - pc_calc_skilltree (sd); // スキルツリーの計算 + pc_calc_skilltree(sd); // スキルツリーの計算 sd->max_weight = max_weight_base[s_class.job] + sd->status.str * 300; @@ -1308,14 +1307,14 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (sd->status.cart[i].nameid == 0) continue; sd->cart_weight += - itemdb_weight (sd->status.cart[i].nameid) * + itemdb_weight(sd->status.cart[i].nameid) * sd->status.cart[i].amount; sd->cart_num++; } } - memset (sd->paramb, 0, sizeof (sd->paramb)); - memset (sd->parame, 0, sizeof (sd->parame)); + memset(sd->paramb, 0, sizeof(sd->paramb)); + memset(sd->parame, 0, sizeof(sd->parame)); sd->hit = 0; sd->flee = 0; sd->flee2 = 0; @@ -1349,20 +1348,20 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->arrow_range = 0; sd->nhealhp = sd->nhealsp = sd->nshealhp = sd->nshealsp = sd->nsshealhp = sd->nsshealsp = 0; - memset (sd->addele, 0, sizeof (sd->addele)); - memset (sd->addrace, 0, sizeof (sd->addrace)); - memset (sd->addsize, 0, sizeof (sd->addsize)); - memset (sd->addele_, 0, sizeof (sd->addele_)); - memset (sd->addrace_, 0, sizeof (sd->addrace_)); - memset (sd->addsize_, 0, sizeof (sd->addsize_)); - memset (sd->subele, 0, sizeof (sd->subele)); - memset (sd->subrace, 0, sizeof (sd->subrace)); - memset (sd->addeff, 0, sizeof (sd->addeff)); - memset (sd->addeff2, 0, sizeof (sd->addeff2)); - memset (sd->reseff, 0, sizeof (sd->reseff)); - memset (&sd->special_state, 0, sizeof (sd->special_state)); - memset (sd->weapon_coma_ele, 0, sizeof (sd->weapon_coma_ele)); - memset (sd->weapon_coma_race, 0, sizeof (sd->weapon_coma_race)); + memset(sd->addele, 0, sizeof(sd->addele)); + memset(sd->addrace, 0, sizeof(sd->addrace)); + memset(sd->addsize, 0, sizeof(sd->addsize)); + memset(sd->addele_, 0, sizeof(sd->addele_)); + memset(sd->addrace_, 0, sizeof(sd->addrace_)); + memset(sd->addsize_, 0, sizeof(sd->addsize_)); + memset(sd->subele, 0, sizeof(sd->subele)); + memset(sd->subrace, 0, sizeof(sd->subrace)); + memset(sd->addeff, 0, sizeof(sd->addeff)); + memset(sd->addeff2, 0, sizeof(sd->addeff2)); + memset(sd->reseff, 0, sizeof(sd->reseff)); + memset(&sd->special_state, 0, sizeof(sd->special_state)); + memset(sd->weapon_coma_ele, 0, sizeof(sd->weapon_coma_ele)); + memset(sd->weapon_coma_race, 0, sizeof(sd->weapon_coma_race)); sd->watk_ = 0; //二刀流用(仮) sd->watk_2 = 0; @@ -1383,14 +1382,14 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->ignore_mdef_ele = sd->ignore_mdef_race = 0; sd->arrow_cri = 0; sd->magic_def_rate = sd->misc_def_rate = 0; - memset (sd->arrow_addele, 0, sizeof (sd->arrow_addele)); - memset (sd->arrow_addrace, 0, sizeof (sd->arrow_addrace)); - memset (sd->arrow_addsize, 0, sizeof (sd->arrow_addsize)); - memset (sd->arrow_addeff, 0, sizeof (sd->arrow_addeff)); - memset (sd->arrow_addeff2, 0, sizeof (sd->arrow_addeff2)); - memset (sd->magic_addele, 0, sizeof (sd->magic_addele)); - memset (sd->magic_addrace, 0, sizeof (sd->magic_addrace)); - memset (sd->magic_subrace, 0, sizeof (sd->magic_subrace)); + memset(sd->arrow_addele, 0, sizeof(sd->arrow_addele)); + memset(sd->arrow_addrace, 0, sizeof(sd->arrow_addrace)); + memset(sd->arrow_addsize, 0, sizeof(sd->arrow_addsize)); + memset(sd->arrow_addeff, 0, sizeof(sd->arrow_addeff)); + memset(sd->arrow_addeff2, 0, sizeof(sd->arrow_addeff2)); + memset(sd->magic_addele, 0, sizeof(sd->magic_addele)); + memset(sd->magic_addrace, 0, sizeof(sd->magic_addrace)); + memset(sd->magic_subrace, 0, sizeof(sd->magic_subrace)); sd->perfect_hit = 0; sd->critical_rate = sd->hit_rate = sd->flee_rate = sd->flee2_rate = 100; sd->def_rate = sd->def2_rate = sd->mdef_rate = sd->mdef2_rate = 100; @@ -1401,14 +1400,14 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->add_magic_damage_class_count = 0; sd->add_def_class_count = sd->add_mdef_class_count = 0; sd->monster_drop_item_count = 0; - memset (sd->add_damage_classrate, 0, sizeof (sd->add_damage_classrate)); - memset (sd->add_damage_classrate_, 0, sizeof (sd->add_damage_classrate_)); - memset (sd->add_magic_damage_classrate, 0, - sizeof (sd->add_magic_damage_classrate)); - memset (sd->add_def_classrate, 0, sizeof (sd->add_def_classrate)); - memset (sd->add_mdef_classrate, 0, sizeof (sd->add_mdef_classrate)); - memset (sd->monster_drop_race, 0, sizeof (sd->monster_drop_race)); - memset (sd->monster_drop_itemrate, 0, sizeof (sd->monster_drop_itemrate)); + memset(sd->add_damage_classrate, 0, sizeof(sd->add_damage_classrate)); + memset(sd->add_damage_classrate_, 0, sizeof(sd->add_damage_classrate_)); + memset(sd->add_magic_damage_classrate, 0, + sizeof(sd->add_magic_damage_classrate)); + memset(sd->add_def_classrate, 0, sizeof(sd->add_def_classrate)); + memset(sd->add_mdef_classrate, 0, sizeof(sd->add_mdef_classrate)); + memset(sd->monster_drop_race, 0, sizeof(sd->monster_drop_race)); + memset(sd->monster_drop_itemrate, 0, sizeof(sd->monster_drop_itemrate)); sd->speed_add_rate = sd->aspd_add_rate = 100; sd->double_add_rate = sd->perfect_hit_add = sd->get_zeny_add_num = 0; sd->splash_range = sd->splash_add_range = 0; @@ -1424,13 +1423,13 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (!sd->disguiseflag && sd->disguise) { sd->disguise = 0; - pc_set_weapon_look (sd); - clif_changelook (&sd->bl, LOOK_SHIELD, sd->status.shield); - clif_changelook (&sd->bl, LOOK_HEAD_BOTTOM, sd->status.head_bottom); - clif_changelook (&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); - clif_changelook (&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); - clif_clearchar (&sd->bl, 9); - pc_setpos (sd, sd->mapname, sd->bl.x, sd->bl.y, 3); + pc_set_weapon_look(sd); + clif_changelook(&sd->bl, LOOK_SHIELD, sd->status.shield); + clif_changelook(&sd->bl, LOOK_HEAD_BOTTOM, sd->status.head_bottom); + clif_changelook(&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); + clif_changelook(&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); + clif_clearchar(&sd->bl, 9); + pc_setpos(sd, sd->mapname, sd->bl.x, sd->bl.y, 3); } sd->spellpower_bonus_target = 0; @@ -1459,10 +1458,10 @@ int pc_calcstatus (struct map_session_data *sd, int first) && sd->status.inventory[index].card[0] != 0x00fe && sd->status.inventory[index].card[0] != (short) 0xff00) { - int j; + int j; for (j = 0; j < sd->inventory_data[index]->slot; j++) { // カード - int c = sd->status.inventory[index].card[j]; + int c = sd->status.inventory[index].card[j]; if (c > 0) { argrec_t arg[2]; @@ -1473,7 +1472,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (i == 8 && sd->status.inventory[index].equip == 0x20) sd->state.lr_flag = 1; - run_script_l (itemdb_equipscript (c), 0, sd->bl.id, + run_script_l(itemdb_equipscript(c), 0, sd->bl.id, 0, 2, arg); sd->state.lr_flag = 0; } @@ -1486,17 +1485,17 @@ int pc_calcstatus (struct map_session_data *sd, int first) && sd->status.inventory[index].card[0] != 0x00fe && sd->status.inventory[index].card[0] != (short) 0xff00) { - int j; + int j; for (j = 0; j < sd->inventory_data[index]->slot; j++) { // カード - int c = sd->status.inventory[index].card[j]; + int c = sd->status.inventory[index].card[j]; if (c > 0) { argrec_t arg[2]; arg[0].name = "@slotId"; arg[0].v.i = i; arg[1].name = "@itemId"; arg[1].v.i = sd->inventory_data[index]->nameid; - run_script_l (itemdb_equipscript (c), 0, sd->bl.id, + run_script_l(itemdb_equipscript(c), 0, sd->bl.id, 0, 2, arg); } } @@ -1509,7 +1508,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (sd->spellpower_bonus_target < 0) sd->spellpower_bonus_target = (sd->spellpower_bonus_target * 256) / - (MIN (128 + skill_power (sd, TMW_ASTRAL_SOUL), 256)); + (MIN(128 + skill_power(sd, TMW_ASTRAL_SOUL), 256)); #endif if (sd->spellpower_bonus_target < sd->spellpower_bonus_current) @@ -1518,7 +1517,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) wele = sd->atk_ele; wele_ = sd->atk_ele_; def_ele = sd->def_ele; - memcpy (sd->paramcard, sd->parame, sizeof (sd->paramcard)); + memcpy(sd->paramcard, sd->parame, sizeof(sd->paramcard)); // 装備品によるステータス変化はここで実行 for (i = 0; i < 10; i++) @@ -1538,7 +1537,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->def += sd->inventory_data[index]->def; if (sd->inventory_data[index]->type == 4) { - int r, wlv = sd->inventory_data[index]->wlv; + int r, wlv = sd->inventory_data[index]->wlv; if (i == 8 && sd->status.inventory[index].equip == 0x20) { //二刀流用データ入力 @@ -1561,7 +1560,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) arg[0].v.i = i; arg[1].name = "@itemId"; arg[1].v.i = sd->inventory_data[index]->nameid; - run_script_l (sd->inventory_data[index]->equip_script, 0, + run_script_l(sd->inventory_data[index]->equip_script, 0, sd->bl.id, 0, 2, arg); } sd->state.lr_flag = 0; @@ -1585,7 +1584,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) wele = (sd->status.inventory[index].card[1] & 0x0f); // 属 性 } sd->attackrange += sd->inventory_data[index]->range; - run_script_l (sd->inventory_data[index]->equip_script, 0, + run_script_l(sd->inventory_data[index]->equip_script, 0, sd->bl.id, 0, 2, arg); } } @@ -1599,18 +1598,18 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->watk += sd->inventory_data[index]->atk; refinedef += sd->status.inventory[index].refine * refinebonus[0][0]; - run_script_l (sd->inventory_data[index]->equip_script, 0, + run_script_l(sd->inventory_data[index]->equip_script, 0, sd->bl.id, 0, 2, arg); } } } - if (battle_is_unarmed (&sd->bl)) + if (battle_is_unarmed(&sd->bl)) { - sd->watk += skill_power (sd, TMW_BRAWLING) / 3; // +66 for 200 - sd->watk2 += skill_power (sd, TMW_BRAWLING) >> 3; // +25 for 200 - sd->watk_ += skill_power (sd, TMW_BRAWLING) / 3; // +66 for 200 - sd->watk_2 += skill_power (sd, TMW_BRAWLING) >> 3; // +25 for 200 + sd->watk += skill_power(sd, TMW_BRAWLING) / 3; // +66 for 200 + sd->watk2 += skill_power(sd, TMW_BRAWLING) >> 3; // +25 for 200 + sd->watk_ += skill_power(sd, TMW_BRAWLING) / 3; // +66 for 200 + sd->watk_2 += skill_power(sd, TMW_BRAWLING) >> 3; // +25 for 200 } if (sd->equip_index[10] >= 0) @@ -1624,7 +1623,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) arg[1].name = "@itemId"; arg[1].v.i = sd->inventory_data[index]->nameid; sd->state.lr_flag = 2; - run_script_l (sd->inventory_data[index]->equip_script, 0, sd->bl.id, + run_script_l(sd->inventory_data[index]->equip_script, 0, sd->bl.id, 0, 2, arg); sd->state.lr_flag = 0; sd->arrow_atk += sd->inventory_data[index]->atk; @@ -1665,14 +1664,14 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->atkmods_[2] = atkmods[2][sd->weapontype2]; /* - // jobボーナス分 - for(i=0;i<sd->status.job_level && i<MAX_LEVEL;i++){ - if(job_bonus[s_class.upper][s_class.job][i]) - sd->paramb[job_bonus[s_class.upper][s_class.job][i]-1]++; - } + // jobボーナス分 + for (i=0;i<sd->status.job_level && i<MAX_LEVEL;i++){ + if (job_bonus[s_class.upper][s_class.job][i]) + sd->paramb[job_bonus[s_class.upper][s_class.job][i]-1]++; + } */ - if ((skill = pc_checkskill (sd, MC_INCCARRY)) > 0) // skill can be used with an item now, thanks to orn [Valaris] + if ((skill = pc_checkskill(sd, MC_INCCARRY)) > 0) // skill can be used with an item now, thanks to orn [Valaris] sd->max_weight += skill * 1000; // ステータス変化による基本パラメータ補正 @@ -1731,21 +1730,21 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->paramb[5] += 5; } } - sd->speed -= skill_power (sd, TMW_SPEED) >> 3; - sd->aspd_rate -= skill_power (sd, TMW_SPEED) / 10; + sd->speed -= skill_power(sd, TMW_SPEED) >> 3; + sd->aspd_rate -= skill_power(sd, TMW_SPEED) / 10; if (sd->aspd_rate < 20) sd->aspd_rate = 20; /* - //1度も死んでないJob70スパノビに+10 - if(s_class.job == 23 && sd->die_counter == 0 && sd->status.job_level >= 70){ - sd->paramb[0]+= 15; - sd->paramb[1]+= 15; - sd->paramb[2]+= 15; - sd->paramb[3]+= 15; - sd->paramb[4]+= 15; - sd->paramb[5]+= 15; - } + //1度も死んでないJob70スパノビに+10 + if (s_class.job == 23 && sd->die_counter == 0 && sd->status.job_level >= 70){ + sd->paramb[0]+= 15; + sd->paramb[1]+= 15; + sd->paramb[2]+= 15; + sd->paramb[3]+= 15; + sd->paramb[4]+= 15; + sd->paramb[5]+= 15; + } */ sd->paramc[0] = sd->status.str + sd->paramb[0] + sd->parame[0]; sd->paramc[1] = sd->status.agi + sd->paramb[1] + sd->parame[1]; @@ -1776,7 +1775,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->matk2 += sd->paramc[3] + (sd->paramc[3] / 7) * (sd->paramc[3] / 7); if (sd->matk1 < sd->matk2) { - int temp = sd->matk2; + int temp = sd->matk2; sd->matk2 = sd->matk1; sd->matk1 = temp; } @@ -1785,7 +1784,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) #ifdef USE_ASTRAL_SOUL_SKILL if (sd->matk1 > MAGIC_SKILL_THRESHOLD) { - int bonus = sd->matk1 - MAGIC_SKILL_THRESHOLD; + int bonus = sd->matk1 - MAGIC_SKILL_THRESHOLD; // Ok if you are above a certain threshold, you get only (1/8) of that matk1 // if you have Astral soul skill you can get the whole power again (and additionally the 1/8 added) sd->matk1 = MAGIC_SKILL_THRESHOLD + (bonus>>3) + ((3*bonus*skill_power(sd, TMW_ASTRAL_SOUL))>>9); @@ -1804,7 +1803,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) // 200 is the maximum of the skill // def2 is the defence gained by vit, whereas "def", which is gained by armor, stays as is - int spbsk = skill_power (sd, TMW_RAGING); + int spbsk = skill_power(sd, TMW_RAGING); if (spbsk != 0 && sd->attackrange <= 2) { sd->critical += sd->critical * spbsk / 100; @@ -1867,7 +1866,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) //攻撃速度増加 - if ((skill = pc_checkskill (sd, AC_VULTURE)) > 0) + if ((skill = pc_checkskill(sd, AC_VULTURE)) > 0) { // ワシの目 sd->hit += skill; if (sd->status.weapon == 11) @@ -1876,17 +1875,17 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (sd->attackrange > 2) { // [fate] ranged weapon? - sd->attackrange += MIN (skill_power (sd, AC_OWL) / 60, 3); - sd->hit += skill_power (sd, AC_OWL) / 10; // 20 for 200 + sd->attackrange += MIN(skill_power(sd, AC_OWL) / 60, 3); + sd->hit += skill_power(sd, AC_OWL) / 10; // 20 for 200 } - if ((skill = pc_checkskill (sd, BS_WEAPONRESEARCH)) > 0) // 武器研究の命中率増加 + if ((skill = pc_checkskill(sd, BS_WEAPONRESEARCH)) > 0) // 武器研究の命中率増加 sd->hit += skill * 2; - if (sd->status.option & 2 && (skill = pc_checkskill (sd, RG_TUNNELDRIVE)) > 0) // トンネルドライブ + if (sd->status.option & 2 && (skill = pc_checkskill(sd, RG_TUNNELDRIVE)) > 0) // トンネルドライブ sd->speed += (1.2 * DEFAULT_WALK_SPEED - skill * 9); - if (pc_iscarton (sd) && (skill = pc_checkskill (sd, MC_PUSHCART)) > 0) // カートによる速度低下 + if (pc_iscarton(sd) && (skill = pc_checkskill(sd, MC_PUSHCART)) > 0) // カートによる速度低下 sd->speed += (10 - skill) * (DEFAULT_WALK_SPEED * 0.1); - else if (pc_isriding (sd)) // ペコペコ乗りによる速度増加 + else if (pc_isriding(sd)) // ペコペコ乗りによる速度増加 sd->speed -= (0.25 * DEFAULT_WALK_SPEED); sd->max_weight += 1000; if (sd->sc_count) @@ -1902,12 +1901,12 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->speed = 2 * DEFAULT_WALK_SPEED; } - if ((skill = pc_checkskill (sd, CR_TRUST)) > 0) + if ((skill = pc_checkskill(sd, CR_TRUST)) > 0) { // フェイス sd->status.max_hp += skill * 200; sd->subele[6] += skill * 5; } - if ((skill = pc_checkskill (sd, BS_SKINTEMPER)) > 0) + if ((skill = pc_checkskill(sd, BS_SKINTEMPER)) > 0) sd->subele[3] += skill * 4; bl = sd->status.base_level; @@ -1952,9 +1951,9 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (sd->sprate != 100) sd->status.max_sp = sd->status.max_sp * sd->sprate / 100; - if ((skill = pc_checkskill (sd, HP_MEDITATIO)) > 0) // メディテイティオ + if ((skill = pc_checkskill(sd, HP_MEDITATIO)) > 0) // メディテイティオ sd->status.max_sp += sd->status.max_sp * skill / 100; - if ((skill = pc_checkskill (sd, HW_SOULDRAIN)) > 0) // ソウルドレイン + if ((skill = pc_checkskill(sd, HW_SOULDRAIN)) > 0) // ソウルドレイン sd->status.max_sp += sd->status.max_sp * 2 * skill / 100; if (sd->status.max_sp < 0 || sd->status.max_sp > battle_config.max_sp) @@ -1962,7 +1961,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) //自然回復HP sd->nhealhp = 1 + (sd->paramc[2] / 5) + (sd->status.max_hp / 200); - if ((skill = pc_checkskill (sd, SM_RECOVERY)) > 0) + if ((skill = pc_checkskill(sd, SM_RECOVERY)) > 0) { // HP回復力向上 sd->nshealhp = skill * 5 + (sd->status.max_hp * skill / 500); if (sd->nshealhp > 0x7fff) @@ -1972,14 +1971,14 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->nhealsp = 1 + (sd->paramc[3] / 6) + (sd->status.max_sp / 100); if (sd->paramc[3] >= 120) sd->nhealsp += ((sd->paramc[3] - 120) >> 1) + 4; - if ((skill = pc_checkskill (sd, MG_SRECOVERY)) > 0) + if ((skill = pc_checkskill(sd, MG_SRECOVERY)) > 0) { // SP回復力向上 sd->nshealsp = skill * 3 + (sd->status.max_sp * skill / 500); if (sd->nshealsp > 0x7fff) sd->nshealsp = 0x7fff; } - if ((skill = pc_checkskill (sd, MO_SPIRITSRECOVERY)) > 0) + if ((skill = pc_checkskill(sd, MO_SPIRITSRECOVERY)) > 0) { sd->nsshealhp = skill * 4 + (sd->status.max_hp * skill / 500); sd->nsshealsp = skill * 2 + (sd->status.max_sp * skill / 500); @@ -2000,7 +1999,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (sd->nhealsp < 1) sd->nhealsp = 1; } - if ((skill = pc_checkskill (sd, HP_MEDITATIO)) > 0) + if ((skill = pc_checkskill(sd, HP_MEDITATIO)) > 0) { // メディテイティオはSPRではなく自然回復にかかる sd->nhealsp += 3 * skill * (sd->status.max_sp) / 100; if (sd->nhealsp > 0x7fff) @@ -2008,7 +2007,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) } // 種族耐性（これでいいの？ ディバインプロテクションと同じ処理がいるかも） - if ((skill = pc_checkskill (sd, SA_DRAGONOLOGY)) > 0) + if ((skill = pc_checkskill(sd, SA_DRAGONOLOGY)) > 0) { // ドラゴノロジー skill = skill * 4; sd->addrace[9] += skill; @@ -2019,7 +2018,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) } //Flee上昇 - if ((skill = pc_checkskill (sd, TF_MISS)) > 0) + if ((skill = pc_checkskill(sd, TF_MISS)) > 0) { // 回避率増加 if (sd->status.pc_class == 6 || sd->status.pc_class == 4007 || sd->status.pc_class == 23) @@ -2032,7 +2031,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) if (sd->status.pc_class == 12 || sd->status.pc_class == 4013) sd->speed -= sd->speed * (skill * .5) / 100; } - if ((skill = pc_checkskill (sd, MO_DODGE)) > 0) // 見切り + if ((skill = pc_checkskill(sd, MO_DODGE)) > 0) // 見切り sd->flee += (skill * 3) >> 1; // スキルやステータス異常による残りのパラメータ補正 @@ -2332,11 +2331,11 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->critical += sd->critical * (sd->sc_data[SC_TRUESIGHT].val1) / 100; -/* if(sd->sc_data[SC_VOLCANO].timer!=-1) // エンチャントポイズン(属性はbattle.cで) - sd->addeff[2]+=sd->sc_data[SC_VOLCANO].val2;//% of granting - if(sd->sc_data[SC_DELUGE].timer!=-1) // エンチャントポイズン(属性はbattle.cで) - sd->addeff[0]+=sd->sc_data[SC_DELUGE].val2;//% of granting - */ +/* if (sd->sc_data[SC_VOLCANO].timer!=-1) // エンチャントポイズン(属性はbattle.cで) + sd->addeff[2]+=sd->sc_data[SC_VOLCANO].val2;//% of granting + if (sd->sc_data[SC_DELUGE].timer!=-1) // エンチャントポイズン(属性はbattle.cで) + sd->addeff[0]+=sd->sc_data[SC_DELUGE].val2;//% of granting + */ } if (sd->speed_rate != 100) @@ -2345,11 +2344,11 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->speed = 1; if (aspd_rate != 100) sd->aspd = sd->aspd * aspd_rate / 100; - if (pc_isriding (sd)) // 騎兵修練 + if (pc_isriding(sd)) // 騎兵修練 sd->aspd = sd->aspd * (100 + 10 * (5 - - pc_checkskill (sd, KN_CAVALIERMASTERY))) / 100; + pc_checkskill(sd, KN_CAVALIERMASTERY))) / 100; if (sd->attack_spell_override) sd->aspd = sd->attack_spell_delay; @@ -2360,7 +2359,7 @@ int pc_calcstatus (struct map_session_data *sd, int first) sd->dmotion = 800 - sd->paramc[1] * 4; if (sd->dmotion < 400) sd->dmotion = 400; - if (sd->skilltimer != -1 && (skill = pc_checkskill (sd, SA_FREECAST)) > 0) + if (sd->skilltimer != -1 && (skill = pc_checkskill(sd, SA_FREECAST)) > 0) { sd->prev_speed = sd->speed; sd->speed = sd->speed * (175 - skill * 5) / 100; @@ -2375,86 +2374,86 @@ int pc_calcstatus (struct map_session_data *sd, int first) return 0; if (first & 3) { - clif_updatestatus (sd, SP_SPEED); - clif_updatestatus (sd, SP_MAXHP); - clif_updatestatus (sd, SP_MAXSP); + clif_updatestatus(sd, SP_SPEED); + clif_updatestatus(sd, SP_MAXHP); + clif_updatestatus(sd, SP_MAXSP); if (first & 1) { - clif_updatestatus (sd, SP_HP); - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_HP); + clif_updatestatus(sd, SP_SP); } return 0; } if (b_class != sd->view_class) { - clif_changelook (&sd->bl, LOOK_BASE, sd->view_class); - clif_changelook (&sd->bl, LOOK_WEAPON, 0); + clif_changelook(&sd->bl, LOOK_BASE, sd->view_class); + clif_changelook(&sd->bl, LOOK_WEAPON, 0); } - if (memcmp (b_skill, sd->status.skill, sizeof (sd->status.skill)) + if (memcmp(b_skill, sd->status.skill, sizeof(sd->status.skill)) || b_attackrange != sd->attackrange) - clif_skillinfoblock (sd); // スキル送信 + clif_skillinfoblock(sd); // スキル送信 if (b_speed != sd->speed) - clif_updatestatus (sd, SP_SPEED); + clif_updatestatus(sd, SP_SPEED); if (b_weight != sd->weight) - clif_updatestatus (sd, SP_WEIGHT); + clif_updatestatus(sd, SP_WEIGHT); if (b_max_weight != sd->max_weight) { - clif_updatestatus (sd, SP_MAXWEIGHT); - pc_checkweighticon (sd); + clif_updatestatus(sd, SP_MAXWEIGHT); + pc_checkweighticon(sd); } for (i = 0; i < 6; i++) if (b_paramb[i] + b_parame[i] != sd->paramb[i] + sd->parame[i]) - clif_updatestatus (sd, SP_STR + i); + clif_updatestatus(sd, SP_STR + i); if (b_hit != sd->hit) - clif_updatestatus (sd, SP_HIT); + clif_updatestatus(sd, SP_HIT); if (b_flee != sd->flee) - clif_updatestatus (sd, SP_FLEE1); + clif_updatestatus(sd, SP_FLEE1); if (b_aspd != sd->aspd) - clif_updatestatus (sd, SP_ASPD); + clif_updatestatus(sd, SP_ASPD); if (b_watk != sd->watk || b_base_atk != sd->base_atk) - clif_updatestatus (sd, SP_ATK1); + clif_updatestatus(sd, SP_ATK1); if (b_def != sd->def) - clif_updatestatus (sd, SP_DEF1); + clif_updatestatus(sd, SP_DEF1); if (b_watk2 != sd->watk2) - clif_updatestatus (sd, SP_ATK2); + clif_updatestatus(sd, SP_ATK2); if (b_def2 != sd->def2) - clif_updatestatus (sd, SP_DEF2); + clif_updatestatus(sd, SP_DEF2); if (b_flee2 != sd->flee2) - clif_updatestatus (sd, SP_FLEE2); + clif_updatestatus(sd, SP_FLEE2); if (b_critical != sd->critical) - clif_updatestatus (sd, SP_CRITICAL); + clif_updatestatus(sd, SP_CRITICAL); if (b_matk1 != sd->matk1) - clif_updatestatus (sd, SP_MATK1); + clif_updatestatus(sd, SP_MATK1); if (b_matk2 != sd->matk2) - clif_updatestatus (sd, SP_MATK2); + clif_updatestatus(sd, SP_MATK2); if (b_mdef != sd->mdef) - clif_updatestatus (sd, SP_MDEF1); + clif_updatestatus(sd, SP_MDEF1); if (b_mdef2 != sd->mdef2) - clif_updatestatus (sd, SP_MDEF2); + clif_updatestatus(sd, SP_MDEF2); if (b_attackrange != sd->attackrange) - clif_updatestatus (sd, SP_ATTACKRANGE); + clif_updatestatus(sd, SP_ATTACKRANGE); if (b_max_hp != sd->status.max_hp) - clif_updatestatus (sd, SP_MAXHP); + clif_updatestatus(sd, SP_MAXHP); if (b_max_sp != sd->status.max_sp) - clif_updatestatus (sd, SP_MAXSP); + clif_updatestatus(sd, SP_MAXSP); if (b_hp != sd->status.hp) - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); if (b_sp != sd->status.sp) - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); -/* if(before.cart_num != before.cart_num || before.cart_max_num != before.cart_max_num || - before.cart_weight != before.cart_weight || before.cart_max_weight != before.cart_max_weight ) - clif_updatestatus(sd,SP_CARTINFO);*/ +/* if (before.cart_num != before.cart_num || before.cart_max_num != before.cart_max_num || + before.cart_weight != before.cart_weight || before.cart_max_weight != before.cart_max_weight ) + clif_updatestatus(sd,SP_CARTINFO);*/ if (sd->status.hp < sd->status.max_hp >> 2 - && pc_checkskill (sd, SM_AUTOBERSERK) > 0 + && pc_checkskill(sd, SM_AUTOBERSERK) > 0 && (sd->sc_data[SC_PROVOKE].timer == -1 - || sd->sc_data[SC_PROVOKE].val2 == 0) && !pc_isdead (sd)) + || sd->sc_data[SC_PROVOKE].val2 == 0) && !pc_isdead(sd)) // オートバーサーク発動 - skill_status_change_start (&sd->bl, SC_PROVOKE, 10, 1, 0, 0, 0, 0); + skill_status_change_start(&sd->bl, SC_PROVOKE, 10, 1, 0, 0, 0, 0); return 0; } @@ -2463,9 +2462,9 @@ int pc_calcstatus (struct map_session_data *sd, int first) * 装 備品による能力等のボーナス設定 *------------------------------------------ */ -int pc_bonus (struct map_session_data *sd, int type, int val) +int pc_bonus(struct map_session_data *sd, int type, int val) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); switch (type) { @@ -2800,12 +2799,12 @@ int pc_bonus (struct map_session_data *sd, int type, int val) sd->parame[SP_INT - SP_STR] += val; sd->parame[SP_DEX - SP_STR] += val; sd->parame[SP_LUK - SP_STR] += val; - clif_updatestatus (sd, 13); - clif_updatestatus (sd, 14); - clif_updatestatus (sd, 15); - clif_updatestatus (sd, 16); - clif_updatestatus (sd, 17); - clif_updatestatus (sd, 18); + clif_updatestatus(sd, 13); + clif_updatestatus(sd, 14); + clif_updatestatus(sd, 15); + clif_updatestatus(sd, 16); + clif_updatestatus(sd, 17); + clif_updatestatus(sd, 18); } break; case SP_AGI_VIT: // [Valaris] @@ -2813,8 +2812,8 @@ int pc_bonus (struct map_session_data *sd, int type, int val) { sd->parame[SP_AGI - SP_STR] += val; sd->parame[SP_VIT - SP_STR] += val; - clif_updatestatus (sd, 14); - clif_updatestatus (sd, 15); + clif_updatestatus(sd, 14); + clif_updatestatus(sd, 15); } break; case SP_AGI_DEX_STR: // [Valaris] @@ -2823,9 +2822,9 @@ int pc_bonus (struct map_session_data *sd, int type, int val) sd->parame[SP_AGI - SP_STR] += val; sd->parame[SP_DEX - SP_STR] += val; sd->parame[SP_STR - SP_STR] += val; - clif_updatestatus (sd, 14); - clif_updatestatus (sd, 17); - clif_updatestatus (sd, 13); + clif_updatestatus(sd, 14); + clif_updatestatus(sd, 17); + clif_updatestatus(sd, 13); } break; case SP_PERFECT_HIDE: // [Valaris] @@ -2837,15 +2836,15 @@ int pc_bonus (struct map_session_data *sd, int type, int val) case SP_DISGUISE: // Disguise script for items [Valaris] if (sd->state.lr_flag != 2 && sd->disguiseflag == 0) { - if (pc_isriding (sd)) + if (pc_isriding(sd)) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Cannot wear disguise when riding a Peco."); break; } sd->disguise = val; - clif_clearchar (&sd->bl, 9); - pc_setpos (sd, sd->mapname, sd->bl.x, sd->bl.y, 3); + clif_clearchar(&sd->bl, 9); + pc_setpos(sd, sd->mapname, sd->bl.x, sd->bl.y, 3); } break; case SP_UNBREAKABLE: @@ -2859,7 +2858,7 @@ int pc_bonus (struct map_session_data *sd, int type, int val) break; default: if (battle_config.error_log) - printf ("pc_bonus: unknown type %d %d !\n", type, val); + printf("pc_bonus: unknown type %d %d !\n", type, val); break; } return 0; @@ -2869,11 +2868,11 @@ int pc_bonus (struct map_session_data *sd, int type, int val) * ｿｽｿｽ ｿｽｿｽｿｽiｿｽﾉゑｿｽｿｽｿｽｿｽ\ｿｽﾍ難ｿｽｿｽﾌボｿｽ[ｿｽiｿｽXｿｽﾝ抵ｿｽ *------------------------------------------ */ -int pc_bonus2 (struct map_session_data *sd, int type, int type2, int val) +int pc_bonus2(struct map_session_data *sd, int type, int type2, int val) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); switch (type) { @@ -3082,17 +3081,17 @@ int pc_bonus2 (struct map_session_data *sd, int type, int type2, int val) } // end addition default: if (battle_config.error_log) - printf ("pc_bonus2: unknown type %d %d %d!\n", type, type2, + printf("pc_bonus2: unknown type %d %d %d!\n", type, type2, val); break; } return 0; } -int pc_bonus3 (struct map_session_data *sd, int type, int type2, int type3, +int pc_bonus3(struct map_session_data *sd, int type, int type2, int type3, int val) { - int i; + int i; switch (type) { case SP_ADD_MONSTER_DROP_ITEM: @@ -3131,7 +3130,7 @@ int pc_bonus3 (struct map_session_data *sd, int type, int type2, int type3, break; default: if (battle_config.error_log) - printf ("pc_bonus3: unknown type %d %d %d %d!\n", type, type2, + printf("pc_bonus3: unknown type %d %d %d %d!\n", type, type2, type3, val); break; } @@ -3143,21 +3142,21 @@ int pc_bonus3 (struct map_session_data *sd, int type, int type2, int type3, * スクリプトによるスキル所得 *------------------------------------------ */ -int pc_skill (struct map_session_data *sd, int id, int level, int flag) +int pc_skill(struct map_session_data *sd, int id, int level, int flag) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (level > MAX_SKILL_LEVEL) { if (battle_config.error_log) - printf ("support card skill only!\n"); + printf("support card skill only!\n"); return 0; } if (!flag && (sd->status.skill[id].id == id || level == 0)) { // クエスト所得ならここで条件を確認して送信する sd->status.skill[id].lv = level; - pc_calcstatus (sd, 0); - clif_skillinfoblock (sd); + pc_calcstatus(sd, 0); + clif_skillinfoblock(sd); } else if (sd->status.skill[id].lv < level) { // 覚えられるがlvが小さいなら @@ -3172,17 +3171,17 @@ int pc_skill (struct map_session_data *sd, int id, int level, int flag) * カード挿入 *------------------------------------------ */ -int pc_insert_card (struct map_session_data *sd, int idx_card, int idx_equip) +int pc_insert_card(struct map_session_data *sd, int idx_card, int idx_equip) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (idx_card >= 0 && idx_card < MAX_INVENTORY && idx_equip >= 0 && idx_equip < MAX_INVENTORY && sd->inventory_data[idx_card]) { - int i; - int nameid = sd->status.inventory[idx_equip].nameid; - int cardid = sd->status.inventory[idx_card].nameid; - int ep = sd->inventory_data[idx_card]->equip; + int i; + int nameid = sd->status.inventory[idx_equip].nameid; + int cardid = sd->status.inventory[idx_card].nameid; + int ep = sd->inventory_data[idx_card]->equip; if (nameid <= 0 || sd->inventory_data[idx_equip] == NULL || (sd->inventory_data[idx_equip]->type != 4 && sd->inventory_data[idx_equip]->type != 5) || // 装 備じゃない @@ -3195,7 +3194,7 @@ int pc_insert_card (struct map_session_data *sd, int idx_card, int idx_equip) || sd->status.inventory[idx_equip].equip) { - clif_insert_card (sd, idx_equip, idx_card, 1); + clif_insert_card(sd, idx_equip, idx_card, 1); return 0; } for (i = 0; i < sd->inventory_data[idx_equip]->slot; i++) @@ -3206,14 +3205,14 @@ int pc_insert_card (struct map_session_data *sd, int idx_card, int idx_equip) sd->status.inventory[idx_equip].card[i] = cardid; // カードは減らす - clif_insert_card (sd, idx_equip, idx_card, 0); - pc_delitem (sd, idx_card, 1, 1); + clif_insert_card(sd, idx_equip, idx_card, 0); + pc_delitem(sd, idx_card, 1, 1); return 0; } } } else - clif_insert_card (sd, idx_equip, idx_card, 1); + clif_insert_card(sd, idx_equip, idx_card, 1); return 0; } @@ -3226,17 +3225,17 @@ int pc_insert_card (struct map_session_data *sd, int idx_card, int idx_equip) * スキルによる買い値修正 *------------------------------------------ */ -int pc_modifybuyvalue (struct map_session_data *sd, int orig_value) +int pc_modifybuyvalue(struct map_session_data *sd, int orig_value) { - int skill, val = orig_value, rate1 = 0, rate2 = 0; - if ((skill = pc_checkskill (sd, MC_DISCOUNT)) > 0) // ディスカウント + int skill, val = orig_value, rate1 = 0, rate2 = 0; + if ((skill = pc_checkskill(sd, MC_DISCOUNT)) > 0) // ディスカウント rate1 = 5 + skill * 2 - ((skill == 10) ? 1 : 0); - if ((skill = pc_checkskill (sd, RG_COMPULSION)) > 0) // コムパルションディスカウント + if ((skill = pc_checkskill(sd, RG_COMPULSION)) > 0) // コムパルションディスカウント rate2 = 5 + skill * 4; if (rate1 < rate2) rate1 = rate2; if (rate1) - val = (int) ((double) orig_value * (double) (100 - rate1) / 100.); + val = (int)((double) orig_value * (double)(100 - rate1) / 100.); if (val < 0) val = 0; if (orig_value > 0 && val < 1) @@ -3249,13 +3248,13 @@ int pc_modifybuyvalue (struct map_session_data *sd, int orig_value) * スキルによる売り値修正 *------------------------------------------ */ -int pc_modifysellvalue (struct map_session_data *sd, int orig_value) +int pc_modifysellvalue(struct map_session_data *sd, int orig_value) { - int skill, val = orig_value, rate = 0; - if ((skill = pc_checkskill (sd, MC_OVERCHARGE)) > 0) // オーバーチャージ + int skill, val = orig_value, rate = 0; + if ((skill = pc_checkskill(sd, MC_OVERCHARGE)) > 0) // オーバーチャージ rate = 5 + skill * 2 - ((skill == 10) ? 1 : 0); if (rate) - val = (int) ((double) orig_value * (double) (100 + rate) / 100.); + val = (int)((double) orig_value * (double)(100 + rate) / 100.); if (val < 0) val = 0; if (orig_value > 0 && val < 1) @@ -3269,13 +3268,13 @@ int pc_modifysellvalue (struct map_session_data *sd, int orig_value) * 3万個制限にかかるか確認 *------------------------------------------ */ -int pc_checkadditem (struct map_session_data *sd, int nameid, int amount) +int pc_checkadditem(struct map_session_data *sd, int nameid, int amount) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (itemdb_isequip (nameid)) + if (itemdb_isequip(nameid)) return ADDITEM_NEW; for (i = 0; i < MAX_INVENTORY; i++) @@ -3297,11 +3296,11 @@ int pc_checkadditem (struct map_session_data *sd, int nameid, int amount) * 空きアイテム欄の個数 *------------------------------------------ */ -int pc_inventoryblank (struct map_session_data *sd) +int pc_inventoryblank(struct map_session_data *sd) { - int i, b; + int i, b; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0, b = 0; i < MAX_INVENTORY; i++) { @@ -3316,17 +3315,17 @@ int pc_inventoryblank (struct map_session_data *sd) * お金を払う *------------------------------------------ */ -int pc_payzeny (struct map_session_data *sd, int zeny) +int pc_payzeny(struct map_session_data *sd, int zeny) { double z; - nullpo_retr (0, sd); + nullpo_retr(0, sd); z = (double) sd->status.zeny; if (sd->status.zeny < zeny || z - (double) zeny > MAX_ZENY) return 1; sd->status.zeny -= zeny; - clif_updatestatus (sd, SP_ZENY); + clif_updatestatus(sd, SP_ZENY); return 0; } @@ -3335,11 +3334,11 @@ int pc_payzeny (struct map_session_data *sd, int zeny) * お金を得る *------------------------------------------ */ -int pc_getzeny (struct map_session_data *sd, int zeny) +int pc_getzeny(struct map_session_data *sd, int zeny) { double z; - nullpo_retr (0, sd); + nullpo_retr(0, sd); z = (double) sd->status.zeny; if (z + (double) zeny > MAX_ZENY) @@ -3348,7 +3347,7 @@ int pc_getzeny (struct map_session_data *sd, int zeny) sd->status.zeny = MAX_ZENY; } sd->status.zeny += zeny; - clif_updatestatus (sd, SP_ZENY); + clif_updatestatus(sd, SP_ZENY); return 0; } @@ -3357,11 +3356,11 @@ int pc_getzeny (struct map_session_data *sd, int zeny) * アイテムを探して、インデックスを返す *------------------------------------------ */ -int pc_search_inventory (struct map_session_data *sd, int item_id) +int pc_search_inventory(struct map_session_data *sd, int item_id) { - int i; + int i; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); for (i = 0; i < MAX_INVENTORY; i++) { @@ -3373,12 +3372,12 @@ int pc_search_inventory (struct map_session_data *sd, int item_id) return -1; } -int pc_count_all_items (struct map_session_data *player, int item_id) +int pc_count_all_items(struct map_session_data *player, int item_id) { - int i; - int count = 0; + int i; + int count = 0; - nullpo_retr (0, player); + nullpo_retr(0, player); for (i = 0; i < MAX_INVENTORY; i++) { @@ -3389,24 +3388,24 @@ int pc_count_all_items (struct map_session_data *player, int item_id) return count; } -int pc_remove_items (struct map_session_data *player, int item_id, int count) +int pc_remove_items(struct map_session_data *player, int item_id, int count) { - int i; + int i; - nullpo_retr (0, player); + nullpo_retr(0, player); for (i = 0; i < MAX_INVENTORY && count; i++) { if (player->status.inventory[i].nameid == item_id) { - int to_delete = count; + int to_delete = count; /* only delete as much as we have */ if (to_delete > player->status.inventory[i].amount) to_delete = player->status.inventory[i].amount; count -= to_delete; - pc_delitem (player, i, to_delete, + pc_delitem(player, i, to_delete, 0 /* means `really delete and update status' */ ); if (!count) @@ -3420,26 +3419,26 @@ int pc_remove_items (struct map_session_data *player, int item_id, int count) * アイテム追加。個数のみitem構造体の数字を無視 *------------------------------------------ */ -int pc_additem (struct map_session_data *sd, struct item *item_data, +int pc_additem(struct map_session_data *sd, struct item *item_data, int amount) { struct item_data *data; - int i, w; + int i, w; - MAP_LOG_PC (sd, "PICKUP %d %d", item_data->nameid, amount); + MAP_LOG_PC(sd, "PICKUP %d %d", item_data->nameid, amount); - nullpo_retr (1, sd); - nullpo_retr (1, item_data); + nullpo_retr(1, sd); + nullpo_retr(1, item_data); if (item_data->nameid <= 0 || amount <= 0) return 1; - data = itemdb_search (item_data->nameid); + data = itemdb_search(item_data->nameid); if ((w = data->weight * amount) + sd->weight > sd->max_weight) return 2; i = MAX_INVENTORY; - if (!itemdb_isequip2 (data)) + if (!itemdb_isequip2(data)) { // 装 備品ではないので、既所有品なら個数のみ変化させる for (i = 0; i < MAX_INVENTORY; i++) @@ -3452,31 +3451,31 @@ int pc_additem (struct map_session_data *sd, struct item *item_data, if (sd->status.inventory[i].amount + amount > MAX_AMOUNT) return 5; sd->status.inventory[i].amount += amount; - clif_additem (sd, i, amount, 0); + clif_additem(sd, i, amount, 0); break; } } if (i >= MAX_INVENTORY) { // 装 備品か未所有品だったので空き欄へ追加 - i = pc_search_inventory (sd, 0); + i = pc_search_inventory(sd, 0); if (i >= 0) { - memcpy (&sd->status.inventory[i], item_data, - sizeof (sd->status.inventory[0])); + memcpy(&sd->status.inventory[i], item_data, + sizeof(sd->status.inventory[0])); if (item_data->equip) sd->status.inventory[i].equip = 0; sd->status.inventory[i].amount = amount; sd->inventory_data[i] = data; - clif_additem (sd, i, amount, 0); + clif_additem(sd, i, amount, 0); } else return 4; } sd->weight += w; - clif_updatestatus (sd, SP_WEIGHT); + clif_updatestatus(sd, SP_WEIGHT); return 0; } @@ -3485,12 +3484,12 @@ int pc_additem (struct map_session_data *sd, struct item *item_data, * アイテムを減らす *------------------------------------------ */ -int pc_delitem (struct map_session_data *sd, int n, int amount, int type) +int pc_delitem(struct map_session_data *sd, int n, int amount, int type) { - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (sd->trade_partner != 0) - trade_tradecancel (sd); + trade_tradecancel(sd); if (sd->status.inventory[n].nameid == 0 || amount <= 0 || sd->status.inventory[n].amount < amount @@ -3502,15 +3501,15 @@ int pc_delitem (struct map_session_data *sd, int n, int amount, int type) if (sd->status.inventory[n].amount <= 0) { if (sd->status.inventory[n].equip) - pc_unequipitem (sd, n, 0); - memset (&sd->status.inventory[n], 0, - sizeof (sd->status.inventory[0])); + pc_unequipitem(sd, n, 0); + memset(&sd->status.inventory[n], 0, + sizeof(sd->status.inventory[0])); sd->inventory_data[n] = NULL; } if (!(type & 1)) - clif_delitem (sd, n, amount); + clif_delitem(sd, n, amount); if (!(type & 2)) - clif_updatestatus (sd, SP_WEIGHT); + clif_updatestatus(sd, SP_WEIGHT); return 0; } @@ -3519,9 +3518,9 @@ int pc_delitem (struct map_session_data *sd, int n, int amount, int type) * アイテムを落す *------------------------------------------ */ -int pc_dropitem (struct map_session_data *sd, int n, int amount) +int pc_dropitem(struct map_session_data *sd, int n, int amount) { - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (sd->trade_partner != 0 || sd->npc_id != 0 || sd->state.storage_open) return 0; // no dropping while trading/npc/storage @@ -3532,15 +3531,15 @@ int pc_dropitem (struct map_session_data *sd, int n, int amount) if (amount <= 0) return 0; - pc_unequipinvyitem (sd, n, 0); + pc_unequipinvyitem(sd, n, 0); if (sd->status.inventory[n].nameid <= 0 || sd->status.inventory[n].amount < amount || sd->trade_partner != 0 || sd->status.inventory[n].amount <= 0) return 1; - map_addflooritem (&sd->status.inventory[n], amount, sd->bl.m, sd->bl.x, + map_addflooritem(&sd->status.inventory[n], amount, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); - pc_delitem (sd, n, amount, 0); + pc_delitem(sd, n, amount, 0); return 0; } @@ -3550,15 +3549,15 @@ int pc_dropitem (struct map_session_data *sd, int n, int amount) *------------------------------------------ */ -static int can_pick_item_up_from (struct map_session_data *self, int other_id) +static int can_pick_item_up_from(struct map_session_data *self, int other_id) { - struct party *p = party_search (self->status.party_id); + struct party *p = party_search(self->status.party_id); /* From ourselves or from no-one? */ if (!self || self->bl.id == other_id || !other_id) return 1; - struct map_session_data *other = map_id2sd (other_id); + struct map_session_data *other = map_id2sd(other_id); /* Other no longer exists? */ if (!other) @@ -3580,22 +3579,22 @@ static int can_pick_item_up_from (struct map_session_data *self, int other_id) return 1; else { - int distance_x = abs (other->bl.x - self->bl.x); - int distance_y = abs (other->bl.y - self->bl.y); - int distance = (distance_x > distance_y) ? distance_x : distance_y; + int distance_x = abs(other->bl.x - self->bl.x); + int distance_y = abs(other->bl.y - self->bl.y); + int distance = (distance_x > distance_y) ? distance_x : distance_y; return distance > battle_config.drop_pickup_safety_zone; } } -int pc_takeitem (struct map_session_data *sd, struct flooritem_data *fitem) +int pc_takeitem(struct map_session_data *sd, struct flooritem_data *fitem) { - int flag; - unsigned int tick = gettick (); - int can_take; + int flag; + unsigned int tick = gettick(); + int can_take; - nullpo_retr (0, sd); - nullpo_retr (0, fitem); + nullpo_retr(0, sd); + nullpo_retr(0, fitem); /* Sometimes the owners reported to us are buggy: */ @@ -3609,14 +3608,14 @@ int pc_takeitem (struct map_session_data *sd, struct flooritem_data *fitem) fitem->third_get_id = 0; } - can_take = can_pick_item_up_from (sd, fitem->first_get_id); + can_take = can_pick_item_up_from(sd, fitem->first_get_id); if (!can_take) can_take = fitem->first_get_tick <= tick - && can_pick_item_up_from (sd, fitem->second_get_id); + && can_pick_item_up_from(sd, fitem->second_get_id); if (!can_take) can_take = fitem->second_get_tick <= tick - && can_pick_item_up_from (sd, fitem->third_get_id); + && can_pick_item_up_from(sd, fitem->third_get_id); if (!can_take) can_take = fitem->third_get_tick <= tick; @@ -3626,44 +3625,44 @@ int pc_takeitem (struct map_session_data *sd, struct flooritem_data *fitem) /* Can pick up */ if ((flag = - pc_additem (sd, &fitem->item_data, fitem->item_data.amount))) + pc_additem(sd, &fitem->item_data, fitem->item_data.amount))) // 重量overで取得失敗 - clif_additem (sd, 0, 0, flag); + clif_additem(sd, 0, 0, flag); else { // 取得成功 if (sd->attacktimer != -1) - pc_stopattack (sd); - clif_takeitem (&sd->bl, &fitem->bl); - map_clearflooritem (fitem->bl.id); + pc_stopattack(sd); + clif_takeitem(&sd->bl, &fitem->bl); + map_clearflooritem(fitem->bl.id); } return 0; } /* Otherwise, we can't pick up */ - clif_additem (sd, 0, 0, 6); + clif_additem(sd, 0, 0, 6); return 0; } static -int pc_isUseitem (struct map_session_data *sd, int n) +int pc_isUseitem(struct map_session_data *sd, int n) { struct item_data *item; - int nameid; + int nameid; - nullpo_retr (0, sd); + nullpo_retr(0, sd); item = sd->inventory_data[n]; nameid = sd->status.inventory[n].nameid; if (item == NULL) return 0; - if (itemdb_type (nameid) != 0) + if (itemdb_type(nameid) != 0) return 0; if (nameid == 601 && (map[sd->bl.m].flag.noteleport)) { - clif_skill_teleportmessage (sd, 0); + clif_skill_teleportmessage(sd, 0); return 0; } @@ -3684,11 +3683,11 @@ int pc_isUseitem (struct map_session_data *sd, int n) * アイテムを使う *------------------------------------------ */ -int pc_useitem (struct map_session_data *sd, int n) +int pc_useitem(struct map_session_data *sd, int n) { - int nameid, amount; + int nameid, amount; - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (n >= 0 && n < MAX_INVENTORY && sd->inventory_data[n]) { @@ -3696,16 +3695,16 @@ int pc_useitem (struct map_session_data *sd, int n) amount = sd->status.inventory[n].amount; if (sd->status.inventory[n].nameid <= 0 || sd->status.inventory[n].amount <= 0 - || sd->sc_data[SC_BERSERK].timer != -1 || !pc_isUseitem (sd, n)) + || sd->sc_data[SC_BERSERK].timer != -1 || !pc_isUseitem(sd, n)) { - clif_useitemack (sd, n, 0, 0); + clif_useitemack(sd, n, 0, 0); return 1; } - run_script (sd->inventory_data[n]->use_script, 0, sd->bl.id, 0); + run_script(sd->inventory_data[n]->use_script, 0, sd->bl.id, 0); - clif_useitemack (sd, n, amount - 1, 1); - pc_delitem (sd, n, 1, 1); + clif_useitemack(sd, n, amount - 1, 1); + pc_delitem(sd, n, 1, 1); } return 0; @@ -3715,24 +3714,24 @@ int pc_useitem (struct map_session_data *sd, int n) * カートアイテム追加。個数のみitem構造体の数字を無視 *------------------------------------------ */ -int pc_cart_additem (struct map_session_data *sd, struct item *item_data, +int pc_cart_additem(struct map_session_data *sd, struct item *item_data, int amount) { struct item_data *data; - int i, w; + int i, w; - nullpo_retr (1, sd); - nullpo_retr (1, item_data); + nullpo_retr(1, sd); + nullpo_retr(1, item_data); if (item_data->nameid <= 0 || amount <= 0) return 1; - data = itemdb_search (item_data->nameid); + data = itemdb_search(item_data->nameid); if ((w = data->weight * amount) + sd->cart_weight > sd->cart_max_weight) return 1; i = MAX_CART; - if (!itemdb_isequip2 (data)) + if (!itemdb_isequip2(data)) { // 装 備品ではないので、既所有品なら個数のみ変化させる for (i = 0; i < MAX_CART; i++) @@ -3746,7 +3745,7 @@ int pc_cart_additem (struct map_session_data *sd, struct item *item_data, if (sd->status.cart[i].amount + amount > MAX_AMOUNT) return 1; sd->status.cart[i].amount += amount; - clif_cart_additem (sd, i, amount, 0); + clif_cart_additem(sd, i, amount, 0); break; } } @@ -3758,11 +3757,11 @@ int pc_cart_additem (struct map_session_data *sd, struct item *item_data, { if (sd->status.cart[i].nameid == 0) { - memcpy (&sd->status.cart[i], item_data, - sizeof (sd->status.cart[0])); + memcpy(&sd->status.cart[i], item_data, + sizeof(sd->status.cart[0])); sd->status.cart[i].amount = amount; sd->cart_num++; - clif_cart_additem (sd, i, amount, 0); + clif_cart_additem(sd, i, amount, 0); break; } } @@ -3770,7 +3769,7 @@ int pc_cart_additem (struct map_session_data *sd, struct item *item_data, return 1; } sd->cart_weight += w; - clif_updatestatus (sd, SP_CARTINFO); + clif_updatestatus(sd, SP_CARTINFO); return 0; } @@ -3779,24 +3778,24 @@ int pc_cart_additem (struct map_session_data *sd, struct item *item_data, * カートアイテムを減らす *------------------------------------------ */ -int pc_cart_delitem (struct map_session_data *sd, int n, int amount, int type) +int pc_cart_delitem(struct map_session_data *sd, int n, int amount, int type) { - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (sd->status.cart[n].nameid == 0 || sd->status.cart[n].amount < amount) return 1; sd->status.cart[n].amount -= amount; - sd->cart_weight -= itemdb_weight (sd->status.cart[n].nameid) * amount; + sd->cart_weight -= itemdb_weight(sd->status.cart[n].nameid) * amount; if (sd->status.cart[n].amount <= 0) { - memset (&sd->status.cart[n], 0, sizeof (sd->status.cart[0])); + memset(&sd->status.cart[n], 0, sizeof(sd->status.cart[0])); sd->cart_num--; } if (!type) { - clif_cart_delitem (sd, n, amount); - clif_updatestatus (sd, SP_CARTINFO); + clif_cart_delitem(sd, n, amount); + clif_updatestatus(sd, SP_CARTINFO); } return 0; @@ -3806,23 +3805,23 @@ int pc_cart_delitem (struct map_session_data *sd, int n, int amount, int type) * カートへアイテム移動 *------------------------------------------ */ -int pc_putitemtocart (struct map_session_data *sd, int idx, int amount) +int pc_putitemtocart(struct map_session_data *sd, int idx, int amount) { struct item *item_data; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (idx < 0 || idx >= MAX_INVENTORY) return 1; - nullpo_retr (0, item_data = &sd->status.inventory[idx]); + nullpo_retr(0, item_data = &sd->status.inventory[idx]); - if (!pc_iscarton (sd)) + if (!pc_iscarton(sd)) return 1; if (item_data->nameid == 0 || item_data->amount < amount) return 1; - if (pc_cart_additem (sd, item_data, amount) == 0) - return pc_delitem (sd, idx, amount, 0); + if (pc_cart_additem(sd, item_data, amount) == 0) + return pc_delitem(sd, idx, amount, 0); return 1; } @@ -3831,18 +3830,18 @@ int pc_putitemtocart (struct map_session_data *sd, int idx, int amount) * カート内のアイテム数確認(個数の差分を返す) *------------------------------------------ */ -int pc_cartitem_amount (struct map_session_data *sd, int idx, int amount) +int pc_cartitem_amount(struct map_session_data *sd, int idx, int amount) { struct item *item_data; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (idx < 0 || idx >= MAX_CART) return -1; - nullpo_retr (-1, item_data = &sd->status.cart[idx]); + nullpo_retr(-1, item_data = &sd->status.cart[idx]); - if (!pc_iscarton (sd)) + if (!pc_iscarton(sd)) return -1; if (item_data->nameid == 0 || !item_data->amount) return -1; @@ -3854,26 +3853,26 @@ int pc_cartitem_amount (struct map_session_data *sd, int idx, int amount) *------------------------------------------ */ -int pc_getitemfromcart (struct map_session_data *sd, int idx, int amount) +int pc_getitemfromcart(struct map_session_data *sd, int idx, int amount) { struct item *item_data; - int flag; + int flag; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (idx < 0 || idx >= MAX_CART) return 1; - nullpo_retr (0, item_data = &sd->status.cart[idx]); + nullpo_retr(0, item_data = &sd->status.cart[idx]); - if (!pc_iscarton (sd)) + if (!pc_iscarton(sd)) return 1; if (item_data->nameid == 0 || item_data->amount < amount) return 1; - if ((flag = pc_additem (sd, item_data, amount)) == 0) - return pc_cart_delitem (sd, idx, amount, 0); + if ((flag = pc_additem(sd, item_data, amount)) == 0) + return pc_cart_delitem(sd, idx, amount, 0); - clif_additem (sd, 0, 0, flag); + clif_additem(sd, 0, 0, flag); return 1; } @@ -3881,11 +3880,11 @@ int pc_getitemfromcart (struct map_session_data *sd, int idx, int amount) * アイテム鑑定 *------------------------------------------ */ -int pc_item_identify (struct map_session_data *sd, int idx) +int pc_item_identify(struct map_session_data *sd, int idx) { - int flag = 1; + int flag = 1; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (idx >= 0 && idx < MAX_INVENTORY) { @@ -3895,10 +3894,10 @@ int pc_item_identify (struct map_session_data *sd, int idx) flag = 0; sd->status.inventory[idx].identify = 1; } - clif_item_identified (sd, idx, flag); + clif_item_identified(sd, idx, flag); } else - clif_item_identified (sd, idx, flag); + clif_item_identified(sd, idx, flag); return !flag; } @@ -3908,36 +3907,36 @@ int pc_item_identify (struct map_session_data *sd, int idx) *------------------------------------------ */ static -void pc_show_steal (struct block_list *bl, va_list ap) +void pc_show_steal(struct block_list *bl, va_list ap) { struct map_session_data *sd; - int itemid; - int type; + int itemid; + int type; struct item_data *item = NULL; char output[100]; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd = va_arg (ap, struct map_session_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd = va_arg(ap, struct map_session_data *)); - itemid = va_arg (ap, int); - type = va_arg (ap, int); + itemid = va_arg(ap, int); + type = va_arg(ap, int); if (!type) { - if ((item = itemdb_exists (itemid)) == NULL) - sprintf (output, "%s stole an Unknown_Item.", sd->status.name); + if ((item = itemdb_exists(itemid)) == NULL) + sprintf(output, "%s stole an Unknown_Item.", sd->status.name); else - sprintf (output, "%s stole %s.", sd->status.name, item->jname); - clif_displaymessage (((struct map_session_data *) bl)->fd, output); + sprintf(output, "%s stole %s.", sd->status.name, item->jname); + clif_displaymessage(((struct map_session_data *) bl)->fd, output); } else { - sprintf (output, + sprintf(output, "%s has not stolen the item because of being overweight.", sd->status.name); - clif_displaymessage (((struct map_session_data *) bl)->fd, output); + clif_displaymessage(((struct map_session_data *) bl)->fd, output); } } @@ -3946,11 +3945,11 @@ void pc_show_steal (struct block_list *bl, va_list ap) *------------------------------------------ */ //** pc.c: Small Steal Item fix by fritz -int pc_steal_item (struct map_session_data *sd, struct block_list *bl) +int pc_steal_item(struct map_session_data *sd, struct block_list *bl) { if (sd != NULL && bl != NULL && bl->type == BL_MOB) { - int i, skill, rate, itemid, flag, count; + int i, skill, rate, itemid, flag, count; struct mob_data *md; md = (struct mob_data *) bl; if (!md->state.steal_flag && mob_db[md->mob_class].mexp <= 0 && @@ -3960,33 +3959,33 @@ int pc_steal_item (struct map_session_data *sd, struct block_list *bl) (!(md->mob_class > 1324 && md->mob_class < 1364))) // prevent stealing from treasure boxes [Valaris] { skill = sd->paramc[4] - mob_db[md->mob_class].dex - + pc_checkskill (sd, TF_STEAL) + 10; + + pc_checkskill(sd, TF_STEAL) + 10; if (0 < skill) { for (count = 8; count <= 8 && count != 0; count--) { - i = rand () % 8; + i = rand() % 8; itemid = mob_db[md->mob_class].dropitem[i].nameid; - if (itemid > 0 && itemdb_type (itemid) != 6) + if (itemid > 0 && itemdb_type(itemid) != 6) { rate = (mob_db[md->mob_class].dropitem[i].p / battle_config.item_rate_common * 100 * skill) / 100; - if (rand () % 10000 < rate) + if (rand() % 10000 < rate) { struct item tmp_item; - memset (&tmp_item, 0, sizeof (tmp_item)); + memset(&tmp_item, 0, sizeof(tmp_item)); tmp_item.nameid = itemid; tmp_item.amount = 1; tmp_item.identify = 1; - flag = pc_additem (sd, &tmp_item, 1); + flag = pc_additem(sd, &tmp_item, 1); if (battle_config.show_steal_in_same_party) { - party_foreachsamemap (pc_show_steal, sd, 1, + party_foreachsamemap(pc_show_steal, sd, 1, sd, tmp_item.nameid, 0); } @@ -3994,12 +3993,12 @@ int pc_steal_item (struct map_session_data *sd, struct block_list *bl) { if (battle_config.show_steal_in_same_party) { - party_foreachsamemap (pc_show_steal, sd, + party_foreachsamemap(pc_show_steal, sd, 1, sd, tmp_item.nameid, 1); } - clif_additem (sd, 0, 0, flag); + clif_additem(sd, 0, 0, flag); } md->state.steal_flag = 1; return 1; @@ -4016,23 +4015,23 @@ int pc_steal_item (struct map_session_data *sd, struct block_list *bl) * *------------------------------------------ */ -int pc_steal_coin (struct map_session_data *sd, struct block_list *bl) +int pc_steal_coin(struct map_session_data *sd, struct block_list *bl) { if (sd != NULL && bl != NULL && bl->type == BL_MOB) { - int rate, skill; + int rate, skill; struct mob_data *md = (struct mob_data *) bl; if (md && !md->state.steal_coin_flag && md->sc_data && md->sc_data[SC_STONE].timer == -1 && md->sc_data[SC_FREEZE].timer == -1) { - skill = pc_checkskill (sd, RG_STEALCOIN) * 10; + skill = pc_checkskill(sd, RG_STEALCOIN) * 10; rate = skill + (sd->status.base_level - mob_db[md->mob_class].lv) * 3 + sd->paramc[4] * 2 + sd->paramc[5] * 2; - if (MRAND (1000) < rate) + if (MRAND(1000) < rate) { - pc_getzeny (sd, mob_db[md->mob_class].lv * 10 + MRAND (100)); + pc_getzeny(sd, mob_db[md->mob_class].lv * 10 + MRAND(100)); md->state.steal_coin_flag = 1; return 1; } @@ -4049,127 +4048,127 @@ int pc_steal_coin (struct map_session_data *sd, struct block_list *bl) * PCの位置設定 *------------------------------------------ */ -int pc_setpos (struct map_session_data *sd, const char *mapname_org, int x, int y, +int pc_setpos(struct map_session_data *sd, const char *mapname_org, int x, int y, int clrtype) { char mapname[24]; - int m = 0, c = 0, disguise = 0; + int m = 0, c = 0, disguise = 0; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->chatID) // チャットから出る - chat_leavechat (sd); + chat_leavechat(sd); if (sd->trade_partner) // 取引を中断する - trade_tradecancel (sd); + trade_tradecancel(sd); if (sd->state.storage_open) - storage_storage_quit (sd); // 倉庫を開いてるなら保存する + storage_storage_quit(sd); // 倉庫を開いてるなら保存する if (sd->party_invite > 0) // パーティ勧誘を拒否する - party_reply_invite (sd, sd->party_invite_account, 0); + party_reply_invite(sd, sd->party_invite_account, 0); - skill_castcancel (&sd->bl, 0); // 詠唱中断 - pc_stop_walking (sd, 0); // 歩行中断 - pc_stopattack (sd); // 攻撃中断 + skill_castcancel(&sd->bl, 0); // 詠唱中断 + pc_stop_walking(sd, 0); // 歩行中断 + pc_stopattack(sd); // 攻撃中断 - if (pc_issit (sd)) + if (pc_issit(sd)) { // pc_setstand (sd); // [fate] Nothing wrong with warping while sitting - skill_gangsterparadise (sd, 0); + skill_gangsterparadise(sd, 0); } if (sd->sc_data[SC_TRICKDEAD].timer != -1) - skill_status_change_end (&sd->bl, SC_TRICKDEAD, -1); + skill_status_change_end(&sd->bl, SC_TRICKDEAD, -1); if (sd->status.option & 2) - skill_status_change_end (&sd->bl, SC_HIDING, -1); + skill_status_change_end(&sd->bl, SC_HIDING, -1); if (sd->status.option & 4) - skill_status_change_end (&sd->bl, SC_CLOAKING, -1); + skill_status_change_end(&sd->bl, SC_CLOAKING, -1); if (sd->status.option & 16386) - skill_status_change_end (&sd->bl, SC_CHASEWALK, -1); + skill_status_change_end(&sd->bl, SC_CHASEWALK, -1); if (sd->sc_data[SC_BLADESTOP].timer != -1) - skill_status_change_end (&sd->bl, SC_BLADESTOP, -1); + skill_status_change_end(&sd->bl, SC_BLADESTOP, -1); if (sd->sc_data[SC_DANCING].timer != -1) // clear dance effect when warping [Valaris] - skill_stop_dancing (&sd->bl, 0); + skill_stop_dancing(&sd->bl, 0); if (sd->disguise) { // clear disguises when warping [Valaris] - clif_clearchar (&sd->bl, 9); + clif_clearchar(&sd->bl, 9); disguise = sd->disguise; sd->disguise = 0; } - memcpy (mapname, mapname_org, 24); + memcpy(mapname, mapname_org, 24); mapname[16] = 0; - if (strstr (mapname, ".gat") == NULL && strlen (mapname) < 16) + if (strstr(mapname, ".gat") == NULL && strlen(mapname) < 16) { - strcat (mapname, ".gat"); + strcat(mapname, ".gat"); } - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); if (m < 0) { if (sd->mapname[0]) { struct in_addr ip; int port; - if (map_mapname2ipport (mapname, &ip, &port) == 0) + if (map_mapname2ipport(mapname, &ip, &port) == 0) { - skill_stop_dancing (&sd->bl, 1); - skill_unit_out_all (&sd->bl, gettick (), 1); - clif_clearchar_area (&sd->bl, clrtype & 0xffff); - skill_gangsterparadise (sd, 0); - map_delblock (&sd->bl); - memcpy (sd->mapname, mapname, 24); + skill_stop_dancing(&sd->bl, 1); + skill_unit_out_all(&sd->bl, gettick(), 1); + clif_clearchar_area(&sd->bl, clrtype & 0xffff); + skill_gangsterparadise(sd, 0); + map_delblock(&sd->bl); + memcpy(sd->mapname, mapname, 24); sd->bl.x = x; sd->bl.y = y; sd->state.waitingdisconnect = 1; - pc_makesavestatus (sd); + pc_makesavestatus(sd); //The storage close routines save the char data. [Skotlex] if (!sd->state.storage_open) - chrif_save (sd); + chrif_save(sd); else if (sd->state.storage_open) - storage_storage_quit (sd); + storage_storage_quit(sd); - chrif_changemapserver (sd, mapname, x, y, ip, port); + chrif_changemapserver(sd, mapname, x, y, ip, port); return 0; } } #if 0 - clif_authfail_fd (sd->fd, 0); // cancel - clif_setwaitclose (sd->fd); + clif_authfail_fd(sd->fd, 0); // cancel + clif_setwaitclose(sd->fd); #endif return 1; } if (x < 0 || x >= map[m].xs || y < 0 || y >= map[m].ys) x = y = 0; - if ((x == 0 && y == 0) || (c = read_gat (m, x, y)) == 1 || c == 5) + if ((x == 0 && y == 0) || (c = read_gat(m, x, y)) == 1 || c == 5) { if (x || y) { if (battle_config.error_log) - printf ("stacked (%d,%d)\n", x, y); + printf("stacked (%d,%d)\n", x, y); } do { - x = MRAND (map[m].xs - 2) + 1; - y = MRAND (map[m].ys - 2) + 1; + x = MRAND(map[m].xs - 2) + 1; + y = MRAND(map[m].ys - 2) + 1; } - while ((c = read_gat (m, x, y)) == 1 || c == 5); + while ((c = read_gat(m, x, y)) == 1 || c == 5); } if (sd->mapname[0] && sd->bl.prev != NULL) { - skill_unit_out_all (&sd->bl, gettick (), 1); - clif_clearchar_area (&sd->bl, clrtype & 0xffff); - skill_gangsterparadise (sd, 0); - map_delblock (&sd->bl); - clif_changemap (sd, map[m].name, x, y); // [MouseJstr] + skill_unit_out_all(&sd->bl, gettick(), 1); + clif_clearchar_area(&sd->bl, clrtype & 0xffff); + skill_gangsterparadise(sd, 0); + map_delblock(&sd->bl); + clif_changemap(sd, map[m].name, x, y); // [MouseJstr] } if (disguise) // disguise teleport fix [Valaris] sd->disguise = disguise; - memcpy (sd->mapname, mapname, 24); + memcpy(sd->mapname, mapname, 24); sd->bl.m = m; sd->to_x = x; sd->to_y = y; @@ -4189,12 +4188,12 @@ int pc_setpos (struct map_session_data *sd, const char *mapname_org, int x, int * PCのランダムワープ *------------------------------------------ */ -int pc_randomwarp (struct map_session_data *sd, int type) +int pc_randomwarp(struct map_session_data *sd, int type) { - int x, y, c, i = 0; - int m; + int x, y, c, i = 0; + int m; - nullpo_retr (0, sd); + nullpo_retr(0, sd); m = sd->bl.m; @@ -4203,13 +4202,13 @@ int pc_randomwarp (struct map_session_data *sd, int type) do { - x = MRAND (map[m].xs - 2) + 1; - y = MRAND (map[m].ys - 2) + 1; + x = MRAND(map[m].xs - 2) + 1; + y = MRAND(map[m].ys - 2) + 1; } - while (((c = read_gat (m, x, y)) == 1 || c == 5) && (i++) < 1000); + while (((c = read_gat(m, x, y)) == 1 || c == 5) && (i++) < 1000); if (i < 1000) - pc_setpos (sd, map[m].name, x, y, type); + pc_setpos(sd, map[m].name, x, y, type); return 0; } @@ -4218,39 +4217,39 @@ int pc_randomwarp (struct map_session_data *sd, int type) * 現在位置のメモ *------------------------------------------ */ -int pc_memo (struct map_session_data *sd, int i) +int pc_memo(struct map_session_data *sd, int i) { - int skill; - int j; + int skill; + int j; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - skill = pc_checkskill (sd, AL_WARP); + skill = pc_checkskill(sd, AL_WARP); if (i >= MIN_PORTAL_MEMO) i -= MIN_PORTAL_MEMO; else if (map[sd->bl.m].flag.nomemo || (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_skill_teleportmessage (sd, 1); + clif_skill_teleportmessage(sd, 1); return 0; } if (skill < 1) { - clif_skill_memo (sd, 2); + clif_skill_memo(sd, 2); } if (skill < 2 || i < -1 || i > 2) { - clif_skill_memo (sd, 1); + clif_skill_memo(sd, 1); return 0; } for (j = 0; j < 3; j++) { - if (strcmp (sd->status.memo_point[j].map, map[sd->bl.m].name) == 0) + if (strcmp(sd->status.memo_point[j].map, map[sd->bl.m].name) == 0) { i = j; break; @@ -4261,16 +4260,16 @@ int pc_memo (struct map_session_data *sd, int i) { for (i = skill - 3; i >= 0; i--) { - memcpy (&sd->status.memo_point[i + 1], &sd->status.memo_point[i], - sizeof (struct point)); + memcpy(&sd->status.memo_point[i + 1], &sd->status.memo_point[i], + sizeof(struct point)); } i = 0; } - memcpy (sd->status.memo_point[i].map, map[sd->bl.m].name, 24); + memcpy(sd->status.memo_point[i].map, map[sd->bl.m].name, 24); sd->status.memo_point[i].x = sd->bl.x; sd->status.memo_point[i].y = sd->bl.y; - clif_skill_memo (sd, 0); + clif_skill_memo(sd, 0); return 1; } @@ -4279,11 +4278,11 @@ int pc_memo (struct map_session_data *sd, int i) * *------------------------------------------ */ -int pc_can_reach (struct map_session_data *sd, int x, int y) +int pc_can_reach(struct map_session_data *sd, int x, int y) { struct walkpath_data wpd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->bl.x == x && sd->bl.y == y) // 同じマス return 1; @@ -4292,7 +4291,7 @@ int pc_can_reach (struct map_session_data *sd, int x, int y) wpd.path_len = 0; wpd.path_pos = 0; wpd.path_half = 0; - return (path_search (&wpd, sd->bl.m, sd->bl.x, sd->bl.y, x, y, 0) != + return (path_search(&wpd, sd->bl.m, sd->bl.x, sd->bl.y, x, y, 0) != -1) ? 1 : 0; } @@ -4303,9 +4302,9 @@ int pc_can_reach (struct map_session_data *sd, int x, int y) * 次の1歩にかかる時間を計算 *------------------------------------------ */ -static int calc_next_walk_step (struct map_session_data *sd) +static int calc_next_walk_step(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->walkpath.path_pos >= sd->walkpath.path_len) return -1; @@ -4319,21 +4318,21 @@ static int calc_next_walk_step (struct map_session_data *sd) * 半歩進む(timer関数) *------------------------------------------ */ -static void pc_walk (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void pc_walk(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct map_session_data *sd; - int i, ctype; - int moveblock; - int x, y, dx, dy; + int i, ctype; + int moveblock; + int x, y, dx, dy; - sd = map_id2sd (id); + sd = map_id2sd(id); if (sd == NULL) return; if (sd->walktimer != tid) { if (battle_config.error_log) - printf ("pc_walk %d != %d\n", sd->walktimer, tid); + printf("pc_walk %d != %d\n", sd->walktimer, tid); return; } sd->walktimer = -1; @@ -4351,7 +4350,7 @@ static void pc_walk (timer_id tid, tick_t tick, custom_id_t id, custom_data_t da sd->walkpath.path_pos++; if (sd->state.change_walk_target) { - pc_walktoxy_sub (sd); + pc_walktoxy_sub(sd); return; } } @@ -4362,19 +4361,19 @@ static void pc_walk (timer_id tid, tick_t tick, custom_id_t id, custom_data_t da x = sd->bl.x; y = sd->bl.y; - ctype = map_getcell (sd->bl.m, x, y); + ctype = map_getcell(sd->bl.m, x, y); if (ctype == 1 || ctype == 5) { - pc_stop_walking (sd, 1); + pc_stop_walking(sd, 1); return; } sd->dir = sd->head_dir = sd->walkpath.path[sd->walkpath.path_pos]; dx = dirx[(int) sd->dir]; dy = diry[(int) sd->dir]; - ctype = map_getcell (sd->bl.m, x + dx, y + dy); + ctype = map_getcell(sd->bl.m, x + dx, y + dy); if (ctype == 1 || ctype == 5) { - pc_walktoxy_sub (sd); + pc_walktoxy_sub(sd); return; } @@ -4382,7 +4381,7 @@ static void pc_walk (timer_id tid, tick_t tick, custom_id_t id, custom_data_t da || y / BLOCK_SIZE != (y + dy) / BLOCK_SIZE); sd->walktimer = 1; - map_foreachinmovearea (clif_pcoutsight, sd->bl.m, x - AREA_SIZE, + map_foreachinmovearea(clif_pcoutsight, sd->bl.m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, dx, dy, 0, sd); @@ -4390,29 +4389,29 @@ static void pc_walk (timer_id tid, tick_t tick, custom_id_t id, custom_data_t da y += dy; if (moveblock) - map_delblock (&sd->bl); + map_delblock(&sd->bl); sd->bl.x = x; sd->bl.y = y; if (moveblock) - map_addblock (&sd->bl); + map_addblock(&sd->bl); if (sd->sc_data[SC_DANCING].timer != -1) - skill_unit_move_unit_group ((struct skill_unit_group *) + skill_unit_move_unit_group((struct skill_unit_group *) sd->sc_data[SC_DANCING].val2, sd->bl.m, dx, dy); - map_foreachinmovearea (clif_pcinsight, sd->bl.m, x - AREA_SIZE, + map_foreachinmovearea(clif_pcinsight, sd->bl.m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, -dx, -dy, 0, sd); sd->walktimer = -1; if (sd->status.party_id > 0) { // パーティのＨＰ情報通知検査 - struct party *p = party_search (sd->status.party_id); + struct party *p = party_search(sd->status.party_id); if (p != NULL) { - int p_flag = 0; - map_foreachinmovearea (party_send_hp_check, sd->bl.m, + int p_flag = 0; + map_foreachinmovearea(party_send_hp_check, sd->bl.m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, -dx, -dy, BL_PC, sd->status.party_id, &p_flag); @@ -4421,34 +4420,34 @@ static void pc_walk (timer_id tid, tick_t tick, custom_id_t id, custom_data_t da } } if (sd->status.option & 4) // クローキングの消滅検査 - skill_check_cloaking (&sd->bl); + skill_check_cloaking(&sd->bl); // ディボーション検査 for (i = 0; i < 5; i++) if (sd->dev.val1[i]) { - skill_devotion3 (&sd->bl, sd->dev.val1[i]); + skill_devotion3(&sd->bl, sd->dev.val1[i]); break; } // 被ディボーション検査 if (sd->sc_data && sd->sc_data[SC_DEVOTION].val1) { - skill_devotion2 (&sd->bl, sd->sc_data[SC_DEVOTION].val1); + skill_devotion2(&sd->bl, sd->sc_data[SC_DEVOTION].val1); } - skill_unit_move (&sd->bl, tick, 1); // スキルユニットの検査 + skill_unit_move(&sd->bl, tick, 1); // スキルユニットの検査 - if (map_getcell (sd->bl.m, x, y) & 0x80) - npc_touch_areanpc (sd, sd->bl.m, x, y); + if (map_getcell(sd->bl.m, x, y) & 0x80) + npc_touch_areanpc(sd, sd->bl.m, x, y); else sd->areanpc_id = 0; } - if ((i = calc_next_walk_step (sd)) > 0) + if ((i = calc_next_walk_step(sd)) > 0) { i = i >> 1; if (i < 1 && sd->walkpath.path_half == 0) i = 1; sd->walktimer = - add_timer (tick + i, pc_walk, id, sd->walkpath.path_pos); + add_timer(tick + i, pc_walk, id, sd->walkpath.path_pos); } } @@ -4456,27 +4455,26 @@ static void pc_walk (timer_id tid, tick_t tick, custom_id_t id, custom_data_t da * 移動可能か確認して、可能なら歩行開始 *------------------------------------------ */ -static int pc_walktoxy_sub (struct map_session_data *sd) +static int pc_walktoxy_sub(struct map_session_data *sd) { struct walkpath_data wpd; - int i; + int i; - nullpo_retr (1, sd); + nullpo_retr(1, sd); - if (path_search - (&wpd, sd->bl.m, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y, 0)) + if (path_search(&wpd, sd->bl.m, sd->bl.x, sd->bl.y, sd->to_x, sd->to_y, 0)) return 1; - memcpy (&sd->walkpath, &wpd, sizeof (wpd)); + memcpy(&sd->walkpath, &wpd, sizeof(wpd)); - clif_walkok (sd); + clif_walkok(sd); sd->state.change_walk_target = 0; - if ((i = calc_next_walk_step (sd)) > 0) + if ((i = calc_next_walk_step(sd)) > 0) { i = i >> 2; - sd->walktimer = add_timer (gettick () + i, pc_walk, sd->bl.id, 0); + sd->walktimer = add_timer(gettick() + i, pc_walk, sd->bl.id, 0); } - clif_movechar (sd); + clif_movechar(sd); return 0; } @@ -4485,16 +4483,16 @@ static int pc_walktoxy_sub (struct map_session_data *sd) * pc歩 行要求 *------------------------------------------ */ -int pc_walktoxy (struct map_session_data *sd, int x, int y) +int pc_walktoxy(struct map_session_data *sd, int x, int y) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); sd->to_x = x; sd->to_y = y; - if (pc_issit (sd)) - pc_setstand (sd); + if (pc_issit(sd)) + pc_setstand(sd); if (sd->walktimer != -1 && sd->state.change_walk_target == 0) { @@ -4504,7 +4502,7 @@ int pc_walktoxy (struct map_session_data *sd, int x, int y) } else { - pc_walktoxy_sub (sd); + pc_walktoxy_sub(sd); } return 0; @@ -4514,24 +4512,24 @@ int pc_walktoxy (struct map_session_data *sd, int x, int y) * 歩 行停止 *------------------------------------------ */ -int pc_stop_walking (struct map_session_data *sd, int type) +int pc_stop_walking(struct map_session_data *sd, int type) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->walktimer != -1) { - delete_timer (sd->walktimer, pc_walk); + delete_timer(sd->walktimer, pc_walk); sd->walktimer = -1; } sd->walkpath.path_len = 0; sd->to_x = sd->bl.x; sd->to_y = sd->bl.y; if (type & 0x01) - clif_fixpos (&sd->bl); + clif_fixpos(&sd->bl); if (type & 0x02 && battle_config.pc_damage_delay) { - unsigned int tick = gettick (); - int delay = battle_get_dmotion (&sd->bl); + unsigned int tick = gettick(); + int delay = battle_get_dmotion(&sd->bl); if (sd->canmove_tick < tick) sd->canmove_tick = tick + delay; } @@ -4539,10 +4537,10 @@ int pc_stop_walking (struct map_session_data *sd, int type) return 0; } -void pc_touch_all_relevant_npcs (struct map_session_data *sd) +void pc_touch_all_relevant_npcs(struct map_session_data *sd) { - if (map_getcell (sd->bl.m, sd->bl.x, sd->bl.y) & 0x80) - npc_touch_areanpc (sd, sd->bl.m, sd->bl.x, sd->bl.y); + if (map_getcell(sd->bl.m, sd->bl.x, sd->bl.y) & 0x80) + npc_touch_areanpc(sd, sd->bl.m, sd->bl.x, sd->bl.y); else sd->areanpc_id = 0; } @@ -4551,49 +4549,49 @@ void pc_touch_all_relevant_npcs (struct map_session_data *sd) * *------------------------------------------ */ -int pc_movepos (struct map_session_data *sd, int dst_x, int dst_y) +int pc_movepos(struct map_session_data *sd, int dst_x, int dst_y) { - int moveblock; - int dx, dy, dist; + int moveblock; + int dx, dy, dist; struct walkpath_data wpd; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (path_search (&wpd, sd->bl.m, sd->bl.x, sd->bl.y, dst_x, dst_y, 0)) + if (path_search(&wpd, sd->bl.m, sd->bl.x, sd->bl.y, dst_x, dst_y, 0)) return 1; - sd->dir = sd->head_dir = map_calc_dir (&sd->bl, dst_x, dst_y); + sd->dir = sd->head_dir = map_calc_dir(&sd->bl, dst_x, dst_y); dx = dst_x - sd->bl.x; dy = dst_y - sd->bl.y; - dist = distance (sd->bl.x, sd->bl.y, dst_x, dst_y); + dist = distance(sd->bl.x, sd->bl.y, dst_x, dst_y); moveblock = (sd->bl.x / BLOCK_SIZE != dst_x / BLOCK_SIZE || sd->bl.y / BLOCK_SIZE != dst_y / BLOCK_SIZE); - map_foreachinmovearea (clif_pcoutsight, sd->bl.m, sd->bl.x - AREA_SIZE, + map_foreachinmovearea(clif_pcoutsight, sd->bl.m, sd->bl.x - AREA_SIZE, sd->bl.y - AREA_SIZE, sd->bl.x + AREA_SIZE, sd->bl.y + AREA_SIZE, dx, dy, 0, sd); if (moveblock) - map_delblock (&sd->bl); + map_delblock(&sd->bl); sd->bl.x = dst_x; sd->bl.y = dst_y; if (moveblock) - map_addblock (&sd->bl); + map_addblock(&sd->bl); - map_foreachinmovearea (clif_pcinsight, sd->bl.m, sd->bl.x - AREA_SIZE, + map_foreachinmovearea(clif_pcinsight, sd->bl.m, sd->bl.x - AREA_SIZE, sd->bl.y - AREA_SIZE, sd->bl.x + AREA_SIZE, sd->bl.y + AREA_SIZE, -dx, -dy, 0, sd); if (sd->status.party_id > 0) { // パーティのＨＰ情報通知検査 - struct party *p = party_search (sd->status.party_id); + struct party *p = party_search(sd->status.party_id); if (p != NULL) { - int flag = 0; - map_foreachinmovearea (party_send_hp_check, sd->bl.m, + int flag = 0; + map_foreachinmovearea(party_send_hp_check, sd->bl.m, sd->bl.x - AREA_SIZE, sd->bl.y - AREA_SIZE, sd->bl.x + AREA_SIZE, sd->bl.y + AREA_SIZE, -dx, -dy, BL_PC, sd->status.party_id, @@ -4604,11 +4602,11 @@ int pc_movepos (struct map_session_data *sd, int dst_x, int dst_y) } if (sd->status.option & 4) // クローキングの消滅検査 - skill_check_cloaking (&sd->bl); + skill_check_cloaking(&sd->bl); - skill_unit_move (&sd->bl, gettick (), dist + 7); // スキルユニットの検査 + skill_unit_move(&sd->bl, gettick(), dist + 7); // スキルユニットの検査 - pc_touch_all_relevant_npcs (sd); + pc_touch_all_relevant_npcs(sd); return 0; } @@ -4619,7 +4617,7 @@ int pc_movepos (struct map_session_data *sd, int dst_x, int dst_y) * スキルの検索 所有していた場合Lvが返る *------------------------------------------ */ -int pc_checkskill (struct map_session_data *sd, int skill_id) +int pc_checkskill(struct map_session_data *sd, int skill_id) { if (sd == NULL) return 0; @@ -4638,54 +4636,54 @@ int pc_checkskill (struct map_session_data *sd, int skill_id) /*========================================== * 武器変更によるスキルの継続チェック * 引数： - * struct map_session_data *sd セッションデータ - * int nameid 装備品ID + * struct map_session_data *sd セッションデータ + * int nameid 装備品ID * 返り値： - * 0 変更なし - * -1 スキルを解除 + * 0 変更なし + * -1 スキルを解除 *------------------------------------------ */ -int pc_checkallowskill (struct map_session_data *sd) +int pc_checkallowskill(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->sc_data == NULL) return 0; - if (!(skill_get_weapontype (KN_TWOHANDQUICKEN) & (1 << sd->status.weapon)) + if (!(skill_get_weapontype(KN_TWOHANDQUICKEN) & (1 << sd->status.weapon)) && sd->sc_data[SC_TWOHANDQUICKEN].timer != -1) { // 2HQ - skill_status_change_end (&sd->bl, SC_TWOHANDQUICKEN, -1); // 2HQを解除 + skill_status_change_end(&sd->bl, SC_TWOHANDQUICKEN, -1); // 2HQを解除 return -1; } - if (!(skill_get_weapontype (LK_AURABLADE) & (1 << sd->status.weapon)) + if (!(skill_get_weapontype(LK_AURABLADE) & (1 << sd->status.weapon)) && sd->sc_data[SC_AURABLADE].timer != -1) { // オーラブレード - skill_status_change_end (&sd->bl, SC_AURABLADE, -1); // オーラブレードを解除 + skill_status_change_end(&sd->bl, SC_AURABLADE, -1); // オーラブレードを解除 return -1; } - if (!(skill_get_weapontype (LK_PARRYING) & (1 << sd->status.weapon)) + if (!(skill_get_weapontype(LK_PARRYING) & (1 << sd->status.weapon)) && sd->sc_data[SC_PARRYING].timer != -1) { // パリイング - skill_status_change_end (&sd->bl, SC_PARRYING, -1); // パリイングを解除 + skill_status_change_end(&sd->bl, SC_PARRYING, -1); // パリイングを解除 return -1; } - if (!(skill_get_weapontype (LK_CONCENTRATION) & (1 << sd->status.weapon)) + if (!(skill_get_weapontype(LK_CONCENTRATION) & (1 << sd->status.weapon)) && sd->sc_data[SC_CONCENTRATION].timer != -1) { // コンセントレーション - skill_status_change_end (&sd->bl, SC_CONCENTRATION, -1); // コンセントレーションを解除 + skill_status_change_end(&sd->bl, SC_CONCENTRATION, -1); // コンセントレーションを解除 return -1; } - if (!(skill_get_weapontype (CR_SPEARQUICKEN) & (1 << sd->status.weapon)) + if (!(skill_get_weapontype(CR_SPEARQUICKEN) & (1 << sd->status.weapon)) && sd->sc_data[SC_SPEARSQUICKEN].timer != -1) { // スピアクィッケン - skill_status_change_end (&sd->bl, SC_SPEARSQUICKEN, -1); // スピアクイッケンを解除 + skill_status_change_end(&sd->bl, SC_SPEARSQUICKEN, -1); // スピアクイッケンを解除 return -1; } - if (!(skill_get_weapontype (BS_ADRENALINE) & (1 << sd->status.weapon)) + if (!(skill_get_weapontype(BS_ADRENALINE) & (1 << sd->status.weapon)) && sd->sc_data[SC_ADRENALINE].timer != -1) { // アドレナリンラッシュ - skill_status_change_end (&sd->bl, SC_ADRENALINE, -1); // アドレナリンラッシュを解除 + skill_status_change_end(&sd->bl, SC_ADRENALINE, -1); // アドレナリンラッシュを解除 return -1; } @@ -4693,17 +4691,17 @@ int pc_checkallowskill (struct map_session_data *sd) { if (sd->sc_data[SC_AUTOGUARD].timer != -1) { // オートガード - skill_status_change_end (&sd->bl, SC_AUTOGUARD, -1); + skill_status_change_end(&sd->bl, SC_AUTOGUARD, -1); return -1; } if (sd->sc_data[SC_DEFENDER].timer != -1) { // ディフェンダー - skill_status_change_end (&sd->bl, SC_DEFENDER, -1); + skill_status_change_end(&sd->bl, SC_DEFENDER, -1); return -1; } if (sd->sc_data[SC_REFLECTSHIELD].timer != -1) { //リフレクトシールド - skill_status_change_end (&sd->bl, SC_REFLECTSHIELD, -1); + skill_status_change_end(&sd->bl, SC_REFLECTSHIELD, -1); return -1; } } @@ -4715,11 +4713,11 @@ int pc_checkallowskill (struct map_session_data *sd) * 装 備品のチェック *------------------------------------------ */ -int pc_checkequip (struct map_session_data *sd, int pos) +int pc_checkequip(struct map_session_data *sd, int pos) { - int i; + int i; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); for (i = 0; i < 11; i++) { @@ -4734,7 +4732,7 @@ int pc_checkequip (struct map_session_data *sd, int pos) * 転生職や養子職の元の職業を返す *------------------------------------------ */ -struct pc_base_job pc_calc_base_job (int b_class) +struct pc_base_job pc_calc_base_job(int b_class) { struct pc_base_job bj; //転生や養子の場合の元の職業を算出する @@ -4785,22 +4783,22 @@ struct pc_base_job pc_calc_base_job (int b_class) *------------------------------------------ */ static -void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void pc_attack_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct map_session_data *sd; struct block_list *bl; struct status_change *sc_data; short *opt; - int dist, skill, range; - int attack_spell_delay; + int dist, skill, range; + int attack_spell_delay; - sd = map_id2sd (id); + sd = map_id2sd(id); if (sd == NULL) return; if (sd->attacktimer != tid) { if (battle_config.error_log) - printf ("pc_attack_timer %d != %d\n", sd->attacktimer, tid); + printf("pc_attack_timer %d != %d\n", sd->attacktimer, tid); return; } sd->attacktimer = -1; @@ -4808,16 +4806,16 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d if (sd->bl.prev == NULL) return; - bl = map_id2bl (sd->attacktarget); + bl = map_id2bl(sd->attacktarget); if (bl == NULL || bl->prev == NULL) return; - if (bl->type == BL_PC && pc_isdead ((struct map_session_data *) bl)) + if (bl->type == BL_PC && pc_isdead((struct map_session_data *) bl)) return; // 同じmapでないなら攻撃しない // PCが死んでても攻撃しない - if (sd->bl.m != bl->m || pc_isdead (sd)) + if (sd->bl.m != bl->m || pc_isdead(sd)) return; if (sd->opt1 > 0 || sd->status.option & 2 || sd->status.option & 16388) // 異常などで攻撃できない @@ -4828,23 +4826,23 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d if (sd->sc_data[SC_BLADESTOP].timer != -1) return; - if ((opt = battle_get_option (bl)) != NULL && *opt & 0x46) + if ((opt = battle_get_option(bl)) != NULL && *opt & 0x46) return; - if (((sc_data = battle_get_sc_data (bl)) != NULL + if (((sc_data = battle_get_sc_data(bl)) != NULL && sc_data[SC_TRICKDEAD].timer != -1) - || ((sc_data = battle_get_sc_data (bl)) != NULL + || ((sc_data = battle_get_sc_data(bl)) != NULL && sc_data[SC_BASILICA].timer != -1)) return; - if (sd->skilltimer != -1 && pc_checkskill (sd, SA_FREECAST) <= 0) + if (sd->skilltimer != -1 && pc_checkskill(sd, SA_FREECAST) <= 0) return; if (!battle_config.sdelay_attack_enable - && pc_checkskill (sd, SA_FREECAST) <= 0) + && pc_checkskill(sd, SA_FREECAST) <= 0) { - if (DIFF_TICK (tick, sd->canact_tick) < 0) + if (DIFF_TICK(tick, sd->canact_tick) < 0) { - clif_skill_fail (sd, 1, 4, 0); + clif_skill_fail(sd, 1, 4, 0); return; } } @@ -4854,7 +4852,7 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d attack_spell_delay = sd->attack_spell_delay; if (sd->attack_spell_override // [Fate] If we have an active attack spell, use that - && spell_attack (id, sd->attacktarget)) + && spell_attack(id, sd->attacktarget)) { // Return if the spell succeeded. If the spell had disspiated, spell_attack() may fail. sd->attackabletime = tick + attack_spell_delay; @@ -4862,7 +4860,7 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d } else { - dist = distance (sd->bl.x, sd->bl.y, bl->x, bl->y); + dist = distance(sd->bl.x, sd->bl.y, bl->x, bl->y); range = sd->attackrange; if (sd->status.weapon != 11) range++; @@ -4873,35 +4871,35 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d return; } - if (dist <= range && !battle_check_range (&sd->bl, bl, range)) + if (dist <= range && !battle_check_range(&sd->bl, bl, range)) { - if (pc_can_reach (sd, bl->x, bl->y) && sd->canmove_tick < tick + if (pc_can_reach(sd, bl->x, bl->y) && sd->canmove_tick < tick && (sd->sc_data[SC_ANKLE].timer == -1 || sd->sc_data[SC_SPIDERWEB].timer == -1)) // TMW client doesn't support this //pc_walktoxy(sd,bl->x,bl->y); - clif_movetoattack (sd, bl); + clif_movetoattack(sd, bl); sd->attackabletime = tick + (sd->aspd << 1); } else { if (battle_config.pc_attack_direction_change) - sd->dir = sd->head_dir = map_calc_dir (&sd->bl, bl->x, bl->y); // 向き設定 + sd->dir = sd->head_dir = map_calc_dir(&sd->bl, bl->x, bl->y); // 向き設定 if (sd->walktimer != -1) - pc_stop_walking (sd, 1); + pc_stop_walking(sd, 1); if (sd->sc_data[SC_COMBO].timer == -1) { - map_freeblock_lock (); - pc_stop_walking (sd, 0); + map_freeblock_lock(); + pc_stop_walking(sd, 0); sd->attacktarget_lv = - battle_weapon_attack (&sd->bl, bl, tick, 0); + battle_weapon_attack(&sd->bl, bl, tick, 0); if (!(battle_config.pc_cloak_check_type & 2) && sd->sc_data[SC_CLOAKING].timer != -1) - skill_status_change_end (&sd->bl, SC_CLOAKING, -1); - map_freeblock_unlock (); - if (sd->skilltimer != -1 && (skill = pc_checkskill (sd, SA_FREECAST)) > 0) // フリーキャスト + skill_status_change_end(&sd->bl, SC_CLOAKING, -1); + map_freeblock_unlock(); + if (sd->skilltimer != -1 && (skill = pc_checkskill(sd, SA_FREECAST)) > 0) // フリーキャスト sd->attackabletime = tick + ((sd->aspd << 1) * (150 - skill * 5) / 100); else @@ -4909,7 +4907,7 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d } else if (sd->attackabletime <= tick) { - if (sd->skilltimer != -1 && (skill = pc_checkskill (sd, SA_FREECAST)) > 0) // フリーキャスト + if (sd->skilltimer != -1 && (skill = pc_checkskill(sd, SA_FREECAST)) > 0) // フリーキャスト sd->attackabletime = tick + ((sd->aspd << 1) * (150 - skill * 5) / 100); else @@ -4923,7 +4921,7 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d if (sd->state.attack_continue) { sd->attacktimer = - add_timer (sd->attackabletime, pc_attack_timer, sd->bl.id, 0); + add_timer(sd->attackabletime, pc_attack_timer, sd->bl.id, 0); } } @@ -4932,40 +4930,40 @@ void pc_attack_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d * typeが1なら継続攻撃 *------------------------------------------ */ -int pc_attack (struct map_session_data *sd, int target_id, int type) +int pc_attack(struct map_session_data *sd, int target_id, int type) { struct block_list *bl; - int d; + int d; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - bl = map_id2bl (target_id); + bl = map_id2bl(target_id); if (bl == NULL) return 1; if (bl->type == BL_NPC) { // monster npcs [Valaris] - npc_click (sd, RFIFOL (sd->fd, 2)); + npc_click(sd, RFIFOL(sd->fd, 2)); return 0; } - if (!battle_check_target (&sd->bl, bl, BCT_ENEMY)) + if (!battle_check_target(&sd->bl, bl, BCT_ENEMY)) return 1; if (sd->attacktimer != -1) - pc_stopattack (sd); + pc_stopattack(sd); sd->attacktarget = target_id; sd->state.attack_continue = type; - d = DIFF_TICK (sd->attackabletime, gettick ()); + d = DIFF_TICK(sd->attackabletime, gettick()); if (d > 0 && d < 2000) { // 攻撃delay中 sd->attacktimer = - add_timer (sd->attackabletime, pc_attack_timer, sd->bl.id, 0); + add_timer(sd->attackabletime, pc_attack_timer, sd->bl.id, 0); } else { // 本来timer関数なので引数を合わせる - pc_attack_timer (-1, gettick (), sd->bl.id, 0); + pc_attack_timer(-1, gettick(), sd->bl.id, 0); } return 0; @@ -4975,13 +4973,13 @@ int pc_attack (struct map_session_data *sd, int target_id, int type) * 継続攻撃停止 *------------------------------------------ */ -int pc_stopattack (struct map_session_data *sd) +int pc_stopattack(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->attacktimer != -1) { - delete_timer (sd->attacktimer, pc_attack_timer); + delete_timer(sd->attacktimer, pc_attack_timer); sd->attacktimer = -1; } sd->attacktarget = 0; @@ -4991,11 +4989,11 @@ int pc_stopattack (struct map_session_data *sd) } static -void pc_follow_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void pc_follow_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct map_session_data *sd, *bl; - sd = map_id2sd (id); + sd = map_id2sd(id); if (sd == NULL || sd->followtimer != tid) return; @@ -5006,7 +5004,7 @@ void pc_follow_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d if (sd->bl.prev == NULL) break; - bl = (struct map_session_data *) map_id2bl (sd->followtarget); + bl = (struct map_session_data *) map_id2bl(sd->followtarget); if (bl == NULL) return; @@ -5015,98 +5013,98 @@ void pc_follow_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d break; if (bl->bl.type == BL_PC - && pc_isdead ((struct map_session_data *) bl)) + && pc_isdead((struct map_session_data *) bl)) return; if (sd->skilltimer == -1 && sd->attacktimer == -1 && sd->walktimer == -1) { if ((sd->bl.m == bl->bl.m) - && pc_can_reach (sd, bl->bl.x, bl->bl.y)) + && pc_can_reach(sd, bl->bl.x, bl->bl.y)) { - if (distance (sd->bl.x, sd->bl.y, bl->bl.x, bl->bl.y) > 5) - pc_walktoxy (sd, bl->bl.x, bl->bl.y); + if (distance(sd->bl.x, sd->bl.y, bl->bl.x, bl->bl.y) > 5) + pc_walktoxy(sd, bl->bl.x, bl->bl.y); } else - pc_setpos ((struct map_session_data *) sd, bl->mapname, + pc_setpos((struct map_session_data *) sd, bl->mapname, bl->bl.x, bl->bl.y, 3); } } while (0); sd->followtimer = - add_timer (tick + sd->aspd, pc_follow_timer, sd->bl.id, 0); + add_timer(tick + sd->aspd, pc_follow_timer, sd->bl.id, 0); } -int pc_follow (struct map_session_data *sd, int target_id) +int pc_follow(struct map_session_data *sd, int target_id) { struct block_list *bl; - bl = map_id2bl (target_id); + bl = map_id2bl(target_id); if (bl == NULL) return 1; sd->followtarget = target_id; if (sd->followtimer != -1) { - delete_timer (sd->followtimer, pc_follow_timer); + delete_timer(sd->followtimer, pc_follow_timer); sd->followtimer = -1; } - pc_follow_timer (-1, gettick (), sd->bl.id, 0); + pc_follow_timer(-1, gettick(), sd->bl.id, 0); return 0; } -int pc_checkbaselevelup (struct map_session_data *sd) +int pc_checkbaselevelup(struct map_session_data *sd) { - int next = pc_nextbaseexp (sd); + int next = pc_nextbaseexp(sd); - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.base_exp >= next && next > 0) { - struct pc_base_job s_class = pc_calc_base_job (sd->status.pc_class); + struct pc_base_job s_class = pc_calc_base_job(sd->status.pc_class); // base側レベルアップ処理 sd->status.base_exp -= next; sd->status.base_level++; sd->status.status_point += (sd->status.base_level + 14) / 4; - clif_updatestatus (sd, SP_STATUSPOINT); - clif_updatestatus (sd, SP_BASELEVEL); - clif_updatestatus (sd, SP_NEXTBASEEXP); - pc_calcstatus (sd, 0); - pc_heal (sd, sd->status.max_hp, sd->status.max_sp); + clif_updatestatus(sd, SP_STATUSPOINT); + clif_updatestatus(sd, SP_BASELEVEL); + clif_updatestatus(sd, SP_NEXTBASEEXP); + pc_calcstatus(sd, 0); + pc_heal(sd, sd->status.max_hp, sd->status.max_sp); //スパノビはキリエ、イムポ、マニピ、グロ、サフラLv1がかかる if (s_class.job == 23) { - skill_status_change_start (&sd->bl, + skill_status_change_start(&sd->bl, SkillStatusChangeTable[PR_KYRIE], 1, 0, - 0, 0, skill_get_time (PR_KYRIE, 1), 0); - skill_status_change_start (&sd->bl, + 0, 0, skill_get_time(PR_KYRIE, 1), 0); + skill_status_change_start(&sd->bl, SkillStatusChangeTable[PR_IMPOSITIO], 1, 0, 0, 0, - skill_get_time (PR_IMPOSITIO, 1), 0); - skill_status_change_start (&sd->bl, + skill_get_time(PR_IMPOSITIO, 1), 0); + skill_status_change_start(&sd->bl, SkillStatusChangeTable[PR_MAGNIFICAT], 1, 0, 0, 0, - skill_get_time (PR_MAGNIFICAT, 1), 0); - skill_status_change_start (&sd->bl, + skill_get_time(PR_MAGNIFICAT, 1), 0); + skill_status_change_start(&sd->bl, SkillStatusChangeTable[PR_GLORIA], 1, - 0, 0, 0, skill_get_time (PR_GLORIA, 1), + 0, 0, 0, skill_get_time(PR_GLORIA, 1), 0); - skill_status_change_start (&sd->bl, + skill_status_change_start(&sd->bl, SkillStatusChangeTable[PR_SUFFRAGIUM], 1, 0, 0, 0, - skill_get_time (PR_SUFFRAGIUM, 1), 0); + skill_get_time(PR_SUFFRAGIUM, 1), 0); } - clif_misceffect (&sd->bl, 0); + clif_misceffect(&sd->bl, 0); //レベルアップしたのでパーティー情報を更新する //(公平範囲チェック) - party_send_movemap (sd); - MAP_LOG_XP (sd, "LEVELUP") return 1; + party_send_movemap(sd); + MAP_LOG_XP(sd, "LEVELUP") return 1; } return 0; @@ -5117,32 +5115,32 @@ int pc_checkbaselevelup (struct map_session_data *sd) *---------------------------------------- */ static -int pc_skillpt_potential (struct map_session_data *sd) +int pc_skillpt_potential(struct map_session_data *sd) { - int skill_id; - int potential = 0; + int skill_id; + int potential = 0; #define RAISE_COST(x) (((x)*((x)-1))>>1) for (skill_id = 0; skill_id < MAX_SKILL; skill_id++) if (sd->status.skill[skill_id].id != 0 && sd->status.skill[skill_id].lv < skill_db[skill_id].max_raise) - potential += RAISE_COST (skill_db[skill_id].max_raise) - - RAISE_COST (sd->status.skill[skill_id].lv); + potential += RAISE_COST(skill_db[skill_id].max_raise) + - RAISE_COST(sd->status.skill[skill_id].lv); #undef RAISE_COST return potential; } -int pc_checkjoblevelup (struct map_session_data *sd) +int pc_checkjoblevelup(struct map_session_data *sd) { - int next = pc_nextjobexp (sd); + int next = pc_nextjobexp(sd); - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.job_exp >= next && next > 0) { - if (pc_skillpt_potential (sd) < sd->status.skill_point) + if (pc_skillpt_potential(sd) < sd->status.skill_point) { // [Fate] Bah, this is is painful. // But the alternative is quite error-prone, and eAthena has far worse performance issues... sd->status.job_exp = next - 1; @@ -5152,18 +5150,18 @@ int pc_checkjoblevelup (struct map_session_data *sd) // job側レベルアップ処理 sd->status.job_exp -= next; - clif_updatestatus (sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_NEXTJOBEXP); sd->status.skill_point++; - clif_updatestatus (sd, SP_SKILLPOINT); - pc_calcstatus (sd, 0); + clif_updatestatus(sd, SP_SKILLPOINT); + pc_calcstatus(sd, 0); - MAP_LOG_PC (sd, "SKILLPOINTS-UP %d", sd->status.skill_point); + MAP_LOG_PC(sd, "SKILLPOINTS-UP %d", sd->status.skill_point); if (sd->status.job_level < 250 && sd->status.job_level < sd->status.base_level * 2) sd->status.job_level++; // Make levelling up a little harder - clif_misceffect (&sd->bl, 1); + clif_misceffect(&sd->bl, 1); return 1; } @@ -5174,25 +5172,25 @@ int pc_checkjoblevelup (struct map_session_data *sd) * 経験値取得 *------------------------------------------ */ -int pc_gainexp (struct map_session_data *sd, int base_exp, int job_exp) +int pc_gainexp(struct map_session_data *sd, int base_exp, int job_exp) { - return pc_gainexp_reason (sd, base_exp, job_exp, + return pc_gainexp_reason(sd, base_exp, job_exp, PC_GAINEXP_REASON_KILLING); } -int pc_gainexp_reason (struct map_session_data *sd, int base_exp, int job_exp, +int pc_gainexp_reason(struct map_session_data *sd, int base_exp, int job_exp, int reason) { char output[256]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (sd->bl.prev == NULL || pc_isdead (sd)) + if (sd->bl.prev == NULL || pc_isdead(sd)) return 0; if ((battle_config.pvp_exp == 0) && map[sd->bl.m].flag.pvp) // [MouseJstr] return 0; // no exp on pvp maps - MAP_LOG_PC (sd, "GAINXP %d %d %s", base_exp, job_exp, + MAP_LOG_PC(sd, "GAINXP %d %d %s", base_exp, job_exp, ((reason == 2) ? "SCRIPTXP" : ((reason == 1) ? "HEALXP" : "KILLXP"))); @@ -5204,11 +5202,11 @@ int pc_gainexp_reason (struct map_session_data *sd, int base_exp, int job_exp, job_exp * (25 + sd->sc_data[SC_RICHMANKIM].val1 * 25) / 100; } - if (!battle_config.multi_level_up && pc_nextbaseafter (sd)) + if (!battle_config.multi_level_up && pc_nextbaseafter(sd)) { - while (sd->status.base_exp + base_exp >= pc_nextbaseafter (sd) - && sd->status.base_exp <= pc_nextbaseexp (sd) - && pc_nextbaseafter (sd) > 0) + while (sd->status.base_exp + base_exp >= pc_nextbaseafter(sd) + && sd->status.base_exp <= pc_nextbaseexp(sd) + && pc_nextbaseafter(sd) > 0) { base_exp *= .90; } @@ -5230,14 +5228,14 @@ int pc_gainexp_reason (struct map_session_data *sd, int base_exp, int job_exp, if (sd->status.base_exp < 0) sd->status.base_exp = 0; - while (pc_checkbaselevelup (sd)); + while (pc_checkbaselevelup(sd)); - clif_updatestatus (sd, SP_BASEEXP); - if (!battle_config.multi_level_up && pc_nextjobafter (sd)) + clif_updatestatus(sd, SP_BASEEXP); + if (!battle_config.multi_level_up && pc_nextjobafter(sd)) { - while (sd->status.job_exp + job_exp >= pc_nextjobafter (sd) - && sd->status.job_exp <= pc_nextjobexp (sd) - && pc_nextjobafter (sd) > 0) + while (sd->status.job_exp + job_exp >= pc_nextjobafter(sd) + && sd->status.job_exp <= pc_nextjobexp(sd) + && pc_nextjobafter(sd) > 0) { job_exp *= .90; } @@ -5247,24 +5245,24 @@ int pc_gainexp_reason (struct map_session_data *sd, int base_exp, int job_exp, if (sd->status.job_exp < 0) sd->status.job_exp = 0; - while (pc_checkjoblevelup (sd)); + while (pc_checkjoblevelup(sd)); - clif_updatestatus (sd, SP_JOBEXP); + clif_updatestatus(sd, SP_JOBEXP); if (battle_config.disp_experience) { - sprintf (output, + sprintf(output, "Experienced Gained Base:%d Job:%d", base_exp, job_exp); - clif_disp_onlyself (sd, output, strlen (output)); + clif_disp_onlyself(sd, output, strlen(output)); } return 0; } -int pc_extract_healer_exp (struct map_session_data *sd, int max) +int pc_extract_healer_exp(struct map_session_data *sd, int max) { - int amount; - nullpo_retr (0, sd); + int amount; + nullpo_retr(0, sd); amount = sd->heal_xp; if (max < amount) @@ -5278,11 +5276,11 @@ int pc_extract_healer_exp (struct map_session_data *sd, int max) * base level側必要経験値計算 *------------------------------------------ */ -int pc_nextbaseexp (struct map_session_data *sd) +int pc_nextbaseexp(struct map_session_data *sd) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.base_level >= MAX_LEVEL || sd->status.base_level <= 0) return 0; @@ -5309,7 +5307,7 @@ int pc_nextbaseexp (struct map_session_data *sd) * job level側必要経験値計算 *------------------------------------------ */ -int pc_nextjobexp (struct map_session_data *sd) +int pc_nextjobexp(struct map_session_data *sd) { // [fate] For normal levels, this ranges from 20k to 50k, depending on job level. // Job level is at most twice the player's experience level (base_level). Levelling @@ -5323,11 +5321,11 @@ int pc_nextjobexp (struct map_session_data *sd) * base level after next [Valaris] *------------------------------------------ */ -int pc_nextbaseafter (struct map_session_data *sd) +int pc_nextbaseafter(struct map_session_data *sd) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.base_level >= MAX_LEVEL || sd->status.base_level <= 0) return 0; @@ -5354,11 +5352,11 @@ int pc_nextbaseafter (struct map_session_data *sd) * job level after next [Valaris] *------------------------------------------ */ -int pc_nextjobafter (struct map_session_data *sd) +int pc_nextjobafter(struct map_session_data *sd) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.job_level >= MAX_LEVEL || sd->status.job_level <= 0) return 0; @@ -5386,11 +5384,11 @@ int pc_nextjobafter (struct map_session_data *sd) * 必要ステータスポイント計算 *------------------------------------------ */ -int pc_need_status_point (struct map_session_data *sd, int type) +int pc_need_status_point(struct map_session_data *sd, int type) { - int val; + int val; - nullpo_retr (-1, sd); + nullpo_retr(-1, sd); if (type < SP_STR || type > SP_LUK) return -1; @@ -5408,11 +5406,11 @@ int pc_need_status_point (struct map_session_data *sd, int type) * 能力値成長 *------------------------------------------ */ -int pc_statusup (struct map_session_data *sd, int type) +int pc_statusup(struct map_session_data *sd, int type) { - int need, val = 0; + int need, val = 0; - nullpo_retr (0, sd); + nullpo_retr(0, sd); switch (type) { @@ -5436,13 +5434,13 @@ int pc_statusup (struct map_session_data *sd, int type) break; } - need = pc_need_status_point (sd, type); + need = pc_need_status_point(sd, type); if (type < SP_STR || type > SP_LUK || need < 0 || need > sd->status.status_point || val >= battle_config.max_parameter) { - clif_statusupack (sd, type, 0, val); - clif_updatestatus (sd, SP_STATUSPOINT); + clif_statusupack(sd, type, 0, val); + clif_updatestatus(sd, SP_STATUSPOINT); return 1; } switch (type) @@ -5467,16 +5465,16 @@ int pc_statusup (struct map_session_data *sd, int type) break; } sd->status.status_point -= need; - if (need != pc_need_status_point (sd, type)) + if (need != pc_need_status_point(sd, type)) { - clif_updatestatus (sd, type - SP_STR + SP_USTR); + clif_updatestatus(sd, type - SP_STR + SP_USTR); } - clif_updatestatus (sd, SP_STATUSPOINT); - clif_updatestatus (sd, type); - pc_calcstatus (sd, 0); - clif_statusupack (sd, type, 1, val); + clif_updatestatus(sd, SP_STATUSPOINT); + clif_updatestatus(sd, type); + pc_calcstatus(sd, 0); + clif_statusupack(sd, type, 1, val); - MAP_LOG_STATS (sd, "STATUP"); + MAP_LOG_STATS(sd, "STATUP"); return 0; } @@ -5485,13 +5483,13 @@ int pc_statusup (struct map_session_data *sd, int type) * 能力値成長 *------------------------------------------ */ -int pc_statusup2 (struct map_session_data *sd, int type, int val) +int pc_statusup2(struct map_session_data *sd, int type, int val) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (type < SP_STR || type > SP_LUK) { - clif_statusupack (sd, type, 0, 0); + clif_statusupack(sd, type, 0, 0); return 1; } switch (type) @@ -5551,11 +5549,11 @@ int pc_statusup2 (struct map_session_data *sd, int type, int val) sd->status.luk = val; break; } - clif_updatestatus (sd, type - SP_STR + SP_USTR); - clif_updatestatus (sd, type); - pc_calcstatus (sd, 0); - clif_statusupack (sd, type, 1, val); - MAP_LOG_STATS (sd, "STATUP2"); + clif_updatestatus(sd, type - SP_STR + SP_USTR); + clif_updatestatus(sd, type); + pc_calcstatus(sd, 0); + clif_statusupack(sd, type, 1, val); + MAP_LOG_STATS(sd, "STATUP2"); return 0; } @@ -5564,9 +5562,9 @@ int pc_statusup2 (struct map_session_data *sd, int type, int val) * スキルポイント割り振り *------------------------------------------ */ -int pc_skillup (struct map_session_data *sd, int skill_num) +int pc_skillup(struct map_session_data *sd, int skill_num) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.skill[skill_num].id != 0 && sd->status.skill_point >= sd->status.skill[skill_num].lv @@ -5575,10 +5573,10 @@ int pc_skillup (struct map_session_data *sd, int skill_num) sd->status.skill_point -= sd->status.skill[skill_num].lv; sd->status.skill[skill_num].lv++; - pc_calcstatus (sd, 0); - clif_skillup (sd, skill_num); - clif_updatestatus (sd, SP_SKILLPOINT); - clif_skillinfoblock (sd); + pc_calcstatus(sd, 0); + clif_skillup(sd, skill_num); + clif_updatestatus(sd, SP_SKILLPOINT); + clif_skillinfoblock(sd); MAP_LOG_PC(sd, "SKILLUP %d %d %d", skill_num, sd->status.skill[skill_num].lv, skill_power(sd, skill_num)); } @@ -5590,16 +5588,16 @@ int pc_skillup (struct map_session_data *sd, int skill_num) * /allskill *------------------------------------------ */ -int pc_allskillup (struct map_session_data *sd) +int pc_allskillup(struct map_session_data *sd) { - int i, id; - int c = 0, s = 0; + int i, id; + int c = 0, s = 0; //転生や養子の場合の元の職業を算出する struct pc_base_job s_class; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); c = s_class.job; s = (s_class.upper == 1) ? 1 : 0; //転生以外は通常のスキル？ @@ -5607,25 +5605,25 @@ int pc_allskillup (struct map_session_data *sd) sd->status.skill[i].id = 0; if (battle_config.gm_allskill > 0 - && pc_isGM (sd) >= battle_config.gm_allskill) + && pc_isGM(sd) >= battle_config.gm_allskill) { // 全てのスキル for (i = 1; i < 158; i++) - sd->status.skill[i].lv = skill_get_max (i); + sd->status.skill[i].lv = skill_get_max(i); for (i = 210; i < 291; i++) - sd->status.skill[i].lv = skill_get_max (i); + sd->status.skill[i].lv = skill_get_max(i); for (i = 304; i < MAX_SKILL; i++) - sd->status.skill[i].lv = skill_get_max (i); + sd->status.skill[i].lv = skill_get_max(i); } else { - for (i = 0; (id = skill_tree[s][c][i].id) > 0; i++) + for (i = 0;(id = skill_tree[s][c][i].id) > 0; i++) { - if (sd->status.skill[id].id == 0 && skill_get_inf2 (id) & 0x01) - sd->status.skill[id].lv = skill_get_max (id); + if (sd->status.skill[id].id == 0 && skill_get_inf2(id) & 0x01) + sd->status.skill[id].lv = skill_get_max(id); } } - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); return 0; } @@ -5634,11 +5632,11 @@ int pc_allskillup (struct map_session_data *sd) * /resetlvl *------------------------------------------ */ -int pc_resetlvl (struct map_session_data *sd, int type) +int pc_resetlvl(struct map_session_data *sd, int type) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 1; i < MAX_SKILL; i++) { @@ -5684,41 +5682,41 @@ int pc_resetlvl (struct map_session_data *sd, int type) sd->status.job_exp = 0; } - clif_updatestatus (sd, SP_STATUSPOINT); - clif_updatestatus (sd, SP_STR); - clif_updatestatus (sd, SP_AGI); - clif_updatestatus (sd, SP_VIT); - clif_updatestatus (sd, SP_INT); - clif_updatestatus (sd, SP_DEX); - clif_updatestatus (sd, SP_LUK); - clif_updatestatus (sd, SP_BASELEVEL); - clif_updatestatus (sd, SP_JOBLEVEL); - clif_updatestatus (sd, SP_STATUSPOINT); - clif_updatestatus (sd, SP_NEXTBASEEXP); - clif_updatestatus (sd, SP_NEXTJOBEXP); - clif_updatestatus (sd, SP_SKILLPOINT); - - clif_updatestatus (sd, SP_USTR); // Updates needed stat points - Valaris - clif_updatestatus (sd, SP_UAGI); - clif_updatestatus (sd, SP_UVIT); - clif_updatestatus (sd, SP_UINT); - clif_updatestatus (sd, SP_UDEX); - clif_updatestatus (sd, SP_ULUK); // End Addition + clif_updatestatus(sd, SP_STATUSPOINT); + clif_updatestatus(sd, SP_STR); + clif_updatestatus(sd, SP_AGI); + clif_updatestatus(sd, SP_VIT); + clif_updatestatus(sd, SP_INT); + clif_updatestatus(sd, SP_DEX); + clif_updatestatus(sd, SP_LUK); + clif_updatestatus(sd, SP_BASELEVEL); + clif_updatestatus(sd, SP_JOBLEVEL); + clif_updatestatus(sd, SP_STATUSPOINT); + clif_updatestatus(sd, SP_NEXTBASEEXP); + clif_updatestatus(sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_SKILLPOINT); + + clif_updatestatus(sd, SP_USTR); // Updates needed stat points - Valaris + clif_updatestatus(sd, SP_UAGI); + clif_updatestatus(sd, SP_UVIT); + clif_updatestatus(sd, SP_UINT); + clif_updatestatus(sd, SP_UDEX); + clif_updatestatus(sd, SP_ULUK); // End Addition for (i = 0; i < 11; i++) { // unequip items that can't be equipped by base 1 [Valaris] if (sd->equip_index[i] >= 0) - if (!pc_isequip (sd, sd->equip_index[i])) + if (!pc_isequip(sd, sd->equip_index[i])) { - pc_unequipitem (sd, sd->equip_index[i], 1); + pc_unequipitem(sd, sd->equip_index[i], 1); sd->equip_index[i] = -1; } } - clif_skillinfoblock (sd); - pc_calcstatus (sd, 0); + clif_skillinfoblock(sd); + pc_calcstatus(sd, 0); - MAP_LOG_STATS (sd, "STATRESET"); + MAP_LOG_STATS(sd, "STATRESET"); return 0; } @@ -5727,15 +5725,15 @@ int pc_resetlvl (struct map_session_data *sd, int type) * /resetstate *------------------------------------------ */ -int pc_resetstate (struct map_session_data *sd) +int pc_resetstate(struct map_session_data *sd) { #define sumsp(a) ((a)*((a-2)/10+2) - 5*((a-2)/10)*((a-2)/10) - 6*((a-2)/10) -2) // int add=0; // Removed by Dexity - nullpo_retr (0, sd); + nullpo_retr(0, sd); // New statpoint table used here - Dexity - sd->status.status_point = atoi (statp[sd->status.base_level - 1]); + sd->status.status_point = atoi(statp[sd->status.base_level - 1]); // End addition // Removed by Dexity - old count @@ -5747,7 +5745,7 @@ int pc_resetstate (struct map_session_data *sd) // add += sumsp(sd->status.luk); // sd->status.status_point+=add; - clif_updatestatus (sd, SP_STATUSPOINT); + clif_updatestatus(sd, SP_STATUSPOINT); sd->status.str = 1; sd->status.agi = 1; @@ -5756,21 +5754,21 @@ int pc_resetstate (struct map_session_data *sd) sd->status.dex = 1; sd->status.luk = 1; - clif_updatestatus (sd, SP_STR); - clif_updatestatus (sd, SP_AGI); - clif_updatestatus (sd, SP_VIT); - clif_updatestatus (sd, SP_INT); - clif_updatestatus (sd, SP_DEX); - clif_updatestatus (sd, SP_LUK); + clif_updatestatus(sd, SP_STR); + clif_updatestatus(sd, SP_AGI); + clif_updatestatus(sd, SP_VIT); + clif_updatestatus(sd, SP_INT); + clif_updatestatus(sd, SP_DEX); + clif_updatestatus(sd, SP_LUK); - clif_updatestatus (sd, SP_USTR); // Updates needed stat points - Valaris - clif_updatestatus (sd, SP_UAGI); - clif_updatestatus (sd, SP_UVIT); - clif_updatestatus (sd, SP_UINT); - clif_updatestatus (sd, SP_UDEX); - clif_updatestatus (sd, SP_ULUK); // End Addition + clif_updatestatus(sd, SP_USTR); // Updates needed stat points - Valaris + clif_updatestatus(sd, SP_UAGI); + clif_updatestatus(sd, SP_UVIT); + clif_updatestatus(sd, SP_UINT); + clif_updatestatus(sd, SP_UDEX); + clif_updatestatus(sd, SP_ULUK); // End Addition - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); return 0; } @@ -5779,24 +5777,24 @@ int pc_resetstate (struct map_session_data *sd) * /resetskill *------------------------------------------ */ -int pc_resetskill (struct map_session_data *sd) +int pc_resetskill(struct map_session_data *sd) { - int i, skill; + int i, skill; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - sd->status.skill_point += pc_calc_skillpoint (sd); + sd->status.skill_point += pc_calc_skillpoint(sd); for (i = 1; i < MAX_SKILL; i++) - if ((skill = pc_checkskill (sd, i)) > 0) + if ((skill = pc_checkskill(sd, i)) > 0) { sd->status.skill[i].lv = 0; sd->status.skill[i].flags = 0; } - clif_updatestatus (sd, SP_SKILLPOINT); - clif_skillinfoblock (sd); - pc_calcstatus (sd, 0); + clif_updatestatus(sd, SP_SKILLPOINT); + clif_skillinfoblock(sd); + pc_calcstatus(sd, 0); return 0; } @@ -5805,87 +5803,87 @@ int pc_resetskill (struct map_session_data *sd) * pcにダメージを与える *------------------------------------------ */ -int pc_damage (struct block_list *src, struct map_session_data *sd, +int pc_damage(struct block_list *src, struct map_session_data *sd, int damage) { - int i = 0, j = 0; + int i = 0, j = 0; struct pc_base_job s_class; - nullpo_retr (0, sd); + nullpo_retr(0, sd); //転生や養子の場合の元の職業を算出する - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); // 既に死んでいたら無効 - if (pc_isdead (sd)) + if (pc_isdead(sd)) return 0; // 座ってたら立ち上がる - if (pc_issit (sd)) + if (pc_issit(sd)) { - pc_setstand (sd); - skill_gangsterparadise (sd, 0); + pc_setstand(sd); + skill_gangsterparadise(sd, 0); } if (src) { if (src->type == BL_PC) { - MAP_LOG_PC (sd, "INJURED-BY PC%d FOR %d", + MAP_LOG_PC(sd, "INJURED-BY PC%d FOR %d", ((struct map_session_data *) src)->status.char_id, damage); } else { - MAP_LOG_PC (sd, "INJURED-BY MOB%d FOR %d", src->id, damage); + MAP_LOG_PC(sd, "INJURED-BY MOB%d FOR %d", src->id, damage); } } else - MAP_LOG_PC (sd, "INJURED-BY null FOR %d", damage); + MAP_LOG_PC(sd, "INJURED-BY null FOR %d", damage); // 歩 いていたら足を止める if (sd->sc_data[SC_ENDURE].timer == -1 && !sd->special_state.infinite_endure) - pc_stop_walking (sd, 3); + pc_stop_walking(sd, 3); // 演奏/ダンスの中断 if (damage > sd->status.max_hp >> 2) - skill_stop_dancing (&sd->bl, 0); + skill_stop_dancing(&sd->bl, 0); sd->status.hp -= damage; if (sd->sc_data[SC_TRICKDEAD].timer != -1) - skill_status_change_end (&sd->bl, SC_TRICKDEAD, -1); + skill_status_change_end(&sd->bl, SC_TRICKDEAD, -1); if (sd->status.option & 2) - skill_status_change_end (&sd->bl, SC_HIDING, -1); + skill_status_change_end(&sd->bl, SC_HIDING, -1); if (sd->status.option & 4) - skill_status_change_end (&sd->bl, SC_CLOAKING, -1); + skill_status_change_end(&sd->bl, SC_CLOAKING, -1); if (sd->status.option & 16386) - skill_status_change_end (&sd->bl, SC_CHASEWALK, -1); + skill_status_change_end(&sd->bl, SC_CHASEWALK, -1); if (sd->status.hp > 0) { // まだ生きているならHP更新 - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); if (sd->status.hp < sd->status.max_hp >> 2 - && pc_checkskill (sd, SM_AUTOBERSERK) > 0 + && pc_checkskill(sd, SM_AUTOBERSERK) > 0 && (sd->sc_data[SC_PROVOKE].timer == -1 || sd->sc_data[SC_PROVOKE].val2 == 0)) // オートバーサーク発動 - skill_status_change_start (&sd->bl, SC_PROVOKE, 10, 1, 0, 0, 0, + skill_status_change_start(&sd->bl, SC_PROVOKE, 10, 1, 0, 0, 0, 0); - sd->canlog_tick = gettick (); + sd->canlog_tick = gettick(); if (sd->status.party_id > 0) { // on-the-fly party hp updates [Valaris] - struct party *p = party_search (sd->status.party_id); + struct party *p = party_search(sd->status.party_id); if (p != NULL) - clif_party_hp (p, sd); + clif_party_hp(p, sd); } // end addition [Valaris] return 0; } - MAP_LOG_PC (sd, "DEAD%s", ""); + MAP_LOG_PC(sd, "DEAD%s", ""); // Character is dead! @@ -5893,28 +5891,28 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, // [Fate] Stop quickregen sd->quick_regeneration_hp.amount = 0; sd->quick_regeneration_sp.amount = 0; - skill_update_heal_animation (sd); + skill_update_heal_animation(sd); - pc_setdead (sd); + pc_setdead(sd); - pc_stop_walking (sd, 0); - skill_castcancel (&sd->bl, 0); // 詠唱の中止 - clif_clearchar_area (&sd->bl, 1); - skill_unit_out_all (&sd->bl, gettick (), 1); + pc_stop_walking(sd, 0); + skill_castcancel(&sd->bl, 0); // 詠唱の中止 + clif_clearchar_area(&sd->bl, 1); + skill_unit_out_all(&sd->bl, gettick(), 1); if (sd->sc_data[SC_BLADESTOP].timer != -1) //白刃は事前に解除 - skill_status_change_end (&sd->bl, SC_BLADESTOP, -1); - pc_setglobalreg (sd, "PC_DIE_COUNTER", ++sd->die_counter); //死にカウンター書き込み - skill_status_change_clear (&sd->bl, 0); // ステータス異常を解除する - clif_updatestatus (sd, SP_HP); - pc_calcstatus (sd, 0); + skill_status_change_end(&sd->bl, SC_BLADESTOP, -1); + pc_setglobalreg(sd, "PC_DIE_COUNTER", ++sd->die_counter); //死にカウンター書き込み + skill_status_change_clear(&sd->bl, 0); // ステータス異常を解除する + clif_updatestatus(sd, SP_HP); + pc_calcstatus(sd, 0); // [Fate] Reset magic - sd->cast_tick = gettick (); - magic_stop_completely (sd); + sd->cast_tick = gettick(); + magic_stop_completely(sd); for (i = 0; i < 5; i++) if (sd->dev.val1[i]) { - skill_status_change_end (&map_id2sd (sd->dev.val1[i])->bl, + skill_status_change_end(&map_id2sd(sd->dev.val1[i])->bl, SC_DEVOTION, -1); sd->dev.val1[i] = sd->dev.val2[i] = 0; } @@ -5926,16 +5924,16 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, if (battle_config.death_penalty_type == 1 && battle_config.death_penalty_base > 0) sd->status.base_exp -= - (double) pc_nextbaseexp (sd) * + (double) pc_nextbaseexp(sd) * (double) battle_config.death_penalty_base / 10000; if (battle_config.pk_mode && src && src->type == BL_PC) sd->status.base_exp -= - (double) pc_nextbaseexp (sd) * + (double) pc_nextbaseexp(sd) * (double) battle_config.death_penalty_base / 10000; else if (battle_config.death_penalty_type == 2 && battle_config.death_penalty_base > 0) { - if (pc_nextbaseexp (sd) > 0) + if (pc_nextbaseexp(sd) > 0) sd->status.base_exp -= (double) sd->status.base_exp * (double) battle_config.death_penalty_base / 10000; @@ -5946,21 +5944,21 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, } if (sd->status.base_exp < 0) sd->status.base_exp = 0; - clif_updatestatus (sd, SP_BASEEXP); + clif_updatestatus(sd, SP_BASEEXP); if (battle_config.death_penalty_type == 1 && battle_config.death_penalty_job > 0) sd->status.job_exp -= - (double) pc_nextjobexp (sd) * + (double) pc_nextjobexp(sd) * (double) battle_config.death_penalty_job / 10000; if (battle_config.pk_mode && src && src->type == BL_PC) sd->status.job_exp -= - (double) pc_nextjobexp (sd) * + (double) pc_nextjobexp(sd) * (double) battle_config.death_penalty_job / 10000; else if (battle_config.death_penalty_type == 2 && battle_config.death_penalty_job > 0) { - if (pc_nextjobexp (sd) > 0) + if (pc_nextjobexp(sd) > 0) sd->status.job_exp -= (double) sd->status.job_exp * (double) battle_config.death_penalty_job / 10000; @@ -5971,7 +5969,7 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, } if (sd->status.job_exp < 0) sd->status.job_exp = 0; - clif_updatestatus (sd, SP_JOBEXP); + clif_updatestatus(sd, SP_JOBEXP); } } //ナイトメアモードアイテムドロップ @@ -5979,19 +5977,19 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, { // Moved this outside so it works when PVP isnt enabled and during pk mode [Ancyker] for (j = 0; j < MAX_DROP_PER_MAP; j++) { - int id = map[sd->bl.m].drop_list[j].drop_id; - int type = map[sd->bl.m].drop_list[j].drop_type; - int per = map[sd->bl.m].drop_list[j].drop_per; + int id = map[sd->bl.m].drop_list[j].drop_id; + int type = map[sd->bl.m].drop_list[j].drop_type; + int per = map[sd->bl.m].drop_list[j].drop_per; if (id == 0) continue; if (id == -1) { //ランダムドロップ - int eq_num = 0, eq_n[MAX_INVENTORY]; - memset (eq_n, 0, sizeof (eq_n)); + int eq_num = 0, eq_n[MAX_INVENTORY]; + memset(eq_n, 0, sizeof(eq_n)); //先ず装備しているアイテム数をカウント for (i = 0; i < MAX_INVENTORY; i++) { - int k; + int k; if ((type == 1 && !sd->status.inventory[i].equip) || (type == 2 && sd->status.inventory[i].equip) || type == 3) @@ -6010,12 +6008,12 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, } if (eq_num > 0) { - int n = eq_n[MRAND (eq_num)]; //該当アイテムの中からランダム - if (MRAND (10000) < per) + int n = eq_n[MRAND(eq_num)]; //該当アイテムの中からランダム + if (MRAND(10000) < per) { if (sd->status.inventory[n].equip) - pc_unequipitem (sd, n, 0); - pc_dropitem (sd, n, 1); + pc_unequipitem(sd, n, 0); + pc_dropitem(sd, n, 1); } } } @@ -6024,14 +6022,14 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].nameid == id //ItemIDが一致していて - && MRAND (10000) < per //ドロップ率判定もOKで + && MRAND(10000) < per //ドロップ率判定もOKで && ((type == 1 && !sd->status.inventory[i].equip) //タイプ判定もOKならドロップ || (type == 2 && sd->status.inventory[i].equip) || type == 3)) { if (sd->status.inventory[i].equip) - pc_unequipitem (sd, i, 0); - pc_dropitem (sd, i, 1); + pc_unequipitem(sd, i, 0); + pc_dropitem(sd, i, 1); break; } } @@ -6048,15 +6046,15 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, if (src && src->type == BL_PC) ((struct map_session_data *) src)->pvp_point++; //} //fixed wrong '{' placement by Lupus - pc_setdead (sd); + pc_setdead(sd); } // 強制送還 if (sd->pvp_point < 0) { sd->pvp_point = 0; - pc_setstand (sd); - pc_setrestartvalue (sd, 3); - pc_setpos (sd, sd->status.save_point.map, sd->status.save_point.x, + pc_setstand(sd); + pc_setrestartvalue(sd, 3); + pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 0); } } @@ -6071,10 +6069,10 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, arg[1].v.i = sd->bl.id; arg[2].name = "@victimlvl"; arg[2].v.i = sd->status.base_level; - npc_event_doall_l ("OnPCKilledEvent", sd->bl.id, 3, arg); - npc_event_doall_l ("OnPCKillEvent", src->id, 3, arg); + npc_event_doall_l("OnPCKilledEvent", sd->bl.id, 3, arg); + npc_event_doall_l("OnPCKillEvent", src->id, 3, arg); } - npc_event_doall_l ("OnPCDieEvent", sd->bl.id, 0, NULL); + npc_event_doall_l("OnPCDieEvent", sd->bl.id, 0, NULL); return 0; } @@ -6086,14 +6084,14 @@ int pc_damage (struct block_list *src, struct map_session_data *sd, * script用PCステータス読み出し *------------------------------------------ */ -int pc_readparam (struct map_session_data *sd, int type) +int pc_readparam(struct map_session_data *sd, int type) { - int val = 0; + int val = 0; struct pc_base_job s_class; - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); - nullpo_retr (0, sd); + nullpo_retr(0, sd); switch (type) { @@ -6137,10 +6135,10 @@ int pc_readparam (struct map_session_data *sd, int type) val = sd->status.job_exp; break; case SP_NEXTBASEEXP: - val = pc_nextbaseexp (sd); + val = pc_nextbaseexp(sd); break; case SP_NEXTJOBEXP: - val = pc_nextjobexp (sd); + val = pc_nextjobexp(sd); break; case SP_HP: val = sd->status.hp; @@ -6184,14 +6182,14 @@ int pc_readparam (struct map_session_data *sd, int type) * script用PCステータス設定 *------------------------------------------ */ -int pc_setparam (struct map_session_data *sd, int type, int val) +int pc_setparam(struct map_session_data *sd, int type, int val) { - int i = 0, up_level = 50; + int i = 0, up_level = 50; struct pc_base_job s_class; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); switch (type) { @@ -6204,12 +6202,12 @@ int pc_setparam (struct map_session_data *sd, int type, int val) } sd->status.base_level = val; sd->status.base_exp = 0; - clif_updatestatus (sd, SP_BASELEVEL); - clif_updatestatus (sd, SP_NEXTBASEEXP); - clif_updatestatus (sd, SP_STATUSPOINT); - clif_updatestatus (sd, SP_BASEEXP); - pc_calcstatus (sd, 0); - pc_heal (sd, sd->status.max_hp, sd->status.max_sp); + clif_updatestatus(sd, SP_BASELEVEL); + clif_updatestatus(sd, SP_NEXTBASEEXP); + clif_updatestatus(sd, SP_STATUSPOINT); + clif_updatestatus(sd, SP_BASEEXP); + pc_calcstatus(sd, 0); + pc_heal(sd, sd->status.max_hp, sd->status.max_sp); break; case SP_JOBLEVEL: if (sd->status.pc_class == 0) @@ -6224,23 +6222,23 @@ int pc_setparam (struct map_session_data *sd, int type, int val) sd->status.skill_point += (val - sd->status.job_level); sd->status.job_level = val; sd->status.job_exp = 0; - clif_updatestatus (sd, SP_JOBLEVEL); - clif_updatestatus (sd, SP_NEXTJOBEXP); - clif_updatestatus (sd, SP_JOBEXP); - clif_updatestatus (sd, SP_SKILLPOINT); - pc_calcstatus (sd, 0); - clif_misceffect (&sd->bl, 1); + clif_updatestatus(sd, SP_JOBLEVEL); + clif_updatestatus(sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_JOBEXP); + clif_updatestatus(sd, SP_SKILLPOINT); + pc_calcstatus(sd, 0); + clif_misceffect(&sd->bl, 1); } else { sd->status.job_level = val; sd->status.job_exp = 0; - clif_updatestatus (sd, SP_JOBLEVEL); - clif_updatestatus (sd, SP_NEXTJOBEXP); - clif_updatestatus (sd, SP_JOBEXP); - pc_calcstatus (sd, 0); + clif_updatestatus(sd, SP_JOBLEVEL); + clif_updatestatus(sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_JOBEXP); + pc_calcstatus(sd, 0); } - clif_updatestatus (sd, type); + clif_updatestatus(sd, type); break; case SP_SKILLPOINT: sd->status.skill_point = val; @@ -6252,21 +6250,21 @@ int pc_setparam (struct map_session_data *sd, int type, int val) sd->status.zeny = val; break; case SP_BASEEXP: - if (pc_nextbaseexp (sd) > 0) + if (pc_nextbaseexp(sd) > 0) { sd->status.base_exp = val; if (sd->status.base_exp < 0) sd->status.base_exp = 0; - pc_checkbaselevelup (sd); + pc_checkbaselevelup(sd); } break; case SP_JOBEXP: - if (pc_nextjobexp (sd) > 0) + if (pc_nextjobexp(sd) > 0) { sd->status.job_exp = val; if (sd->status.job_exp < 0) sd->status.job_exp = 0; - pc_checkjoblevelup (sd); + pc_checkjoblevelup(sd); } break; case SP_SEX: @@ -6312,7 +6310,7 @@ int pc_setparam (struct map_session_data *sd, int type, int val) sd->fame = val; break; } - clif_updatestatus (sd, type); + clif_updatestatus(sd, type); return 0; } @@ -6321,19 +6319,19 @@ int pc_setparam (struct map_session_data *sd, int type, int val) * HP/SP回復 *------------------------------------------ */ -int pc_heal (struct map_session_data *sd, int hp, int sp) +int pc_heal(struct map_session_data *sd, int hp, int sp) { // if(battle_config.battle_log) // printf("heal %d %d\n",hp,sp); - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (pc_checkoverhp (sd)) + if (pc_checkoverhp(sd)) { if (hp > 0) hp = 0; } - if (pc_checkoversp (sd)) + if (pc_checkoversp(sd)) { if (sp > 0) sp = 0; @@ -6350,22 +6348,22 @@ int pc_heal (struct map_session_data *sd, int hp, int sp) if (sd->status.hp <= 0) { sd->status.hp = 0; - pc_damage (NULL, sd, 1); + pc_damage(NULL, sd, 1); hp = 0; } sd->status.sp += sp; if (sd->status.sp <= 0) sd->status.sp = 0; if (hp) - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); if (sp) - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); if (sd->status.party_id > 0) { // on-the-fly party hp updates [Valaris] - struct party *p = party_search (sd->status.party_id); + struct party *p = party_search(sd->status.party_id); if (p != NULL) - clif_party_hp (p, sd); + clif_party_hp(p, sd); } // end addition [Valaris] return hp + sp; @@ -6375,10 +6373,10 @@ int pc_heal (struct map_session_data *sd, int hp, int sp) * HP/SP回復 *------------------------------------------ */ -static int pc_itemheal_effect (struct map_session_data *sd, int hp, int sp); +static int pc_itemheal_effect(struct map_session_data *sd, int hp, int sp); -static int // Compute how quickly we regenerate (less is faster) for that amount -pc_heal_quick_speed (int amount) +static int // Compute how quickly we regenerate (less is faster) for that amount +pc_heal_quick_speed(int amount) { if (amount >= 100) { @@ -6399,34 +6397,34 @@ pc_heal_quick_speed (int amount) } static void -pc_heal_quick_accumulate (int new_amount, +pc_heal_quick_accumulate(int new_amount, struct quick_regeneration *quick_regen, int max) { - int current_amount = quick_regen->amount; - int current_speed = quick_regen->speed; - int new_speed = pc_heal_quick_speed (new_amount); + int current_amount = quick_regen->amount; + int current_speed = quick_regen->speed; + int new_speed = pc_heal_quick_speed(new_amount); - int average_speed = ((new_speed * new_amount) + (current_speed * current_amount)) / (current_amount + new_amount); // new_amount > 0, current_amount >= 0 + int average_speed = ((new_speed * new_amount) + (current_speed * current_amount)) / (current_amount + new_amount); // new_amount > 0, current_amount >= 0 quick_regen->speed = average_speed; - quick_regen->amount = MIN (current_amount + new_amount, max); + quick_regen->amount = MIN(current_amount + new_amount, max); - quick_regen->tickdelay = MIN (quick_regen->speed, quick_regen->tickdelay); + quick_regen->tickdelay = MIN(quick_regen->speed, quick_regen->tickdelay); } -int pc_itemheal (struct map_session_data *sd, int hp, int sp) +int pc_itemheal(struct map_session_data *sd, int hp, int sp) { /* defer healing */ if (hp > 0) { - pc_heal_quick_accumulate (hp, + pc_heal_quick_accumulate(hp, &sd->quick_regeneration_hp, sd->status.max_hp - sd->status.hp); hp = 0; } if (sp > 0) { - pc_heal_quick_accumulate (sp, + pc_heal_quick_accumulate(sp, &sd->quick_regeneration_sp, sd->status.max_sp - sd->status.sp); @@ -6435,7 +6433,7 @@ int pc_itemheal (struct map_session_data *sd, int hp, int sp) /* Hurt right away, if necessary */ if (hp < 0 || sp < 0) - pc_itemheal_effect (sd, hp, sp); + pc_itemheal_effect(sd, hp, sp); return 0; } @@ -6443,13 +6441,13 @@ int pc_itemheal (struct map_session_data *sd, int hp, int sp) /* pc_itemheal_effect is invoked once every 0.5s whenever the pc * has health recovery queued up (cf. pc_natural_heal_sub). */ -static int pc_itemheal_effect (struct map_session_data *sd, int hp, int sp) +static int pc_itemheal_effect(struct map_session_data *sd, int hp, int sp) { - int bonus; + int bonus; // if(battle_config.battle_log) // printf("heal %d %d\n",hp,sp); - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->sc_data && sd->sc_data[SC_GOSPEL].timer != -1) //バーサーク中は回復させないらしい return 0; @@ -6461,12 +6459,12 @@ static int pc_itemheal_effect (struct map_session_data *sd, int hp, int sp) return 0; } - if (pc_checkoverhp (sd)) + if (pc_checkoverhp(sd)) { if (hp > 0) hp = 0; } - if (pc_checkoversp (sd)) + if (pc_checkoversp(sd)) { if (sp > 0) sp = 0; @@ -6474,21 +6472,21 @@ static int pc_itemheal_effect (struct map_session_data *sd, int hp, int sp) if (hp > 0) { bonus = - (sd->paramc[2] << 1) + 100 + pc_checkskill (sd, SM_RECOVERY) * 10; + (sd->paramc[2] << 1) + 100 + pc_checkskill(sd, SM_RECOVERY) * 10; if (bonus != 100) hp = hp * bonus / 100; - bonus = 100 + pc_checkskill (sd, AM_LEARNINGPOTION) * 5; + bonus = 100 + pc_checkskill(sd, AM_LEARNINGPOTION) * 5; if (bonus != 100) hp = hp * bonus / 100; } if (sp > 0) { bonus = - (sd->paramc[3] << 1) + 100 + pc_checkskill (sd, + (sd->paramc[3] << 1) + 100 + pc_checkskill(sd, MG_SRECOVERY) * 10; if (bonus != 100) sp = sp * bonus / 100; - bonus = 100 + pc_checkskill (sd, AM_LEARNINGPOTION) * 5; + bonus = 100 + pc_checkskill(sd, AM_LEARNINGPOTION) * 5; if (bonus != 100) sp = sp * bonus / 100; } @@ -6500,16 +6498,16 @@ static int pc_itemheal_effect (struct map_session_data *sd, int hp, int sp) if (sd->status.hp <= 0) { sd->status.hp = 0; - pc_damage (NULL, sd, 1); + pc_damage(NULL, sd, 1); hp = 0; } sd->status.sp += sp; if (sd->status.sp <= 0) sd->status.sp = 0; if (hp) - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); if (sp) - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); return 0; } @@ -6518,9 +6516,9 @@ static int pc_itemheal_effect (struct map_session_data *sd, int hp, int sp) * HP/SP回復 *------------------------------------------ */ -int pc_percentheal (struct map_session_data *sd, int hp, int sp) +int pc_percentheal(struct map_session_data *sd, int hp, int sp) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->state.potionpitcher_flag) { @@ -6529,12 +6527,12 @@ int pc_percentheal (struct map_session_data *sd, int hp, int sp) return 0; } - if (pc_checkoverhp (sd)) + if (pc_checkoverhp(sd)) { if (hp > 0) hp = 0; } - if (pc_checkoversp (sd)) + if (pc_checkoversp(sd)) { if (sp > 0) sp = 0; @@ -6548,7 +6546,7 @@ int pc_percentheal (struct map_session_data *sd, int hp, int sp) else if (hp <= -100) { sd->status.hp = 0; - pc_damage (NULL, sd, 1); + pc_damage(NULL, sd, 1); } else { @@ -6558,7 +6556,7 @@ int pc_percentheal (struct map_session_data *sd, int hp, int sp) if (sd->status.hp <= 0) { sd->status.hp = 0; - pc_damage (NULL, sd, 1); + pc_damage(NULL, sd, 1); hp = 0; } } @@ -6583,27 +6581,27 @@ int pc_percentheal (struct map_session_data *sd, int hp, int sp) } } if (hp) - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); if (sp) - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); return 0; } /*========================================== * 職変更 - * 引数 job 職業 0〜23 - * upper 通常 0, 転生 1, 養子 2, そのまま -1 + * 引数 job 職業 0〜23 + * upper 通常 0, 転生 1, 養子 2, そのまま -1 *------------------------------------------ */ -int pc_jobchange (struct map_session_data *sd, int job, int upper) +int pc_jobchange(struct map_session_data *sd, int job, int upper) { - int i; - int b_class = 0; + int i; + int b_class = 0; //転生や養子の場合の元の職業を算出する - struct pc_base_job s_class = pc_calc_base_job (sd->status.pc_class); + struct pc_base_job s_class = pc_calc_base_job(sd->status.pc_class); - nullpo_retr (0, sd); + nullpo_retr(0, sd); if ((job > 23) && (job < 68)) job += 3977; @@ -6647,35 +6645,35 @@ int pc_jobchange (struct map_session_data *sd, int job, int upper) sd->status.job_level = 1; sd->status.job_exp = 0; - clif_updatestatus (sd, SP_JOBLEVEL); - clif_updatestatus (sd, SP_JOBEXP); - clif_updatestatus (sd, SP_NEXTJOBEXP); + clif_updatestatus(sd, SP_JOBLEVEL); + clif_updatestatus(sd, SP_JOBEXP); + clif_updatestatus(sd, SP_NEXTJOBEXP); for (i = 0; i < 11; i++) { if (sd->equip_index[i] >= 0) - if (!pc_isequip (sd, sd->equip_index[i])) - pc_unequipitem (sd, sd->equip_index[i], 1); // 装備外し + if (!pc_isequip(sd, sd->equip_index[i])) + pc_unequipitem(sd, sd->equip_index[i], 1); // 装備外し } - clif_changelook (&sd->bl, LOOK_BASE, sd->view_class); // move sprite update to prevent client crashes with incompatible equipment [Valaris] + clif_changelook(&sd->bl, LOOK_BASE, sd->view_class); // move sprite update to prevent client crashes with incompatible equipment [Valaris] if (sd->status.clothes_color > 0) - clif_changelook (&sd->bl, LOOK_CLOTHES_COLOR, + clif_changelook(&sd->bl, LOOK_CLOTHES_COLOR, sd->status.clothes_color); if (battle_config.muting_players && sd->status.manner < 0) - clif_changestatus (&sd->bl, SP_MANNER, sd->status.manner); + clif_changestatus(&sd->bl, SP_MANNER, sd->status.manner); - pc_calcstatus (sd, 0); - pc_checkallowskill (sd); - pc_equiplookall (sd); - clif_equiplist (sd); + pc_calcstatus(sd, 0); + pc_checkallowskill(sd); + pc_equiplookall(sd); + clif_equiplist(sd); - if (pc_isriding (sd)) + if (pc_isriding(sd)) { // remove peco status if changing into invalid class [Valaris] - if (!(pc_checkskill (sd, KN_RIDING))) - pc_setoption (sd, sd->status.option | -0x0000); - if (pc_checkskill (sd, KN_RIDING) > 0) - pc_setriding (sd); + if (!(pc_checkskill(sd, KN_RIDING))) + pc_setoption(sd, sd->status.option | -0x0000); + if (pc_checkskill(sd, KN_RIDING) > 0) + pc_setriding(sd); } return 0; @@ -6685,17 +6683,17 @@ int pc_jobchange (struct map_session_data *sd, int job, int upper) * 見た目変更 *------------------------------------------ */ -int pc_equiplookall (struct map_session_data *sd) +int pc_equiplookall(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); - clif_changelook (&sd->bl, LOOK_WEAPON, 0); + clif_changelook(&sd->bl, LOOK_WEAPON, 0); // clif_changelook(&sd->bl,LOOK_SHOES,0); - clif_changelook (&sd->bl, LOOK_HEAD_BOTTOM, sd->status.head_bottom); - clif_changelook (&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); - clif_changelook (&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); + clif_changelook(&sd->bl, LOOK_HEAD_BOTTOM, sd->status.head_bottom); + clif_changelook(&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); + clif_changelook(&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); - clif_changelook_accessories (&sd->bl, NULL); + clif_changelook_accessories(&sd->bl, NULL); return 0; } @@ -6704,9 +6702,9 @@ int pc_equiplookall (struct map_session_data *sd) * 見た目変更 *------------------------------------------ */ -int pc_changelook (struct map_session_data *sd, int type, int val) +int pc_changelook(struct map_session_data *sd, int type, int val) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); switch (type) { @@ -6737,7 +6735,7 @@ int pc_changelook (struct map_session_data *sd, int type, int val) case LOOK_SHOES: break; } - clif_changelook (&sd->bl, type, val); + clif_changelook(&sd->bl, type, val); return 0; } @@ -6746,13 +6744,13 @@ int pc_changelook (struct map_session_data *sd, int type, int val) * 付属品(鷹,ペコ,カート)設定 *------------------------------------------ */ -int pc_setoption (struct map_session_data *sd, int type) +int pc_setoption(struct map_session_data *sd, int type) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); sd->status.option = type; - clif_changeoption (&sd->bl); - pc_calcstatus (sd, 0); + clif_changeoption(&sd->bl); + pc_calcstatus(sd, 0); return 0; } @@ -6761,25 +6759,25 @@ int pc_setoption (struct map_session_data *sd, int type) * カート設定 *------------------------------------------ */ -int pc_setcart (struct map_session_data *sd, int type) +int pc_setcart(struct map_session_data *sd, int type) { - int cart[6] = { 0x0000, 0x0008, 0x0080, 0x0100, 0x0200, 0x0400 }; + int cart[6] = { 0x0000, 0x0008, 0x0080, 0x0100, 0x0200, 0x0400 }; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (pc_checkskill (sd, MC_PUSHCART) > 0) + if (pc_checkskill(sd, MC_PUSHCART) > 0) { // プッシュカートスキル所持 - if (!pc_iscarton (sd)) + if (!pc_iscarton(sd)) { // カートを付けていない - pc_setoption (sd, cart[type]); - clif_cart_itemlist (sd); - clif_cart_equiplist (sd); - clif_updatestatus (sd, SP_CARTINFO); - clif_status_change (&sd->bl, 0x0c, 0); + pc_setoption(sd, cart[type]); + clif_cart_itemlist(sd); + clif_cart_equiplist(sd); + clif_updatestatus(sd, SP_CARTINFO); + clif_status_change(&sd->bl, 0x0c, 0); } else { - pc_setoption (sd, cart[type]); + pc_setoption(sd, cart[type]); } } @@ -6790,11 +6788,11 @@ int pc_setcart (struct map_session_data *sd, int type) * 鷹設定 *------------------------------------------ */ -int pc_setfalcon (struct map_session_data *sd) +int pc_setfalcon(struct map_session_data *sd) { - if (pc_checkskill (sd, HT_FALCON) > 0) + if (pc_checkskill(sd, HT_FALCON) > 0) { // ファルコンマスタリースキル所持 - pc_setoption (sd, sd->status.option | 0x0010); + pc_setoption(sd, sd->status.option | 0x0010); } return 0; @@ -6804,18 +6802,18 @@ int pc_setfalcon (struct map_session_data *sd) * ペコペコ設定 *------------------------------------------ */ -int pc_setriding (struct map_session_data *sd) +int pc_setriding(struct map_session_data *sd) { if (sd->disguise > 0) { // temporary prevention of crash caused by peco + disguise, will look into a better solution [Valaris] - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "Cannot mount a Peco while in disguise."); return 0; } - if ((pc_checkskill (sd, KN_RIDING) > 0)) + if ((pc_checkskill(sd, KN_RIDING) > 0)) { // ライディングスキル所持 - pc_setoption (sd, sd->status.option | 0x0020); + pc_setoption(sd, sd->status.option | 0x0020); if (sd->status.pc_class == 7) sd->status.pc_class = sd->view_class = 13; @@ -6837,11 +6835,11 @@ int pc_setriding (struct map_session_data *sd) * script用変数の値を読む *------------------------------------------ */ -int pc_readreg (struct map_session_data *sd, int reg) +int pc_readreg(struct map_session_data *sd, int reg) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < sd->reg_num; i++) if (sd->reg[i].index == reg) @@ -6854,11 +6852,11 @@ int pc_readreg (struct map_session_data *sd, int reg) * script用変数の値を設定 *------------------------------------------ */ -int pc_setreg (struct map_session_data *sd, int reg, int val) +int pc_setreg(struct map_session_data *sd, int reg, int val) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < sd->reg_num; i++) { @@ -6869,7 +6867,7 @@ int pc_setreg (struct map_session_data *sd, int reg, int val) } } sd->reg_num++; - RECREATE (sd->reg, struct script_reg, sd->reg_num); + RECREATE(sd->reg, struct script_reg, sd->reg_num); sd->reg[i].index = reg; sd->reg[i].data = val; @@ -6880,11 +6878,11 @@ int pc_setreg (struct map_session_data *sd, int reg, int val) * script用文字列変数の値を読む *------------------------------------------ */ -char *pc_readregstr (struct map_session_data *sd, int reg) +char *pc_readregstr(struct map_session_data *sd, int reg) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < sd->regstr_num; i++) if (sd->regstr[i].index == reg) @@ -6897,28 +6895,28 @@ char *pc_readregstr (struct map_session_data *sd, int reg) * script用文字列変数の値を設定 *------------------------------------------ */ -int pc_setregstr (struct map_session_data *sd, int reg, const char *str) +int pc_setregstr(struct map_session_data *sd, int reg, const char *str) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (strlen (str) + 1 > sizeof (sd->regstr[0].data)) + if (strlen(str) + 1 > sizeof(sd->regstr[0].data)) { - printf ("pc_setregstr(): String too long!\n"); + printf("pc_setregstr(): String too long!\n"); return 0; } for (i = 0; i < sd->regstr_num; i++) if (sd->regstr[i].index == reg) { - strcpy (sd->regstr[i].data, str); + strcpy(sd->regstr[i].data, str); return 0; } sd->regstr_num++; - RECREATE (sd->regstr, struct script_regstr, sd->regstr_num); + RECREATE(sd->regstr, struct script_regstr, sd->regstr_num); sd->regstr[i].index = reg; - strcpy (sd->regstr[i].data, str); + strcpy(sd->regstr[i].data, str); return 0; } @@ -6927,15 +6925,15 @@ int pc_setregstr (struct map_session_data *sd, int reg, const char *str) * script用グローバル変数の値を読む *------------------------------------------ */ -int pc_readglobalreg (struct map_session_data *sd, const char *reg) +int pc_readglobalreg(struct map_session_data *sd, const char *reg) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < sd->status.global_reg_num; i++) { - if (strcmp (sd->status.global_reg[i].str, reg) == 0) + if (strcmp(sd->status.global_reg[i].str, reg) == 0) return sd->status.global_reg[i].value; } @@ -6946,23 +6944,23 @@ int pc_readglobalreg (struct map_session_data *sd, const char *reg) * script用グローバル変数の値を設定 *------------------------------------------ */ -int pc_setglobalreg (struct map_session_data *sd, const char *reg, int val) +int pc_setglobalreg(struct map_session_data *sd, const char *reg, int val) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); //PC_DIE_COUNTERがスクリプトなどで変更された時の処理 - if (strcmp (reg, "PC_DIE_COUNTER") == 0 && sd->die_counter != val) + if (strcmp(reg, "PC_DIE_COUNTER") == 0 && sd->die_counter != val) { sd->die_counter = val; - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); } if (val == 0) { for (i = 0; i < sd->status.global_reg_num; i++) { - if (strcmp (sd->status.global_reg[i].str, reg) == 0) + if (strcmp(sd->status.global_reg[i].str, reg) == 0) { sd->status.global_reg[i] = sd->status.global_reg[sd->status.global_reg_num - 1]; @@ -6974,7 +6972,7 @@ int pc_setglobalreg (struct map_session_data *sd, const char *reg, int val) } for (i = 0; i < sd->status.global_reg_num; i++) { - if (strcmp (sd->status.global_reg[i].str, reg) == 0) + if (strcmp(sd->status.global_reg[i].str, reg) == 0) { sd->status.global_reg[i].value = val; return 0; @@ -6982,13 +6980,13 @@ int pc_setglobalreg (struct map_session_data *sd, const char *reg, int val) } if (sd->status.global_reg_num < GLOBAL_REG_NUM) { - strcpy (sd->status.global_reg[i].str, reg); + strcpy(sd->status.global_reg[i].str, reg); sd->status.global_reg[i].value = val; sd->status.global_reg_num++; return 0; } if (battle_config.error_log) - printf ("pc_setglobalreg : couldn't set %s (GLOBAL_REG_NUM = %d)\n", + printf("pc_setglobalreg : couldn't set %s (GLOBAL_REG_NUM = %d)\n", reg, GLOBAL_REG_NUM); return 1; @@ -6998,15 +6996,15 @@ int pc_setglobalreg (struct map_session_data *sd, const char *reg, int val) * script用アカウント変数の値を読む *------------------------------------------ */ -int pc_readaccountreg (struct map_session_data *sd, const char *reg) +int pc_readaccountreg(struct map_session_data *sd, const char *reg) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < sd->status.account_reg_num; i++) { - if (strcmp (sd->status.account_reg[i].str, reg) == 0) + if (strcmp(sd->status.account_reg[i].str, reg) == 0) return sd->status.account_reg[i].value; } @@ -7017,17 +7015,17 @@ int pc_readaccountreg (struct map_session_data *sd, const char *reg) * script用アカウント変数の値を設定 *------------------------------------------ */ -int pc_setaccountreg (struct map_session_data *sd, const char *reg, int val) +int pc_setaccountreg(struct map_session_data *sd, const char *reg, int val) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (val == 0) { for (i = 0; i < sd->status.account_reg_num; i++) { - if (strcmp (sd->status.account_reg[i].str, reg) == 0) + if (strcmp(sd->status.account_reg[i].str, reg) == 0) { sd->status.account_reg[i] = sd->status.account_reg[sd->status.account_reg_num - 1]; @@ -7035,28 +7033,28 @@ int pc_setaccountreg (struct map_session_data *sd, const char *reg, int val) break; } } - intif_saveaccountreg (sd); + intif_saveaccountreg(sd); return 0; } for (i = 0; i < sd->status.account_reg_num; i++) { - if (strcmp (sd->status.account_reg[i].str, reg) == 0) + if (strcmp(sd->status.account_reg[i].str, reg) == 0) { sd->status.account_reg[i].value = val; - intif_saveaccountreg (sd); + intif_saveaccountreg(sd); return 0; } } if (sd->status.account_reg_num < ACCOUNT_REG_NUM) { - strcpy (sd->status.account_reg[i].str, reg); + strcpy(sd->status.account_reg[i].str, reg); sd->status.account_reg[i].value = val; sd->status.account_reg_num++; - intif_saveaccountreg (sd); + intif_saveaccountreg(sd); return 0; } if (battle_config.error_log) - printf ("pc_setaccountreg : couldn't set %s (ACCOUNT_REG_NUM = %d)\n", + printf("pc_setaccountreg : couldn't set %s (ACCOUNT_REG_NUM = %d)\n", reg, ACCOUNT_REG_NUM); return 1; @@ -7066,15 +7064,15 @@ int pc_setaccountreg (struct map_session_data *sd, const char *reg, int val) * script用アカウント変数2の値を読む *------------------------------------------ */ -int pc_readaccountreg2 (struct map_session_data *sd, const char *reg) +int pc_readaccountreg2(struct map_session_data *sd, const char *reg) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < sd->status.account_reg2_num; i++) { - if (strcmp (sd->status.account_reg2[i].str, reg) == 0) + if (strcmp(sd->status.account_reg2[i].str, reg) == 0) return sd->status.account_reg2[i].value; } @@ -7085,17 +7083,17 @@ int pc_readaccountreg2 (struct map_session_data *sd, const char *reg) * script用アカウント変数2の値を設定 *------------------------------------------ */ -int pc_setaccountreg2 (struct map_session_data *sd, const char *reg, int val) +int pc_setaccountreg2(struct map_session_data *sd, const char *reg, int val) { - int i; + int i; - nullpo_retr (1, sd); + nullpo_retr(1, sd); if (val == 0) { for (i = 0; i < sd->status.account_reg2_num; i++) { - if (strcmp (sd->status.account_reg2[i].str, reg) == 0) + if (strcmp(sd->status.account_reg2[i].str, reg) == 0) { sd->status.account_reg2[i] = sd->status.account_reg2[sd->status.account_reg2_num - 1]; @@ -7103,29 +7101,28 @@ int pc_setaccountreg2 (struct map_session_data *sd, const char *reg, int val) break; } } - chrif_saveaccountreg2 (sd); + chrif_saveaccountreg2(sd); return 0; } for (i = 0; i < sd->status.account_reg2_num; i++) { - if (strcmp (sd->status.account_reg2[i].str, reg) == 0) + if (strcmp(sd->status.account_reg2[i].str, reg) == 0) { sd->status.account_reg2[i].value = val; - chrif_saveaccountreg2 (sd); + chrif_saveaccountreg2(sd); return 0; } } if (sd->status.account_reg2_num < ACCOUNT_REG2_NUM) { - strcpy (sd->status.account_reg2[i].str, reg); + strcpy(sd->status.account_reg2[i].str, reg); sd->status.account_reg2[i].value = val; sd->status.account_reg2_num++; - chrif_saveaccountreg2 (sd); + chrif_saveaccountreg2(sd); return 0; } if (battle_config.error_log) - printf - ("pc_setaccountreg2 : couldn't set %s (ACCOUNT_REG2_NUM = %d)\n", + printf("pc_setaccountreg2 : couldn't set %s (ACCOUNT_REG2_NUM = %d)\n", reg, ACCOUNT_REG2_NUM); return 1; @@ -7135,14 +7132,14 @@ int pc_setaccountreg2 (struct map_session_data *sd, const char *reg, int val) * 精錬成功率 *------------------------------------------ */ -int pc_percentrefinery (struct map_session_data *sd, struct item *item) +int pc_percentrefinery(struct map_session_data *sd, struct item *item) { - int percent; + int percent; - nullpo_retr (0, item); - percent = percentrefinery[itemdb_wlv (item->nameid)][(int) item->refine]; + nullpo_retr(0, item); + percent = percentrefinery[itemdb_wlv(item->nameid)][(int) item->refine]; - percent += pc_checkskill (sd, BS_WEAPONRESEARCH); // 武器研究スキル所持 + percent += pc_checkskill(sd, BS_WEAPONRESEARCH); // 武器研究スキル所持 // 確率の有効範囲チェック if (percent > 100) @@ -7162,10 +7159,10 @@ int pc_percentrefinery (struct map_session_data *sd, struct item *item) *------------------------------------------ */ static -void pc_eventtimer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void pc_eventtimer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - struct map_session_data *sd = map_id2sd (id); - int i; + struct map_session_data *sd = map_id2sd(id); + int i; if (sd == NULL) return; @@ -7174,15 +7171,15 @@ void pc_eventtimer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t dat if (sd->eventtimer[i] == tid) { sd->eventtimer[i] = -1; - npc_event (sd, (const char *) data, 0); + npc_event(sd, (const char *) data, 0); break; } } - free ((void *) data); + free((void *) data); if (i == MAX_EVENTTIMER) { if (battle_config.error_log) - printf ("pc_eventtimer: no such event timer\n"); + printf("pc_eventtimer: no such event timer\n"); } } @@ -7190,11 +7187,11 @@ void pc_eventtimer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t dat * イベントタイマー追加 *------------------------------------------ */ -int pc_addeventtimer (struct map_session_data *sd, int tick, const char *name) +int pc_addeventtimer(struct map_session_data *sd, int tick, const char *name) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < MAX_EVENTTIMER; i++) if (sd->eventtimer[i] == -1) @@ -7202,10 +7199,10 @@ int pc_addeventtimer (struct map_session_data *sd, int tick, const char *name) if (i < MAX_EVENTTIMER) { - char *evname = (char *) calloc (24, 1); - strncpy (evname, name, 24); + char *evname = (char *) calloc(24, 1); + strncpy(evname, name, 24); evname[23] = '\0'; - sd->eventtimer[i] = add_timer (gettick () + tick, + sd->eventtimer[i] = add_timer(gettick() + tick, pc_eventtimer, sd->bl.id, (int) evname); return 1; @@ -7218,19 +7215,19 @@ int pc_addeventtimer (struct map_session_data *sd, int tick, const char *name) * イベントタイマー削除 *------------------------------------------ */ -int pc_deleventtimer (struct map_session_data *sd, const char *name) +int pc_deleventtimer(struct map_session_data *sd, const char *name) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < MAX_EVENTTIMER; i++) - if (sd->eventtimer[i] != -1 && strcmp ((char - *) (get_timer (sd->eventtimer + if (sd->eventtimer[i] != -1 && strcmp((char + *) (get_timer(sd->eventtimer [i])->data), name) == 0) { - delete_timer (sd->eventtimer[i], pc_eventtimer); + delete_timer(sd->eventtimer[i], pc_eventtimer); sd->eventtimer[i] = -1; break; } @@ -7242,20 +7239,20 @@ int pc_deleventtimer (struct map_session_data *sd, const char *name) * イベントタイマーカウント値追加 *------------------------------------------ */ -int pc_addeventtimercount (struct map_session_data *sd, const char *name, +int pc_addeventtimercount(struct map_session_data *sd, const char *name, int tick) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < MAX_EVENTTIMER; i++) - if (sd->eventtimer[i] != -1 && strcmp ((char - *) (get_timer (sd->eventtimer + if (sd->eventtimer[i] != -1 && strcmp((char + *) (get_timer(sd->eventtimer [i])->data), name) == 0) { - addtick_timer (sd->eventtimer[i], tick); + addtick_timer(sd->eventtimer[i], tick); break; } @@ -7266,16 +7263,16 @@ int pc_addeventtimercount (struct map_session_data *sd, const char *name, * イベントタイマー全削除 *------------------------------------------ */ -int pc_cleareventtimer (struct map_session_data *sd) +int pc_cleareventtimer(struct map_session_data *sd) { - int i; + int i; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < MAX_EVENTTIMER; i++) if (sd->eventtimer[i] != -1) { - delete_timer (sd->eventtimer[i], pc_eventtimer); + delete_timer(sd->eventtimer[i], pc_eventtimer); sd->eventtimer[i] = -1; } @@ -7290,44 +7287,44 @@ int pc_cleareventtimer (struct map_session_data *sd) *------------------------------------------ */ static int -pc_signal_advanced_equipment_change (struct map_session_data *sd, int n) +pc_signal_advanced_equipment_change(struct map_session_data *sd, int n) { if (sd->status.inventory[n].equip & 0x0040) - clif_changelook (&sd->bl, LOOK_SHOES, 0); + clif_changelook(&sd->bl, LOOK_SHOES, 0); if (sd->status.inventory[n].equip & 0x0004) - clif_changelook (&sd->bl, LOOK_GLOVES, 0); + clif_changelook(&sd->bl, LOOK_GLOVES, 0); if (sd->status.inventory[n].equip & 0x0008) - clif_changelook (&sd->bl, LOOK_CAPE, 0); + clif_changelook(&sd->bl, LOOK_CAPE, 0); if (sd->status.inventory[n].equip & 0x0010) - clif_changelook (&sd->bl, LOOK_MISC1, 0); + clif_changelook(&sd->bl, LOOK_MISC1, 0); if (sd->status.inventory[n].equip & 0x0080) - clif_changelook (&sd->bl, LOOK_MISC2, 0); + clif_changelook(&sd->bl, LOOK_MISC2, 0); return 0; } -int pc_equipitem (struct map_session_data *sd, int n, int pos) +int pc_equipitem(struct map_session_data *sd, int n, int pos) { - int i, nameid, arrow, view; + int i, nameid, arrow, view; struct item_data *id; //ｿｽ]ｿｽｿｽｿｽｿｽｿｽ{ｿｽqｿｽﾌ場合ｿｽﾌ鯉ｿｽｿｽﾌ職ｿｽﾆゑｿｽｿｽZｿｽoｿｽｿｽｿｽｿｽ - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (n < 0 || n >= MAX_INVENTORY) { - clif_equipitemack (sd, 0, 0, 0); + clif_equipitemack(sd, 0, 0, 0); return 0; } nameid = sd->status.inventory[n].nameid; id = sd->inventory_data[n]; - pos = pc_equippoint (sd, n); + pos = pc_equippoint(sd, n); if (battle_config.battle_log) - printf ("equip %d(%d) %x:%x\n", nameid, n, id->equip, pos); - if (!pc_isequip (sd, n) || !pos || sd->status.inventory[n].broken == 1) + printf("equip %d (%d) %x:%x\n", nameid, n, id->equip, pos); + if (!pc_isequip(sd, n) || !pos || sd->status.inventory[n].broken == 1) { // [Valaris] - clif_equipitemack (sd, n, 0, 0); // fail + clif_equipitemack(sd, n, 0, 0); // fail return 0; } @@ -7335,13 +7332,13 @@ int pc_equipitem (struct map_session_data *sd, int n, int pos) // if (sd->sc_data[SC_BERSERK].timer != -1) { - clif_equipitemack (sd, n, 0, 0); // fail + clif_equipitemack(sd, n, 0, 0); // fail return 0; } if (pos == 0x88) { // アクセサリ用例外処理 - int epor = 0; + int epor = 0; if (sd->equip_index[0] >= 0) epor |= sd->status.inventory[sd->equip_index[0]].equip; if (sd->equip_index[1] >= 0) @@ -7353,9 +7350,9 @@ int pc_equipitem (struct map_session_data *sd, int n, int pos) // 二刀流処理 if ((pos == 0x22) // 一応、装備要求箇所が二刀流武器かチェックする && (id->equip == 2) // 単 手武器 - && (pc_checkskill (sd, AS_LEFT) > 0 || sd->status.pc_class == 12)) // 左手修錬有 + && (pc_checkskill(sd, AS_LEFT) > 0 || sd->status.pc_class == 12)) // 左手修錬有 { - int tpos = 0; + int tpos = 0; if (sd->equip_index[8] >= 0) tpos |= sd->status.inventory[sd->equip_index[8]].equip; if (sd->equip_index[9] >= 0) @@ -7364,27 +7361,27 @@ int pc_equipitem (struct map_session_data *sd, int n, int pos) pos = tpos == 0x02 ? 0x20 : 0x02; } - arrow = pc_search_inventory (sd, pc_checkequip (sd, 9)); // Added by RoVeRT + arrow = pc_search_inventory(sd, pc_checkequip(sd, 9)); // Added by RoVeRT for (i = 0; i < 11; i++) { if (pos & equip_pos[i]) { if (sd->equip_index[i] >= 0) //Slot taken, remove item from there. - pc_unequipitem (sd, sd->equip_index[i], 1); + pc_unequipitem(sd, sd->equip_index[i], 1); sd->equip_index[i] = n; } } // 弓矢装備 if (pos == 0x8000) { - clif_arrowequip (sd, n); - clif_arrow_fail (sd, 3); // 3=矢が装備できました + clif_arrowequip(sd, n); + clif_arrow_fail(sd, 3); // 3=矢が装備できました } else { /* Don't update re-equipping if we're using a spell */ if (!(pos == 4 && sd->attack_spell_override)) - clif_equipitemack (sd, n, pos, 1); + clif_equipitemack(sd, n, pos, 1); } for (i = 0; i < 11; i++) @@ -7408,8 +7405,8 @@ int pc_equipitem (struct map_session_data *sd, int n, int pos) if (sd->status.inventory[n].equip & 0x0002) { sd->weapontype1 = view; - pc_calcweapontype (sd); - pc_set_weapon_look (sd); + pc_calcweapontype(sd); + pc_set_weapon_look(sd); } if (sd->status.inventory[n].equip & 0x0020) { @@ -7429,51 +7426,51 @@ int pc_equipitem (struct map_session_data *sd, int n, int pos) } else sd->status.shield = sd->weapontype2 = 0; - pc_calcweapontype (sd); - clif_changelook (&sd->bl, LOOK_SHIELD, sd->status.shield); + pc_calcweapontype(sd); + clif_changelook(&sd->bl, LOOK_SHIELD, sd->status.shield); } if (sd->status.inventory[n].equip & 0x0001) { sd->status.head_bottom = view; - clif_changelook (&sd->bl, LOOK_HEAD_BOTTOM, sd->status.head_bottom); + clif_changelook(&sd->bl, LOOK_HEAD_BOTTOM, sd->status.head_bottom); } if (sd->status.inventory[n].equip & 0x0100) { sd->status.head_top = view; - clif_changelook (&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); + clif_changelook(&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); } if (sd->status.inventory[n].equip & 0x0200) { sd->status.head_mid = view; - clif_changelook (&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); + clif_changelook(&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); } - pc_signal_advanced_equipment_change (sd, n); + pc_signal_advanced_equipment_change(sd, n); - pc_checkallowskill (sd); // 装備品でスキルか解除されるかチェック - if (itemdb_look (sd->status.inventory[n].nameid) == 11 && arrow) + pc_checkallowskill(sd); // 装備品でスキルか解除されるかチェック + if (itemdb_look(sd->status.inventory[n].nameid) == 11 && arrow) { // Added by RoVeRT - clif_arrowequip (sd, arrow); + clif_arrowequip(sd, arrow); sd->status.inventory[arrow].equip = 32768; } - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); if (sd->special_state.infinite_endure) { if (sd->sc_data[SC_ENDURE].timer == -1) - skill_status_change_start (&sd->bl, SC_ENDURE, 10, 1, 0, 0, 0, 0); + skill_status_change_start(&sd->bl, SC_ENDURE, 10, 1, 0, 0, 0, 0); } else { if (sd->sc_data[SC_ENDURE].timer != -1 && sd->sc_data[SC_ENDURE].val2) - skill_status_change_end (&sd->bl, SC_ENDURE, -1); + skill_status_change_end(&sd->bl, SC_ENDURE, -1); } if (sd->sc_data[SC_SIGNUMCRUCIS].timer != -1 - && !battle_check_undead (7, sd->def_ele)) - skill_status_change_end (&sd->bl, SC_SIGNUMCRUCIS, -1); + && !battle_check_undead(7, sd->def_ele)) + skill_status_change_end(&sd->bl, SC_SIGNUMCRUCIS, -1); if (sd->sc_data[SC_DANCING].timer != -1 && (sd->status.weapon != 13 && sd->status.weapon != 14)) - skill_stop_dancing (&sd->bl, 0); + skill_stop_dancing(&sd->bl, 0); return 0; } @@ -7482,24 +7479,24 @@ int pc_equipitem (struct map_session_data *sd, int n, int pos) * 装 備した物を外す *------------------------------------------ */ -int pc_unequipitem (struct map_session_data *sd, int n, int type) +int pc_unequipitem(struct map_session_data *sd, int n, int type) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); // -- moonsoul (if player is berserk then cannot unequip) // if (sd->sc_data[SC_BERSERK].timer != -1) { - clif_unequipitemack (sd, n, 0, 0); + clif_unequipitemack(sd, n, 0, 0); return 0; } if (battle_config.battle_log) - printf ("unequip %d %x:%x\n", n, pc_equippoint (sd, n), + printf("unequip %d %x:%x\n", n, pc_equippoint(sd, n), sd->status.inventory[n].equip); if (sd->status.inventory[n].equip) { - int i; + int i; for (i = 0; i < 11; i++) { if (sd->status.inventory[n].equip & equip_pos[i]) @@ -7509,71 +7506,71 @@ int pc_unequipitem (struct map_session_data *sd, int n, int type) { sd->weapontype1 = 0; sd->status.weapon = sd->weapontype2; - pc_calcweapontype (sd); - pc_set_weapon_look (sd); + pc_calcweapontype(sd); + pc_set_weapon_look(sd); } if (sd->status.inventory[n].equip & 0x0020) { sd->status.shield = sd->weapontype2 = 0; - pc_calcweapontype (sd); - clif_changelook (&sd->bl, LOOK_SHIELD, sd->status.shield); + pc_calcweapontype(sd); + clif_changelook(&sd->bl, LOOK_SHIELD, sd->status.shield); } if (sd->status.inventory[n].equip & 0x0001) { sd->status.head_bottom = 0; - clif_changelook (&sd->bl, LOOK_HEAD_BOTTOM, + clif_changelook(&sd->bl, LOOK_HEAD_BOTTOM, sd->status.head_bottom); } if (sd->status.inventory[n].equip & 0x0100) { sd->status.head_top = 0; - clif_changelook (&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); + clif_changelook(&sd->bl, LOOK_HEAD_TOP, sd->status.head_top); } if (sd->status.inventory[n].equip & 0x0200) { sd->status.head_mid = 0; - clif_changelook (&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); + clif_changelook(&sd->bl, LOOK_HEAD_MID, sd->status.head_mid); } - pc_signal_advanced_equipment_change (sd, n); + pc_signal_advanced_equipment_change(sd, n); if (sd->sc_data[SC_BROKNWEAPON].timer != -1 && sd->status.inventory[n].equip & 0x0002 && sd->status.inventory[i].broken == 1) - skill_status_change_end (&sd->bl, SC_BROKNWEAPON, -1); + skill_status_change_end(&sd->bl, SC_BROKNWEAPON, -1); - clif_unequipitemack (sd, n, sd->status.inventory[n].equip, 1); + clif_unequipitemack(sd, n, sd->status.inventory[n].equip, 1); sd->status.inventory[n].equip = 0; if (!type) - pc_checkallowskill (sd); + pc_checkallowskill(sd); if (sd->weapontype1 == 0 && sd->weapontype2 == 0) - skill_encchant_eremental_end (&sd->bl, -1); //武器持ち誓えは無条件で属性付与解除 + skill_encchant_eremental_end(&sd->bl, -1); //武器持ち誓えは無条件で属性付与解除 } else { - clif_unequipitemack (sd, n, 0, 0); + clif_unequipitemack(sd, n, 0, 0); } if (!type) { - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); if (sd->sc_data[SC_SIGNUMCRUCIS].timer != -1 - && !battle_check_undead (7, sd->def_ele)) - skill_status_change_end (&sd->bl, SC_SIGNUMCRUCIS, -1); + && !battle_check_undead(7, sd->def_ele)) + skill_status_change_end(&sd->bl, SC_SIGNUMCRUCIS, -1); } return 0; } -int pc_unequipinvyitem (struct map_session_data *sd, int n, int type) +int pc_unequipinvyitem(struct map_session_data *sd, int n, int type) { - int i; + int i; - nullpo_retr (1, sd); + nullpo_retr(1, sd); for (i = 0; i < 11; i++) { if (equip_pos[i] > 0 && sd->equip_index[i] == n) { //Slot taken, remove item from there. - pc_unequipitem (sd, sd->equip_index[i], type); + pc_unequipitem(sd, sd->equip_index[i], type); sd->equip_index[i] = -1; } } @@ -7586,37 +7583,37 @@ int pc_unequipinvyitem (struct map_session_data *sd, int n, int type) * 装 備品の装備可能チェックを行なう *------------------------------------------ */ -int pc_checkitem (struct map_session_data *sd) +int pc_checkitem(struct map_session_data *sd) { - int i, j, k, id, calc_flag = 0; + int i, j, k, id, calc_flag = 0; struct item_data *it = NULL; - nullpo_retr (0, sd); + nullpo_retr(0, sd); // 所持品空き詰め for (i = j = 0; i < MAX_INVENTORY; i++) { if ((id = sd->status.inventory[i].nameid) == 0) continue; - if (battle_config.item_check && !itemdb_available (id)) + if (battle_config.item_check && !itemdb_available(id)) { if (battle_config.error_log) - printf ("illeagal item id %d in %d[%s] inventory.\n", id, + printf("illeagal item id %d in %d[%s] inventory.\n", id, sd->bl.id, sd->status.name); - pc_delitem (sd, i, sd->status.inventory[i].amount, 3); + pc_delitem(sd, i, sd->status.inventory[i].amount, 3); continue; } if (i > j) { - memcpy (&sd->status.inventory[j], &sd->status.inventory[i], - sizeof (struct item)); + memcpy(&sd->status.inventory[j], &sd->status.inventory[i], + sizeof(struct item)); sd->inventory_data[j] = sd->inventory_data[i]; } j++; } if (j < MAX_INVENTORY) - memset (&sd->status.inventory[j], 0, - sizeof (struct item) * (MAX_INVENTORY - j)); + memset(&sd->status.inventory[j], 0, + sizeof(struct item) * (MAX_INVENTORY - j)); for (k = j; k < MAX_INVENTORY; k++) sd->inventory_data[k] = NULL; @@ -7625,24 +7622,24 @@ int pc_checkitem (struct map_session_data *sd) { if ((id = sd->status.cart[i].nameid) == 0) continue; - if (battle_config.item_check && !itemdb_available (id)) + if (battle_config.item_check && !itemdb_available(id)) { if (battle_config.error_log) - printf ("illeagal item id %d in %d[%s] cart.\n", id, + printf("illeagal item id %d in %d[%s] cart.\n", id, sd->bl.id, sd->status.name); - pc_cart_delitem (sd, i, sd->status.cart[i].amount, 1); + pc_cart_delitem(sd, i, sd->status.cart[i].amount, 1); continue; } if (i > j) { - memcpy (&sd->status.cart[j], &sd->status.cart[i], - sizeof (struct item)); + memcpy(&sd->status.cart[j], &sd->status.cart[i], + sizeof(struct item)); } j++; } if (j < MAX_CART) - memset (&sd->status.cart[j], 0, - sizeof (struct item) * (MAX_CART - j)); + memset(&sd->status.cart[j], 0, + sizeof(struct item) * (MAX_CART - j)); // 装 備位置チェック @@ -7653,7 +7650,7 @@ int pc_checkitem (struct map_session_data *sd) if (sd->status.inventory[i].nameid == 0) continue; - if (sd->status.inventory[i].equip & ~pc_equippoint (sd, i)) + if (sd->status.inventory[i].equip & ~pc_equippoint(sd, i)) { sd->status.inventory[i].equip = 0; calc_flag = 1; @@ -7667,39 +7664,39 @@ int pc_checkitem (struct map_session_data *sd) } } - pc_setequipindex (sd); + pc_setequipindex(sd); if (calc_flag) - pc_calcstatus (sd, 2); + pc_calcstatus(sd, 2); return 0; } -int pc_checkoverhp (struct map_session_data *sd) +int pc_checkoverhp(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.hp == sd->status.max_hp) return 1; if (sd->status.hp > sd->status.max_hp) { sd->status.hp = sd->status.max_hp; - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); return 2; } return 0; } -int pc_checkoversp (struct map_session_data *sd) +int pc_checkoversp(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->status.sp == sd->status.max_sp) return 1; if (sd->status.sp > sd->status.max_sp) { sd->status.sp = sd->status.max_sp; - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); return 2; } @@ -7711,14 +7708,14 @@ int pc_checkoversp (struct map_session_data *sd) *------------------------------------------ */ static -void pc_calc_pvprank_sub (struct block_list *bl, va_list ap) +void pc_calc_pvprank_sub(struct block_list *bl, va_list ap) { struct map_session_data *sd1, *sd2 = NULL; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd1 = (struct map_session_data *) bl); - nullpo_retv (sd2 = va_arg (ap, struct map_session_data *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd1 = (struct map_session_data *) bl); + nullpo_retv(sd2 = va_arg(ap, struct map_session_data *)); if (sd1->pvp_point > sd2->pvp_point) sd2->pvp_rank++; @@ -7728,23 +7725,23 @@ void pc_calc_pvprank_sub (struct block_list *bl, va_list ap) * PVP順位計算 *------------------------------------------ */ -int pc_calc_pvprank (struct map_session_data *sd) +int pc_calc_pvprank(struct map_session_data *sd) { - int old; + int old; struct map_data *m; - nullpo_retr (0, sd); - nullpo_retr (0, m = &map[sd->bl.m]); + nullpo_retr(0, sd); + nullpo_retr(0, m = &map[sd->bl.m]); old = sd->pvp_rank; if (!(m->flag.pvp)) return 0; sd->pvp_rank = 1; - map_foreachinarea (pc_calc_pvprank_sub, sd->bl.m, 0, 0, m->xs, m->ys, + map_foreachinarea(pc_calc_pvprank_sub, sd->bl.m, 0, 0, m->xs, m->ys, BL_PC, sd); if (old != sd->pvp_rank || sd->pvp_lastusers != m->users) - clif_pvpset (sd, sd->pvp_rank, sd->pvp_lastusers = m->users, 0); + clif_pvpset(sd, sd->pvp_rank, sd->pvp_lastusers = m->users, 0); return sd->pvp_rank; } @@ -7752,18 +7749,18 @@ int pc_calc_pvprank (struct map_session_data *sd) * PVP順位計算(timer) *------------------------------------------ */ -void pc_calc_pvprank_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void pc_calc_pvprank_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct map_session_data *sd = NULL; if (battle_config.pk_mode) // disable pvp ranking if pk_mode on [Valaris] return; - sd = map_id2sd (id); + sd = map_id2sd(id); if (sd == NULL) return; sd->pvp_timer = -1; - if (pc_calc_pvprank (sd) > 0) - sd->pvp_timer = add_timer (gettick () + PVP_CALCRANK_INTERVAL, + if (pc_calc_pvprank(sd) > 0) + sd->pvp_timer = add_timer(gettick() + PVP_CALCRANK_INTERVAL, pc_calc_pvprank_timer, id, data); } @@ -7771,7 +7768,7 @@ void pc_calc_pvprank_timer (timer_id tid, tick_t tick, custom_id_t id, custom_da * sdは結婚しているか(既婚の場合は相方のchar_idを返す) *------------------------------------------ */ -int pc_ismarried (struct map_session_data *sd) +int pc_ismarried(struct map_session_data *sd) { if (sd == NULL) return -1; @@ -7785,7 +7782,7 @@ int pc_ismarried (struct map_session_data *sd) * sdがdstsdと結婚(dstsd→sdの結婚処理も同時に行う) *------------------------------------------ */ -int pc_marriage (struct map_session_data *sd, struct map_session_data *dstsd) +int pc_marriage(struct map_session_data *sd, struct map_session_data *dstsd) { if (sd == NULL || dstsd == NULL || sd->status.partner_id > 0 || dstsd->status.partner_id > 0) @@ -7799,20 +7796,20 @@ int pc_marriage (struct map_session_data *sd, struct map_session_data *dstsd) * sdが離婚(相手はsd->status.partner_idに依る)(相手も同時に離婚・結婚指輪自動剥奪) *------------------------------------------ */ -int pc_divorce (struct map_session_data *sd) +int pc_divorce(struct map_session_data *sd) { struct map_session_data *p_sd = NULL; - if (sd == NULL || !pc_ismarried (sd)) + if (sd == NULL || !pc_ismarried(sd)) return -1; // If both are on map server we don't need to bother the char server if ((p_sd = - map_nick2sd (map_charid2nick (sd->status.partner_id))) != NULL) + map_nick2sd(map_charid2nick(sd->status.partner_id))) != NULL) { if (p_sd->status.partner_id != sd->status.char_id || sd->status.partner_id != p_sd->status.char_id) { - printf ("pc_divorce: Illegal partner_id sd=%d p_sd=%d\n", + printf("pc_divorce: Illegal partner_id sd=%d p_sd=%d\n", sd->status.partner_id, p_sd->status.partner_id); return -1; } @@ -7822,11 +7819,11 @@ int pc_divorce (struct map_session_data *sd) if (sd->npc_flags.divorce) { sd->npc_flags.divorce = 0; - map_scriptcont (sd, sd->npc_id); + map_scriptcont(sd, sd->npc_id); } } else - chrif_send_divorce (sd->status.char_id); + chrif_send_divorce(sd->status.char_id); return 0; } @@ -7835,19 +7832,19 @@ int pc_divorce (struct map_session_data *sd) * sdの相方のmap_session_dataを返す *------------------------------------------ */ -struct map_session_data *pc_get_partner (struct map_session_data *sd) +struct map_session_data *pc_get_partner(struct map_session_data *sd) { struct map_session_data *p_sd = NULL; char *nick; - if (sd == NULL || !pc_ismarried (sd)) + if (sd == NULL || !pc_ismarried(sd)) return NULL; - nick = map_charid2nick (sd->status.partner_id); + nick = map_charid2nick(sd->status.partner_id); if (nick == NULL) return NULL; - if ((p_sd = map_nick2sd (nick)) == NULL) + if ((p_sd = map_nick2sd(nick)) == NULL) return NULL; return p_sd; @@ -7861,14 +7858,14 @@ struct map_session_data *pc_get_partner (struct map_session_data *sd) *------------------------------------------ */ static int natural_heal_tick, natural_heal_prev_tick, natural_heal_diff_tick; -static int pc_spheal (struct map_session_data *sd) +static int pc_spheal(struct map_session_data *sd) { - int a; + int a; - nullpo_retr (0, sd); + nullpo_retr(0, sd); a = natural_heal_diff_tick; - if (pc_issit (sd)) + if (pc_issit(sd)) a += a; if (sd->sc_data[SC_MAGNIFICAT].timer != -1) // マグニフィカート a += a; @@ -7880,14 +7877,14 @@ static int pc_spheal (struct map_session_data *sd) * HP回復量計算 *------------------------------------------ */ -static int pc_hpheal (struct map_session_data *sd) +static int pc_hpheal(struct map_session_data *sd) { - int a; + int a; - nullpo_retr (0, sd); + nullpo_retr(0, sd); a = natural_heal_diff_tick; - if (pc_issit (sd)) + if (pc_issit(sd)) a += a; if (sd->sc_data[SC_MAGNIFICAT].timer != -1) // Modified by RoVeRT a += a; @@ -7895,29 +7892,29 @@ static int pc_hpheal (struct map_session_data *sd) return a; } -static int pc_natural_heal_hp (struct map_session_data *sd) +static int pc_natural_heal_hp(struct map_session_data *sd) { - int bhp; - int inc_num, bonus, skill, hp_flag; + int bhp; + int inc_num, bonus, skill, hp_flag; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->sc_data[SC_TRICKDEAD].timer != -1) // Modified by RoVeRT return 0; - if (pc_checkoverhp (sd)) + if (pc_checkoverhp(sd)) { sd->hp_sub = sd->inchealhptick = 0; return 0; } bhp = sd->status.hp; - hp_flag = (pc_checkskill (sd, SM_MOVINGRECOVERY) > 0 + hp_flag = (pc_checkskill(sd, SM_MOVINGRECOVERY) > 0 && sd->walktimer != -1); if (sd->walktimer == -1) { - inc_num = pc_hpheal (sd); + inc_num = pc_hpheal(sd); if (sd->sc_data[SC_TENSIONRELAX].timer != -1) { // テンションリラックス sd->hp_sub += 2 * inc_num; @@ -7931,7 +7928,7 @@ static int pc_natural_heal_hp (struct map_session_data *sd) } else if (hp_flag) { - inc_num = pc_hpheal (sd); + inc_num = pc_hpheal(sd); sd->hp_sub += inc_num; sd->inchealhptick = 0; } @@ -7963,7 +7960,7 @@ static int pc_natural_heal_hp (struct map_session_data *sd) } } if (bhp != sd->status.hp) - clif_updatestatus (sd, SP_HP); + clif_updatestatus(sd, SP_HP); if (sd->nshealhp > 0) { @@ -7984,7 +7981,7 @@ static int pc_natural_heal_hp (struct map_session_data *sd) sd->status.hp = sd->status.max_hp; sd->hp_sub = sd->inchealhptick = 0; } - clif_heal (sd->fd, SP_HP, bonus); + clif_heal(sd->fd, SP_HP, bonus); } } } @@ -8009,7 +8006,7 @@ static int pc_natural_heal_hp (struct map_session_data *sd) sd->status.hp = sd->status.max_hp; sd->hp_sub = sd->inchealhptick = 0; } - clif_heal (sd->fd, SP_HP, bonus); + clif_heal(sd->fd, SP_HP, bonus); } } } @@ -8019,17 +8016,17 @@ static int pc_natural_heal_hp (struct map_session_data *sd) return 0; } -static int pc_natural_heal_sp (struct map_session_data *sd) +static int pc_natural_heal_sp(struct map_session_data *sd) { - int bsp; - int inc_num, bonus; + int bsp; + int inc_num, bonus; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->sc_data[SC_TRICKDEAD].timer != -1) // Modified by RoVeRT return 0; - if (pc_checkoversp (sd)) + if (pc_checkoversp(sd)) { sd->sp_sub = sd->inchealsptick = 0; return 0; @@ -8037,7 +8034,7 @@ static int pc_natural_heal_sp (struct map_session_data *sd) bsp = sd->status.sp; - inc_num = pc_spheal (sd); + inc_num = pc_spheal(sd); if (sd->sc_data[SC_EXPLOSIONSPIRITS].timer == -1) sd->sp_sub += inc_num; if (sd->walktimer == -1) @@ -8062,14 +8059,14 @@ static int pc_natural_heal_sp (struct map_session_data *sd) } if (bsp != sd->status.sp) - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); if (sd->nshealsp > 0) { if (sd->inchealsptick >= battle_config.natural_heal_skill_interval && sd->status.sp < sd->status.max_sp) { - struct pc_base_job s_class = pc_calc_base_job (sd->status.pc_class); + struct pc_base_job s_class = pc_calc_base_job(sd->status.pc_class); if (sd->doridori_counter && s_class.job == 23) bonus = sd->nshealsp * 2; else @@ -8088,7 +8085,7 @@ static int pc_natural_heal_sp (struct map_session_data *sd) sd->status.sp = sd->status.max_sp; sd->sp_sub = sd->inchealsptick = 0; } - clif_heal (sd->fd, SP_SP, bonus); + clif_heal(sd->fd, SP_SP, bonus); } } } @@ -8098,14 +8095,14 @@ static int pc_natural_heal_sp (struct map_session_data *sd) return 0; } -static int pc_spirit_heal_hp (struct map_session_data *sd, int level) +static int pc_spirit_heal_hp(struct map_session_data *sd, int level) { - int bonus_hp, interval = battle_config.natural_heal_skill_interval; - struct status_change *sc_data = battle_get_sc_data (&sd->bl); + int bonus_hp, interval = battle_config.natural_heal_skill_interval; + struct status_change *sc_data = battle_get_sc_data(&sd->bl); - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (pc_checkoverhp (sd)) + if (pc_checkoverhp(sd)) { sd->inchealspirithptick = 0; return 0; @@ -8123,7 +8120,7 @@ static int pc_spirit_heal_hp (struct map_session_data *sd, int level) bonus_hp = sd->nsshealhp; while (sd->inchealspirithptick >= interval) { - if (pc_issit (sd)) + if (pc_issit(sd)) { sd->inchealspirithptick -= interval; if (sd->status.hp < sd->status.max_hp) @@ -8135,7 +8132,7 @@ static int pc_spirit_heal_hp (struct map_session_data *sd, int level) bonus_hp = sd->status.max_hp - sd->status.hp; sd->status.hp = sd->status.max_hp; } - clif_heal (sd->fd, SP_HP, bonus_hp); + clif_heal(sd->fd, SP_HP, bonus_hp); sd->inchealspirithptick = 0; } } @@ -8150,13 +8147,13 @@ static int pc_spirit_heal_hp (struct map_session_data *sd, int level) return 0; } -static int pc_spirit_heal_sp (struct map_session_data *sd, int level) +static int pc_spirit_heal_sp(struct map_session_data *sd, int level) { - int bonus_sp, interval = battle_config.natural_heal_skill_interval; + int bonus_sp, interval = battle_config.natural_heal_skill_interval; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (pc_checkoversp (sd)) + if (pc_checkoversp(sd)) { sd->inchealspiritsptick = 0; return 0; @@ -8173,7 +8170,7 @@ static int pc_spirit_heal_sp (struct map_session_data *sd, int level) bonus_sp = sd->nsshealsp; while (sd->inchealspiritsptick >= interval) { - if (pc_issit (sd)) + if (pc_issit(sd)) { sd->inchealspiritsptick -= interval; if (sd->status.sp < sd->status.max_sp) @@ -8185,7 +8182,7 @@ static int pc_spirit_heal_sp (struct map_session_data *sd, int level) bonus_sp = sd->status.max_sp - sd->status.sp; sd->status.sp = sd->status.max_sp; } - clif_heal (sd->fd, SP_SP, bonus_sp); + clif_heal(sd->fd, SP_SP, bonus_sp); sd->inchealspiritsptick = 0; } } @@ -8206,13 +8203,13 @@ static int pc_spirit_heal_sp (struct map_session_data *sd, int level) */ static int -pc_quickregenerate_effect (struct quick_regeneration *quick_regen, +pc_quickregenerate_effect(struct quick_regeneration *quick_regen, int heal_speed) { if (!(quick_regen->tickdelay--)) { - int bonus = - MIN (heal_speed * battle_config.itemheal_regeneration_factor, + int bonus = + MIN(heal_speed * battle_config.itemheal_regeneration_factor, quick_regen->amount); quick_regen->amount -= bonus; @@ -8225,11 +8222,11 @@ pc_quickregenerate_effect (struct quick_regeneration *quick_regen, return 0; } -static int pc_natural_heal_sub (struct map_session_data *sd, va_list ap) +static int pc_natural_heal_sub(struct map_session_data *sd, va_list ap) { - int skill; + int skill; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->heal_xp > 0) { @@ -8243,7 +8240,7 @@ static int pc_natural_heal_sub (struct map_session_data *sd, va_list ap) if (sd->spellpower_bonus_target < sd->spellpower_bonus_current) { sd->spellpower_bonus_current = sd->spellpower_bonus_target; - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); } else if (sd->spellpower_bonus_target > sd->spellpower_bonus_current) { @@ -8251,7 +8248,7 @@ static int pc_natural_heal_sub (struct map_session_data *sd, va_list ap) 1 + ((sd->spellpower_bonus_target - sd->spellpower_bonus_current) >> 5); - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); } if (sd->sc_data[SC_HALT_REGENERATE].timer != -1) @@ -8259,40 +8256,40 @@ static int pc_natural_heal_sub (struct map_session_data *sd, va_list ap) if (sd->quick_regeneration_hp.amount || sd->quick_regeneration_sp.amount) { - int hp_bonus = pc_quickregenerate_effect (&sd->quick_regeneration_hp, + int hp_bonus = pc_quickregenerate_effect(&sd->quick_regeneration_hp, (sd->sc_data[SC_POISON].timer == -1 || sd->sc_data[SC_SLOWPOISON].timer != -1) ? sd->nhealhp : 1); // [fate] slow down when poisoned - int sp_bonus = pc_quickregenerate_effect (&sd->quick_regeneration_sp, + int sp_bonus = pc_quickregenerate_effect(&sd->quick_regeneration_sp, sd->nhealsp); - pc_itemheal_effect (sd, hp_bonus, sp_bonus); + pc_itemheal_effect(sd, hp_bonus, sp_bonus); } - skill_update_heal_animation (sd); // if needed. + skill_update_heal_animation(sd); // if needed. // -- moonsoul (if conditions below altered to disallow natural healing if under berserk status) if ((sd->sc_data[SC_FLYING_BACKPACK].timer != -1 || battle_config.natural_heal_weight_rate > 100 || sd->weight * 100 / sd->max_weight < - battle_config.natural_heal_weight_rate) && !pc_isdead (sd) - && !pc_ishiding (sd) && sd->sc_data[SC_POISON].timer == -1) + battle_config.natural_heal_weight_rate) && !pc_isdead(sd) + && !pc_ishiding(sd) && sd->sc_data[SC_POISON].timer == -1) { - pc_natural_heal_hp (sd); + pc_natural_heal_hp(sd); if (sd->sc_data && sd->sc_data[SC_EXTREMITYFIST].timer == -1 && //阿修羅状態ではSPが回復しない sd->sc_data[SC_DANCING].timer == -1 && //ダンス状態ではSPが回復しない sd->sc_data[SC_BERSERK].timer == -1 //バーサーク状態ではSPが回復しない ) - pc_natural_heal_sp (sd); + pc_natural_heal_sp(sd); } else { sd->hp_sub = sd->inchealhptick = 0; sd->sp_sub = sd->inchealsptick = 0; } - if ((skill = pc_checkskill (sd, MO_SPIRITSRECOVERY)) > 0 - && !pc_ishiding (sd) && sd->sc_data[SC_POISON].timer == -1 + if ((skill = pc_checkskill(sd, MO_SPIRITSRECOVERY)) > 0 + && !pc_ishiding(sd) && sd->sc_data[SC_POISON].timer == -1 && sd->sc_data[SC_BERSERK].timer == -1) { - pc_spirit_heal_hp (sd, skill); - pc_spirit_heal_sp (sd, skill); + pc_spirit_heal_hp(sd, skill); + pc_spirit_heal_sp(sd, skill); } else { @@ -8307,12 +8304,12 @@ static int pc_natural_heal_sub (struct map_session_data *sd, va_list ap) *------------------------------------------ */ static -void pc_natural_heal (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void pc_natural_heal(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { natural_heal_tick = tick; natural_heal_diff_tick = - DIFF_TICK (natural_heal_tick, natural_heal_prev_tick); - clif_foreachclient (pc_natural_heal_sub); + DIFF_TICK(natural_heal_tick, natural_heal_prev_tick); + clif_foreachclient(pc_natural_heal_sub); natural_heal_prev_tick = tick; } @@ -8321,11 +8318,11 @@ void pc_natural_heal (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d * セーブポイントの保存 *------------------------------------------ */ -int pc_setsavepoint (struct map_session_data *sd, const char *mapname, int x, int y) +int pc_setsavepoint(struct map_session_data *sd, const char *mapname, int x, int y) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); - strncpy (sd->status.save_point.map, mapname, 23); + strncpy(sd->status.save_point.map, mapname, 23); sd->status.save_point.map[23] = '\0'; sd->status.save_point.x = x; sd->status.save_point.y = y; @@ -8338,16 +8335,16 @@ int pc_setsavepoint (struct map_session_data *sd, const char *mapname, int x, in *------------------------------------------ */ static int last_save_fd, save_flag; -static int pc_autosave_sub (struct map_session_data *sd, va_list ap) +static int pc_autosave_sub(struct map_session_data *sd, va_list ap) { - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (save_flag == 0 && sd->fd > last_save_fd) { - int i; + int i; - pc_makesavestatus (sd); - chrif_save (sd); + pc_makesavestatus(sd); + chrif_save(sd); save_flag = 1; last_save_fd = sd->fd; @@ -8361,33 +8358,33 @@ static int pc_autosave_sub (struct map_session_data *sd, va_list ap) *------------------------------------------ */ static -void pc_autosave (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void pc_autosave(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - int interval; + int interval; save_flag = 0; - clif_foreachclient (pc_autosave_sub); + clif_foreachclient(pc_autosave_sub); if (save_flag == 0) last_save_fd = 0; - interval = autosave_interval / (clif_countusers () + 1); + interval = autosave_interval / (clif_countusers() + 1); if (interval <= 0) interval = 1; - add_timer (gettick () + interval, pc_autosave, 0, 0); + add_timer(gettick() + interval, pc_autosave, 0, 0); } -int pc_read_gm_account (int fd) +int pc_read_gm_account(int fd) { - int i = 0; + int i = 0; if (gm_account != NULL) - free (gm_account); + free(gm_account); GM_num = 0; - CREATE (gm_account, struct gm_account, (RFIFOW (fd, 2) - 4) / 5); - for (i = 4; i < RFIFOW (fd, 2); i = i + 5) + CREATE(gm_account, struct gm_account, (RFIFOW(fd, 2) - 4) / 5); + for (i = 4; i < RFIFOW(fd, 2); i = i + 5) { - gm_account[GM_num].account_id = RFIFOL (fd, i); - gm_account[GM_num].level = (int) RFIFOB (fd, i + 4); + gm_account[GM_num].account_id = RFIFOL(fd, i); + gm_account[GM_num].level = (int) RFIFOB(fd, i + 4); //printf("GM account: %d -> level %d\n", gm_account[GM_num].account_id, gm_account[GM_num].level); GM_num++; } @@ -8398,17 +8395,17 @@ int pc_read_gm_account (int fd) * timer to do the day *------------------------------------------ */ -void map_day_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void map_day_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { // by [yor] struct map_session_data *pl_sd = NULL; - int i; + int i; char tmpstr[1024]; if (battle_config.day_duration > 0) { // if we want a day if (night_flag != 0) { - strcpy (tmpstr, "The day has arrived!"); + strcpy(tmpstr, "The day has arrived!"); night_flag = 0; // 0=day, 1=night [Yor] for (i = 0; i < fd_max; i++) { @@ -8416,9 +8413,9 @@ void map_day_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t dat && pl_sd->state.auth) { pl_sd->opt2 &= ~STATE_BLIND; - clif_changeoption (&pl_sd->bl); - clif_wis_message (pl_sd->fd, wisp_server_name, tmpstr, - strlen (tmpstr) + 1); + clif_changeoption(&pl_sd->bl); + clif_wis_message(pl_sd->fd, wisp_server_name, tmpstr, + strlen(tmpstr) + 1); } } } @@ -8429,17 +8426,17 @@ void map_day_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t dat * timer to do the night *------------------------------------------ */ -void map_night_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void map_night_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { // by [yor] struct map_session_data *pl_sd = NULL; - int i; + int i; char tmpstr[1024]; if (battle_config.night_duration > 0) { // if we want a night if (night_flag == 0) { - strcpy (tmpstr, "The night has fallen..."); + strcpy(tmpstr, "The night has fallen..."); night_flag = 1; // 0=day, 1=night [Yor] for (i = 0; i < fd_max; i++) { @@ -8447,21 +8444,21 @@ void map_night_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d && pl_sd->state.auth) { pl_sd->opt2 |= STATE_BLIND; - clif_changeoption (&pl_sd->bl); - clif_wis_message (pl_sd->fd, wisp_server_name, tmpstr, - strlen (tmpstr) + 1); + clif_changeoption(&pl_sd->bl); + clif_wis_message(pl_sd->fd, wisp_server_name, tmpstr, + strlen(tmpstr) + 1); } } } } } -void pc_setstand (struct map_session_data *sd) +void pc_setstand(struct map_session_data *sd) { - nullpo_retv (sd); + nullpo_retv(sd); if (sd->sc_data && sd->sc_data[SC_TENSIONRELAX].timer != -1) - skill_status_change_end (&sd->bl, SC_TENSIONRELAX, -1); + skill_status_change_end(&sd->bl, SC_TENSIONRELAX, -1); sd->state.dead_sit = 0; } @@ -8481,28 +8478,27 @@ void pc_setstand (struct map_session_data *sd) *------------------------------------------ */ static -int pc_readdb (void) +int pc_readdb(void) { - int i, j, k; + int i, j, k; FILE *fp; char line[1024], *p; // 必要経験値読み込み - fp = fopen_ ("db/exp.txt", "r"); + fp = fopen_("db/exp.txt", "r"); if (fp == NULL) { - printf ("can't read db/exp.txt\n"); + printf("can't read db/exp.txt\n"); return 1; } i = 0; - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { - int bn, b1, b2, b3, b4, b5, b6, jn, j1, j2, j3, j4, j5, j6; + int bn, b1, b2, b3, b4, b5, b6, jn, j1, j2, j3, j4, j5, j6; if (line[0] == '/' && line[1] == '/') continue; - if (sscanf - (line, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", &bn, &b1, &b2, + if (sscanf(line, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", &bn, &b1, &b2, &b3, &b4, &b5, &b6, &jn, &j1, &j2, &j3, &j4, &j5, &j6) != 14) continue; exp_table[0][i] = bn; @@ -8523,18 +8519,18 @@ int pc_readdb (void) if (i >= battle_config.maximum_level) break; } - fclose_ (fp); - printf ("read db/exp.txt done\n"); + fclose_(fp); + printf("read db/exp.txt done\n"); // JOB補正数値１ - fp = fopen_ ("db/job_db1.txt", "r"); + fp = fopen_("db/job_db1.txt", "r"); if (fp == NULL) { - printf ("can't read db/job_db1.txt\n"); + printf("can't read db/job_db1.txt\n"); return 1; } i = 0; - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { char *split[50]; if (line[0] == '/' && line[1] == '/') @@ -8542,18 +8538,18 @@ int pc_readdb (void) for (j = 0, p = line; j < 21 && p; j++) { split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } if (j < 21) continue; - max_weight_base[i] = atoi (split[0]); - hp_coefficient[i] = atoi (split[1]); - hp_coefficient2[i] = atoi (split[2]); - sp_coefficient[i] = atoi (split[3]); + max_weight_base[i] = atoi(split[0]); + hp_coefficient[i] = atoi(split[1]); + hp_coefficient2[i] = atoi(split[2]); + sp_coefficient[i] = atoi(split[3]); for (j = 0; j < 17; j++) - aspd_base[i][j] = atoi (split[j + 4]); + aspd_base[i][j] = atoi(split[j + 4]); i++; // -- moonsoul (below two lines added to accommodate high numbered new class ids) if (i == 24) @@ -8561,28 +8557,28 @@ int pc_readdb (void) if (i == MAX_PC_CLASS) break; } - fclose_ (fp); - printf ("read db/job_db1.txt done\n"); + fclose_(fp); + printf("read db/job_db1.txt done\n"); // JOBボーナス - fp = fopen_ ("db/job_db2.txt", "r"); + fp = fopen_("db/job_db2.txt", "r"); if (fp == NULL) { - printf ("can't read db/job_db2.txt\n"); + printf("can't read db/job_db2.txt\n"); return 1; } i = 0; - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { if (line[0] == '/' && line[1] == '/') continue; for (j = 0, p = line; j < MAX_LEVEL && p; j++) { - if (sscanf (p, "%d", &k) == 0) + if (sscanf(p, "%d", &k) == 0) break; job_bonus[0][i][j] = k; job_bonus[2][i][j] = k; //養子職のボーナスは分からないので仮 - p = strchr (p, ','); + p = strchr(p, ','); if (p) p++; } @@ -8593,27 +8589,27 @@ int pc_readdb (void) if (i == MAX_PC_CLASS) break; } - fclose_ (fp); - printf ("read db/job_db2.txt done\n"); + fclose_(fp); + printf("read db/job_db2.txt done\n"); // JOBボーナス2 転生職用 - fp = fopen_ ("db/job_db2-2.txt", "r"); + fp = fopen_("db/job_db2-2.txt", "r"); if (fp == NULL) { - printf ("can't read db/job_db2-2.txt\n"); + printf("can't read db/job_db2-2.txt\n"); return 1; } i = 0; - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { if (line[0] == '/' && line[1] == '/') continue; for (j = 0, p = line; j < MAX_LEVEL && p; j++) { - if (sscanf (p, "%d", &k) == 0) + if (sscanf(p, "%d", &k) == 0) break; job_bonus[1][i][j] = k; - p = strchr (p, ','); + p = strchr(p, ','); if (p) p++; } @@ -8621,18 +8617,18 @@ int pc_readdb (void) if (i == MAX_PC_CLASS) break; } - fclose_ (fp); - printf ("read db/job_db2-2.txt done\n"); + fclose_(fp); + printf("read db/job_db2-2.txt done\n"); // スキルツリー - memset (skill_tree, 0, sizeof (skill_tree)); - fp = fopen_ ("db/skill_tree.txt", "r"); + memset(skill_tree, 0, sizeof(skill_tree)); + fp = fopen_("db/skill_tree.txt", "r"); if (fp == NULL) { - printf ("can't read db/skill_tree.txt\n"); + printf("can't read db/skill_tree.txt\n"); return 1; } - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { char *split[50]; if (line[0] == '/' && line[1] == '/') @@ -8640,60 +8636,60 @@ int pc_readdb (void) for (j = 0, p = line; j < 13 && p; j++) { split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } if (j < 13) continue; - i = atoi (split[0]); + i = atoi(split[0]); for (j = 0; skill_tree[0][i][j].id; j++); - skill_tree[0][i][j].id = atoi (split[1]); - skill_tree[0][i][j].max = atoi (split[2]); - skill_tree[2][i][j].id = atoi (split[1]); //養子職は良く分からないので暫定 - skill_tree[2][i][j].max = atoi (split[2]); //養子職は良く分からないので暫定 + skill_tree[0][i][j].id = atoi(split[1]); + skill_tree[0][i][j].max = atoi(split[2]); + skill_tree[2][i][j].id = atoi(split[1]); //養子職は良く分からないので暫定 + skill_tree[2][i][j].max = atoi(split[2]); //養子職は良く分からないので暫定 for (k = 0; k < 5; k++) { - skill_tree[0][i][j].need[k].id = atoi (split[k * 2 + 3]); - skill_tree[0][i][j].need[k].lv = atoi (split[k * 2 + 4]); - skill_tree[2][i][j].need[k].id = atoi (split[k * 2 + 3]); //養子職は良く分からないので暫定 - skill_tree[2][i][j].need[k].lv = atoi (split[k * 2 + 4]); //養子職は良く分からないので暫定 + skill_tree[0][i][j].need[k].id = atoi(split[k * 2 + 3]); + skill_tree[0][i][j].need[k].lv = atoi(split[k * 2 + 4]); + skill_tree[2][i][j].need[k].id = atoi(split[k * 2 + 3]); //養子職は良く分からないので暫定 + skill_tree[2][i][j].need[k].lv = atoi(split[k * 2 + 4]); //養子職は良く分からないので暫定 } } - fclose_ (fp); - printf ("read db/skill_tree.txt done\n"); + fclose_(fp); + printf("read db/skill_tree.txt done\n"); // 属性修正テーブル for (i = 0; i < 4; i++) for (j = 0; j < 10; j++) for (k = 0; k < 10; k++) attr_fix_table[i][j][k] = 100; - fp = fopen_ ("db/attr_fix.txt", "r"); + fp = fopen_("db/attr_fix.txt", "r"); if (fp == NULL) { - printf ("can't read db/attr_fix.txt\n"); + printf("can't read db/attr_fix.txt\n"); return 1; } - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { char *split[10]; - int lv, n; + int lv, n; if (line[0] == '/' && line[1] == '/') continue; for (j = 0, p = line; j < 3 && p; j++) { split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } - lv = atoi (split[0]); - n = atoi (split[1]); + lv = atoi(split[0]); + n = atoi(split[1]); // printf("%d %d\n",lv,n); for (i = 0; i < n;) { - if (!fgets (line, sizeof (line) - 1, fp)) + if (!fgets(line, sizeof(line) - 1, fp)) break; if (line[0] == '/' && line[1] == '/') continue; @@ -8702,11 +8698,11 @@ int pc_readdb (void) { while (*p == 32 && *p > 0) p++; - attr_fix_table[lv - 1][i][j] = atoi (p); + attr_fix_table[lv - 1][i][j] = atoi(p); if (battle_config.attr_recover == 0 && attr_fix_table[lv - 1][i][j] < 0) attr_fix_table[lv - 1][i][j] = 0; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } @@ -8714,41 +8710,41 @@ int pc_readdb (void) i++; } } - fclose_ (fp); - printf ("read db/attr_fix.txt done\n"); + fclose_(fp); + printf("read db/attr_fix.txt done\n"); // サイズ補正テーブル for (i = 0; i < 3; i++) for (j = 0; j < 20; j++) atkmods[i][j] = 100; - fp = fopen_ ("db/size_fix.txt", "r"); + fp = fopen_("db/size_fix.txt", "r"); if (fp == NULL) { - printf ("can't read db/size_fix.txt\n"); + printf("can't read db/size_fix.txt\n"); return 1; } i = 0; - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { char *split[20]; if (line[0] == '/' && line[1] == '/') continue; - if (atoi (line) <= 0) + if (atoi(line) <= 0) continue; - memset (split, 0, sizeof (split)); + memset(split, 0, sizeof(split)); for (j = 0, p = line; j < 20 && p; j++) { split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } for (j = 0; j < 20 && split[j]; j++) - atkmods[i][j] = atoi (split[j]); + atkmods[i][j] = atoi(split[j]); i++; } - fclose_ (fp); - printf ("read db/size_fix.txt done\n"); + fclose_(fp); + printf("read db/size_fix.txt done\n"); // 精錬データテーブル for (i = 0; i < 5; i++) @@ -8759,48 +8755,48 @@ int pc_readdb (void) refinebonus[i][1] = 0; refinebonus[i][2] = 10; } - fp = fopen_ ("db/refine_db.txt", "r"); + fp = fopen_("db/refine_db.txt", "r"); if (fp == NULL) { - printf ("can't read db/refine_db.txt\n"); + printf("can't read db/refine_db.txt\n"); return 1; } i = 0; - while (fgets (line, sizeof (line) - 1, fp)) + while (fgets(line, sizeof(line) - 1, fp)) { char *split[16]; if (line[0] == '/' && line[1] == '/') continue; - if (atoi (line) <= 0) + if (atoi(line) <= 0) continue; - memset (split, 0, sizeof (split)); + memset(split, 0, sizeof(split)); for (j = 0, p = line; j < 16 && p; j++) { split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } - refinebonus[i][0] = atoi (split[0]); // 精錬ボーナス - refinebonus[i][1] = atoi (split[1]); // 過剰精錬ボーナス - refinebonus[i][2] = atoi (split[2]); // 安全精錬限界 + refinebonus[i][0] = atoi(split[0]); // 精錬ボーナス + refinebonus[i][1] = atoi(split[1]); // 過剰精錬ボーナス + refinebonus[i][2] = atoi(split[2]); // 安全精錬限界 for (j = 0; j < 10 && split[j]; j++) - percentrefinery[i][j] = atoi (split[j + 3]); + percentrefinery[i][j] = atoi(split[j + 3]); i++; } - fclose_ (fp); //Lupus. close this file!!! - printf ("read db/refine_db.txt done\n"); + fclose_(fp); //Lupus. close this file!!! + printf("read db/refine_db.txt done\n"); return 0; } -static int pc_calc_sigma (void) +static int pc_calc_sigma(void) { - int i, j, k; + int i, j, k; for (i = 0; i < MAX_PC_CLASS; i++) { - memset (hp_sigma_val[i], 0, sizeof (hp_sigma_val[i])); + memset(hp_sigma_val[i], 0, sizeof(hp_sigma_val[i])); for (k = 0, j = 2; j <= MAX_LEVEL; j++) { k += hp_coefficient[i] * j + 50; @@ -8811,29 +8807,29 @@ static int pc_calc_sigma (void) return 0; } -static void pc_statpointdb (void) +static void pc_statpointdb(void) { char *buf_stat; - int i = 0, j = 0, k = 0, l = 0, end = 0; + int i = 0, j = 0, k = 0, l = 0, end = 0; FILE *stp; - stp = fopen_ ("db/statpoint.txt", "r"); + stp = fopen_("db/statpoint.txt", "r"); if (stp == NULL) { - printf ("can't read db/statpoint.txt\n"); + printf("can't read db/statpoint.txt\n"); return; } - fseek (stp, 0, SEEK_END); - end = ftell (stp); - rewind (stp); + fseek(stp, 0, SEEK_END); + end = ftell(stp); + rewind(stp); - buf_stat = (char *) malloc (end + 1); - l = fread (buf_stat, 1, end, stp); - fclose_ (stp); - printf ("read db/statpoint.txt done (size=%d)\n", l); + buf_stat = (char *) malloc(end + 1); + l = fread(buf_stat, 1, end, stp); + fclose_(stp); + printf("read db/statpoint.txt done (size=%d)\n", l); for (i = 0; i < 255; i++) { @@ -8848,29 +8844,29 @@ static void pc_statpointdb (void) k++; } - free (buf_stat); + free(buf_stat); } /*========================================== * pc関 係初期化 *------------------------------------------ */ -int do_init_pc (void) +int do_init_pc(void) { - pc_readdb (); - pc_statpointdb (); - pc_calc_sigma (); + pc_readdb(); + pc_statpointdb(); + pc_calc_sigma(); // gm_account_db = numdb_init(); - add_timer_interval ((natural_heal_prev_tick = - gettick () + NATURAL_HEAL_INTERVAL), pc_natural_heal, + add_timer_interval((natural_heal_prev_tick = + gettick() + NATURAL_HEAL_INTERVAL), pc_natural_heal, 0, 0, NATURAL_HEAL_INTERVAL); - add_timer (gettick () + autosave_interval, pc_autosave, 0, 0); + add_timer(gettick() + autosave_interval, pc_autosave, 0, 0); { - int day_duration = battle_config.day_duration; - int night_duration = battle_config.night_duration; + int day_duration = battle_config.day_duration; + int night_duration = battle_config.night_duration; if (day_duration < 60000) day_duration = 60000; if (night_duration < 60000) @@ -8879,11 +8875,11 @@ int do_init_pc (void) { night_flag = 0; // 0=day, 1=night [Yor] day_timer_tid = - add_timer_interval (gettick () + day_duration + + add_timer_interval(gettick() + day_duration + night_duration, map_day_timer, 0, 0, day_duration + night_duration); night_timer_tid = - add_timer_interval (gettick () + day_duration, + add_timer_interval(gettick() + day_duration, map_night_timer, 0, 0, day_duration + night_duration); } @@ -8891,11 +8887,11 @@ int do_init_pc (void) { night_flag = 1; // 0=day, 1=night [Yor] day_timer_tid = - add_timer_interval (gettick () + night_duration, + add_timer_interval(gettick() + night_duration, map_day_timer, 0, 0, day_duration + night_duration); night_timer_tid = - add_timer_interval (gettick () + day_duration + + add_timer_interval(gettick() + day_duration + night_duration, map_night_timer, 0, 0, day_duration + night_duration); } @@ -8904,30 +8900,30 @@ int do_init_pc (void) return 0; } -void pc_cleanup (struct map_session_data *sd) +void pc_cleanup(struct map_session_data *sd) { - magic_stop_completely (sd); + magic_stop_completely(sd); } -void pc_invisibility (struct map_session_data *sd, int enabled) +void pc_invisibility(struct map_session_data *sd, int enabled) { if (enabled && !(sd->status.option & OPTION_INVISIBILITY)) { - clif_clearchar_area (&sd->bl, 3); + clif_clearchar_area(&sd->bl, 3); sd->status.option |= OPTION_INVISIBILITY; - clif_status_change (&sd->bl, CLIF_OPTION_SC_INVISIBILITY, 1); + clif_status_change(&sd->bl, CLIF_OPTION_SC_INVISIBILITY, 1); } else if (!enabled) { sd->status.option &= ~OPTION_INVISIBILITY; - clif_status_change (&sd->bl, CLIF_OPTION_SC_INVISIBILITY, 0); - pc_setpos (sd, map[sd->bl.m].name, sd->bl.x, sd->bl.y, 3); + clif_status_change(&sd->bl, CLIF_OPTION_SC_INVISIBILITY, 0); + pc_setpos(sd, map[sd->bl.m].name, sd->bl.x, sd->bl.y, 3); } } -int pc_logout (struct map_session_data *sd) // [fate] Player logs out +int pc_logout(struct map_session_data *sd) // [fate] Player logs out { - unsigned int tick = gettick (); + unsigned int tick = gettick(); if (!sd) return 0; @@ -8943,12 +8939,12 @@ int pc_logout (struct map_session_data *sd) // [fate] Player logs out // Removed because it's buggy, see above. if (sd->cast_tick > tick) { - if (pc_setglobalreg (sd, "MAGIC_CAST_TICK", sd->cast_tick - tick)) + if (pc_setglobalreg(sd, "MAGIC_CAST_TICK", sd->cast_tick - tick)) sd->status.sp = 1; } else #endif - pc_setglobalreg (sd, "MAGIC_CAST_TICK", 0); + pc_setglobalreg(sd, "MAGIC_CAST_TICK", 0); - MAP_LOG_STATS (sd, "LOGOUT") return 0; + MAP_LOG_STATS(sd, "LOGOUT") return 0; } diff --git a/src/map/pc.hpp b/src/map/pc.hpp index cc433b8..9027694 100644 --- a/src/map/pc.hpp +++ b/src/map/pc.hpp @@ -23,179 +23,179 @@ #define pc_is50overweight(sd) (sd->weight*2 >= sd->max_weight) #define pc_is90overweight(sd) (sd->weight*10 >= sd->max_weight*9) -void pc_touch_all_relevant_npcs (struct map_session_data *sd); /* Checks all npcs/warps at the same location to see whether they +void pc_touch_all_relevant_npcs(struct map_session_data *sd); /* Checks all npcs/warps at the same location to see whether they ** should do something with the specified player. */ -int pc_isGM (struct map_session_data *sd); -int pc_iskiller (struct map_session_data *src, struct map_session_data *target); // [MouseJstr] -int pc_getrefinebonus (int lv, int type); +int pc_isGM(struct map_session_data *sd); +int pc_iskiller(struct map_session_data *src, struct map_session_data *target); // [MouseJstr] +int pc_getrefinebonus(int lv, int type); -void pc_invisibility (struct map_session_data *sd, int enabled); // [Fate] -int pc_counttargeted (struct map_session_data *sd, struct block_list *src, +void pc_invisibility(struct map_session_data *sd, int enabled); // [Fate] +int pc_counttargeted(struct map_session_data *sd, struct block_list *src, int target_lv); -int pc_setrestartvalue (struct map_session_data *sd, int type); -int pc_makesavestatus (struct map_session_data *); -int pc_setnewpc (struct map_session_data *, int, int, int, int, int, int); -int pc_authok (int, int, time_t, short tmw_version, struct mmo_charstatus *); -int pc_authfail (int); - -int pc_isequip (struct map_session_data *sd, int n); -int pc_equippoint (struct map_session_data *sd, int n); - -int pc_breakweapon (struct map_session_data *sd); // weapon breaking [Valaris] -int pc_breakarmor (struct map_session_data *sd); // armor breaking [Valaris] - -int pc_checkskill (struct map_session_data *sd, int skill_id); -int pc_checkallowskill (struct map_session_data *sd); -int pc_checkequip (struct map_session_data *sd, int pos); - -int pc_checkoverhp (struct map_session_data *); -int pc_checkoversp (struct map_session_data *); - -int pc_can_reach (struct map_session_data *, int, int); -int pc_walktoxy (struct map_session_data *, int, int); -int pc_stop_walking (struct map_session_data *, int); -int pc_movepos (struct map_session_data *, int, int); -int pc_setpos (struct map_session_data *, const char *, int, int, int); -int pc_setsavepoint (struct map_session_data *, const char *, int, int); -int pc_randomwarp (struct map_session_data *sd, int type); -int pc_memo (struct map_session_data *sd, int i); - -int pc_checkadditem (struct map_session_data *, int, int); -int pc_inventoryblank (struct map_session_data *); -int pc_search_inventory (struct map_session_data *sd, int item_id); -int pc_payzeny (struct map_session_data *, int); -int pc_additem (struct map_session_data *, struct item *, int); -int pc_getzeny (struct map_session_data *, int); -int pc_delitem (struct map_session_data *, int, int, int); -int pc_checkitem (struct map_session_data *); -int pc_count_all_items (struct map_session_data *player, int item_id); -int pc_remove_items (struct map_session_data *player, int item_id, +int pc_setrestartvalue(struct map_session_data *sd, int type); +int pc_makesavestatus(struct map_session_data *); +int pc_setnewpc(struct map_session_data *, int, int, int, int, int, int); +int pc_authok(int, int, time_t, short tmw_version, struct mmo_charstatus *); +int pc_authfail(int); + +int pc_isequip(struct map_session_data *sd, int n); +int pc_equippoint(struct map_session_data *sd, int n); + +int pc_breakweapon(struct map_session_data *sd); // weapon breaking [Valaris] +int pc_breakarmor(struct map_session_data *sd); // armor breaking [Valaris] + +int pc_checkskill(struct map_session_data *sd, int skill_id); +int pc_checkallowskill(struct map_session_data *sd); +int pc_checkequip(struct map_session_data *sd, int pos); + +int pc_checkoverhp(struct map_session_data *); +int pc_checkoversp(struct map_session_data *); + +int pc_can_reach(struct map_session_data *, int, int); +int pc_walktoxy(struct map_session_data *, int, int); +int pc_stop_walking(struct map_session_data *, int); +int pc_movepos(struct map_session_data *, int, int); +int pc_setpos(struct map_session_data *, const char *, int, int, int); +int pc_setsavepoint(struct map_session_data *, const char *, int, int); +int pc_randomwarp(struct map_session_data *sd, int type); +int pc_memo(struct map_session_data *sd, int i); + +int pc_checkadditem(struct map_session_data *, int, int); +int pc_inventoryblank(struct map_session_data *); +int pc_search_inventory(struct map_session_data *sd, int item_id); +int pc_payzeny(struct map_session_data *, int); +int pc_additem(struct map_session_data *, struct item *, int); +int pc_getzeny(struct map_session_data *, int); +int pc_delitem(struct map_session_data *, int, int, int); +int pc_checkitem(struct map_session_data *); +int pc_count_all_items(struct map_session_data *player, int item_id); +int pc_remove_items(struct map_session_data *player, int item_id, int count); -int pc_cart_additem (struct map_session_data *sd, struct item *item_data, +int pc_cart_additem(struct map_session_data *sd, struct item *item_data, int amount); -int pc_cart_delitem (struct map_session_data *sd, int n, int amount, +int pc_cart_delitem(struct map_session_data *sd, int n, int amount, int type); -int pc_putitemtocart (struct map_session_data *sd, int idx, int amount); -int pc_getitemfromcart (struct map_session_data *sd, int idx, int amount); -int pc_cartitem_amount (struct map_session_data *sd, int idx, int amount); +int pc_putitemtocart(struct map_session_data *sd, int idx, int amount); +int pc_getitemfromcart(struct map_session_data *sd, int idx, int amount); +int pc_cartitem_amount(struct map_session_data *sd, int idx, int amount); -int pc_takeitem (struct map_session_data *, struct flooritem_data *); -int pc_dropitem (struct map_session_data *, int, int); +int pc_takeitem(struct map_session_data *, struct flooritem_data *); +int pc_dropitem(struct map_session_data *, int, int); -int pc_checkweighticon (struct map_session_data *sd); +int pc_checkweighticon(struct map_session_data *sd); -int pc_calcstatus (struct map_session_data *, int); -int pc_bonus (struct map_session_data *, int, int); -int pc_bonus2 (struct map_session_data *sd, int, int, int); -int pc_bonus3 (struct map_session_data *sd, int, int, int, int); -int pc_skill (struct map_session_data *, int, int, int); +int pc_calcstatus(struct map_session_data *, int); +int pc_bonus(struct map_session_data *, int, int); +int pc_bonus2(struct map_session_data *sd, int, int, int); +int pc_bonus3(struct map_session_data *sd, int, int, int, int); +int pc_skill(struct map_session_data *, int, int, int); -int pc_insert_card (struct map_session_data *sd, int idx_card, +int pc_insert_card(struct map_session_data *sd, int idx_card, int idx_equip); -int pc_item_identify (struct map_session_data *sd, int idx); -int pc_steal_item (struct map_session_data *sd, struct block_list *bl); -int pc_steal_coin (struct map_session_data *sd, struct block_list *bl); - -int pc_modifybuyvalue (struct map_session_data *, int); -int pc_modifysellvalue (struct map_session_data *, int); - -int pc_attack (struct map_session_data *, int, int); -int pc_stopattack (struct map_session_data *); - -int pc_follow (struct map_session_data *, int); // [MouseJstr] - -int pc_checkbaselevelup (struct map_session_data *sd); -int pc_checkjoblevelup (struct map_session_data *sd); -int pc_gainexp (struct map_session_data *, int, int); - -#define PC_GAINEXP_REASON_KILLING 0 -#define PC_GAINEXP_REASON_HEALING 1 -#define PC_GAINEXP_REASON_SCRIPT 2 -int pc_gainexp_reason (struct map_session_data *, int, int, int reason); -int pc_extract_healer_exp (struct map_session_data *, int max); // [Fate] Used by healers: extract healer-xp from the target, return result (up to max) - -int pc_nextbaseexp (struct map_session_data *); -int pc_nextbaseafter (struct map_session_data *); // [Valaris] -int pc_nextjobexp (struct map_session_data *); -int pc_nextjobafter (struct map_session_data *); // [Valaris] -int pc_need_status_point (struct map_session_data *, int); -int pc_statusup (struct map_session_data *, int); -int pc_statusup2 (struct map_session_data *, int, int); -int pc_skillup (struct map_session_data *, int); -int pc_allskillup (struct map_session_data *); -int pc_resetlvl (struct map_session_data *, int type); -int pc_resetstate (struct map_session_data *); -int pc_resetskill (struct map_session_data *); -int pc_equipitem (struct map_session_data *, int, int); -int pc_unequipitem (struct map_session_data *, int, int); -int pc_unequipinvyitem (struct map_session_data *, int, int); -int pc_useitem (struct map_session_data *, int); - -int pc_damage (struct block_list *, struct map_session_data *, int); -int pc_heal (struct map_session_data *, int, int); -int pc_itemheal (struct map_session_data *sd, int hp, int sp); -int pc_percentheal (struct map_session_data *sd, int, int); -int pc_jobchange (struct map_session_data *, int, int); -int pc_setoption (struct map_session_data *, int); -int pc_setcart (struct map_session_data *sd, int type); -int pc_setfalcon (struct map_session_data *sd); -int pc_setriding (struct map_session_data *sd); -int pc_changelook (struct map_session_data *, int, int); -int pc_equiplookall (struct map_session_data *sd); - -int pc_readparam (struct map_session_data *, int); -int pc_setparam (struct map_session_data *, int, int); -int pc_readreg (struct map_session_data *, int); -int pc_setreg (struct map_session_data *, int, int); -char *pc_readregstr (struct map_session_data *sd, int reg); -int pc_setregstr (struct map_session_data *sd, int reg, const char *str); -int pc_readglobalreg (struct map_session_data *, const char *); -int pc_setglobalreg (struct map_session_data *, const char *, int); -int pc_readaccountreg (struct map_session_data *, const char *); -int pc_setaccountreg (struct map_session_data *, const char *, int); -int pc_readaccountreg2 (struct map_session_data *, const char *); -int pc_setaccountreg2 (struct map_session_data *, const char *, int); -int pc_percentrefinery (struct map_session_data *sd, struct item *item); - -int pc_addeventtimer (struct map_session_data *sd, int tick, +int pc_item_identify(struct map_session_data *sd, int idx); +int pc_steal_item(struct map_session_data *sd, struct block_list *bl); +int pc_steal_coin(struct map_session_data *sd, struct block_list *bl); + +int pc_modifybuyvalue(struct map_session_data *, int); +int pc_modifysellvalue(struct map_session_data *, int); + +int pc_attack(struct map_session_data *, int, int); +int pc_stopattack(struct map_session_data *); + +int pc_follow(struct map_session_data *, int); // [MouseJstr] + +int pc_checkbaselevelup(struct map_session_data *sd); +int pc_checkjoblevelup(struct map_session_data *sd); +int pc_gainexp(struct map_session_data *, int, int); + +#define PC_GAINEXP_REASON_KILLING 0 +#define PC_GAINEXP_REASON_HEALING 1 +#define PC_GAINEXP_REASON_SCRIPT 2 +int pc_gainexp_reason(struct map_session_data *, int, int, int reason); +int pc_extract_healer_exp(struct map_session_data *, int max); // [Fate] Used by healers: extract healer-xp from the target, return result (up to max) + +int pc_nextbaseexp(struct map_session_data *); +int pc_nextbaseafter(struct map_session_data *); // [Valaris] +int pc_nextjobexp(struct map_session_data *); +int pc_nextjobafter(struct map_session_data *); // [Valaris] +int pc_need_status_point(struct map_session_data *, int); +int pc_statusup(struct map_session_data *, int); +int pc_statusup2(struct map_session_data *, int, int); +int pc_skillup(struct map_session_data *, int); +int pc_allskillup(struct map_session_data *); +int pc_resetlvl(struct map_session_data *, int type); +int pc_resetstate(struct map_session_data *); +int pc_resetskill(struct map_session_data *); +int pc_equipitem(struct map_session_data *, int, int); +int pc_unequipitem(struct map_session_data *, int, int); +int pc_unequipinvyitem(struct map_session_data *, int, int); +int pc_useitem(struct map_session_data *, int); + +int pc_damage(struct block_list *, struct map_session_data *, int); +int pc_heal(struct map_session_data *, int, int); +int pc_itemheal(struct map_session_data *sd, int hp, int sp); +int pc_percentheal(struct map_session_data *sd, int, int); +int pc_jobchange(struct map_session_data *, int, int); +int pc_setoption(struct map_session_data *, int); +int pc_setcart(struct map_session_data *sd, int type); +int pc_setfalcon(struct map_session_data *sd); +int pc_setriding(struct map_session_data *sd); +int pc_changelook(struct map_session_data *, int, int); +int pc_equiplookall(struct map_session_data *sd); + +int pc_readparam(struct map_session_data *, int); +int pc_setparam(struct map_session_data *, int, int); +int pc_readreg(struct map_session_data *, int); +int pc_setreg(struct map_session_data *, int, int); +char *pc_readregstr(struct map_session_data *sd, int reg); +int pc_setregstr(struct map_session_data *sd, int reg, const char *str); +int pc_readglobalreg(struct map_session_data *, const char *); +int pc_setglobalreg(struct map_session_data *, const char *, int); +int pc_readaccountreg(struct map_session_data *, const char *); +int pc_setaccountreg(struct map_session_data *, const char *, int); +int pc_readaccountreg2(struct map_session_data *, const char *); +int pc_setaccountreg2(struct map_session_data *, const char *, int); +int pc_percentrefinery(struct map_session_data *sd, struct item *item); + +int pc_addeventtimer(struct map_session_data *sd, int tick, const char *name); -int pc_deleventtimer (struct map_session_data *sd, const char *name); -int pc_cleareventtimer (struct map_session_data *sd); -int pc_addeventtimercount (struct map_session_data *sd, const char *name, +int pc_deleventtimer(struct map_session_data *sd, const char *name); +int pc_cleareventtimer(struct map_session_data *sd); +int pc_addeventtimercount(struct map_session_data *sd, const char *name, int tick); -int pc_calc_pvprank (struct map_session_data *sd); -void pc_calc_pvprank_timer (timer_id, tick_t, custom_id_t, custom_data_t); +int pc_calc_pvprank(struct map_session_data *sd); +void pc_calc_pvprank_timer(timer_id, tick_t, custom_id_t, custom_data_t); -int pc_ismarried (struct map_session_data *sd); -int pc_marriage (struct map_session_data *sd, +int pc_ismarried(struct map_session_data *sd); +int pc_marriage(struct map_session_data *sd, struct map_session_data *dstsd); -int pc_divorce (struct map_session_data *sd); -struct map_session_data *pc_get_partner (struct map_session_data *sd); -int pc_set_gm_level (int account_id, int level); -void pc_setstand (struct map_session_data *sd); -void pc_cleanup (struct map_session_data *sd); // [Fate] Clean up after a logged-out PC +int pc_divorce(struct map_session_data *sd); +struct map_session_data *pc_get_partner(struct map_session_data *sd); +int pc_set_gm_level(int account_id, int level); +void pc_setstand(struct map_session_data *sd); +void pc_cleanup(struct map_session_data *sd); // [Fate] Clean up after a logged-out PC struct pc_base_job { - int job; //職業、ただし転生職や養子職の場合は元の職業を返す(廃プリ→プリ) - int type; //ノビ 0, 一次職 1, 二次職 2, スパノビ 3 - int upper; //通常 0, 転生 1, 養子 2 + int job; //職業、ただし転生職や養子職の場合は元の職業を返す(廃プリ→プリ) + int type; //ノビ 0, 一次職 1, 二次職 2, スパノビ 3 + int upper; //通常 0, 転生 1, 養子 2 }; -struct pc_base_job pc_calc_base_job (int b_class); //転生や養子職の元の職業を返す +struct pc_base_job pc_calc_base_job(int b_class); //転生や養子職の元の職業を返す -int pc_read_gm_account (int fd); -int pc_setinvincibletimer (struct map_session_data *sd, int); -int pc_delinvincibletimer (struct map_session_data *sd); -int pc_addspiritball (struct map_session_data *sd, int, int); -int pc_delspiritball (struct map_session_data *sd, int, int); -int pc_logout (struct map_session_data *sd); // [fate] Player logs out +int pc_read_gm_account(int fd); +int pc_setinvincibletimer(struct map_session_data *sd, int); +int pc_delinvincibletimer(struct map_session_data *sd); +int pc_addspiritball(struct map_session_data *sd, int, int); +int pc_delspiritball(struct map_session_data *sd, int, int); +int pc_logout(struct map_session_data *sd); // [fate] Player logs out -int do_init_pc (void); +int do_init_pc(void); enum { ADDITEM_EXIST, ADDITEM_NEW, ADDITEM_OVERAMOUNT }; @@ -203,7 +203,7 @@ enum // timer for night.day extern timer_id day_timer_tid; extern timer_id night_timer_tid; -void map_day_timer (timer_id, tick_t, custom_id_t, custom_data_t); // by [yor] -void map_night_timer (timer_id, tick_t, custom_id_t, custom_data_t); // by [yor] +void map_day_timer(timer_id, tick_t, custom_id_t, custom_data_t); // by [yor] +void map_night_timer(timer_id, tick_t, custom_id_t, custom_data_t); // by [yor] #endif diff --git a/src/map/script.cpp b/src/map/script.cpp index b3f44b3..e2181e2 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -51,38 +51,38 @@ static ScriptCode *script_buf; static int script_pos, script_size; char *str_buf; -int str_pos, str_size; +int str_pos, str_size; static struct str_data_t { ScriptCode type; - int str; - int backpatch; - int label; - void (*func) (ScriptState *); - int val; - int next; + int str; + int backpatch; + int label; + void(*func)(ScriptState *); + int val; + int next; } *str_data; -int str_num = LABEL_START, str_data_size; -int str_hash[16]; +int str_num = LABEL_START, str_data_size; +int str_hash[16]; static struct dbt *mapreg_db = NULL; static struct dbt *mapregstr_db = NULL; static int mapreg_dirty = -1; char mapreg_txt[256] = "save/mapreg.txt"; -#define MAPREG_AUTOSAVE_INTERVAL (10*1000) +#define MAPREG_AUTOSAVE_INTERVAL (10*1000) static struct dbt *scriptlabel_db = NULL; static struct dbt *userfunc_db = NULL; -struct dbt *script_get_label_db (void) +struct dbt *script_get_label_db(void) { return scriptlabel_db; } -struct dbt *script_get_userfunc_db (void) +struct dbt *script_get_userfunc_db(void) { if (!userfunc_db) - userfunc_db = strdb_init (50); + userfunc_db = strdb_init(50); return userfunc_db; } @@ -93,12 +93,12 @@ static char pos[11][100] = static struct Script_Config { - int warn_func_no_comma; - int warn_cmd_no_comma; - int warn_func_mismatch_paramnum; - int warn_cmd_mismatch_paramnum; - int check_cmdcount; - int check_gotocount; + int warn_func_no_comma; + int warn_cmd_no_comma; + int warn_func_mismatch_paramnum; + int warn_cmd_mismatch_paramnum; + int check_cmdcount; + int check_gotocount; } script_config; static int parse_cmd_if = 0; static int parse_cmd; @@ -107,7 +107,7 @@ static int parse_cmd; * ローカルプロトタイプ宣言 (必要な物のみ) *------------------------------------------ */ -const char *parse_subexpr (const char *, int); +const char *parse_subexpr(const char *, int); void builtin_mes(ScriptState *st); void builtin_goto(ScriptState *st); void builtin_callsub(ScriptState *st); @@ -136,7 +136,7 @@ void builtin_copyarray(ScriptState *st); void builtin_getarraysize(ScriptState *st); void builtin_deletearray(ScriptState *st); void builtin_getelementofarray(ScriptState *st); -void builtin_if(ScriptState *st); +void builtin_if (ScriptState *st); void builtin_getitem(ScriptState *st); void builtin_getitem2(ScriptState *st); void builtin_makeitem(ScriptState *st); @@ -296,15 +296,15 @@ void builtin_gety(ScriptState *st); // [Kage] void builtin_getmap(ScriptState *st); -void push_val (struct script_stack *stack, int type, int val); -void run_func (ScriptState *st); +void push_val(struct script_stack *stack, int type, int val); +void run_func(ScriptState *st); -void mapreg_setreg (int num, int val); -void mapreg_setregstr (int num, const char *str); +void mapreg_setreg(int num, int val); +void mapreg_setregstr(int num, const char *str); struct { - void (*func) (ScriptState *); + void(*func)(ScriptState *); const char *name; const char *arg; } builtin_functions[] = @@ -520,10 +520,10 @@ enum class ScriptCode : uint8_t * 文字列のハッシュを計算 *------------------------------------------ */ -static int calc_hash (const char *s) +static int calc_hash(const char *s) { const unsigned char *p = (const unsigned char *)s; - int h = 0; + int h = 0; while (*p) { h = (h << 1) + (h >> 3) + (h >> 5) + (h >> 8); @@ -537,13 +537,13 @@ static int calc_hash (const char *s) *------------------------------------------ */ // 既存のであれば番号、無ければ-1 -static int search_str (const char *p) +static int search_str(const char *p) { - int i; - i = str_hash[calc_hash (p)]; + int i; + i = str_hash[calc_hash(p)]; while (i) { - if (strcmp (str_buf + str_data[i].str, p) == 0) + if (strcmp(str_buf + str_data[i].str, p) == 0) { return i; } @@ -557,22 +557,22 @@ static int search_str (const char *p) *------------------------------------------ */ // 既存のであれば番号、無ければ登録して新規番号 -static int add_str (const char *p) +static int add_str(const char *p) { - int i; + int i; char *lowcase; - lowcase = strdup (p); + lowcase = strdup(p); for (i = 0; lowcase[i]; i++) - lowcase[i] = tolower (lowcase[i]); - if ((i = search_str (lowcase)) >= 0) + lowcase[i] = tolower(lowcase[i]); + if ((i = search_str(lowcase)) >= 0) { - free (lowcase); + free(lowcase); return i; } - free (lowcase); + free(lowcase); - i = calc_hash (p); + i = calc_hash(p); if (str_hash[i] == 0) { str_hash[i] = str_num; @@ -582,7 +582,7 @@ static int add_str (const char *p) i = str_hash[i]; for (;;) { - if (strcmp (str_buf + str_data[i].str, p) == 0) + if (strcmp(str_buf + str_data[i].str, p) == 0) { return i; } @@ -595,23 +595,23 @@ static int add_str (const char *p) if (str_num >= str_data_size) { str_data_size += 128; - RECREATE (str_data, struct str_data_t, str_data_size); - memset (str_data + (str_data_size - 128), '\0', 128); + RECREATE(str_data, struct str_data_t, str_data_size); + memset(str_data + (str_data_size - 128), '\0', 128); } - while (str_pos + strlen (p) + 1 >= str_size) + while (str_pos + strlen(p) + 1 >= str_size) { str_size += 256; - str_buf = (char *) realloc (str_buf, str_size); - memset (str_buf + (str_size - 256), '\0', 256); + str_buf = (char *) realloc(str_buf, str_size); + memset(str_buf + (str_size - 256), '\0', 256); } - strcpy (str_buf + str_pos, p); + strcpy(str_buf + str_pos, p); str_data[str_num].type = ScriptCode::NOP; str_data[str_num].str = str_pos; str_data[str_num].next = 0; str_data[str_num].func = NULL; str_data[str_num].backpatch = -1; str_data[str_num].label = -1; - str_pos += strlen (p) + 1; + str_pos += strlen(p) + 1; return str_num++; } @@ -619,13 +619,13 @@ static int add_str (const char *p) * スクリプトバッファサイズの確認と拡張 *------------------------------------------ */ -static void check_script_buf (int size) +static void check_script_buf(int size) { if (script_pos + size >= script_size) { script_size += SCRIPT_BLOCK_SIZE; - script_buf = (ScriptCode *) realloc (script_buf, script_size); - memset (script_buf + script_size - SCRIPT_BLOCK_SIZE, '\0', + script_buf = (ScriptCode *) realloc(script_buf, script_size); + memset(script_buf + script_size - SCRIPT_BLOCK_SIZE, '\0', SCRIPT_BLOCK_SIZE); } } @@ -635,9 +635,9 @@ static void check_script_buf (int size) *------------------------------------------ */ static -void add_scriptc (ScriptCode a) +void add_scriptc(ScriptCode a) { - check_script_buf (1); + check_script_buf(1); script_buf[script_pos++] = a; } @@ -646,7 +646,7 @@ void add_scriptc (ScriptCode a) *------------------------------------------ */ static -void add_scriptb (uint8_t a) +void add_scriptb(uint8_t a) { add_scriptc(static_cast<ScriptCode>(a)); } @@ -655,14 +655,14 @@ void add_scriptb (uint8_t a) * スクリプトバッファに整数を書き込む *------------------------------------------ */ -static void add_scripti (unsigned int a) +static void add_scripti(unsigned int a) { while (a >= 0x40) { - add_scriptb (a | 0xc0); + add_scriptb(a | 0xc0); a = (a - 0x40) >> 6; } - add_scriptb (a | 0x80); + add_scriptb(a | 0x80); } /*========================================== @@ -670,35 +670,35 @@ static void add_scripti (unsigned int a) *------------------------------------------ */ // 最大16Mまで -static void add_scriptl (int l) +static void add_scriptl(int l) { - int backpatch = str_data[l].backpatch; + int backpatch = str_data[l].backpatch; switch (str_data[l].type) { case ScriptCode::POS: - add_scriptc (ScriptCode::POS); - add_scriptb ({uint8_t(str_data[l].label)}); - add_scriptb ({uint8_t(str_data[l].label >> 8)}); - add_scriptb ({uint8_t(str_data[l].label >> 16)}); + add_scriptc(ScriptCode::POS); + add_scriptb({uint8_t(str_data[l].label)}); + add_scriptb({uint8_t(str_data[l].label >> 8)}); + add_scriptb({uint8_t(str_data[l].label >> 16)}); break; case ScriptCode::NOP: // ラベルの可能性があるのでbackpatch用データ埋め込み - add_scriptc (ScriptCode::NAME); + add_scriptc(ScriptCode::NAME); str_data[l].backpatch = script_pos; - add_scriptb ({uint8_t(backpatch)}); - add_scriptb ({uint8_t(backpatch >> 8)}); - add_scriptb ({uint8_t(backpatch >> 16)}); + add_scriptb({uint8_t(backpatch)}); + add_scriptb({uint8_t(backpatch >> 8)}); + add_scriptb({uint8_t(backpatch >> 16)}); break; case ScriptCode::INT: - add_scripti (str_data[l].val); + add_scripti(str_data[l].val); break; default: // もう他の用途と確定してるので数字をそのまま - add_scriptc (ScriptCode::NAME); - add_scriptb ({uint8_t(l)}); - add_scriptb ({uint8_t(l >> 8)}); - add_scriptb ({uint8_t(l >> 16)}); + add_scriptc(ScriptCode::NAME); + add_scriptb({uint8_t(l)}); + add_scriptb({uint8_t(l >> 8)}); + add_scriptb({uint8_t(l >> 16)}); break; } } @@ -708,15 +708,15 @@ static void add_scriptl (int l) *------------------------------------------ */ static -void set_label (int l, int pos_) +void set_label(int l, int pos_) { - int i, next; + int i, next; str_data[l].type = ScriptCode::POS; str_data[l].label = pos_; for (i = str_data[l].backpatch; i >= 0 && i != 0x00ffffff;) { - next = (*(int *) (script_buf + i)) & 0x00ffffff; + next = (*(int *)(script_buf + i)) & 0x00ffffff; script_buf[i - 1] = ScriptCode::POS; script_buf[i] = static_cast<ScriptCode>(pos_); script_buf[i + 1] = static_cast<ScriptCode>(pos_ >> 8); @@ -729,11 +729,11 @@ void set_label (int l, int pos_) * スペース/コメント読み飛ばし *------------------------------------------ */ -static const char *skip_space (const char *p) +static const char *skip_space(const char *p) { while (1) { - while (isspace (*p)) + while (isspace(*p)) p++; if (p[0] == '/' && p[1] == '/') { @@ -759,7 +759,7 @@ static const char *skip_space (const char *p) *------------------------------------------ */ static -const char *skip_word (const char *p) +const char *skip_word(const char *p) { // prefix if (*p == '$') @@ -773,7 +773,7 @@ const char *skip_word (const char *p) if (*p == 'l') p++; // 一時的変数用(like weiss) - while (isalnum (*p) || *p == '_') + while (isalnum(*p) || *p == '_') p++; // postfix @@ -790,7 +790,7 @@ static int startline; * エラーメッセージ出力 *------------------------------------------ */ -static void disp_error_message (const char *mes, const char *pos_) +static void disp_error_message(const char *mes, const char *pos_) { int line; const char *p; @@ -798,7 +798,7 @@ static void disp_error_message (const char *mes, const char *pos_) for (line = startline, p = startptr; p && *p; line++) { const char *linestart = p; - char *lineend = const_cast<char *>(strchr (p, '\n')); + char *lineend = const_cast<char *>(strchr(p, '\n')); char c; if (lineend) { @@ -807,17 +807,17 @@ static void disp_error_message (const char *mes, const char *pos_) } if (lineend == NULL || pos_ < lineend) { - printf ("%s line %d : ", mes, line); + printf("%s line %d : ", mes, line); for (int i = 0; (linestart[i] != '\r') && (linestart[i] != '\n') && linestart[i]; i++) { if (linestart + i != pos_) - printf ("%c", linestart[i]); + printf("%c", linestart[i]); else - printf ("\'%c\'", linestart[i]); + printf("\'%c\'", linestart[i]); } - printf ("\a\n"); + printf("\a\n"); if (lineend) *lineend = c; return; @@ -832,41 +832,41 @@ static void disp_error_message (const char *mes, const char *pos_) *------------------------------------------ */ static -const char *parse_simpleexpr (const char *p) +const char *parse_simpleexpr(const char *p) { - int i; - p = skip_space (p); + int i; + p = skip_space(p); #ifdef DEBUG_FUNCIN if (battle_config.etc_log) - printf ("parse_simpleexpr %s\n", p); + printf("parse_simpleexpr %s\n", p); #endif if (*p == ';' || *p == ',') { - disp_error_message ("unexpected expr end", p); - exit (1); + disp_error_message("unexpected expr end", p); + exit(1); } if (*p == '(') { - p = parse_subexpr (p + 1, -1); - p = skip_space (p); + p = parse_subexpr(p + 1, -1); + p = skip_space(p); if ((*p++) != ')') { - disp_error_message ("unmatch ')'", p); - exit (1); + disp_error_message("unmatch ')'", p); + exit(1); } } - else if (isdigit (*p) || ((*p == '-' || *p == '+') && isdigit (p[1]))) + else if (isdigit(*p) || ((*p == '-' || *p == '+') && isdigit(p[1]))) { char *np; - i = strtoul (p, &np, 0); - add_scripti (i); + i = strtoul(p, &np, 0); + add_scripti(i); p = np; } else if (*p == '"') { - add_scriptc (ScriptCode::STR); + add_scriptc(ScriptCode::STR); p++; while (*p && *p != '"') { @@ -874,44 +874,44 @@ const char *parse_simpleexpr (const char *p) p++; else if (*p == '\n') { - disp_error_message ("unexpected newline @ string", p); - exit (1); + disp_error_message("unexpected newline @ string", p); + exit(1); } - add_scriptb (*p++); + add_scriptb(*p++); } if (!*p) { - disp_error_message ("unexpected eof @ string", p); - exit (1); + disp_error_message("unexpected eof @ string", p); + exit(1); } - add_scriptb (0); + add_scriptb(0); p++; //'"' } else { int l; // label , register , function etc - if (skip_word (p) == p) + if (skip_word(p) == p) { - disp_error_message ("unexpected character", p); - exit (1); + disp_error_message("unexpected character", p); + exit(1); } char *p2 = const_cast<char *>(skip_word(p)); char c = *p2; *p2 = 0; // 名前をadd_strする - l = add_str (p); + l = add_str(p); parse_cmd = l; // warn_*_mismatch_paramnumのために必要 - if (l == search_str ("if")) // warn_cmd_no_commaのために必要 + if (l == search_str("if")) // warn_cmd_no_commaのために必要 parse_cmd_if++; /* - // 廃止予定のl14/l15,およびプレフィックスｌの警告 - if( strcmp(str_buf+str_data[l].str,"l14")==0 || - strcmp(str_buf+str_data[l].str,"l15")==0 ){ - disp_error_message("l14 and l15 is DEPRECATED. use @menu instead of l15.",p); - }else if(str_buf[str_data[l].str]=='l'){ - disp_error_message("prefix 'l' is DEPRECATED. use prefix '@' instead.",p2); - } + // 廃止予定のl14/l15,およびプレフィックスｌの警告 + if ( strcmp(str_buf+str_data[l].str,"l14")==0 || + strcmp(str_buf+str_data[l].str,"l15")==0 ){ + disp_error_message("l14 and l15 is DEPRECATED. use @menu instead of l15.",p); + }else if (str_buf[str_data[l].str]=='l'){ + disp_error_message("prefix 'l' is DEPRECATED. use prefix '@' instead.",p2); + } */ *p2 = c; p = p2; @@ -919,26 +919,26 @@ const char *parse_simpleexpr (const char *p) if (str_data[l].type != ScriptCode::FUNC && c == '[') { // array(name[i] => getelementofarray(name,i) ) - add_scriptl (search_str ("getelementofarray")); - add_scriptc (ScriptCode::ARG); - add_scriptl (l); - p = parse_subexpr (p + 1, -1); - p = skip_space (p); + add_scriptl(search_str("getelementofarray")); + add_scriptc(ScriptCode::ARG); + add_scriptl(l); + p = parse_subexpr(p + 1, -1); + p = skip_space(p); if ((*p++) != ']') { - disp_error_message ("unmatch ']'", p); - exit (1); + disp_error_message("unmatch ']'", p); + exit(1); } - add_scriptc (ScriptCode::FUNC); + add_scriptc(ScriptCode::FUNC); } else - add_scriptl (l); + add_scriptl(l); } #ifdef DEBUG_FUNCIN if (battle_config.etc_log) - printf ("parse_simpleexpr end %s\n", p); + printf("parse_simpleexpr end %s\n", p); #endif return p; } @@ -947,23 +947,23 @@ const char *parse_simpleexpr (const char *p) * 式の解析 *------------------------------------------ */ -const char *parse_subexpr (const char *p, int limit) +const char *parse_subexpr(const char *p, int limit) { ScriptCode op; int opl, len; #ifdef DEBUG_FUNCIN if (battle_config.etc_log) - printf ("parse_subexpr %s\n", p); + printf("parse_subexpr %s\n", p); #endif - p = skip_space (p); + p = skip_space(p); if (*p == '-') { - const char *tmpp = skip_space (p + 1); + const char *tmpp = skip_space(p + 1); if (*tmpp == ';' || *tmpp == ',') { - add_scriptl (LABEL_NEXTLINE); + add_scriptl(LABEL_NEXTLINE); p++; return p; } @@ -972,12 +972,12 @@ const char *parse_subexpr (const char *p, int limit) if ((op = ScriptCode::NEG, *p == '-') || (op = ScriptCode::LNOT, *p == '!') || (op = ScriptCode::NOT, *p == '~')) { - p = parse_subexpr (p + 1, 100); - add_scriptc (op); + p = parse_subexpr(p + 1, 100); + add_scriptc(op); } else - p = parse_simpleexpr (p); - p = skip_space (p); + p = parse_simpleexpr(p); + p = skip_space(p); while (((op = ScriptCode::ADD, opl = 6, len = 1, *p == '+') || (op = ScriptCode::SUB, opl = 6, len = 1, *p == '-') || (op = ScriptCode::MUL, opl = 7, len = 1, *p == '*') || @@ -1001,63 +1001,63 @@ const char *parse_subexpr (const char *p, int limit) p += len; if (op == ScriptCode::FUNC) { - int i = 0, func = parse_cmd; + int i = 0, func = parse_cmd; const char *plist[128]; if (str_data[func].type != ScriptCode::FUNC) { - disp_error_message ("expect function", tmpp); - exit (0); + disp_error_message("expect function", tmpp); + exit(0); } - add_scriptc (ScriptCode::ARG); + add_scriptc(ScriptCode::ARG); while (*p && *p != ')' && i < 128) { plist[i] = p; - p = parse_subexpr (p, -1); - p = skip_space (p); + p = parse_subexpr(p, -1); + p = skip_space(p); if (*p == ',') p++; else if (*p != ')' && script_config.warn_func_no_comma) { - disp_error_message ("expect ',' or ')' at func params", + disp_error_message("expect ',' or ')' at func params", p); } - p = skip_space (p); + p = skip_space(p); i++; } plist[i] = p; if (*(p++) != ')') { - disp_error_message ("func request '(' ')'", p); - exit (1); + disp_error_message("func request '(' ')'", p); + exit(1); } if (str_data[func].type == ScriptCode::FUNC && script_config.warn_func_mismatch_paramnum) { const char *arg = builtin_functions[str_data[func].val].arg; - int j = 0; + int j = 0; for (j = 0; arg[j]; j++) if (arg[j] == '*') break; if ((arg[j] == 0 && i != j) || (arg[j] == '*' && i < j)) { - disp_error_message ("illegal number of parameters", + disp_error_message("illegal number of parameters", plist[(i < j) ? i : j]); } } } else // not op == ScriptCode::FUNC { - p = parse_subexpr (p, opl); + p = parse_subexpr(p, opl); } - add_scriptc (op); - p = skip_space (p); + add_scriptc(op); + p = skip_space(p); } #ifdef DEBUG_FUNCIN if (battle_config.etc_log) - printf ("parse_subexpr end %s\n", p); + printf("parse_subexpr end %s\n", p); #endif return p; /* return first untreated operator */ } @@ -1067,11 +1067,11 @@ const char *parse_subexpr (const char *p, int limit) *------------------------------------------ */ static -const char *parse_expr (const char *p) +const char *parse_expr(const char *p) { #ifdef DEBUG_FUNCIN if (battle_config.etc_log) - printf ("parse_expr %s\n", p); + printf("parse_expr %s\n", p); #endif switch (*p) { @@ -1081,13 +1081,13 @@ const char *parse_expr (const char *p) case '[': case ']': case '}': - disp_error_message ("unexpected char", p); - exit (1); + disp_error_message("unexpected char", p); + exit(1); } - p = parse_subexpr (p, -1); + p = parse_subexpr(p, -1); #ifdef DEBUG_FUNCIN if (battle_config.etc_log) - printf ("parse_expr end %s\n", p); + printf("parse_expr end %s\n", p); #endif return p; } @@ -1097,12 +1097,12 @@ const char *parse_expr (const char *p) *------------------------------------------ */ static -const char *parse_line (const char *p) +const char *parse_line(const char *p) { - int i = 0, cmd; + int i = 0, cmd; const char *plist[128]; - p = skip_space (p); + p = skip_space(p); if (*p == ';') return p; @@ -1110,53 +1110,53 @@ const char *parse_line (const char *p) // 最初は関数名 const char *p2 = p; - p = parse_simpleexpr (p); - p = skip_space (p); + p = parse_simpleexpr(p); + p = skip_space(p); cmd = parse_cmd; if (str_data[cmd].type != ScriptCode::FUNC) { - disp_error_message ("expect command", p2); + disp_error_message("expect command", p2); // exit(0); } - add_scriptc (ScriptCode::ARG); + add_scriptc(ScriptCode::ARG); while (p && *p && *p != ';' && i < 128) { plist[i] = p; - p = parse_expr (p); - p = skip_space (p); + p = parse_expr(p); + p = skip_space(p); // 引数区切りの,処理 if (*p == ',') p++; else if (*p != ';' && script_config.warn_cmd_no_comma && parse_cmd_if * 2 <= i) { - disp_error_message ("expect ',' or ';' at cmd params", p); + disp_error_message("expect ',' or ';' at cmd params", p); } - p = skip_space (p); + p = skip_space(p); i++; } plist[i] = p; if (!p || *(p++) != ';') { - disp_error_message ("need ';'", p); - exit (1); + disp_error_message("need ';'", p); + exit(1); } - add_scriptc (ScriptCode::FUNC); + add_scriptc(ScriptCode::FUNC); if (str_data[cmd].type == ScriptCode::FUNC && script_config.warn_cmd_mismatch_paramnum) { const char *arg = builtin_functions[str_data[cmd].val].arg; - int j = 0; + int j = 0; for (j = 0; arg[j]; j++) if (arg[j] == '*') break; if ((arg[j] == 0 && i != j) || (arg[j] == '*' && i < j)) { - disp_error_message ("illegal number of parameters", + disp_error_message("illegal number of parameters", plist[(i < j) ? i : j]); } } @@ -1168,12 +1168,12 @@ const char *parse_line (const char *p) * 組み込み関数の追加 *------------------------------------------ */ -static void add_builtin_functions (void) +static void add_builtin_functions(void) { - int i, n; + int i, n; for (i = 0; builtin_functions[i].func; i++) { - n = add_str (builtin_functions[i].name); + n = add_str(builtin_functions[i].name); str_data[n].type = ScriptCode::FUNC; str_data[n].val = i; str_data[n].func = builtin_functions[i].func; @@ -1184,29 +1184,29 @@ static void add_builtin_functions (void) * 定数データベースの読み込み *------------------------------------------ */ -static void read_constdb (void) +static void read_constdb(void) { FILE *fp; char line[1024], name[1024]; - int val, n, i, type; + int val, n, i, type; - fp = fopen_ ("db/const.txt", "r"); + fp = fopen_("db/const.txt", "r"); if (fp == NULL) { - printf ("can't read db/const.txt\n"); + printf("can't read db/const.txt\n"); return; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { if (line[0] == '/' && line[1] == '/') continue; type = 0; - if (sscanf (line, "%[A-Za-z0-9_],%d,%d", name, &val, &type) >= 2 || - sscanf (line, "%[A-Za-z0-9_] %d %d", name, &val, &type) >= 2) + if (sscanf(line, "%[A-Za-z0-9_],%d,%d", name, &val, &type) >= 2 || + sscanf(line, "%[A-Za-z0-9_] %d %d", name, &val, &type) >= 2) { for (i = 0; name[i]; i++) - name[i] = tolower (name[i]); - n = add_str (name); + name[i] = tolower(name[i]); + n = add_str(name); if (type == 0) str_data[n].type = ScriptCode::INT; else @@ -1214,26 +1214,26 @@ static void read_constdb (void) str_data[n].val = val; } } - fclose_ (fp); + fclose_(fp); } /*========================================== * スクリプトの解析 *------------------------------------------ */ -const ScriptCode *parse_script (const char *src, int line) +const ScriptCode *parse_script(const char *src, int line) { const char *p; - int i; + int i; static int first = 1; if (first) { - add_builtin_functions (); - read_constdb (); + add_builtin_functions(); + read_constdb(); } first = 0; - script_buf = (ScriptCode *) calloc (SCRIPT_BLOCK_SIZE, 1); + script_buf = (ScriptCode *) calloc(SCRIPT_BLOCK_SIZE, 1); script_pos = 0; script_size = SCRIPT_BLOCK_SIZE; str_data[LABEL_NEXTLINE].type = ScriptCode::NOP; @@ -1251,70 +1251,70 @@ const ScriptCode *parse_script (const char *src, int line) // 外部用label dbの初期化 if (scriptlabel_db != NULL) - strdb_final (scriptlabel_db, NULL); - scriptlabel_db = strdb_init (50); + strdb_final(scriptlabel_db, NULL); + scriptlabel_db = strdb_init(50); // for error message startptr = src; startline = line; p = src; - p = skip_space (p); + p = skip_space(p); if (*p != '{') { - disp_error_message ("not found '{'", p); + disp_error_message("not found '{'", p); return NULL; } for (p++; p && *p && *p != '}';) { - p = skip_space (p); + p = skip_space(p); // labelだけ特殊処理 - if (*skip_space (skip_word (p)) == ':') + if (*skip_space(skip_word(p)) == ':') { char *tmpp = const_cast<char *>(skip_word(p)); char c = *tmpp; *tmpp = '\0'; - int l = add_str (p); + int l = add_str(p); if (str_data[l].label != -1) { *tmpp = c; - disp_error_message ("dup label ", p); - exit (1); + disp_error_message("dup label ", p); + exit(1); } - set_label (l, script_pos); - strdb_insert (scriptlabel_db, (const char*)p, script_pos); // 外部用label db登録 + set_label(l, script_pos); + strdb_insert(scriptlabel_db, (const char*)p, script_pos); // 外部用label db登録 *tmpp = c; p = tmpp + 1; continue; } // 他は全部一緒くた - p = parse_line (p); - p = skip_space (p); - add_scriptc (ScriptCode::EOL); + p = parse_line(p); + p = skip_space(p); + add_scriptc(ScriptCode::EOL); - set_label (LABEL_NEXTLINE, script_pos); + set_label(LABEL_NEXTLINE, script_pos); str_data[LABEL_NEXTLINE].type = ScriptCode::NOP; str_data[LABEL_NEXTLINE].backpatch = -1; str_data[LABEL_NEXTLINE].label = -1; } - add_scriptc (ScriptCode::NOP); + add_scriptc(ScriptCode::NOP); script_size = script_pos; - script_buf = (ScriptCode *) realloc (script_buf, script_pos + 1); + script_buf = (ScriptCode *) realloc(script_buf, script_pos + 1); // 未解決のラベルを解決 for (i = LABEL_START; i < str_num; i++) { if (str_data[i].type == ScriptCode::NOP) { - int j, next; + int j, next; str_data[i].type = ScriptCode::NAME; str_data[i].label = i; for (j = str_data[i].backpatch; j >= 0 && j != 0x00ffffff;) { - next = (*(int *) (script_buf + j)) & 0x00ffffff; + next = (*(int *)(script_buf + j)) & 0x00ffffff; script_buf[j] = static_cast<ScriptCode>(i); script_buf[j + 1] = static_cast<ScriptCode>(i >> 8); script_buf[j + 2] = static_cast<ScriptCode>(i >> 16); @@ -1327,12 +1327,12 @@ const ScriptCode *parse_script (const char *src, int line) for (i = 0; i < script_pos; i++) { if ((i & 15) == 0) - printf ("%04x : ", i); - printf ("%02x ", script_buf[i]); + printf("%04x : ", i); + printf("%02x ", script_buf[i]); if ((i & 15) == 15) - printf ("\n"); + printf("\n"); } - printf ("\n"); + printf("\n"); #endif return script_buf; @@ -1349,12 +1349,12 @@ enum *------------------------------------------ */ static -struct map_session_data *script_rid2sd (ScriptState *st) +struct map_session_data *script_rid2sd(ScriptState *st) { - struct map_session_data *sd = map_id2sd (st->rid); + struct map_session_data *sd = map_id2sd(st->rid); if (!sd) { - printf ("script_rid2sd: fatal error ! player not attached!\n"); + printf("script_rid2sd: fatal error ! player not attached!\n"); } return sd; } @@ -1364,19 +1364,19 @@ struct map_session_data *script_rid2sd (ScriptState *st) *------------------------------------------ */ static -void get_val (ScriptState *st, struct script_data *data) +void get_val(ScriptState *st, struct script_data *data) { struct map_session_data *sd = NULL; if (data->type == ScriptCode::NAME) { char *name = str_buf + str_data[data->u.num & 0x00ffffff].str; char prefix = *name; - char postfix = name[strlen (name) - 1]; + char postfix = name[strlen(name) - 1]; if (prefix != '$') { - if ((sd = script_rid2sd (st)) == NULL) - printf ("get_val error name?:%s\n", name); + if ((sd = script_rid2sd(st)) == NULL) + printf("get_val error name?:%s\n", name); } if (postfix == '$') { @@ -1385,16 +1385,16 @@ void get_val (ScriptState *st, struct script_data *data) if (prefix == '@' || prefix == 'l') { if (sd) - data->u.str = pc_readregstr (sd, data->u.num); + data->u.str = pc_readregstr(sd, data->u.num); } else if (prefix == '$') { data->u.str = - (char *) numdb_search (mapregstr_db, data->u.num); + (char *) numdb_search(mapregstr_db, data->u.num); } else { - printf ("script: get_val: illegal scope string variable.\n"); + printf("script: get_val: illegal scope string variable.\n"); data->u.str = "!!ERROR!!"; } if (data->u.str == NULL) @@ -1414,35 +1414,35 @@ void get_val (ScriptState *st, struct script_data *data) { if (sd) data->u.num = - pc_readparam (sd, + pc_readparam(sd, str_data[data->u.num & 0x00ffffff].val); } else if (prefix == '@' || prefix == 'l') { if (sd) - data->u.num = pc_readreg (sd, data->u.num); + data->u.num = pc_readreg(sd, data->u.num); } else if (prefix == '$') { - data->u.num = (int) numdb_search (mapreg_db, data->u.num); + data->u.num = (int) numdb_search(mapreg_db, data->u.num); } else if (prefix == '#') { if (name[1] == '#') { if (sd) - data->u.num = pc_readaccountreg2 (sd, name); + data->u.num = pc_readaccountreg2(sd, name); } else { if (sd) - data->u.num = pc_readaccountreg (sd, name); + data->u.num = pc_readaccountreg(sd, name); } } else { if (sd) - data->u.num = pc_readglobalreg (sd, name); + data->u.num = pc_readglobalreg(sd, name); } } } @@ -1453,12 +1453,12 @@ void get_val (ScriptState *st, struct script_data *data) *------------------------------------------ */ static -struct script_data get_val2 (ScriptState *st, int num) +struct script_data get_val2(ScriptState *st, int num) { struct script_data dat; dat.type = ScriptCode::NAME; dat.u.num = num; - get_val (st, &dat); + get_val(st, &dat); return dat; } @@ -1467,25 +1467,25 @@ struct script_data get_val2 (ScriptState *st, int num) *------------------------------------------ */ static -void set_reg (struct map_session_data *sd, int num, const char *name, struct script_data vd) +void set_reg(struct map_session_data *sd, int num, const char *name, struct script_data vd) { char prefix = *name; - char postfix = name[strlen (name) - 1]; + char postfix = name[strlen(name) - 1]; if (postfix == '$') { const char *str = vd.u.str; if (prefix == '@' || prefix == 'l') { - pc_setregstr (sd, num, str); + pc_setregstr(sd, num, str); } else if (prefix == '$') { - mapreg_setregstr (num, str); + mapreg_setregstr(num, str); } else { - printf ("script: set_reg: illegal scope string variable !"); + printf("script: set_reg: illegal scope string variable !"); } } else @@ -1494,32 +1494,32 @@ void set_reg (struct map_session_data *sd, int num, const char *name, struct scr int val = vd.u.num; if (str_data[num & 0x00ffffff].type == ScriptCode::PARAM) { - pc_setparam (sd, str_data[num & 0x00ffffff].val, val); + pc_setparam(sd, str_data[num & 0x00ffffff].val, val); } else if (prefix == '@' || prefix == 'l') { - pc_setreg (sd, num, val); + pc_setreg(sd, num, val); } else if (prefix == '$') { - mapreg_setreg (num, val); + mapreg_setreg(num, val); } else if (prefix == '#') { if (name[1] == '#') - pc_setaccountreg2 (sd, name, val); + pc_setaccountreg2(sd, name, val); else - pc_setaccountreg (sd, name, val); + pc_setaccountreg(sd, name, val); } else { - pc_setglobalreg (sd, name, val); + pc_setglobalreg(sd, name, val); } } } static -void set_reg (struct map_session_data *sd, int num, const char *name, int id) +void set_reg(struct map_session_data *sd, int num, const char *name, int id) { struct script_data vd; vd.u.num = id; @@ -1527,7 +1527,7 @@ void set_reg (struct map_session_data *sd, int num, const char *name, int id) } static -void set_reg (struct map_session_data *sd, int num, const char *name, const char *zd) +void set_reg(struct map_session_data *sd, int num, const char *name, const char *zd) { struct script_data vd; vd.u.str = zd; @@ -1539,14 +1539,14 @@ void set_reg (struct map_session_data *sd, int num, const char *name, const char *------------------------------------------ */ static -const char *conv_str (ScriptState *st, struct script_data *data) +const char *conv_str(ScriptState *st, struct script_data *data) { - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::INT) { char *buf; - buf = (char *) calloc (16, 1); - sprintf (buf, "%d", data->u.num); + buf = (char *) calloc(16, 1); + sprintf(buf, "%d", data->u.num); data->type = ScriptCode::STR; data->u.str = buf; } @@ -1566,13 +1566,13 @@ const char *conv_str (ScriptState *st, struct script_data *data) *------------------------------------------ */ static -int conv_num (ScriptState *st, struct script_data *data) +int conv_num(ScriptState *st, struct script_data *data) { - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { const char *p = data->u.str; - data->u.num = atoi (p); + data->u.num = atoi(p); if (data->type == ScriptCode::STR) free(const_cast<char *>(p)); data->type = ScriptCode::INT; @@ -1585,16 +1585,16 @@ int conv_num (ScriptState *st, struct script_data *data) *------------------------------------------ */ static -void push_val (struct script_stack *stack, ScriptCode type, int val) +void push_val(struct script_stack *stack, ScriptCode type, int val) { if (stack->sp >= stack->sp_max) { stack->sp_max += 64; stack->stack_data = (struct script_data *) - realloc (stack->stack_data, sizeof (stack->stack_data[0]) * + realloc(stack->stack_data, sizeof(stack->stack_data[0]) * stack->sp_max); - memset (stack->stack_data + (stack->sp_max - 64), 0, - 64 * sizeof (*(stack->stack_data))); + memset(stack->stack_data + (stack->sp_max - 64), 0, + 64 * sizeof(*(stack->stack_data))); } // if(battle_config.etc_log) // printf("push (%d,%d)-> %d\n",type,val,stack->sp); @@ -1608,16 +1608,16 @@ void push_val (struct script_stack *stack, ScriptCode type, int val) *------------------------------------------ */ static -void push_str (struct script_stack *stack, ScriptCode type, const char *str) +void push_str(struct script_stack *stack, ScriptCode type, const char *str) { if (stack->sp >= stack->sp_max) { stack->sp_max += 64; stack->stack_data = (struct script_data *) - realloc (stack->stack_data, sizeof (stack->stack_data[0]) * + realloc(stack->stack_data, sizeof(stack->stack_data[0]) * stack->sp_max); - memset (stack->stack_data + (stack->sp_max - 64), '\0', - 64 * sizeof (*(stack->stack_data))); + memset(stack->stack_data + (stack->sp_max - 64), '\0', + 64 * sizeof(*(stack->stack_data))); } // if(battle_config.etc_log) // printf("push (%d,%x)-> %d\n",type,str,stack->sp); @@ -1631,18 +1631,18 @@ void push_str (struct script_stack *stack, ScriptCode type, const char *str) *------------------------------------------ */ static -void push_copy (struct script_stack *stack, int pos_) +void push_copy(struct script_stack *stack, int pos_) { switch (stack->stack_data[pos_].type) { case ScriptCode::CONSTSTR: - push_str (stack, ScriptCode::CONSTSTR, stack->stack_data[pos_].u.str); + push_str(stack, ScriptCode::CONSTSTR, stack->stack_data[pos_].u.str); break; case ScriptCode::STR: - push_str (stack, ScriptCode::STR, strdup (stack->stack_data[pos_].u.str)); + push_str(stack, ScriptCode::STR, strdup(stack->stack_data[pos_].u.str)); break; default: - push_val (stack, stack->stack_data[pos_].type, + push_val(stack, stack->stack_data[pos_].type, stack->stack_data[pos_].u.num); break; } @@ -1653,20 +1653,20 @@ void push_copy (struct script_stack *stack, int pos_) *------------------------------------------ */ static -void pop_stack (struct script_stack *stack, int start, int end) +void pop_stack(struct script_stack *stack, int start, int end) { - int i; + int i; for (i = start; i < end; i++) { if (stack->stack_data[i].type == ScriptCode::STR) { - free (const_cast<char *>(stack->stack_data[i].u.str)); + free(const_cast<char *>(stack->stack_data[i].u.str)); } } if (stack->sp > end) { - memmove (&stack->stack_data[start], &stack->stack_data[end], - sizeof (stack->stack_data[0]) * (stack->sp - end)); + memmove(&stack->stack_data[start], &stack->stack_data[end], + sizeof(stack->stack_data[0]) * (stack->sp - end)); } stack->sp -= end - start; } @@ -1678,10 +1678,10 @@ void pop_stack (struct script_stack *stack, int start, int end) * *------------------------------------------ */ -void builtin_mes (ScriptState *st) +void builtin_mes(ScriptState *st) { - conv_str (st, &(st->stack->stack_data[st->start + 2])); - clif_scriptmes (script_rid2sd (st), st->oid, + conv_str(st, &(st->stack->stack_data[st->start + 2])); + clif_scriptmes(script_rid2sd(st), st->oid, st->stack->stack_data[st->start + 2].u.str); } @@ -1689,16 +1689,16 @@ void builtin_mes (ScriptState *st) * *------------------------------------------ */ -void builtin_goto (ScriptState *st) +void builtin_goto(ScriptState *st) { if (st->stack->stack_data[st->start + 2].type != ScriptCode::POS) { - printf ("script: goto: not label !\n"); + printf("script: goto: not label !\n"); st->state = END; return; } - st->pos = conv_num (st, &(st->stack->stack_data[st->start + 2])); + st->pos = conv_num(st, &(st->stack->stack_data[st->start + 2])); st->state = GOTO; } @@ -1706,21 +1706,21 @@ void builtin_goto (ScriptState *st) * ユーザー定義関数の呼び出し *------------------------------------------ */ -void builtin_callfunc (ScriptState *st) +void builtin_callfunc(ScriptState *st) { const ScriptCode *scr; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); - if ((scr = (const ScriptCode *)strdb_search (script_get_userfunc_db (), str))) + if ((scr = (const ScriptCode *)strdb_search(script_get_userfunc_db(), str))) { - int i, j; + int i, j; for (i = st->start + 3, j = 0; i < st->end; i++, j++) - push_copy (st->stack, i); + push_copy(st->stack, i); - push_val (st->stack, ScriptCode::INT, j); // 引数の数をプッシュ - push_val (st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ - push_val (st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ - push_val (st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ + push_val(st->stack, ScriptCode::INT, j); // 引数の数をプッシュ + push_val(st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ + push_val(st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ + push_val(st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ st->pos = 0; st->script = scr; @@ -1729,7 +1729,7 @@ void builtin_callfunc (ScriptState *st) } else { - printf ("script:callfunc: function not found! [%s]\n", str); + printf("script:callfunc: function not found! [%s]\n", str); st->state = END; } } @@ -1738,17 +1738,17 @@ void builtin_callfunc (ScriptState *st) * サブルーティンの呼び出し *------------------------------------------ */ -void builtin_callsub (ScriptState *st) +void builtin_callsub(ScriptState *st) { - int pos_ = conv_num (st, &(st->stack->stack_data[st->start + 2])); - int i, j; + int pos_ = conv_num(st, &(st->stack->stack_data[st->start + 2])); + int i, j; for (i = st->start + 3, j = 0; i < st->end; i++, j++) - push_copy (st->stack, i); + push_copy(st->stack, i); - push_val (st->stack, ScriptCode::INT, j); // 引数の数をプッシュ - push_val (st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ - push_val (st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ - push_val (st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ + push_val(st->stack, ScriptCode::INT, j); // 引数の数をプッシュ + push_val(st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ + push_val(st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ + push_val(st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ st->pos = pos_; st->defsp = st->start + 4 + j; @@ -1759,37 +1759,37 @@ void builtin_callsub (ScriptState *st) * 引数の所得 *------------------------------------------ */ -void builtin_getarg (ScriptState *st) +void builtin_getarg(ScriptState *st) { - int num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - int max, stsp; + int num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + int max, stsp; if (st->defsp < 4 || st->stack->stack_data[st->defsp - 1].type != ScriptCode::RETINFO) { - printf ("script:getarg without callfunc or callsub!\n"); + printf("script:getarg without callfunc or callsub!\n"); st->state = END; return; } - max = conv_num (st, &(st->stack->stack_data[st->defsp - 4])); + max = conv_num(st, &(st->stack->stack_data[st->defsp - 4])); stsp = st->defsp - max - 4; if (num >= max) { - printf ("script:getarg arg1(%d) out of range(%d) !\n", num, max); + printf("script:getarg arg1 (%d) out of range (%d) !\n", num, max); st->state = END; return; } - push_copy (st->stack, stsp + num); + push_copy(st->stack, stsp + num); } /*========================================== * サブルーチン/ユーザー定義関数の終了 *------------------------------------------ */ -void builtin_return (ScriptState *st) +void builtin_return(ScriptState *st) { if (st->end > st->start + 2) { // 戻り値有り - push_copy (st->stack, st->start + 2); + push_copy(st->stack, st->start + 2); } st->state = RETFUNC; } @@ -1798,49 +1798,49 @@ void builtin_return (ScriptState *st) * *------------------------------------------ */ -void builtin_next (ScriptState *st) +void builtin_next(ScriptState *st) { st->state = STOP; - clif_scriptnext (script_rid2sd (st), st->oid); + clif_scriptnext(script_rid2sd(st), st->oid); } /*========================================== * *------------------------------------------ */ -void builtin_close (ScriptState *st) +void builtin_close(ScriptState *st) { st->state = END; - clif_scriptclose (script_rid2sd (st), st->oid); + clif_scriptclose(script_rid2sd(st), st->oid); } -void builtin_close2 (ScriptState *st) +void builtin_close2(ScriptState *st) { st->state = STOP; - clif_scriptclose (script_rid2sd (st), st->oid); + clif_scriptclose(script_rid2sd(st), st->oid); } /*========================================== * *------------------------------------------ */ -void builtin_menu (ScriptState *st) +void builtin_menu(ScriptState *st) { char *buf; - int i, len = 0; // [fate] len is the total # of bytes we need to transmit the string choices - int menu_choices = 0; - int finished_menu_items = 0; // [fate] set to 1 after we hit the first empty string + int i, len = 0; // [fate] len is the total # of bytes we need to transmit the string choices + int menu_choices = 0; + int finished_menu_items = 0; // [fate] set to 1 after we hit the first empty string struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); // We don't need to do this iteration if the player cancels, strictly speaking. for (i = st->start + 2; i < st->end; i += 2) { - int choice_len; - conv_str (st, &(st->stack->stack_data[i])); - choice_len = strlen (st->stack->stack_data[i].u.str); + int choice_len; + conv_str(st, &(st->stack->stack_data[i])); + choice_len = strlen(st->stack->stack_data[i].u.str); len += choice_len + 1; // count # of bytes we'll need for packet. Only used if menu_or_input = 0. if (choice_len && !finished_menu_items) @@ -1854,15 +1854,15 @@ void builtin_menu (ScriptState *st) st->state = RERUNLINE; sd->state.menu_or_input = 1; - buf = (char *) calloc (len + 1, 1); + buf = (char *) calloc(len + 1, 1); buf[0] = 0; for (i = st->start + 2; menu_choices > 0; i += 2, --menu_choices) { - strcat (buf, st->stack->stack_data[i].u.str); - strcat (buf, ":"); + strcat(buf, st->stack->stack_data[i].u.str); + strcat(buf, ":"); } - clif_scriptmenu (script_rid2sd (st), st->oid, buf); - free (buf); + clif_scriptmenu(script_rid2sd(st), st->oid, buf); + free(buf); } else if (sd->npc_menu == 0xff) { // cansel @@ -1872,8 +1872,8 @@ void builtin_menu (ScriptState *st) else { // goto動作 // ragemu互換のため - pc_setreg (sd, add_str ("l15"), sd->npc_menu); - pc_setreg (sd, add_str ("@menu"), sd->npc_menu); + pc_setreg(sd, add_str("l15"), sd->npc_menu); + pc_setreg(sd, add_str("@menu"), sd->npc_menu); sd->state.menu_or_input = 0; if (sd->npc_menu > 0 && sd->npc_menu <= menu_choices) { @@ -1884,7 +1884,7 @@ void builtin_menu (ScriptState *st) return; } st->pos = - conv_num (st, + conv_num(st, &(st-> stack->stack_data[st->start + sd->npc_menu * 2 + 1])); @@ -1897,28 +1897,28 @@ void builtin_menu (ScriptState *st) * *------------------------------------------ */ -void builtin_rand (ScriptState *st) +void builtin_rand(ScriptState *st) { - int range, min, max; + int range, min, max; if (st->end > st->start + 3) { - min = conv_num (st, &(st->stack->stack_data[st->start + 2])); - max = conv_num (st, &(st->stack->stack_data[st->start + 3])); + min = conv_num(st, &(st->stack->stack_data[st->start + 2])); + max = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (max < min) { - int tmp; + int tmp; tmp = min; min = max; max = tmp; } range = max - min + 1; - push_val (st->stack, ScriptCode::INT, (range <= 0 ? 0 : MRAND (range)) + min); + push_val(st->stack, ScriptCode::INT, (range <= 0 ? 0 : MRAND(range)) + min); } else { - range = conv_num (st, &(st->stack->stack_data[st->start + 2])); - push_val (st->stack, ScriptCode::INT, range <= 0 ? 0 : MRAND (range)); + range = conv_num(st, &(st->stack->stack_data[st->start + 2])); + push_val(st->stack, ScriptCode::INT, range <= 0 ? 0 : MRAND(range)); } } @@ -1926,14 +1926,14 @@ void builtin_rand (ScriptState *st) * *------------------------------------------ */ -void builtin_pow (ScriptState *st) +void builtin_pow(ScriptState *st) { - int a, b; + int a, b; - a = conv_num (st, &(st->stack->stack_data[st->start + 2])); - b = conv_num (st, &(st->stack->stack_data[st->start + 3])); + a = conv_num(st, &(st->stack->stack_data[st->start + 2])); + b = conv_num(st, &(st->stack->stack_data[st->start + 3])); - push_val (st->stack, ScriptCode::INT, (int) pow (a * 0.001, b)); + push_val(st->stack, ScriptCode::INT, (int) pow(a * 0.001, b)); } @@ -1941,21 +1941,21 @@ void builtin_pow (ScriptState *st) * Check whether the PC is at the specified location *------------------------------------------ */ -void builtin_isat (ScriptState *st) +void builtin_isat(ScriptState *st) { - int x, y; - struct map_session_data *sd = script_rid2sd (st); + int x, y; + struct map_session_data *sd = script_rid2sd(st); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y = conv_num (st, &(st->stack->stack_data[st->start + 4])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y = conv_num(st, &(st->stack->stack_data[st->start + 4])); if (!sd) return; - push_val (st->stack, ScriptCode::INT, + push_val(st->stack, ScriptCode::INT, (x == sd->bl.x) - && (y == sd->bl.y) && (!strcmp (str, map[sd->bl.m].name))); + && (y == sd->bl.y) && (!strcmp(str, map[sd->bl.m].name))); } @@ -1963,34 +1963,34 @@ void builtin_isat (ScriptState *st) * *------------------------------------------ */ -void builtin_warp (ScriptState *st) +void builtin_warp(ScriptState *st) { - int x, y; - struct map_session_data *sd = script_rid2sd (st); + int x, y; + struct map_session_data *sd = script_rid2sd(st); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y = conv_num (st, &(st->stack->stack_data[st->start + 4])); - if (strcmp (str, "Random") == 0) - pc_randomwarp (sd, 3); - else if (strcmp (str, "SavePoint") == 0) + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y = conv_num(st, &(st->stack->stack_data[st->start + 4])); + if (strcmp(str, "Random") == 0) + pc_randomwarp(sd, 3); + else if (strcmp(str, "SavePoint") == 0) { if (map[sd->bl.m].flag.noreturn) // 蝶禁止 return; - pc_setpos (sd, sd->status.save_point.map, + pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 3); } - else if (strcmp (str, "Save") == 0) + else if (strcmp(str, "Save") == 0) { if (map[sd->bl.m].flag.noreturn) // 蝶禁止 return; - pc_setpos (sd, sd->status.save_point.map, + pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 3); } else - pc_setpos (sd, str, x, y, 0); + pc_setpos(sd, str, x, y, 0); } /*========================================== @@ -1998,36 +1998,36 @@ void builtin_warp (ScriptState *st) *------------------------------------------ */ static -void builtin_areawarp_sub (struct block_list *bl, va_list ap) -{ - int x, y; - const char *mapname = va_arg (ap, const char *); - x = va_arg (ap, int); - y = va_arg (ap, int); - if (strcmp (mapname, "Random") == 0) - pc_randomwarp ((struct map_session_data *) bl, 3); +void builtin_areawarp_sub(struct block_list *bl, va_list ap) +{ + int x, y; + const char *mapname = va_arg(ap, const char *); + x = va_arg(ap, int); + y = va_arg(ap, int); + if (strcmp(mapname, "Random") == 0) + pc_randomwarp((struct map_session_data *) bl, 3); else - pc_setpos ((struct map_session_data *) bl, mapname, x, y, 0); + pc_setpos((struct map_session_data *) bl, mapname, x, y, 0); } -void builtin_areawarp (ScriptState *st) +void builtin_areawarp(ScriptState *st) { - int x, y, m; - int x0, y0, x1, y1; + int x, y, m; + int x0, y0, x1, y1; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x0 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y0 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - x1 = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y1 = conv_num (st, &(st->stack->stack_data[st->start + 6])); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 7])); - x = conv_num (st, &(st->stack->stack_data[st->start + 8])); - y = conv_num (st, &(st->stack->stack_data[st->start + 9])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x0 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y0 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + x1 = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y1 = conv_num(st, &(st->stack->stack_data[st->start + 6])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 7])); + x = conv_num(st, &(st->stack->stack_data[st->start + 8])); + y = conv_num(st, &(st->stack->stack_data[st->start + 9])); - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) return; - map_foreachinarea (builtin_areawarp_sub, + map_foreachinarea(builtin_areawarp_sub, m, x0, y0, x1, y1, BL_PC, str, x, y); } @@ -2035,55 +2035,55 @@ void builtin_areawarp (ScriptState *st) * *------------------------------------------ */ -void builtin_heal (ScriptState *st) +void builtin_heal(ScriptState *st) { - int hp, sp; + int hp, sp; - hp = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sp = conv_num (st, &(st->stack->stack_data[st->start + 3])); - pc_heal (script_rid2sd (st), hp, sp); + hp = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sp = conv_num(st, &(st->stack->stack_data[st->start + 3])); + pc_heal(script_rid2sd(st), hp, sp); } /*========================================== * *------------------------------------------ */ -void builtin_itemheal (ScriptState *st) +void builtin_itemheal(ScriptState *st) { - int hp, sp; + int hp, sp; - hp = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sp = conv_num (st, &(st->stack->stack_data[st->start + 3])); - pc_itemheal (script_rid2sd (st), hp, sp); + hp = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sp = conv_num(st, &(st->stack->stack_data[st->start + 3])); + pc_itemheal(script_rid2sd(st), hp, sp); } /*========================================== * *------------------------------------------ */ -void builtin_percentheal (ScriptState *st) +void builtin_percentheal(ScriptState *st) { - int hp, sp; + int hp, sp; - hp = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sp = conv_num (st, &(st->stack->stack_data[st->start + 3])); - pc_percentheal (script_rid2sd (st), hp, sp); + hp = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sp = conv_num(st, &(st->stack->stack_data[st->start + 3])); + pc_percentheal(script_rid2sd(st), hp, sp); } /*========================================== * *------------------------------------------ */ -void builtin_jobchange (ScriptState *st) +void builtin_jobchange(ScriptState *st) { - int job, upper = -1; + int job, upper = -1; - job = conv_num (st, &(st->stack->stack_data[st->start + 2])); + job = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (st->end > st->start + 3) - upper = conv_num (st, &(st->stack->stack_data[st->start + 3])); + upper = conv_num(st, &(st->stack->stack_data[st->start + 3])); if ((job >= 0 && job < MAX_PC_CLASS)) - pc_jobchange (script_rid2sd (st), job, upper); + pc_jobchange(script_rid2sd(st), job, upper); } @@ -2091,19 +2091,19 @@ void builtin_jobchange (ScriptState *st) * *------------------------------------------ */ -void builtin_input (ScriptState *st) +void builtin_input(ScriptState *st) { struct map_session_data *sd = NULL; - int num = + int num = (st->end > st->start + 2) ? st->stack->stack_data[st->start + 2].u.num : 0; const char *name = (st->end > st->start + 2) ? str_buf + str_data[num & 0x00ffffff].str : ""; // char prefix=*name; - char postfix = name[strlen (name) - 1]; + char postfix = name[strlen(name) - 1]; - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (sd->state.menu_or_input) { sd->state.menu_or_input = 0; @@ -2112,11 +2112,11 @@ void builtin_input (ScriptState *st) // 文字列 if (st->end > st->start + 2) { // 引数1個 - set_reg (sd, num, name, sd->npc_str); + set_reg(sd, num, name, sd->npc_str); } else { - printf ("builtin_input: string discarded !!\n"); + printf("builtin_input: string discarded !!\n"); } } else @@ -2126,19 +2126,19 @@ void builtin_input (ScriptState *st) //** Fix by fritz :X keeps people from abusing old input bugs if (sd->npc_amount < 0) //** If input amount is less then 0 { - clif_tradecancelled (sd); // added "Deal has been cancelled" message by Valaris - builtin_close (st); //** close + clif_tradecancelled(sd); // added "Deal has been cancelled" message by Valaris + builtin_close(st); //** close } // 数値 if (st->end > st->start + 2) { // 引数1個 - set_reg (sd, num, name, sd->npc_amount); + set_reg(sd, num, name, sd->npc_amount); } else { // ragemu互換のため - pc_setreg (sd, add_str ("l14"), sd->npc_amount); + pc_setreg(sd, add_str("l14"), sd->npc_amount); } } } @@ -2146,9 +2146,9 @@ void builtin_input (ScriptState *st) { st->state = RERUNLINE; if (postfix == '$') - clif_scriptinputstr (sd, st->oid); + clif_scriptinputstr(sd, st->oid); else - clif_scriptinput (sd, st->oid); + clif_scriptinput(sd, st->oid); sd->state.menu_or_input = 1; } } @@ -2159,22 +2159,22 @@ void builtin_input (ScriptState *st) */ void builtin_if (ScriptState *st) { - int sel, i; + int sel, i; - sel = conv_num (st, &(st->stack->stack_data[st->start + 2])); + sel = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (!sel) return; // 関数名をコピー - push_copy (st->stack, st->start + 3); + push_copy(st->stack, st->start + 3); // 間に引数マーカを入れて - push_val (st->stack, ScriptCode::ARG, 0); + push_val(st->stack, ScriptCode::ARG, 0); // 残りの引数をコピー for (i = st->start + 4; i < st->end; i++) { - push_copy (st->stack, i); + push_copy(st->stack, i); } - run_func (st); + run_func(st); } @@ -2182,34 +2182,34 @@ void builtin_if (ScriptState *st) * 変数設定 *------------------------------------------ */ -void builtin_set (ScriptState *st) +void builtin_set(ScriptState *st) { struct map_session_data *sd = NULL; - int num = st->stack->stack_data[st->start + 2].u.num; + int num = st->stack->stack_data[st->start + 2].u.num; char *name = str_buf + str_data[num & 0x00ffffff].str; char prefix = *name; - char postfix = name[strlen (name) - 1]; + char postfix = name[strlen(name) - 1]; if (st->stack->stack_data[st->start + 2].type != ScriptCode::NAME) { - printf ("script: builtin_set: not name\n"); + printf("script: builtin_set: not name\n"); return; } if (prefix != '$') - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (postfix == '$') { // 文字列 - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 3])); - set_reg (sd, num, name, str); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 3])); + set_reg(sd, num, name, str); } else { // 数値 - int val = conv_num (st, &(st->stack->stack_data[st->start + 3])); - set_reg (sd, num, name, val); + int val = conv_num(st, &(st->stack->stack_data[st->start + 3])); + set_reg(sd, num, name, val); } } @@ -2218,22 +2218,22 @@ void builtin_set (ScriptState *st) * 配列変数設定 *------------------------------------------ */ -void builtin_setarray (ScriptState *st) +void builtin_setarray(ScriptState *st) { struct map_session_data *sd = NULL; - int num = st->stack->stack_data[st->start + 2].u.num; + int num = st->stack->stack_data[st->start + 2].u.num; char *name = str_buf + str_data[num & 0x00ffffff].str; char prefix = *name; - char postfix = name[strlen (name) - 1]; - int i, j; + char postfix = name[strlen(name) - 1]; + int i, j; if (prefix != '$' && prefix != '@') { - printf ("builtin_setarray: illegal scope !\n"); + printf("builtin_setarray: illegal scope !\n"); return; } if (prefix != '$') - sd = script_rid2sd (st); + sd = script_rid2sd(st); for (j = 0, i = st->start + 3; i < st->end && j < 128; i++, j++) { @@ -2248,24 +2248,24 @@ void builtin_setarray (ScriptState *st) * 配列変数クリア *------------------------------------------ */ -void builtin_cleararray (ScriptState *st) +void builtin_cleararray(ScriptState *st) { struct map_session_data *sd = NULL; - int num = st->stack->stack_data[st->start + 2].u.num; + int num = st->stack->stack_data[st->start + 2].u.num; char *name = str_buf + str_data[num & 0x00ffffff].str; char prefix = *name; - char postfix = name[strlen (name) - 1]; - int sz = conv_num (st, &(st->stack->stack_data[st->start + 4])); - int i; + char postfix = name[strlen(name) - 1]; + int sz = conv_num(st, &(st->stack->stack_data[st->start + 4])); + int i; void *v; if (prefix != '$' && prefix != '@') { - printf ("builtin_cleararray: illegal scope !\n"); + printf("builtin_cleararray: illegal scope !\n"); return; } if (prefix != '$') - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (postfix == '$') for (i = 0; i < sz; i++) @@ -2280,105 +2280,105 @@ void builtin_cleararray (ScriptState *st) * 配列変数コピー *------------------------------------------ */ -void builtin_copyarray (ScriptState *st) +void builtin_copyarray(ScriptState *st) { struct map_session_data *sd = NULL; - int num = st->stack->stack_data[st->start + 2].u.num; + int num = st->stack->stack_data[st->start + 2].u.num; char *name = str_buf + str_data[num & 0x00ffffff].str; char prefix = *name; - char postfix = name[strlen (name) - 1]; - int num2 = st->stack->stack_data[st->start + 3].u.num; + char postfix = name[strlen(name) - 1]; + int num2 = st->stack->stack_data[st->start + 3].u.num; char *name2 = str_buf + str_data[num2 & 0x00ffffff].str; char prefix2 = *name2; - char postfix2 = name2[strlen (name2) - 1]; - int sz = conv_num (st, &(st->stack->stack_data[st->start + 4])); - int i; + char postfix2 = name2[strlen(name2) - 1]; + int sz = conv_num(st, &(st->stack->stack_data[st->start + 4])); + int i; if (prefix != '$' && prefix != '@' && prefix2 != '$' && prefix2 != '@') { - printf ("builtin_copyarray: illegal scope !\n"); + printf("builtin_copyarray: illegal scope !\n"); return; } if ((postfix == '$' || postfix2 == '$') && postfix != postfix2) { - printf ("builtin_copyarray: type mismatch !\n"); + printf("builtin_copyarray: type mismatch !\n"); return; } if (prefix != '$' || prefix2 != '$') - sd = script_rid2sd (st); + sd = script_rid2sd(st); for (i = 0; i < sz; i++) - set_reg (sd, num + (i << 24), name, get_val2 (st, num2 + (i << 24))); + set_reg(sd, num + (i << 24), name, get_val2(st, num2 + (i << 24))); } /*========================================== * 配列変数のサイズ所得 *------------------------------------------ */ -static int getarraysize (ScriptState *st, int num, int postfix) +static int getarraysize(ScriptState *st, int num, int postfix) { - int i = (num >> 24), c = i; + int i = (num >> 24), c = i; for (; i < 128; i++) { - struct script_data vd = get_val2 (st, num + (i << 24)); + struct script_data vd = get_val2(st, num + (i << 24)); if (postfix == '$' ? bool(*vd.u.str) : bool(vd.u.num)) c = i; } return c + 1; } -void builtin_getarraysize (ScriptState *st) +void builtin_getarraysize(ScriptState *st) { - int num = st->stack->stack_data[st->start + 2].u.num; + int num = st->stack->stack_data[st->start + 2].u.num; char *name = str_buf + str_data[num & 0x00ffffff].str; char prefix = *name; - char postfix = name[strlen (name) - 1]; + char postfix = name[strlen(name) - 1]; if (prefix != '$' && prefix != '@') { - printf ("builtin_copyarray: illegal scope !\n"); + printf("builtin_copyarray: illegal scope !\n"); return; } - push_val (st->stack, ScriptCode::INT, getarraysize (st, num, postfix)); + push_val(st->stack, ScriptCode::INT, getarraysize(st, num, postfix)); } /*========================================== * 配列変数から要素削除 *------------------------------------------ */ -void builtin_deletearray (ScriptState *st) +void builtin_deletearray(ScriptState *st) { struct map_session_data *sd = NULL; - int num = st->stack->stack_data[st->start + 2].u.num; + int num = st->stack->stack_data[st->start + 2].u.num; char *name = str_buf + str_data[num & 0x00ffffff].str; char prefix = *name; - char postfix = name[strlen (name) - 1]; - int count = 1; - int i, sz = getarraysize (st, num, postfix) - (num >> 24) - count + 1; + char postfix = name[strlen(name) - 1]; + int count = 1; + int i, sz = getarraysize(st, num, postfix) - (num >> 24) - count + 1; if ((st->end > st->start + 3)) - count = conv_num (st, &(st->stack->stack_data[st->start + 3])); + count = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (prefix != '$' && prefix != '@') { - printf ("builtin_deletearray: illegal scope !\n"); + printf("builtin_deletearray: illegal scope !\n"); return; } if (prefix != '$') - sd = script_rid2sd (st); + sd = script_rid2sd(st); for (i = 0; i < sz; i++) { - set_reg (sd, num + (i << 24), name, - get_val2 (st, num + ((i + count) << 24))); + set_reg(sd, num + (i << 24), name, + get_val2(st, num + ((i + count) << 24))); } for (; i < (128 - (num >> 24)); i++) { if (postfix != '$') - set_reg (sd, num + (i << 24), name, 0); + set_reg(sd, num + (i << 24), name, 0); if (postfix == '$') - set_reg (sd, num + (i << 24), name, ""); + set_reg(sd, num + (i << 24), name, ""); } } @@ -2386,29 +2386,27 @@ void builtin_deletearray (ScriptState *st) * 指定要素を表す値(キー)を所得する *------------------------------------------ */ -void builtin_getelementofarray (ScriptState *st) +void builtin_getelementofarray(ScriptState *st) { if (st->stack->stack_data[st->start + 2].type == ScriptCode::NAME) { - int i = conv_num (st, &(st->stack->stack_data[st->start + 3])); + int i = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (i > 127 || i < 0) { - printf - ("script: getelementofarray (operator[]): param2 illegal number %d\n", + printf("script: getelementofarray (operator[]): param2 illegal number %d\n", i); - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } else { - push_val (st->stack, ScriptCode::NAME, + push_val(st->stack, ScriptCode::NAME, (i << 24) | st->stack->stack_data[st->start + 2].u.num); } } else { - printf - ("script: getelementofarray (operator[]): param1 not name !\n"); - push_val (st->stack, ScriptCode::INT, 0); + printf("script: getelementofarray (operator[]): param1 not name !\n"); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -2416,14 +2414,14 @@ void builtin_getelementofarray (ScriptState *st) * *------------------------------------------ */ -void builtin_setlook (ScriptState *st) +void builtin_setlook(ScriptState *st) { - int type, val; + int type, val; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - val = conv_num (st, &(st->stack->stack_data[st->start + 3])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + val = conv_num(st, &(st->stack->stack_data[st->start + 3])); - pc_changelook (script_rid2sd (st), type, val); + pc_changelook(script_rid2sd(st), type, val); } @@ -2431,14 +2429,14 @@ void builtin_setlook (ScriptState *st) * *------------------------------------------ */ -void builtin_cutin (ScriptState *st) +void builtin_cutin(ScriptState *st) { - int type; + int type; - conv_str (st, &(st->stack->stack_data[st->start + 2])); - type = conv_num (st, &(st->stack->stack_data[st->start + 3])); + conv_str(st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 3])); - clif_cutin (script_rid2sd (st), + clif_cutin(script_rid2sd(st), st->stack->stack_data[st->start + 2].u.str, type); } @@ -2447,13 +2445,13 @@ void builtin_cutin (ScriptState *st) * カードのイラストを表示する *------------------------------------------ */ -void builtin_cutincard (ScriptState *st) +void builtin_cutincard(ScriptState *st) { - int itemid; + int itemid; - itemid = conv_num (st, &(st->stack->stack_data[st->start + 2])); + itemid = conv_num(st, &(st->stack->stack_data[st->start + 2])); - clif_cutin (script_rid2sd (st), itemdb_search (itemid)->cardillustname, + clif_cutin(script_rid2sd(st), itemdb_search(itemid)->cardillustname, 4); } @@ -2462,17 +2460,17 @@ void builtin_cutincard (ScriptState *st) * *------------------------------------------ */ -void builtin_viewpoint (ScriptState *st) +void builtin_viewpoint(ScriptState *st) { - int type, x, y, id, color; + int type, x, y, id, color; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - x = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y = conv_num (st, &(st->stack->stack_data[st->start + 4])); - id = conv_num (st, &(st->stack->stack_data[st->start + 5])); - color = conv_num (st, &(st->stack->stack_data[st->start + 6])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + x = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y = conv_num(st, &(st->stack->stack_data[st->start + 4])); + id = conv_num(st, &(st->stack->stack_data[st->start + 5])); + color = conv_num(st, &(st->stack->stack_data[st->start + 6])); - clif_viewpoint (script_rid2sd (st), st->oid, type, x, y, id, color); + clif_viewpoint(script_rid2sd(st), st->oid, type, x, y, id, color); } @@ -2480,26 +2478,26 @@ void builtin_viewpoint (ScriptState *st) * *------------------------------------------ */ -void builtin_countitem (ScriptState *st) +void builtin_countitem(ScriptState *st) { - int nameid = 0, count = 0, i; + int nameid = 0, count = 0, i; struct map_session_data *sd; struct script_data *data; - sd = script_rid2sd (st); + sd = script_rid2sd(st); data = &(st->stack->stack_data[st->start + 2]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); + const char *name = conv_str(st, data); struct item_data *item_data; - if ((item_data = itemdb_searchname (name)) != NULL) + if ((item_data = itemdb_searchname(name)) != NULL) nameid = item_data->nameid; } else - nameid = conv_num (st, data); + nameid = conv_num(st, data); if (nameid >= 500) //if no such ID then skip this iteration for (i = 0; i < MAX_INVENTORY; i++) @@ -2510,9 +2508,9 @@ void builtin_countitem (ScriptState *st) else { if (battle_config.error_log) - printf ("wrong item ID : countitem(%i)\n", nameid); + printf("wrong item ID : countitem (%i)\n", nameid); } - push_val (st->stack, ScriptCode::INT, count); + push_val(st->stack, ScriptCode::INT, count); } @@ -2520,40 +2518,40 @@ void builtin_countitem (ScriptState *st) * 重量チェック *------------------------------------------ */ -void builtin_checkweight (ScriptState *st) +void builtin_checkweight(ScriptState *st) { - int nameid = 0, amount; + int nameid = 0, amount; struct map_session_data *sd; struct script_data *data; - sd = script_rid2sd (st); + sd = script_rid2sd(st); data = &(st->stack->stack_data[st->start + 2]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); - struct item_data *item_data = itemdb_searchname (name); + const char *name = conv_str(st, data); + struct item_data *item_data = itemdb_searchname(name); if (item_data) nameid = item_data->nameid; } else - nameid = conv_num (st, data); + nameid = conv_num(st, data); - amount = conv_num (st, &(st->stack->stack_data[st->start + 3])); + amount = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (amount <= 0 || nameid < 500) { //if get wrong item ID or amount<=0, don't count weight of non existing items - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } - sd = script_rid2sd (st); - if (itemdb_weight (nameid) * amount + sd->weight > sd->max_weight) + sd = script_rid2sd(st); + if (itemdb_weight(nameid) * amount + sd->weight > sd->max_weight) { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } else { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } } @@ -2562,57 +2560,56 @@ void builtin_checkweight (ScriptState *st) * *------------------------------------------ */ -void builtin_getitem (ScriptState *st) +void builtin_getitem(ScriptState *st) { - int nameid, amount, flag = 0; + int nameid, amount, flag = 0; struct item item_tmp; struct map_session_data *sd; struct script_data *data; - sd = script_rid2sd (st); + sd = script_rid2sd(st); data = &(st->stack->stack_data[st->start + 2]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); - struct item_data *item_data = itemdb_searchname (name); + const char *name = conv_str(st, data); + struct item_data *item_data = itemdb_searchname(name); nameid = 727; //Default to iten if (item_data != NULL) nameid = item_data->nameid; } else - nameid = conv_num (st, data); + nameid = conv_num(st, data); if ((amount = - conv_num (st, &(st->stack->stack_data[st->start + 3]))) <= 0) + conv_num(st, &(st->stack->stack_data[st->start + 3]))) <= 0) { return; //return if amount <=0, skip the useles iteration } //Violet Box, Blue Box, etc - random item pick if (nameid < 0) { // ランダム - nameid = itemdb_searchrandomid (-nameid); + nameid = itemdb_searchrandomid(-nameid); flag = 1; } if (nameid > 0) { - memset (&item_tmp, 0, sizeof (item_tmp)); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = nameid; if (!flag) item_tmp.identify = 1; else - item_tmp.identify = !itemdb_isequip3 (nameid); + item_tmp.identify = !itemdb_isequip3(nameid); if (st->end > st->start + 5) //アイテムを指定したIDに渡す - sd = map_id2sd (conv_num - (st, &(st->stack->stack_data[st->start + 5]))); + sd = map_id2sd(conv_num(st, &(st->stack->stack_data[st->start + 5]))); if (sd == NULL) //アイテムを渡す相手がいなかったらお帰り return; - if ((flag = pc_additem (sd, &item_tmp, amount))) + if ((flag = pc_additem(sd, &item_tmp, amount))) { - clif_additem (sd, 0, 0, flag); - map_addflooritem (&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y, + clif_additem(sd, 0, 0, flag); + map_addflooritem(&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } } @@ -2623,53 +2620,52 @@ void builtin_getitem (ScriptState *st) * *------------------------------------------ */ -void builtin_getitem2 (ScriptState *st) +void builtin_getitem2(ScriptState *st) { - int nameid, amount, flag = 0; - int iden, ref, attr, c1, c2, c3, c4; + int nameid, amount, flag = 0; + int iden, ref, attr, c1, c2, c3, c4; struct item item_tmp; struct map_session_data *sd; struct script_data *data; - sd = script_rid2sd (st); + sd = script_rid2sd(st); data = &(st->stack->stack_data[st->start + 2]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); - struct item_data *item_data = itemdb_searchname (name); + const char *name = conv_str(st, data); + struct item_data *item_data = itemdb_searchname(name); nameid = 512; //Apple item ID if (item_data) nameid = item_data->nameid; } else - nameid = conv_num (st, data); - - amount = conv_num (st, &(st->stack->stack_data[st->start + 3])); - iden = conv_num (st, &(st->stack->stack_data[st->start + 4])); - ref = conv_num (st, &(st->stack->stack_data[st->start + 5])); - attr = conv_num (st, &(st->stack->stack_data[st->start + 6])); - c1 = conv_num (st, &(st->stack->stack_data[st->start + 7])); - c2 = conv_num (st, &(st->stack->stack_data[st->start + 8])); - c3 = conv_num (st, &(st->stack->stack_data[st->start + 9])); - c4 = conv_num (st, &(st->stack->stack_data[st->start + 10])); + nameid = conv_num(st, data); + + amount = conv_num(st, &(st->stack->stack_data[st->start + 3])); + iden = conv_num(st, &(st->stack->stack_data[st->start + 4])); + ref = conv_num(st, &(st->stack->stack_data[st->start + 5])); + attr = conv_num(st, &(st->stack->stack_data[st->start + 6])); + c1 = conv_num(st, &(st->stack->stack_data[st->start + 7])); + c2 = conv_num(st, &(st->stack->stack_data[st->start + 8])); + c3 = conv_num(st, &(st->stack->stack_data[st->start + 9])); + c4 = conv_num(st, &(st->stack->stack_data[st->start + 10])); if (st->end > st->start + 11) //アイテムを指定したIDに渡す - sd = map_id2sd (conv_num - (st, &(st->stack->stack_data[st->start + 11]))); + sd = map_id2sd(conv_num(st, &(st->stack->stack_data[st->start + 11]))); if (sd == NULL) //アイテムを渡す相手がいなかったらお帰り return; if (nameid < 0) { // ランダム - nameid = itemdb_searchrandomid (-nameid); + nameid = itemdb_searchrandomid(-nameid); flag = 1; } if (nameid > 0) { - memset (&item_tmp, 0, sizeof (item_tmp)); - struct item_data *item_data = itemdb_search (nameid); + memset(&item_tmp, 0, sizeof(item_tmp)); + struct item_data *item_data = itemdb_search(nameid); if (item_data->type == 4 || item_data->type == 5) { if (ref > 10) @@ -2697,10 +2693,10 @@ void builtin_getitem2 (ScriptState *st) item_tmp.card[1] = c2; item_tmp.card[2] = c3; item_tmp.card[3] = c4; - if ((flag = pc_additem (sd, &item_tmp, amount))) + if ((flag = pc_additem(sd, &item_tmp, amount))) { - clif_additem (sd, 0, 0, flag); - map_addflooritem (&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y, + clif_additem(sd, 0, 0, flag); + map_addflooritem(&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } } @@ -2711,56 +2707,56 @@ void builtin_getitem2 (ScriptState *st) * *------------------------------------------ */ -void builtin_makeitem (ScriptState *st) +void builtin_makeitem(ScriptState *st) { - int nameid, amount, flag = 0; - int x, y, m; + int nameid, amount, flag = 0; + int x, y, m; struct item item_tmp; struct map_session_data *sd; struct script_data *data; - sd = script_rid2sd (st); + sd = script_rid2sd(st); data = &(st->stack->stack_data[st->start + 2]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); - struct item_data *item_data = itemdb_searchname (name); + const char *name = conv_str(st, data); + struct item_data *item_data = itemdb_searchname(name); nameid = 512; //Apple Item ID if (item_data) nameid = item_data->nameid; } else - nameid = conv_num (st, data); + nameid = conv_num(st, data); - amount = conv_num (st, &(st->stack->stack_data[st->start + 3])); - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 4])); - x = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y = conv_num (st, &(st->stack->stack_data[st->start + 6])); + amount = conv_num(st, &(st->stack->stack_data[st->start + 3])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 4])); + x = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y = conv_num(st, &(st->stack->stack_data[st->start + 6])); - if (sd && strcmp (mapname, "this") == 0) + if (sd && strcmp(mapname, "this") == 0) m = sd->bl.m; else - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); if (nameid < 0) { // ランダム - nameid = itemdb_searchrandomid (-nameid); + nameid = itemdb_searchrandomid(-nameid); flag = 1; } if (nameid > 0) { - memset (&item_tmp, 0, sizeof (item_tmp)); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = nameid; if (!flag) item_tmp.identify = 1; else - item_tmp.identify = !itemdb_isequip3 (nameid); + item_tmp.identify = !itemdb_isequip3(nameid); // clif_additem(sd,0,0,flag); - map_addflooritem (&item_tmp, amount, m, x, y, NULL, NULL, NULL, 0); + map_addflooritem(&item_tmp, amount, m, x, y, NULL, NULL, NULL, 0); } } @@ -2769,35 +2765,35 @@ void builtin_makeitem (ScriptState *st) * *------------------------------------------ */ -void builtin_delitem (ScriptState *st) +void builtin_delitem(ScriptState *st) { - int nameid = 0, amount, i; + int nameid = 0, amount, i; struct map_session_data *sd; struct script_data *data; - sd = script_rid2sd (st); + sd = script_rid2sd(st); data = &(st->stack->stack_data[st->start + 2]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); - struct item_data *item_data = itemdb_searchname (name); + const char *name = conv_str(st, data); + struct item_data *item_data = itemdb_searchname(name); //nameid=512; if (item_data) nameid = item_data->nameid; } else - nameid = conv_num (st, data); + nameid = conv_num(st, data); - amount = conv_num (st, &(st->stack->stack_data[st->start + 3])); + amount = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (nameid < 500 || amount <= 0) { //by Lupus. Don't run FOR if u got wrong item ID or amount<=0 //printf("wrong item ID or amount<=0 : delitem %i,\n",nameid,amount); return; } - sd = script_rid2sd (st); + sd = script_rid2sd(st); for (i = 0; i < MAX_INVENTORY; i++) { @@ -2813,7 +2809,7 @@ void builtin_delitem (ScriptState *st) { if (sd->status.inventory[i].amount >= amount) { - pc_delitem (sd, i, amount, 0); + pc_delitem(sd, i, amount, 0); break; } else @@ -2821,7 +2817,7 @@ void builtin_delitem (ScriptState *st) amount -= sd->status.inventory[i].amount; if (amount == 0) amount = sd->status.inventory[i].amount; - pc_delitem (sd, i, amount, 0); + pc_delitem(sd, i, amount, 0); break; } } @@ -2833,25 +2829,24 @@ void builtin_delitem (ScriptState *st) *キャラ関係のパラメータ取得 *------------------------------------------ */ -void builtin_readparam (ScriptState *st) +void builtin_readparam(ScriptState *st) { - int type; + int type; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (st->end > st->start + 3) - sd = map_nick2sd (conv_str - (st, &(st->stack->stack_data[st->start + 3]))); + sd = map_nick2sd(conv_str(st, &(st->stack->stack_data[st->start + 3]))); else - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (sd == NULL) { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); return; } - push_val (st->stack, ScriptCode::INT, pc_readparam (sd, type)); + push_val(st->stack, ScriptCode::INT, pc_readparam(sd, type)); } @@ -2859,30 +2854,29 @@ void builtin_readparam (ScriptState *st) *キャラ関係のID取得 *------------------------------------------ */ -void builtin_getcharid (ScriptState *st) +void builtin_getcharid(ScriptState *st) { - int num; + int num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (st->end > st->start + 3) - sd = map_nick2sd (conv_str - (st, &(st->stack->stack_data[st->start + 3]))); + sd = map_nick2sd(conv_str(st, &(st->stack->stack_data[st->start + 3]))); else - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (sd == NULL) { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); return; } if (num == 0) - push_val (st->stack, ScriptCode::INT, sd->status.char_id); + push_val(st->stack, ScriptCode::INT, sd->status.char_id); if (num == 1) - push_val (st->stack, ScriptCode::INT, sd->status.party_id); + push_val(st->stack, ScriptCode::INT, sd->status.party_id); if (num == 2) - push_val (st->stack, ScriptCode::INT, 0/*guild_id*/); + push_val(st->stack, ScriptCode::INT, 0/*guild_id*/); if (num == 3) - push_val (st->stack, ScriptCode::INT, sd->status.account_id); + push_val(st->stack, ScriptCode::INT, sd->status.account_id); } /*========================================== @@ -2890,35 +2884,35 @@ void builtin_getcharid (ScriptState *st) *------------------------------------------ */ static -char *builtin_getpartyname_sub (int party_id) +char *builtin_getpartyname_sub(int party_id) { struct party *p; p = NULL; - p = party_search (party_id); + p = party_search(party_id); if (p != NULL) { char *buf; - buf = (char *) calloc (24, 1); - strcpy (buf, p->name); + buf = (char *) calloc(24, 1); + strcpy(buf, p->name); return buf; } return 0; } -void builtin_getpartyname (ScriptState *st) +void builtin_getpartyname(ScriptState *st) { char *name; - int party_id; + int party_id; - party_id = conv_num (st, &(st->stack->stack_data[st->start + 2])); - name = builtin_getpartyname_sub (party_id); + party_id = conv_num(st, &(st->stack->stack_data[st->start + 2])); + name = builtin_getpartyname_sub(party_id); if (name != 0) - push_str (st->stack, ScriptCode::STR, name); + push_str(st->stack, ScriptCode::STR, name); else - push_str (st->stack, ScriptCode::CONSTSTR, "null"); + push_str(st->stack, ScriptCode::CONSTSTR, "null"); } @@ -2926,13 +2920,13 @@ void builtin_getpartyname (ScriptState *st) *指定IDのPT人数とメンバーID取得 *------------------------------------------ */ -void builtin_getpartymember (ScriptState *st) +void builtin_getpartymember(ScriptState *st) { struct party *p; - int i, j = 0; + int i, j = 0; p = NULL; - p = party_search (conv_num (st, &(st->stack->stack_data[st->start + 2]))); + p = party_search(conv_num(st, &(st->stack->stack_data[st->start + 2]))); if (p != NULL) { @@ -2941,13 +2935,13 @@ void builtin_getpartymember (ScriptState *st) if (p->member[i].account_id) { // printf("name:%s %d\n",p->member[i].name,i); - mapreg_setregstr (add_str ("$@partymembername$") + (i << 24), + mapreg_setregstr(add_str("$@partymembername$") + (i << 24), p->member[i].name); j++; } } } - mapreg_setreg (add_str ("$@partymembercount"), j); + mapreg_setreg(add_str("$@partymembercount"), j); } @@ -2956,33 +2950,33 @@ void builtin_getpartymember (ScriptState *st) * キャラクタの名前 *------------------------------------------ */ -void builtin_strcharinfo (ScriptState *st) +void builtin_strcharinfo(ScriptState *st) { struct map_session_data *sd; - int num; + int num; - sd = script_rid2sd (st); - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (num == 0) { char *buf; - buf = (char *) calloc (24, 1); - strncpy (buf, sd->status.name, 23); - push_str (st->stack, ScriptCode::STR, buf); + buf = (char *) calloc(24, 1); + strncpy(buf, sd->status.name, 23); + push_str(st->stack, ScriptCode::STR, buf); } if (num == 1) { char *buf; - buf = builtin_getpartyname_sub (sd->status.party_id); + buf = builtin_getpartyname_sub(sd->status.party_id); if (buf != 0) - push_str (st->stack, ScriptCode::STR, buf); + push_str(st->stack, ScriptCode::STR, buf); else - push_str (st->stack, ScriptCode::CONSTSTR, ""); + push_str(st->stack, ScriptCode::CONSTSTR, ""); } if (num == 2) { // was: guild name - push_str (st->stack, ScriptCode::CONSTSTR, ""); + push_str(st->stack, ScriptCode::CONSTSTR, ""); } } @@ -2996,31 +2990,31 @@ unsigned int equip[10] = * GetEquipID(Pos); Pos: 1-10 *------------------------------------------ */ -void builtin_getequipid (ScriptState *st) +void builtin_getequipid(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; struct item_data *item; - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (sd == NULL) { - printf ("getequipid: sd == NULL\n"); + printf("getequipid: sd == NULL\n"); return; } - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) { item = sd->inventory_data[i]; if (item) - push_val (st->stack, ScriptCode::INT, item->nameid); + push_val(st->stack, ScriptCode::INT, item->nameid); else - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } else { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); } } @@ -3028,30 +3022,30 @@ void builtin_getequipid (ScriptState *st) * 装備名文字列（精錬メニュー用） *------------------------------------------ */ -void builtin_getequipname (ScriptState *st) +void builtin_getequipname(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; struct item_data *item; char *buf; - buf = (char *) calloc (64, 1); - sd = script_rid2sd (st); - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - i = pc_checkequip (sd, equip[num - 1]); + buf = (char *) calloc(64, 1); + sd = script_rid2sd(st); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) { item = sd->inventory_data[i]; if (item) - sprintf (buf, "%s-[%s]", pos[num - 1], item->jname); + sprintf(buf, "%s-[%s]", pos[num - 1], item->jname); else - sprintf (buf, "%s-[%s]", pos[num - 1], pos[10]); + sprintf(buf, "%s-[%s]", pos[num - 1], pos[10]); } else { - sprintf (buf, "%s-[%s]", pos[num - 1], pos[10]); + sprintf(buf, "%s-[%s]", pos[num - 1], pos[10]); } - push_str (st->stack, ScriptCode::STR, buf); + push_str(st->stack, ScriptCode::STR, buf); } @@ -3059,14 +3053,14 @@ void builtin_getequipname (ScriptState *st) * getbrokenid [Valaris] *------------------------------------------ */ -void builtin_getbrokenid (ScriptState *st) +void builtin_getbrokenid(ScriptState *st) { - int i, num, id = 0, brokencounter = 0; + int i, num, id = 0, brokencounter = 0; struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].broken == 1) @@ -3080,7 +3074,7 @@ void builtin_getbrokenid (ScriptState *st) } } - push_val (st->stack, ScriptCode::INT, id); + push_val(st->stack, ScriptCode::INT, id); } @@ -3088,15 +3082,15 @@ void builtin_getbrokenid (ScriptState *st) * repair [Valaris] *------------------------------------------ */ -void builtin_repair (ScriptState *st) +void builtin_repair(ScriptState *st) { - int i, num; - int repaircounter = 0; + int i, num; + int repaircounter = 0; struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].broken == 1) @@ -3105,10 +3099,10 @@ void builtin_repair (ScriptState *st) if (num == repaircounter) { sd->status.inventory[i].broken = 0; - clif_equiplist (sd); - clif_produceeffect (sd, 0, sd->status.inventory[i].nameid); - clif_misceffect (&sd->bl, 3); - clif_displaymessage (sd->fd, "Item has been repaired."); + clif_equiplist(sd); + clif_produceeffect(sd, 0, sd->status.inventory[i].nameid); + clif_misceffect(&sd->bl, 3); + clif_displaymessage(sd->fd, "Item has been repaired."); break; } } @@ -3120,21 +3114,21 @@ void builtin_repair (ScriptState *st) * 装備チェック *------------------------------------------ */ -void builtin_getequipisequiped (ScriptState *st) +void builtin_getequipisequiped(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } else { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -3143,14 +3137,14 @@ void builtin_getequipisequiped (ScriptState *st) * 装備品精錬可能チェック *------------------------------------------ */ -void builtin_getequipisenableref (ScriptState *st) +void builtin_getequipisenableref(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0 && num < 7 && sd->inventory_data[i] && (num != 1 || sd->inventory_data[i]->def > 1 || (sd->inventory_data[i]->def == 1 @@ -3158,11 +3152,11 @@ void builtin_getequipisenableref (ScriptState *st) || (sd->inventory_data[i]->def <= 0 && sd->inventory_data[i]->equip_script != NULL))) { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } else { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -3171,18 +3165,18 @@ void builtin_getequipisenableref (ScriptState *st) * 装備品鑑定チェック *------------------------------------------ */ -void builtin_getequipisidentify (ScriptState *st) +void builtin_getequipisidentify(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) - push_val (st->stack, ScriptCode::INT, sd->status.inventory[i].identify); + push_val(st->stack, ScriptCode::INT, sd->status.inventory[i].identify); else - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } @@ -3190,18 +3184,18 @@ void builtin_getequipisidentify (ScriptState *st) * 装備品精錬度 *------------------------------------------ */ -void builtin_getequiprefinerycnt (ScriptState *st) +void builtin_getequiprefinerycnt(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) - push_val (st->stack, ScriptCode::INT, sd->status.inventory[i].refine); + push_val(st->stack, ScriptCode::INT, sd->status.inventory[i].refine); else - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } @@ -3209,18 +3203,18 @@ void builtin_getequiprefinerycnt (ScriptState *st) * 装備品武器LV *------------------------------------------ */ -void builtin_getequipweaponlv (ScriptState *st) +void builtin_getequipweaponlv(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0 && sd->inventory_data[i]) - push_val (st->stack, ScriptCode::INT, sd->inventory_data[i]->wlv); + push_val(st->stack, ScriptCode::INT, sd->inventory_data[i]->wlv); else - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } @@ -3228,19 +3222,19 @@ void builtin_getequipweaponlv (ScriptState *st) * 装備品精錬成功率 *------------------------------------------ */ -void builtin_getequippercentrefinery (ScriptState *st) +void builtin_getequippercentrefinery(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) - push_val (st->stack, ScriptCode::INT, - pc_percentrefinery (sd, &sd->status.inventory[i])); + push_val(st->stack, ScriptCode::INT, + pc_percentrefinery(sd, &sd->status.inventory[i])); else - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } @@ -3248,25 +3242,25 @@ void builtin_getequippercentrefinery (ScriptState *st) * 精錬成功 *------------------------------------------ */ -void builtin_successrefitem (ScriptState *st) +void builtin_successrefitem(ScriptState *st) { - int i, num, ep; + int i, num, ep; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) { ep = sd->status.inventory[i].equip; sd->status.inventory[i].refine++; - pc_unequipitem (sd, i, 0); - clif_refine (sd->fd, sd, 0, i, sd->status.inventory[i].refine); - clif_delitem (sd, i, 1); - clif_additem (sd, i, 1, 0); - pc_equipitem (sd, i, ep); - clif_misceffect (&sd->bl, 3); + pc_unequipitem(sd, i, 0); + clif_refine(sd->fd, sd, 0, i, sd->status.inventory[i].refine); + clif_delitem(sd, i, 1); + clif_additem(sd, i, 1, 0); + pc_equipitem(sd, i, ep); + clif_misceffect(&sd->bl, 3); } } @@ -3275,23 +3269,23 @@ void builtin_successrefitem (ScriptState *st) * 精錬失敗 *------------------------------------------ */ -void builtin_failedrefitem (ScriptState *st) +void builtin_failedrefitem(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (i >= 0) { sd->status.inventory[i].refine = 0; - pc_unequipitem (sd, i, 0); + pc_unequipitem(sd, i, 0); // 精錬失敗エフェクトのパケット - clif_refine (sd->fd, sd, 1, i, sd->status.inventory[i].refine); - pc_delitem (sd, i, 1, 0); + clif_refine(sd->fd, sd, 1, i, sd->status.inventory[i].refine); + pc_delitem(sd, i, 1, 0); // 他の人にも失敗を通知 - clif_misceffect (&sd->bl, 2); + clif_misceffect(&sd->bl, 2); } } @@ -3300,14 +3294,14 @@ void builtin_failedrefitem (ScriptState *st) * *------------------------------------------ */ -void builtin_statusup (ScriptState *st) +void builtin_statusup(ScriptState *st) { - int type; + int type; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - pc_statusup (sd, type); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + pc_statusup(sd, type); } @@ -3315,15 +3309,15 @@ void builtin_statusup (ScriptState *st) * *------------------------------------------ */ -void builtin_statusup2 (ScriptState *st) +void builtin_statusup2(ScriptState *st) { - int type, val; + int type, val; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - val = conv_num (st, &(st->stack->stack_data[st->start + 3])); - sd = script_rid2sd (st); - pc_statusup2 (sd, type, val); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + val = conv_num(st, &(st->stack->stack_data[st->start + 3])); + sd = script_rid2sd(st); + pc_statusup2(sd, type, val); } @@ -3331,15 +3325,15 @@ void builtin_statusup2 (ScriptState *st) * 装備品による能力値ボーナス *------------------------------------------ */ -void builtin_bonus (ScriptState *st) +void builtin_bonus(ScriptState *st) { - int type, val; + int type, val; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - val = conv_num (st, &(st->stack->stack_data[st->start + 3])); - sd = script_rid2sd (st); - pc_bonus (sd, type, val); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + val = conv_num(st, &(st->stack->stack_data[st->start + 3])); + sd = script_rid2sd(st); + pc_bonus(sd, type, val); } @@ -3347,16 +3341,16 @@ void builtin_bonus (ScriptState *st) * 装備品による能力値ボーナス *------------------------------------------ */ -void builtin_bonus2 (ScriptState *st) +void builtin_bonus2(ScriptState *st) { - int type, type2, val; + int type, type2, val; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - type2 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - val = conv_num (st, &(st->stack->stack_data[st->start + 4])); - sd = script_rid2sd (st); - pc_bonus2 (sd, type, type2, val); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + type2 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + val = conv_num(st, &(st->stack->stack_data[st->start + 4])); + sd = script_rid2sd(st); + pc_bonus2(sd, type, type2, val); } @@ -3364,17 +3358,17 @@ void builtin_bonus2 (ScriptState *st) * 装備品による能力値ボーナス *------------------------------------------ */ -void builtin_bonus3 (ScriptState *st) +void builtin_bonus3(ScriptState *st) { - int type, type2, type3, val; + int type, type2, type3, val; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - type2 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - type3 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - val = conv_num (st, &(st->stack->stack_data[st->start + 5])); - sd = script_rid2sd (st); - pc_bonus3 (sd, type, type2, type3, val); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + type2 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + type3 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + val = conv_num(st, &(st->stack->stack_data[st->start + 5])); + sd = script_rid2sd(st); + pc_bonus3(sd, type, type2, type3, val); } @@ -3382,18 +3376,18 @@ void builtin_bonus3 (ScriptState *st) * スキル所得 *------------------------------------------ */ -void builtin_skill (ScriptState *st) +void builtin_skill(ScriptState *st) { - int id, level, flag = 1; + int id, level, flag = 1; struct map_session_data *sd; - id = conv_num (st, &(st->stack->stack_data[st->start + 2])); - level = conv_num (st, &(st->stack->stack_data[st->start + 3])); + id = conv_num(st, &(st->stack->stack_data[st->start + 2])); + level = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (st->end > st->start + 4) - flag = conv_num (st, &(st->stack->stack_data[st->start + 4])); - sd = script_rid2sd (st); - pc_skill (sd, id, level, flag); - clif_skillinfoblock (sd); + flag = conv_num(st, &(st->stack->stack_data[st->start + 4])); + sd = script_rid2sd(st); + pc_skill(sd, id, level, flag); + clif_skillinfoblock(sd); } @@ -3401,53 +3395,53 @@ void builtin_skill (ScriptState *st) * [Fate] Sets the skill level permanently *------------------------------------------ */ -void builtin_setskill (ScriptState *st) +void builtin_setskill(ScriptState *st) { - int id, level; + int id, level; struct map_session_data *sd; - id = conv_num (st, &(st->stack->stack_data[st->start + 2])); - level = conv_num (st, &(st->stack->stack_data[st->start + 3])); - sd = script_rid2sd (st); + id = conv_num(st, &(st->stack->stack_data[st->start + 2])); + level = conv_num(st, &(st->stack->stack_data[st->start + 3])); + sd = script_rid2sd(st); sd->status.skill[id].id = level ? id : 0; sd->status.skill[id].lv = level; - clif_skillinfoblock (sd); + clif_skillinfoblock(sd); } /*========================================== * スキルレベル所得 *------------------------------------------ */ -void builtin_getskilllv (ScriptState *st) +void builtin_getskilllv(ScriptState *st) { - int id = conv_num (st, &(st->stack->stack_data[st->start + 2])); - push_val (st->stack, ScriptCode::INT, pc_checkskill (script_rid2sd (st), id)); + int id = conv_num(st, &(st->stack->stack_data[st->start + 2])); + push_val(st->stack, ScriptCode::INT, pc_checkskill(script_rid2sd(st), id)); } /*========================================== * *------------------------------------------ */ -void builtin_basicskillcheck (ScriptState *st) +void builtin_basicskillcheck(ScriptState *st) { - push_val (st->stack, ScriptCode::INT, battle_config.basic_skill_check); + push_val(st->stack, ScriptCode::INT, battle_config.basic_skill_check); } /*========================================== * *------------------------------------------ */ -void builtin_getgmlevel (ScriptState *st) +void builtin_getgmlevel(ScriptState *st) { - push_val (st->stack, ScriptCode::INT, pc_isGM (script_rid2sd (st))); + push_val(st->stack, ScriptCode::INT, pc_isGM(script_rid2sd(st))); } /*========================================== * *------------------------------------------ */ -void builtin_end (ScriptState *st) +void builtin_end(ScriptState *st) { st->state = END; } @@ -3457,13 +3451,13 @@ void builtin_end (ScriptState *st) *------------------------------------------ */ -void builtin_getopt2 (ScriptState *st) +void builtin_getopt2(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - push_val (st->stack, ScriptCode::INT, sd->opt2); + push_val(st->stack, ScriptCode::INT, sd->opt2); } @@ -3472,18 +3466,18 @@ void builtin_getopt2 (ScriptState *st) *------------------------------------------ */ -void builtin_setopt2 (ScriptState *st) +void builtin_setopt2(ScriptState *st) { - int new_opt2; + int new_opt2; struct map_session_data *sd; - new_opt2 = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); + new_opt2 = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); if (new_opt2 == sd->opt2) return; sd->opt2 = new_opt2; - clif_changeoption (&sd->bl); - pc_calcstatus (sd, 0); + clif_changeoption(&sd->bl); + pc_calcstatus(sd, 0); } @@ -3491,21 +3485,21 @@ void builtin_setopt2 (ScriptState *st) * *------------------------------------------ */ -void builtin_checkoption (ScriptState *st) +void builtin_checkoption(ScriptState *st) { - int type; + int type; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); if (sd->status.option & type) { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } else { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -3514,14 +3508,14 @@ void builtin_checkoption (ScriptState *st) * *------------------------------------------ */ -void builtin_setoption (ScriptState *st) +void builtin_setoption(ScriptState *st) { - int type; + int type; struct map_session_data *sd; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - pc_setoption (sd, type); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + pc_setoption(sd, type); } @@ -3530,19 +3524,19 @@ void builtin_setoption (ScriptState *st) *------------------------------------------ */ -void builtin_checkcart (ScriptState *st) +void builtin_checkcart(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - if (pc_iscarton (sd)) + if (pc_iscarton(sd)) { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } else { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -3550,12 +3544,12 @@ void builtin_checkcart (ScriptState *st) * カートを付ける *------------------------------------------ */ -void builtin_setcart (ScriptState *st) +void builtin_setcart(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); - pc_setcart (sd, 1); + sd = script_rid2sd(st); + pc_setcart(sd, 1); } @@ -3564,19 +3558,19 @@ void builtin_setcart (ScriptState *st) *------------------------------------------ */ -void builtin_checkfalcon (ScriptState *st) +void builtin_checkfalcon(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - if (pc_isfalcon (sd)) + if (pc_isfalcon(sd)) { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } else { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -3585,12 +3579,12 @@ void builtin_checkfalcon (ScriptState *st) * 鷹を付ける *------------------------------------------ */ -void builtin_setfalcon (ScriptState *st) +void builtin_setfalcon(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); - pc_setfalcon (sd); + sd = script_rid2sd(st); + pc_setfalcon(sd); } @@ -3599,19 +3593,19 @@ void builtin_setfalcon (ScriptState *st) *------------------------------------------ */ -void builtin_checkriding (ScriptState *st) +void builtin_checkriding(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - if (pc_isriding (sd)) + if (pc_isriding(sd)) { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } else { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -3620,27 +3614,27 @@ void builtin_checkriding (ScriptState *st) * ペコペコ乗り *------------------------------------------ */ -void builtin_setriding (ScriptState *st) +void builtin_setriding(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); - pc_setriding (sd); + sd = script_rid2sd(st); + pc_setriding(sd); } /*========================================== - * セーブポイントの保存 + * セーブポイントの保存 *------------------------------------------ */ -void builtin_savepoint (ScriptState *st) +void builtin_savepoint(ScriptState *st) { - int x, y; + int x, y; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y = conv_num (st, &(st->stack->stack_data[st->start + 4])); - pc_setsavepoint (script_rid2sd (st), str, x, y); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y = conv_num(st, &(st->stack->stack_data[st->start + 4])); + pc_setsavepoint(script_rid2sd(st), str, x, y); } /*========================================== @@ -3653,33 +3647,33 @@ void builtin_savepoint (ScriptState *st) * other value. *------------------------------------------ */ -void builtin_gettimetick (ScriptState *st) /* Asgard Version */ +void builtin_gettimetick(ScriptState *st) /* Asgard Version */ { - int type; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + int type; + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); switch (type) { - /* Number of seconds elapsed today (0-86399, 00:00:00-23:59:59). */ + /* Number of seconds elapsed today(0-86399, 00:00:00-23:59:59). */ case 1: { time_t timer; struct tm *t; - time (&timer); - t = gmtime (&timer); - push_val (st->stack, ScriptCode::INT, + time(&timer); + t = gmtime(&timer); + push_val(st->stack, ScriptCode::INT, ((t->tm_hour) * 3600 + (t->tm_min) * 60 + t->tm_sec)); break; } /* Seconds since Unix epoch. */ case 2: - push_val (st->stack, ScriptCode::INT, (int) time (NULL)); + push_val(st->stack, ScriptCode::INT, (int) time(NULL)); break; - /* System tick (unsigned int, and yes, it will wrap). */ + /* System tick(unsigned int, and yes, it will wrap). */ case 0: default: - push_val (st->stack, ScriptCode::INT, gettick ()); + push_val(st->stack, ScriptCode::INT, gettick()); break; } } @@ -3691,42 +3685,42 @@ void builtin_gettimetick (ScriptState *st) /* Asgard Version */ * 7: Year *------------------------------------------ */ -void builtin_gettime (ScriptState *st) /* Asgard Version */ +void builtin_gettime(ScriptState *st) /* Asgard Version */ { - int type; + int type; time_t timer; struct tm *t; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); - time (&timer); - t = gmtime (&timer); + time(&timer); + t = gmtime(&timer); switch (type) { case 1: //Sec(0~59) - push_val (st->stack, ScriptCode::INT, t->tm_sec); + push_val(st->stack, ScriptCode::INT, t->tm_sec); break; case 2: //Min(0~59) - push_val (st->stack, ScriptCode::INT, t->tm_min); + push_val(st->stack, ScriptCode::INT, t->tm_min); break; case 3: //Hour(0~23) - push_val (st->stack, ScriptCode::INT, t->tm_hour); + push_val(st->stack, ScriptCode::INT, t->tm_hour); break; case 4: //WeekDay(0~6) - push_val (st->stack, ScriptCode::INT, t->tm_wday); + push_val(st->stack, ScriptCode::INT, t->tm_wday); break; case 5: //MonthDay(01~31) - push_val (st->stack, ScriptCode::INT, t->tm_mday); + push_val(st->stack, ScriptCode::INT, t->tm_mday); break; case 6: //Month(01~12) - push_val (st->stack, ScriptCode::INT, t->tm_mon + 1); + push_val(st->stack, ScriptCode::INT, t->tm_mon + 1); break; case 7: //Year(20xx) - push_val (st->stack, ScriptCode::INT, t->tm_year + 1900); + push_val(st->stack, ScriptCode::INT, t->tm_year + 1900); break; default: //(format error) - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); break; } } @@ -3735,52 +3729,52 @@ void builtin_gettime (ScriptState *st) /* Asgard Version */ * GetTimeStr("TimeFMT", Length); *------------------------------------------ */ -void builtin_gettimestr (ScriptState *st) +void builtin_gettimestr(ScriptState *st) { char *tmpstr; - int maxlen; - time_t now = time (NULL); + int maxlen; + time_t now = time(NULL); - const char *fmtstr = conv_str (st, &(st->stack->stack_data[st->start + 2])); - maxlen = conv_num (st, &(st->stack->stack_data[st->start + 3])); + const char *fmtstr = conv_str(st, &(st->stack->stack_data[st->start + 2])); + maxlen = conv_num(st, &(st->stack->stack_data[st->start + 3])); - tmpstr = (char *) calloc (maxlen + 1, 1); - strftime (tmpstr, maxlen, fmtstr, gmtime (&now)); + tmpstr = (char *) calloc(maxlen + 1, 1); + strftime(tmpstr, maxlen, fmtstr, gmtime(&now)); tmpstr[maxlen] = '\0'; - push_str (st->stack, ScriptCode::STR, tmpstr); + push_str(st->stack, ScriptCode::STR, tmpstr); } /*========================================== * カプラ倉庫を開く *------------------------------------------ */ -void builtin_openstorage (ScriptState *st) +void builtin_openstorage(ScriptState *st) { // int sync = 0; // if (st->end >= 3) sync = conv_num(st,& (st->stack->stack_data[st->start+2])); - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); // if (sync) { st->state = STOP; sd->npc_flags.storage = 1; // } else st->state = END; - storage_storageopen (sd); + storage_storageopen(sd); } /*========================================== * アイテムによるスキル発動 *------------------------------------------ */ -void builtin_itemskill (ScriptState *st) +void builtin_itemskill(ScriptState *st) { - int id, lv; - struct map_session_data *sd = script_rid2sd (st); + int id, lv; + struct map_session_data *sd = script_rid2sd(st); - id = conv_num (st, &(st->stack->stack_data[st->start + 2])); - lv = conv_num (st, &(st->stack->stack_data[st->start + 3])); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 4])); + id = conv_num(st, &(st->stack->stack_data[st->start + 2])); + lv = conv_num(st, &(st->stack->stack_data[st->start + 3])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 4])); // 詠唱中にスキルアイテムは使用できない if (sd->skilltimer != -1) @@ -3788,24 +3782,24 @@ void builtin_itemskill (ScriptState *st) sd->skillitem = id; sd->skillitemlv = lv; - clif_item_skill (sd, id, lv, str); + clif_item_skill(sd, id, lv, str); } /*========================================== * NPCで経験値上げる *------------------------------------------ */ -void builtin_getexp (ScriptState *st) +void builtin_getexp(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int base = 0, job = 0; + struct map_session_data *sd = script_rid2sd(st); + int base = 0, job = 0; - base = conv_num (st, &(st->stack->stack_data[st->start + 2])); - job = conv_num (st, &(st->stack->stack_data[st->start + 3])); + base = conv_num(st, &(st->stack->stack_data[st->start + 2])); + job = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (base < 0 || job < 0) return; if (sd) - pc_gainexp_reason (sd, base, job, PC_GAINEXP_REASON_SCRIPT); + pc_gainexp_reason(sd, base, job, PC_GAINEXP_REASON_SCRIPT); } @@ -3813,21 +3807,21 @@ void builtin_getexp (ScriptState *st) * モンスター発生 *------------------------------------------ */ -void builtin_monster (ScriptState *st) +void builtin_monster(ScriptState *st) { - int mob_class, amount, x, y; + int mob_class, amount, x, y; const char *event = ""; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y = conv_num (st, &(st->stack->stack_data[st->start + 4])); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 5])); - mob_class = conv_num (st, &(st->stack->stack_data[st->start + 6])); - amount = conv_num (st, &(st->stack->stack_data[st->start + 7])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y = conv_num(st, &(st->stack->stack_data[st->start + 4])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 5])); + mob_class = conv_num(st, &(st->stack->stack_data[st->start + 6])); + amount = conv_num(st, &(st->stack->stack_data[st->start + 7])); if (st->end > st->start + 8) - event = conv_str (st, &(st->stack->stack_data[st->start + 8])); + event = conv_str(st, &(st->stack->stack_data[st->start + 8])); - mob_once_spawn (map_id2sd (st->rid), mapname, x, y, str, mob_class, amount, + mob_once_spawn(map_id2sd(st->rid), mapname, x, y, str, mob_class, amount, event); } @@ -3835,23 +3829,23 @@ void builtin_monster (ScriptState *st) * モンスター発生 *------------------------------------------ */ -void builtin_areamonster (ScriptState *st) +void builtin_areamonster(ScriptState *st) { - int mob_class, amount, x0, y0, x1, y1; + int mob_class, amount, x0, y0, x1, y1; const char *event = ""; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x0 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y0 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - x1 = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y1 = conv_num (st, &(st->stack->stack_data[st->start + 6])); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 7])); - mob_class = conv_num (st, &(st->stack->stack_data[st->start + 8])); - amount = conv_num (st, &(st->stack->stack_data[st->start + 9])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x0 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y0 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + x1 = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y1 = conv_num(st, &(st->stack->stack_data[st->start + 6])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 7])); + mob_class = conv_num(st, &(st->stack->stack_data[st->start + 8])); + amount = conv_num(st, &(st->stack->stack_data[st->start + 9])); if (st->end > st->start + 10) - event = conv_str (st, &(st->stack->stack_data[st->start + 10])); + event = conv_str(st, &(st->stack->stack_data[st->start + 10])); - mob_once_spawn_area (map_id2sd (st->rid), mapname, x0, y0, x1, y1, str, mob_class, + mob_once_spawn_area(map_id2sd(st->rid), mapname, x0, y0, x1, y1, str, mob_class, amount, event); } @@ -3860,54 +3854,54 @@ void builtin_areamonster (ScriptState *st) *------------------------------------------ */ static -void builtin_killmonster_sub (struct block_list *bl, va_list ap) +void builtin_killmonster_sub(struct block_list *bl, va_list ap) { - char *event = va_arg (ap, char *); - int allflag = va_arg (ap, int); + char *event = va_arg(ap, char *); + int allflag = va_arg(ap, int); if (!allflag) { - if (strcmp (event, ((struct mob_data *) bl)->npc_event) == 0) - mob_delete ((struct mob_data *) bl); + if (strcmp(event, ((struct mob_data *) bl)->npc_event) == 0) + mob_delete((struct mob_data *) bl); return; } else if (allflag) { if (((struct mob_data *) bl)->spawndelay1 == -1 && ((struct mob_data *) bl)->spawndelay2 == -1) - mob_delete ((struct mob_data *) bl); + mob_delete((struct mob_data *) bl); return; } } -void builtin_killmonster (ScriptState *st) +void builtin_killmonster(ScriptState *st) { - int m, allflag = 0; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 3])); - if (strcmp (event, "All") == 0) + int m, allflag = 0; + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 3])); + if (strcmp(event, "All") == 0) allflag = 1; - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) return; - map_foreachinarea (builtin_killmonster_sub, + map_foreachinarea(builtin_killmonster_sub, m, 0, 0, map[m].xs, map[m].ys, BL_MOB, event, allflag); } static -void builtin_killmonsterall_sub (struct block_list *bl, va_list ap) +void builtin_killmonsterall_sub(struct block_list *bl, va_list ap) { - mob_delete ((struct mob_data *) bl); + mob_delete((struct mob_data *) bl); } -void builtin_killmonsterall (ScriptState *st) +void builtin_killmonsterall(ScriptState *st) { - int m; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); + int m; + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) return; - map_foreachinarea (builtin_killmonsterall_sub, + map_foreachinarea(builtin_killmonsterall_sub, m, 0, 0, map[m].xs, map[m].ys, BL_MOB); } @@ -3915,124 +3909,120 @@ void builtin_killmonsterall (ScriptState *st) * イベント実行 *------------------------------------------ */ -void builtin_doevent (ScriptState *st) +void builtin_doevent(ScriptState *st) { - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2])); - npc_event (map_id2sd (st->rid), event, 0); + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2])); + npc_event(map_id2sd(st->rid), event, 0); } /*========================================== * NPC主体イベント実行 *------------------------------------------ */ -void builtin_donpcevent (ScriptState *st) +void builtin_donpcevent(ScriptState *st) { - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2])); - npc_event_do (event); + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2])); + npc_event_do(event); } /*========================================== * イベントタイマー追加 *------------------------------------------ */ -void builtin_addtimer (ScriptState *st) +void builtin_addtimer(ScriptState *st) { - int tick; - tick = conv_num (st, &(st->stack->stack_data[st->start + 2])); - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 3])); - pc_addeventtimer (script_rid2sd (st), tick, event); + int tick; + tick = conv_num(st, &(st->stack->stack_data[st->start + 2])); + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 3])); + pc_addeventtimer(script_rid2sd(st), tick, event); } /*========================================== * イベントタイマー削除 *------------------------------------------ */ -void builtin_deltimer (ScriptState *st) +void builtin_deltimer(ScriptState *st) { - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2])); - pc_deleventtimer (script_rid2sd (st), event); + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2])); + pc_deleventtimer(script_rid2sd(st), event); } /*========================================== * イベントタイマーのカウント値追加 *------------------------------------------ */ -void builtin_addtimercount (ScriptState *st) +void builtin_addtimercount(ScriptState *st) { - int tick; - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2])); - tick = conv_num (st, &(st->stack->stack_data[st->start + 3])); - pc_addeventtimercount (script_rid2sd (st), event, tick); + int tick; + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2])); + tick = conv_num(st, &(st->stack->stack_data[st->start + 3])); + pc_addeventtimercount(script_rid2sd(st), event, tick); } /*========================================== * NPCタイマー初期化 *------------------------------------------ */ -void builtin_initnpctimer (ScriptState *st) +void builtin_initnpctimer(ScriptState *st) { struct npc_data *nd; if (st->end > st->start + 2) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); - npc_settimerevent_tick (nd, 0); - npc_timerevent_start (nd); + npc_settimerevent_tick(nd, 0); + npc_timerevent_start(nd); } /*========================================== * NPCタイマー開始 *------------------------------------------ */ -void builtin_startnpctimer (ScriptState *st) +void builtin_startnpctimer(ScriptState *st) { struct npc_data *nd; if (st->end > st->start + 2) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); - npc_timerevent_start (nd); + npc_timerevent_start(nd); } /*========================================== * NPCタイマー停止 *------------------------------------------ */ -void builtin_stopnpctimer (ScriptState *st) +void builtin_stopnpctimer(ScriptState *st) { struct npc_data *nd; if (st->end > st->start + 2) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); - npc_timerevent_stop (nd); + npc_timerevent_stop(nd); } /*========================================== * NPCタイマー情報所得 *------------------------------------------ */ -void builtin_getnpctimer (ScriptState *st) +void builtin_getnpctimer(ScriptState *st) { struct npc_data *nd; - int type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - int val = 0; + int type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + int val = 0; if (st->end > st->start + 3) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 3]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 3]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); switch (type) { case 0: - val = npc_gettimerevent_tick (nd); + val = npc_gettimerevent_tick(nd); break; case 1: val = (nd->u.scr.nexttimer >= 0); @@ -4041,45 +4031,44 @@ void builtin_getnpctimer (ScriptState *st) val = nd->u.scr.timeramount; break; } - push_val (st->stack, ScriptCode::INT, val); + push_val(st->stack, ScriptCode::INT, val); } /*========================================== * NPCタイマー値設定 *------------------------------------------ */ -void builtin_setnpctimer (ScriptState *st) +void builtin_setnpctimer(ScriptState *st) { - int tick; + int tick; struct npc_data *nd; - tick = conv_num (st, &(st->stack->stack_data[st->start + 2])); + tick = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (st->end > st->start + 3) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 3]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 3]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); - npc_settimerevent_tick (nd, tick); + npc_settimerevent_tick(nd, tick); } /*========================================== * 天の声アナウンス *------------------------------------------ */ -void builtin_announce (ScriptState *st) +void builtin_announce(ScriptState *st) { - int flag; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - flag = conv_num (st, &(st->stack->stack_data[st->start + 3])); + int flag; + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + flag = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (flag & 0x0f) { - struct block_list *bl = (flag & 0x08) ? map_id2bl (st->oid) : - (struct block_list *) script_rid2sd (st); - clif_GMmessage (bl, str, strlen (str) + 1, flag); + struct block_list *bl = (flag & 0x08) ? map_id2bl(st->oid) : + (struct block_list *) script_rid2sd(st); + clif_GMmessage(bl, str, strlen(str) + 1, flag); } else - intif_GMmessage (str, strlen (str) + 1, flag); + intif_GMmessage(str, strlen(str) + 1, flag); } /*========================================== @@ -4087,53 +4076,53 @@ void builtin_announce (ScriptState *st) *------------------------------------------ */ static -void builtin_mapannounce_sub (struct block_list *bl, va_list ap) +void builtin_mapannounce_sub(struct block_list *bl, va_list ap) { char *str; - int len, flag; - str = va_arg (ap, char *); - len = va_arg (ap, int); - flag = va_arg (ap, int); - clif_GMmessage (bl, str, len, flag | 3); + int len, flag; + str = va_arg(ap, char *); + len = va_arg(ap, int); + flag = va_arg(ap, int); + clif_GMmessage(bl, str, len, flag | 3); } -void builtin_mapannounce (ScriptState *st) +void builtin_mapannounce(ScriptState *st) { - int flag, m; + int flag, m; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 3])); - flag = conv_num (st, &(st->stack->stack_data[st->start + 4])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 3])); + flag = conv_num(st, &(st->stack->stack_data[st->start + 4])); - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) return; - map_foreachinarea (builtin_mapannounce_sub, + map_foreachinarea(builtin_mapannounce_sub, m, 0, 0, map[m].xs, map[m].ys, BL_PC, str, - strlen (str) + 1, flag & 0x10); + strlen(str) + 1, flag & 0x10); } /*========================================== * 天の声アナウンス（特定エリア） *------------------------------------------ */ -void builtin_areaannounce (ScriptState *st) +void builtin_areaannounce(ScriptState *st) { - int flag, m; - int x0, y0, x1, y1; + int flag, m; + int x0, y0, x1, y1; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x0 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y0 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - x1 = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y1 = conv_num (st, &(st->stack->stack_data[st->start + 6])); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 7])); - flag = conv_num (st, &(st->stack->stack_data[st->start + 8])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x0 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y0 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + x1 = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y1 = conv_num(st, &(st->stack->stack_data[st->start + 6])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 7])); + flag = conv_num(st, &(st->stack->stack_data[st->start + 8])); - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) return; - map_foreachinarea (builtin_mapannounce_sub, - m, x0, y0, x1, y1, BL_PC, str, strlen (str) + 1, + map_foreachinarea(builtin_mapannounce_sub, + m, x0, y0, x1, y1, BL_PC, str, strlen(str) + 1, flag & 0x10); } @@ -4141,37 +4130,37 @@ void builtin_areaannounce (ScriptState *st) * ユーザー数所得 *------------------------------------------ */ -void builtin_getusers (ScriptState *st) +void builtin_getusers(ScriptState *st) { - int flag = conv_num (st, &(st->stack->stack_data[st->start + 2])); - struct block_list *bl = map_id2bl ((flag & 0x08) ? st->oid : st->rid); - int val = 0; + int flag = conv_num(st, &(st->stack->stack_data[st->start + 2])); + struct block_list *bl = map_id2bl((flag & 0x08) ? st->oid : st->rid); + int val = 0; switch (flag & 0x07) { case 0: val = map[bl->m].users; break; case 1: - val = map_getusers (); + val = map_getusers(); break; } - push_val (st->stack, ScriptCode::INT, val); + push_val(st->stack, ScriptCode::INT, val); } /*========================================== * マップ指定ユーザー数所得 *------------------------------------------ */ -void builtin_getmapusers (ScriptState *st) +void builtin_getmapusers(ScriptState *st) { - int m; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - if ((m = map_mapname2mapid (str)) < 0) + int m; + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + if ((m = map_mapname2mapid(str)) < 0) { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); return; } - push_val (st->stack, ScriptCode::INT, map[m].users); + push_val(st->stack, ScriptCode::INT, map[m].users); } /*========================================== @@ -4179,42 +4168,42 @@ void builtin_getmapusers (ScriptState *st) *------------------------------------------ */ static -void builtin_getareausers_sub (struct block_list *bl, va_list ap) +void builtin_getareausers_sub(struct block_list *bl, va_list ap) { - int *users = va_arg (ap, int *); + int *users = va_arg(ap, int *); (*users)++; } static -void builtin_getareausers_living_sub (struct block_list *bl, va_list ap) +void builtin_getareausers_living_sub(struct block_list *bl, va_list ap) { - int *users = va_arg (ap, int *); + int *users = va_arg(ap, int *); if (!pc_isdead((struct map_session_data *)bl)) (*users)++; } -void builtin_getareausers (ScriptState *st) +void builtin_getareausers(ScriptState *st) { - int m, x0, y0, x1, y1, users = 0; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x0 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y0 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - x1 = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y1 = conv_num (st, &(st->stack->stack_data[st->start + 6])); + int m, x0, y0, x1, y1, users = 0; + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x0 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y0 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + x1 = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y1 = conv_num(st, &(st->stack->stack_data[st->start + 6])); int living = 0; if (st->end > st->start + 7) { - living = conv_num (st, &(st->stack->stack_data[st->start + 7])); + living = conv_num(st, &(st->stack->stack_data[st->start + 7])); } - if ((m = map_mapname2mapid (str)) < 0) + if ((m = map_mapname2mapid(str)) < 0) { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); return; } - map_foreachinarea (living ? builtin_getareausers_living_sub: builtin_getareausers_sub, + map_foreachinarea(living ? builtin_getareausers_living_sub: builtin_getareausers_sub, m, x0, y0, x1, y1, BL_PC, &users); - push_val (st->stack, ScriptCode::INT, users); + push_val(st->stack, ScriptCode::INT, users); } /*========================================== @@ -4222,10 +4211,10 @@ void builtin_getareausers (ScriptState *st) *------------------------------------------ */ static -void builtin_getareadropitem_sub (struct block_list *bl, va_list ap) +void builtin_getareadropitem_sub(struct block_list *bl, va_list ap) { - int item = va_arg (ap, int); - int *amount = va_arg (ap, int *); + int item = va_arg(ap, int); + int *amount = va_arg(ap, int *); struct flooritem_data *drop = (struct flooritem_data *) bl; if (drop->item_data.nameid == item) @@ -4234,10 +4223,10 @@ void builtin_getareadropitem_sub (struct block_list *bl, va_list ap) } static -void builtin_getareadropitem_sub_anddelete (struct block_list *bl, va_list ap) +void builtin_getareadropitem_sub_anddelete(struct block_list *bl, va_list ap) { - int item = va_arg (ap, int); - int *amount = va_arg (ap, int *); + int item = va_arg(ap, int); + int *amount = va_arg(ap, int *); struct flooritem_data *drop = (struct flooritem_data *) bl; if (drop->item_data.nameid == item) { @@ -4247,88 +4236,88 @@ void builtin_getareadropitem_sub_anddelete (struct block_list *bl, va_list ap) } } -void builtin_getareadropitem (ScriptState *st) +void builtin_getareadropitem(ScriptState *st) { - int m, x0, y0, x1, y1, item, amount = 0, delitems = 0; + int m, x0, y0, x1, y1, item, amount = 0, delitems = 0; struct script_data *data; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x0 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y0 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - x1 = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y1 = conv_num (st, &(st->stack->stack_data[st->start + 6])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x0 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y0 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + x1 = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y1 = conv_num(st, &(st->stack->stack_data[st->start + 6])); data = &(st->stack->stack_data[st->start + 7]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); - struct item_data *item_data = itemdb_searchname (name); + const char *name = conv_str(st, data); + struct item_data *item_data = itemdb_searchname(name); item = 512; if (item_data) item = item_data->nameid; } else - item = conv_num (st, data); + item = conv_num(st, data); if (st->end > st->start + 8) - delitems = conv_num (st, &(st->stack->stack_data[st->start + 8])); + delitems = conv_num(st, &(st->stack->stack_data[st->start + 8])); - if ((m = map_mapname2mapid (str)) < 0) + if ((m = map_mapname2mapid(str)) < 0) { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); return; } if (delitems) - map_foreachinarea (builtin_getareadropitem_sub_anddelete, + map_foreachinarea(builtin_getareadropitem_sub_anddelete, m, x0, y0, x1, y1, BL_ITEM, item, &amount); else - map_foreachinarea (builtin_getareadropitem_sub, + map_foreachinarea(builtin_getareadropitem_sub, m, x0, y0, x1, y1, BL_ITEM, item, &amount); - push_val (st->stack, ScriptCode::INT, amount); + push_val(st->stack, ScriptCode::INT, amount); } /*========================================== * NPCの有効化 *------------------------------------------ */ -void builtin_enablenpc (ScriptState *st) +void builtin_enablenpc(ScriptState *st) { - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - npc_enable (str, 1); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + npc_enable(str, 1); } /*========================================== * NPCの無効化 *------------------------------------------ */ -void builtin_disablenpc (ScriptState *st) +void builtin_disablenpc(ScriptState *st) { - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - npc_enable (str, 0); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + npc_enable(str, 0); } -void builtin_enablearena (ScriptState *st) // Added by RoVeRT +void builtin_enablearena(ScriptState *st) // Added by RoVeRT { - struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid); + struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid); struct chat_data *cd; if (nd == NULL - || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL) + || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL) return; - npc_enable (nd->name, 1); + npc_enable(nd->name, 1); nd->arenaflag = 1; if (cd->users >= cd->trigger && cd->npc_event[0]) - npc_timer_event (cd->npc_event); + npc_timer_event(cd->npc_event); } -void builtin_disablearena (ScriptState *st) // Added by RoVeRT +void builtin_disablearena(ScriptState *st) // Added by RoVeRT { - struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid); + struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid); nd->arenaflag = 0; } @@ -4337,97 +4326,95 @@ void builtin_disablearena (ScriptState *st) // Added by RoVeRT * 隠れているNPCの表示 *------------------------------------------ */ -void builtin_hideoffnpc (ScriptState *st) +void builtin_hideoffnpc(ScriptState *st) { - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - npc_enable (str, 2); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + npc_enable(str, 2); } /*========================================== * NPCをハイディング *------------------------------------------ */ -void builtin_hideonnpc (ScriptState *st) +void builtin_hideonnpc(ScriptState *st) { - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - npc_enable (str, 4); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + npc_enable(str, 4); } /*========================================== * 状態異常にかかる *------------------------------------------ */ -void builtin_sc_start (ScriptState *st) +void builtin_sc_start(ScriptState *st) { struct block_list *bl; - int type, tick, val1; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - tick = conv_num (st, &(st->stack->stack_data[st->start + 3])); - val1 = conv_num (st, &(st->stack->stack_data[st->start + 4])); + int type, tick, val1; + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + tick = conv_num(st, &(st->stack->stack_data[st->start + 3])); + val1 = conv_num(st, &(st->stack->stack_data[st->start + 4])); if (st->end > st->start + 5) //指定したキャラを状態異常にする - bl = map_id2bl (conv_num - (st, &(st->stack->stack_data[st->start + 5]))); + bl = map_id2bl(conv_num(st, &(st->stack->stack_data[st->start + 5]))); else - bl = map_id2bl (st->rid); + bl = map_id2bl(st->rid); if (bl->type == BL_PC && ((struct map_session_data *) bl)->state.potionpitcher_flag) - bl = map_id2bl (((struct map_session_data *) bl)->skilltarget); - skill_status_change_start (bl, type, val1, 0, 0, 0, tick, 0); + bl = map_id2bl(((struct map_session_data *) bl)->skilltarget); + skill_status_change_start(bl, type, val1, 0, 0, 0, tick, 0); } /*========================================== * 状態異常にかかる(確率指定) *------------------------------------------ */ -void builtin_sc_start2 (ScriptState *st) +void builtin_sc_start2(ScriptState *st) { struct block_list *bl; - int type, tick, val1, per; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - tick = conv_num (st, &(st->stack->stack_data[st->start + 3])); - val1 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - per = conv_num (st, &(st->stack->stack_data[st->start + 5])); + int type, tick, val1, per; + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + tick = conv_num(st, &(st->stack->stack_data[st->start + 3])); + val1 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + per = conv_num(st, &(st->stack->stack_data[st->start + 5])); if (st->end > st->start + 6) //指定したキャラを状態異常にする - bl = map_id2bl (conv_num - (st, &(st->stack->stack_data[st->start + 6]))); + bl = map_id2bl(conv_num(st, &(st->stack->stack_data[st->start + 6]))); else - bl = map_id2bl (st->rid); + bl = map_id2bl(st->rid); if (bl->type == BL_PC && ((struct map_session_data *) bl)->state.potionpitcher_flag) - bl = map_id2bl (((struct map_session_data *) bl)->skilltarget); - if (MRAND (10000) < per) - skill_status_change_start (bl, type, val1, 0, 0, 0, tick, 0); + bl = map_id2bl(((struct map_session_data *) bl)->skilltarget); + if (MRAND(10000) < per) + skill_status_change_start(bl, type, val1, 0, 0, 0, tick, 0); } /*========================================== * 状態異常が直る *------------------------------------------ */ -void builtin_sc_end (ScriptState *st) +void builtin_sc_end(ScriptState *st) { struct block_list *bl; - int type; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - bl = map_id2bl (st->rid); + int type; + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + bl = map_id2bl(st->rid); if (bl->type == BL_PC && ((struct map_session_data *) bl)->state.potionpitcher_flag) - bl = map_id2bl (((struct map_session_data *) bl)->skilltarget); - skill_status_change_end (bl, type, -1); + bl = map_id2bl(((struct map_session_data *) bl)->skilltarget); + skill_status_change_end(bl, type, -1); // if(battle_config.etc_log) // printf("sc_end : %d %d\n",st->rid,type); } -void builtin_sc_check (ScriptState *st) +void builtin_sc_check(ScriptState *st) { struct block_list *bl; - int type; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - bl = map_id2bl (st->rid); + int type; + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + bl = map_id2bl(st->rid); if (bl->type == BL_PC && ((struct map_session_data *) bl)->state.potionpitcher_flag) - bl = map_id2bl (((struct map_session_data *) bl)->skilltarget); + bl = map_id2bl(((struct map_session_data *) bl)->skilltarget); - push_val (st->stack, ScriptCode::INT, skill_status_change_active (bl, type)); + push_val(st->stack, ScriptCode::INT, skill_status_change_active(bl, type)); } @@ -4435,24 +4422,23 @@ void builtin_sc_check (ScriptState *st) * 状態異常耐性を計算した確率を返す *------------------------------------------ */ -void builtin_getscrate (ScriptState *st) +void builtin_getscrate(ScriptState *st) { struct block_list *bl; - int sc_def = 100, sc_def_mdef2, sc_def_vit2, sc_def_int2, sc_def_luk2; - int type, rate, luk; + int sc_def = 100, sc_def_mdef2, sc_def_vit2, sc_def_int2, sc_def_luk2; + int type, rate, luk; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); - rate = conv_num (st, &(st->stack->stack_data[st->start + 3])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); + rate = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (st->end > st->start + 4) //指定したキャラの耐性を計算する - bl = map_id2bl (conv_num - (st, &(st->stack->stack_data[st->start + 6]))); + bl = map_id2bl(conv_num(st, &(st->stack->stack_data[st->start + 6]))); else - bl = map_id2bl (st->rid); + bl = map_id2bl(st->rid); - luk = battle_get_luk (bl); - sc_def_mdef2 = 100 - (3 + battle_get_mdef (bl) + luk / 3); - sc_def_vit2 = 100 - (3 + battle_get_vit (bl) + luk / 3); - sc_def_int2 = 100 - (3 + battle_get_int (bl) + luk / 3); + luk = battle_get_luk(bl); + sc_def_mdef2 = 100 - (3 + battle_get_mdef(bl) + luk / 3); + sc_def_vit2 = 100 - (3 + battle_get_vit(bl) + luk / 3); + sc_def_int2 = 100 - (3 + battle_get_int(bl) + luk / 3); sc_def_luk2 = 100 - (3 + luk); if (type == SC_STONE || type == SC_FREEZE) @@ -4465,7 +4451,7 @@ void builtin_getscrate (ScriptState *st) sc_def = sc_def_luk2; rate = rate * sc_def / 100; - push_val (st->stack, ScriptCode::INT, rate); + push_val(st->stack, ScriptCode::INT, rate); return; @@ -4475,10 +4461,10 @@ void builtin_getscrate (ScriptState *st) * *------------------------------------------ */ -void builtin_debugmes (ScriptState *st) +void builtin_debugmes(ScriptState *st) { - conv_str (st, &(st->stack->stack_data[st->start + 2])); - printf ("script debug : %d %d : %s\n", st->rid, st->oid, + conv_str(st, &(st->stack->stack_data[st->start + 2])); + printf("script debug : %d %d : %s\n", st->rid, st->oid, st->stack->stack_data[st->start + 2].u.str); } @@ -4486,57 +4472,56 @@ void builtin_debugmes (ScriptState *st) * Added - AppleGirl For Advanced Classes, (Updated for Cleaner Script Purposes) *------------------------------------------ */ -void builtin_resetlvl (ScriptState *st) +void builtin_resetlvl(ScriptState *st) { struct map_session_data *sd; - int type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + int type = conv_num(st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - pc_resetlvl (sd, type); + sd = script_rid2sd(st); + pc_resetlvl(sd, type); } /*========================================== * ステータスリセット *------------------------------------------ */ -void builtin_resetstatus (ScriptState *st) +void builtin_resetstatus(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); - pc_resetstate (sd); + sd = script_rid2sd(st); + pc_resetstate(sd); } /*========================================== * スキルリセット *------------------------------------------ */ -void builtin_resetskill (ScriptState *st) +void builtin_resetskill(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); - pc_resetskill (sd); + sd = script_rid2sd(st); + pc_resetskill(sd); } /*========================================== * *------------------------------------------ */ -void builtin_changebase (ScriptState *st) +void builtin_changebase(ScriptState *st) { struct map_session_data *sd = NULL; - int vclass; + int vclass; if (st->end > st->start + 3) - sd = map_id2sd (conv_num - (st, &(st->stack->stack_data[st->start + 3]))); + sd = map_id2sd(conv_num(st, &(st->stack->stack_data[st->start + 3]))); else - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (sd == NULL) return; - vclass = conv_num (st, &(st->stack->stack_data[st->start + 2])); + vclass = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (vclass == 22 && !battle_config.wedding_modifydisplay) return; @@ -4552,10 +4537,10 @@ void builtin_changebase (ScriptState *st) * 性別変換 *------------------------------------------ */ -void builtin_changesex (ScriptState *st) +void builtin_changesex(ScriptState *st) { struct map_session_data *sd = NULL; - sd = script_rid2sd (st); + sd = script_rid2sd(st); if (sd->status.sex == 0) { @@ -4571,63 +4556,62 @@ void builtin_changesex (ScriptState *st) if (sd->status.pc_class == 19 || sd->status.pc_class == 4020) sd->status.pc_class += 1; } - chrif_char_ask_name (-1, sd->status.name, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex - chrif_save (sd); + chrif_char_ask_name(-1, sd->status.name, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex + chrif_save(sd); } /*========================================== * npcチャット作成 *------------------------------------------ */ -void builtin_waitingroom (ScriptState *st) +void builtin_waitingroom(ScriptState *st) { const char *name, *ev = ""; - int limit, trigger = 0, pub = 1; - name = conv_str (st, &(st->stack->stack_data[st->start + 2])); - limit = conv_num (st, &(st->stack->stack_data[st->start + 3])); + int limit, trigger = 0, pub = 1; + name = conv_str(st, &(st->stack->stack_data[st->start + 2])); + limit = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (limit == 0) pub = 3; if ((st->end > st->start + 5)) { struct script_data *data = &(st->stack->stack_data[st->start + 5]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::INT) { // 新Athena仕様(旧Athena仕様と互換性あり) - ev = conv_str (st, &(st->stack->stack_data[st->start + 4])); - trigger = conv_num (st, &(st->stack->stack_data[st->start + 5])); + ev = conv_str(st, &(st->stack->stack_data[st->start + 4])); + trigger = conv_num(st, &(st->stack->stack_data[st->start + 5])); } else { // eathena仕様 - trigger = conv_num (st, &(st->stack->stack_data[st->start + 4])); - ev = conv_str (st, &(st->stack->stack_data[st->start + 5])); + trigger = conv_num(st, &(st->stack->stack_data[st->start + 4])); + ev = conv_str(st, &(st->stack->stack_data[st->start + 5])); } } else { // 旧Athena仕様 if (st->end > st->start + 4) - ev = conv_str (st, &(st->stack->stack_data[st->start + 4])); + ev = conv_str(st, &(st->stack->stack_data[st->start + 4])); } - chat_createnpcchat ((struct npc_data *) map_id2bl (st->oid), - limit, pub, trigger, name, strlen (name) + 1, ev); + chat_createnpcchat((struct npc_data *) map_id2bl(st->oid), + limit, pub, trigger, name, strlen(name) + 1, ev); } /*========================================== * npcチャット削除 *------------------------------------------ */ -void builtin_delwaitingroom (ScriptState *st) +void builtin_delwaitingroom(ScriptState *st) { struct npc_data *nd; if (st->end > st->start + 2) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); else - nd = (struct npc_data *) map_id2bl (st->oid); - chat_deletenpcchat (nd); + nd = (struct npc_data *) map_id2bl(st->oid); + chat_deletenpcchat(nd); } /*========================================== @@ -4635,85 +4619,81 @@ void builtin_delwaitingroom (ScriptState *st) *------------------------------------------ */ static -void builtin_waitingroomkickall (ScriptState *st) +void builtin_waitingroomkickall(ScriptState *st) { struct npc_data *nd; struct chat_data *cd; if (st->end > st->start + 2) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); if (nd == NULL - || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL) + || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL) return; - chat_npckickall (cd); + chat_npckickall(cd); } /*========================================== * npcチャットイベント有効化 *------------------------------------------ */ -void builtin_enablewaitingroomevent (ScriptState *st) +void builtin_enablewaitingroomevent(ScriptState *st) { struct npc_data *nd; struct chat_data *cd; if (st->end > st->start + 2) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); if (nd == NULL - || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL) + || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL) return; - chat_enableevent (cd); + chat_enableevent(cd); } /*========================================== * npcチャットイベント無効化 *------------------------------------------ */ -void builtin_disablewaitingroomevent (ScriptState *st) +void builtin_disablewaitingroomevent(ScriptState *st) { struct npc_data *nd; struct chat_data *cd; if (st->end > st->start + 2) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); if (nd == NULL - || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL) + || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL) return; - chat_disableevent (cd); + chat_disableevent(cd); } /*========================================== * npcチャット状態所得 *------------------------------------------ */ -void builtin_getwaitingroomstate (ScriptState *st) +void builtin_getwaitingroomstate(ScriptState *st) { struct npc_data *nd; struct chat_data *cd; - int val = 0, type; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + int val = 0, type; + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (st->end > st->start + 3) - nd = npc_name2id (conv_str - (st, &(st->stack->stack_data[st->start + 3]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 3]))); else - nd = (struct npc_data *) map_id2bl (st->oid); + nd = (struct npc_data *) map_id2bl(st->oid); if (nd == NULL - || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL) + || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL) { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); return; } @@ -4739,77 +4719,77 @@ void builtin_getwaitingroomstate (ScriptState *st) break; case 4: - push_str (st->stack, ScriptCode::CONSTSTR, cd->title); + push_str(st->stack, ScriptCode::CONSTSTR, cd->title); return; case 5: - push_str (st->stack, ScriptCode::CONSTSTR, cd->pass); + push_str(st->stack, ScriptCode::CONSTSTR, cd->pass); return; case 16: - push_str (st->stack, ScriptCode::CONSTSTR, cd->npc_event); + push_str(st->stack, ScriptCode::CONSTSTR, cd->npc_event); return; } - push_val (st->stack, ScriptCode::INT, val); + push_val(st->stack, ScriptCode::INT, val); } /*========================================== * チャットメンバー(規定人数)ワープ *------------------------------------------ */ -void builtin_warpwaitingpc (ScriptState *st) +void builtin_warpwaitingpc(ScriptState *st) { - int x, y, i, n; - struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid); + int x, y, i, n; + struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid); struct chat_data *cd; if (nd == NULL - || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL) + || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL) return; n = cd->trigger & 0x7f; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y = conv_num (st, &(st->stack->stack_data[st->start + 4])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y = conv_num(st, &(st->stack->stack_data[st->start + 4])); if (st->end > st->start + 5) - n = conv_num (st, &(st->stack->stack_data[st->start + 5])); + n = conv_num(st, &(st->stack->stack_data[st->start + 5])); for (i = 0; i < n; i++) { struct map_session_data *sd = cd->usersd[0]; // リスト先頭のPCを次々に。 - mapreg_setreg (add_str ("$@warpwaitingpc") + (i << 24), sd->bl.id); + mapreg_setreg(add_str("$@warpwaitingpc") + (i << 24), sd->bl.id); - if (strcmp (str, "Random") == 0) - pc_randomwarp (sd, 3); - else if (strcmp (str, "SavePoint") == 0) + if (strcmp(str, "Random") == 0) + pc_randomwarp(sd, 3); + else if (strcmp(str, "SavePoint") == 0) { if (map[sd->bl.m].flag.noteleport) // テレポ禁止 return; - pc_setpos (sd, sd->status.save_point.map, + pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 3); } else - pc_setpos (sd, str, x, y, 0); + pc_setpos(sd, str, x, y, 0); } - mapreg_setreg (add_str ("$@warpwaitingpcnum"), n); + mapreg_setreg(add_str("$@warpwaitingpcnum"), n); } /*========================================== * RIDのアタッチ *------------------------------------------ */ -void builtin_attachrid (ScriptState *st) +void builtin_attachrid(ScriptState *st) { - st->rid = conv_num (st, &(st->stack->stack_data[st->start + 2])); - push_val (st->stack, ScriptCode::INT, (map_id2sd (st->rid) != NULL)); + st->rid = conv_num(st, &(st->stack->stack_data[st->start + 2])); + push_val(st->stack, ScriptCode::INT, (map_id2sd(st->rid) != NULL)); } /*========================================== * RIDのデタッチ *------------------------------------------ */ -void builtin_detachrid (ScriptState *st) +void builtin_detachrid(ScriptState *st) { st->rid = 0; } @@ -4818,11 +4798,10 @@ void builtin_detachrid (ScriptState *st) * 存在チェック *------------------------------------------ */ -void builtin_isloggedin (ScriptState *st) +void builtin_isloggedin(ScriptState *st) { - push_val (st->stack, ScriptCode::INT, - map_id2sd (conv_num - (st, + push_val(st->stack, ScriptCode::INT, + map_id2sd(conv_num(st, &(st->stack->stack_data[st->start + 2]))) != NULL); } @@ -4855,32 +4834,32 @@ enum MF_RAIN = 20, }; -void builtin_setmapflagnosave (ScriptState *st) +void builtin_setmapflagnosave(ScriptState *st) { - int m, x, y; + int m, x, y; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - const char *str2 = conv_str (st, &(st->stack->stack_data[st->start + 3])); - x = conv_num (st, &(st->stack->stack_data[st->start + 4])); - y = conv_num (st, &(st->stack->stack_data[st->start + 5])); - m = map_mapname2mapid (str); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + const char *str2 = conv_str(st, &(st->stack->stack_data[st->start + 3])); + x = conv_num(st, &(st->stack->stack_data[st->start + 4])); + y = conv_num(st, &(st->stack->stack_data[st->start + 5])); + m = map_mapname2mapid(str); if (m >= 0) { map[m].flag.nosave = 1; - memcpy (map[m].save.map, str2, 16); + memcpy(map[m].save.map, str2, 16); map[m].save.x = x; map[m].save.y = y; } } -void builtin_setmapflag (ScriptState *st) +void builtin_setmapflag(ScriptState *st) { - int m, i; + int m, i; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - i = conv_num (st, &(st->stack->stack_data[st->start + 3])); - m = map_mapname2mapid (str); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + i = conv_num(st, &(st->stack->stack_data[st->start + 3])); + m = map_mapname2mapid(str); if (m >= 0) { switch (i) @@ -4938,13 +4917,13 @@ void builtin_setmapflag (ScriptState *st) } -void builtin_removemapflag (ScriptState *st) +void builtin_removemapflag(ScriptState *st) { - int m, i; + int m, i; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - i = conv_num (st, &(st->stack->stack_data[st->start + 3])); - m = map_mapname2mapid (str); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + i = conv_num(st, &(st->stack->stack_data[st->start + 3])); + m = map_mapname2mapid(str); if (m >= 0) { switch (i) @@ -5003,13 +4982,13 @@ void builtin_removemapflag (ScriptState *st) } -void builtin_getmapflag (ScriptState *st) +void builtin_getmapflag(ScriptState *st) { - int m, i, r; + int m, i, r; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - i = conv_num (st, &(st->stack->stack_data[st->start + 3])); - m = map_mapname2mapid (str); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + i = conv_num(st, &(st->stack->stack_data[st->start + 3])); + m = map_mapname2mapid(str); if (m >= 0) { switch (i) @@ -5066,20 +5045,20 @@ void builtin_getmapflag (ScriptState *st) } } - push_val (st->stack, ScriptCode::INT, r); + push_val(st->stack, ScriptCode::INT, r); } -void builtin_pvpon (ScriptState *st) +void builtin_pvpon(ScriptState *st) { - int m, i; + int m, i; struct map_session_data *pl_sd = NULL; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - m = map_mapname2mapid (str); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + m = map_mapname2mapid(str); if (m >= 0 && !map[m].flag.pvp && !map[m].flag.nopvp) { map[m].flag.pvp = 1; - clif_send0199 (m, 1); + clif_send0199(m, 1); if (battle_config.pk_mode) // disable ranking functions if pk_mode is on [Valaris] return; @@ -5092,7 +5071,7 @@ void builtin_pvpon (ScriptState *st) if (m == pl_sd->bl.m && pl_sd->pvp_timer == -1) { pl_sd->pvp_timer = - add_timer (gettick () + 200, pc_calc_pvprank_timer, + add_timer(gettick() + 200, pc_calc_pvprank_timer, pl_sd->bl.id, 0); pl_sd->pvp_rank = 0; pl_sd->pvp_lastusers = 0; @@ -5104,17 +5083,17 @@ void builtin_pvpon (ScriptState *st) } -void builtin_pvpoff (ScriptState *st) +void builtin_pvpoff(ScriptState *st) { - int m, i; + int m, i; struct map_session_data *pl_sd = NULL; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - m = map_mapname2mapid (str); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + m = map_mapname2mapid(str); if (m >= 0 && map[m].flag.pvp && map[m].flag.nopvp) { map[m].flag.pvp = 0; - clif_send0199 (m, 0); + clif_send0199(m, 0); if (battle_config.pk_mode) // disable ranking options if pk_mode is on [Valaris] return; @@ -5126,10 +5105,10 @@ void builtin_pvpoff (ScriptState *st) { if (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; } @@ -5141,35 +5120,35 @@ void builtin_pvpoff (ScriptState *st) } /*========================================== - * NPCエモーション + * NPCエモーション *------------------------------------------ */ -void builtin_emotion (ScriptState *st) +void builtin_emotion(ScriptState *st) { - int type; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + int type; + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (type < 0 || type > 100) return; - clif_emotion (map_id2bl (st->oid), type); + clif_emotion(map_id2bl(st->oid), type); } /* ===================================================================== * カードの数を得る * --------------------------------------------------------------------- */ -void builtin_getequipcardcnt (ScriptState *st) +void builtin_getequipcardcnt(ScriptState *st) { - int i, num; + int i, num; struct map_session_data *sd; - int c = 4; + int c = 4; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (sd->status.inventory[i].card[0] == 0x00ff) { // 製造武器はカードなし - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); return; } do @@ -5178,28 +5157,28 @@ void builtin_getequipcardcnt (ScriptState *st) (sd->status.inventory[i].card[c - 1] < 5000)) { - push_val (st->stack, ScriptCode::INT, (c)); + push_val(st->stack, ScriptCode::INT, (c)); return; } } while (c--); - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } /* ================================================================ * カード取り外し成功 * ---------------------------------------------------------------- */ -void builtin_successremovecards (ScriptState *st) +void builtin_successremovecards(ScriptState *st) { - int i, num, cardflag = 0, flag; + int i, num, cardflag = 0, flag; struct map_session_data *sd; struct item item_tmp; - int c = 4; + int c = 4; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (sd->status.inventory[i].card[0] == 0x00ff) { // 製造武器は処理しない return; @@ -5218,10 +5197,10 @@ void builtin_successremovecards (ScriptState *st) item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] = 0, item_tmp.card[3] = 0; - if ((flag = pc_additem (sd, &item_tmp, 1))) + if ((flag = pc_additem(sd, &item_tmp, 1))) { // 持てないならドロップ - clif_additem (sd, 0, 0, flag); - map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, + clif_additem(sd, 0, 0, flag); + map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } } @@ -5237,14 +5216,14 @@ void builtin_successremovecards (ScriptState *st) item_tmp.attribute = sd->status.inventory[i].attribute; item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] = 0, item_tmp.card[3] = 0; - pc_delitem (sd, i, 1, 0); - if ((flag = pc_additem (sd, &item_tmp, 1))) + pc_delitem(sd, i, 1, 0); + if ((flag = pc_additem(sd, &item_tmp, 1))) { // もてないならドロップ - clif_additem (sd, 0, 0, flag); - map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, + clif_additem(sd, 0, 0, flag); + map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } - clif_misceffect (&sd->bl, 3); + clif_misceffect(&sd->bl, 3); return; } } @@ -5254,17 +5233,17 @@ void builtin_successremovecards (ScriptState *st) * type=0: 両方損失、1:カード損失、2:武具損失、3:損失無し * ---------------------------------------------------------------- */ -void builtin_failedremovecards (ScriptState *st) +void builtin_failedremovecards(ScriptState *st) { - int i, num, cardflag = 0, flag, typefail; + int i, num, cardflag = 0, flag, typefail; struct map_session_data *sd; struct item item_tmp; - int c = 4; + int c = 4; - num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - typefail = conv_num (st, &(st->stack->stack_data[st->start + 3])); - sd = script_rid2sd (st); - i = pc_checkequip (sd, equip[num - 1]); + num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + typefail = conv_num(st, &(st->stack->stack_data[st->start + 3])); + sd = script_rid2sd(st); + i = pc_checkequip(sd, equip[num - 1]); if (sd->status.inventory[i].card[0] == 0x00ff) { // 製造武器は処理しない return; @@ -5286,10 +5265,10 @@ void builtin_failedremovecards (ScriptState *st) item_tmp.attribute = 0; item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] = 0, item_tmp.card[3] = 0; - if ((flag = pc_additem (sd, &item_tmp, 1))) + if ((flag = pc_additem(sd, &item_tmp, 1))) { - clif_additem (sd, 0, 0, flag); - map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, + clif_additem(sd, 0, 0, flag); + map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } } @@ -5302,8 +5281,8 @@ void builtin_failedremovecards (ScriptState *st) if (typefail == 0 || typefail == 2) { // 武具損失 - pc_delitem (sd, i, 1, 0); - clif_misceffect (&sd->bl, 2); + pc_delitem(sd, i, 1, 0); + clif_misceffect(&sd->bl, 2); return; } if (typefail == 1) @@ -5315,143 +5294,143 @@ void builtin_failedremovecards (ScriptState *st) item_tmp.attribute = sd->status.inventory[i].attribute; item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] = 0, item_tmp.card[3] = 0; - pc_delitem (sd, i, 1, 0); - if ((flag = pc_additem (sd, &item_tmp, 1))) + pc_delitem(sd, i, 1, 0); + if ((flag = pc_additem(sd, &item_tmp, 1))) { - clif_additem (sd, 0, 0, flag); - map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, + clif_additem(sd, 0, 0, flag); + map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } } - clif_misceffect (&sd->bl, 2); + clif_misceffect(&sd->bl, 2); return; } } -void builtin_mapwarp (ScriptState *st) // Added by RoVeRT +void builtin_mapwarp(ScriptState *st) // Added by RoVeRT { - int x, y, m; - int x0, y0, x1, y1; + int x, y, m; + int x0, y0, x1, y1; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); x0 = 0; y0 = 0; - x1 = map[map_mapname2mapid (mapname)].xs; - y1 = map[map_mapname2mapid (mapname)].ys; - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 3])); - x = conv_num (st, &(st->stack->stack_data[st->start + 4])); - y = conv_num (st, &(st->stack->stack_data[st->start + 5])); + x1 = map[map_mapname2mapid(mapname)].xs; + y1 = map[map_mapname2mapid(mapname)].ys; + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 3])); + x = conv_num(st, &(st->stack->stack_data[st->start + 4])); + y = conv_num(st, &(st->stack->stack_data[st->start + 5])); - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) return; - map_foreachinarea (builtin_areawarp_sub, + map_foreachinarea(builtin_areawarp_sub, m, x0, y0, x1, y1, BL_PC, str, x, y); } -void builtin_cmdothernpc (ScriptState *st) // Added by RoVeRT +void builtin_cmdothernpc(ScriptState *st) // Added by RoVeRT { - const char *npc = conv_str (st, &(st->stack->stack_data[st->start + 2])); - const char *command = conv_str (st, &(st->stack->stack_data[st->start + 3])); + const char *npc = conv_str(st, &(st->stack->stack_data[st->start + 2])); + const char *command = conv_str(st, &(st->stack->stack_data[st->start + 3])); - npc_command (map_id2sd (st->rid), npc, command); + npc_command(map_id2sd(st->rid), npc, command); } -void builtin_inittimer (ScriptState *st) // Added by RoVeRT +void builtin_inittimer(ScriptState *st) // Added by RoVeRT { // struct npc_data *nd=(struct npc_data*)map_id2bl(st->oid); // nd->lastaction=nd->timer=gettick(); - npc_do_ontimer (st->oid, map_id2sd (st->rid), 1); + npc_do_ontimer(st->oid, map_id2sd(st->rid), 1); } -void builtin_stoptimer (ScriptState *st) // Added by RoVeRT +void builtin_stoptimer(ScriptState *st) // Added by RoVeRT { // struct npc_data *nd=(struct npc_data*)map_id2bl(st->oid); // nd->lastaction=nd->timer=-1; - npc_do_ontimer (st->oid, map_id2sd (st->rid), 0); + npc_do_ontimer(st->oid, map_id2sd(st->rid), 0); } static -void builtin_mobcount_sub (struct block_list *bl, va_list ap) // Added by RoVeRT +void builtin_mobcount_sub(struct block_list *bl, va_list ap) // Added by RoVeRT { - char *event = va_arg (ap, char *); - int *c = va_arg (ap, int *); + char *event = va_arg(ap, char *); + int *c = va_arg(ap, int *); - if (strcmp (event, ((struct mob_data *) bl)->npc_event) == 0) + if (strcmp(event, ((struct mob_data *) bl)->npc_event) == 0) (*c)++; } -void builtin_mobcount (ScriptState *st) // Added by RoVeRT +void builtin_mobcount(ScriptState *st) // Added by RoVeRT { - int m, c = 0; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 3])); + int m, c = 0; + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 3])); - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) { - push_val (st->stack, ScriptCode::INT, -1); + push_val(st->stack, ScriptCode::INT, -1); return; } - map_foreachinarea (builtin_mobcount_sub, + map_foreachinarea(builtin_mobcount_sub, m, 0, 0, map[m].xs, map[m].ys, BL_MOB, event, &c); - push_val (st->stack, ScriptCode::INT, (c - 1)); + push_val(st->stack, ScriptCode::INT, (c - 1)); } -void builtin_marriage (ScriptState *st) +void builtin_marriage(ScriptState *st) { - const char *partner = conv_str (st, &(st->stack->stack_data[st->start + 2])); - struct map_session_data *sd = script_rid2sd (st); - struct map_session_data *p_sd = map_nick2sd (partner); + const char *partner = conv_str(st, &(st->stack->stack_data[st->start + 2])); + struct map_session_data *sd = script_rid2sd(st); + struct map_session_data *p_sd = map_nick2sd(partner); - if (sd == NULL || p_sd == NULL || pc_marriage (sd, p_sd) < 0) + if (sd == NULL || p_sd == NULL || pc_marriage(sd, p_sd) < 0) { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); return; } - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } -void builtin_wedding_effect (ScriptState *st) +void builtin_wedding_effect(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); if (sd == NULL) return; - clif_wedding_effect (&sd->bl); + clif_wedding_effect(&sd->bl); } -void builtin_divorce (ScriptState *st) +void builtin_divorce(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); st->state = STOP; // rely on pc_divorce to restart sd->npc_flags.divorce = 1; - if (sd == NULL || pc_divorce (sd) < 0) + if (sd == NULL || pc_divorce(sd) < 0) { - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); return; } - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); } /*================================================ * Script for Displaying MOB Information [Valaris] *------------------------------------------------ */ -void builtin_strmobinfo (ScriptState *st) +void builtin_strmobinfo(ScriptState *st) { - int num = conv_num (st, &(st->stack->stack_data[st->start + 2])); - int mob_class = conv_num (st, &(st->stack->stack_data[st->start + 3])); + int num = conv_num(st, &(st->stack->stack_data[st->start + 2])); + int mob_class = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (num <= 0 || num >= 8 || (mob_class >= 0 && mob_class <= 1000) || mob_class > 2000) return; @@ -5460,98 +5439,98 @@ void builtin_strmobinfo (ScriptState *st) { char *buf; buf = mob_db[mob_class].name; - push_str (st->stack, ScriptCode::STR, buf); + push_str(st->stack, ScriptCode::STR, buf); return; } else if (num == 2) { char *buf; buf = mob_db[mob_class].jname; - push_str (st->stack, ScriptCode::STR, buf); + push_str(st->stack, ScriptCode::STR, buf); return; } else if (num == 3) - push_val (st->stack, ScriptCode::INT, mob_db[mob_class].lv); + push_val(st->stack, ScriptCode::INT, mob_db[mob_class].lv); else if (num == 4) - push_val (st->stack, ScriptCode::INT, mob_db[mob_class].max_hp); + push_val(st->stack, ScriptCode::INT, mob_db[mob_class].max_hp); else if (num == 5) - push_val (st->stack, ScriptCode::INT, mob_db[mob_class].max_sp); + push_val(st->stack, ScriptCode::INT, mob_db[mob_class].max_sp); else if (num == 6) - push_val (st->stack, ScriptCode::INT, mob_db[mob_class].base_exp); + push_val(st->stack, ScriptCode::INT, mob_db[mob_class].base_exp); else if (num == 7) - push_val (st->stack, ScriptCode::INT, mob_db[mob_class].job_exp); + push_val(st->stack, ScriptCode::INT, mob_db[mob_class].job_exp); } /*========================================== * IDからItem名 *------------------------------------------ */ -void builtin_getitemname (ScriptState *st) +void builtin_getitemname(ScriptState *st) { struct item_data *i_data; char *item_name; struct script_data *data; data = &(st->stack->stack_data[st->start + 2]); - get_val (st, data); + get_val(st, data); if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR) { - const char *name = conv_str (st, data); - i_data = itemdb_searchname (name); + const char *name = conv_str(st, data); + i_data = itemdb_searchname(name); } else { - int item_id = conv_num (st, data); - i_data = itemdb_search (item_id); + int item_id = conv_num(st, data); + i_data = itemdb_search(item_id); } - item_name = (char *) calloc (24, 1); + item_name = (char *) calloc(24, 1); if (i_data) - strncpy (item_name, i_data->jname, 23); + strncpy(item_name, i_data->jname, 23); else - strncpy (item_name, "Unknown Item", 23); + strncpy(item_name, "Unknown Item", 23); - push_str (st->stack, ScriptCode::STR, item_name); + push_str(st->stack, ScriptCode::STR, item_name); } -void builtin_getspellinvocation (ScriptState *st) +void builtin_getspellinvocation(ScriptState *st) { - const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2])); + const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2])); - const char *invocation = magic_find_invocation (name); + const char *invocation = magic_find_invocation(name); if (!invocation) invocation = "..."; - push_str (st->stack, ScriptCode::STR, strdup (invocation)); + push_str(st->stack, ScriptCode::STR, strdup(invocation)); } -void builtin_getanchorinvocation (ScriptState *st) +void builtin_getanchorinvocation(ScriptState *st) { - const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2])); + const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2])); - const char *invocation = magic_find_anchor_invocation (name); + const char *invocation = magic_find_anchor_invocation(name); if (!invocation) invocation = "..."; - push_str (st->stack, ScriptCode::STR, strdup (invocation)); + push_str(st->stack, ScriptCode::STR, strdup(invocation)); } -void builtin_getpartnerid (ScriptState *st) +void builtin_getpartnerid(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); - push_val (st->stack, ScriptCode::INT, sd->status.partner_id); + push_val(st->stack, ScriptCode::INT, sd->status.partner_id); } /*========================================== * PCの所持品情報読み取り *------------------------------------------ */ -void builtin_getinventorylist (ScriptState *st) +void builtin_getinventorylist(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int i, j = 0; + struct map_session_data *sd = script_rid2sd(st); + int i, j = 0; if (!sd) return; for (i = 0; i < MAX_INVENTORY; i++) @@ -5559,185 +5538,185 @@ void builtin_getinventorylist (ScriptState *st) if (sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].amount > 0) { - pc_setreg (sd, add_str ("@inventorylist_id") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_id") + (j << 24), sd->status.inventory[i].nameid); - pc_setreg (sd, add_str ("@inventorylist_amount") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_amount") + (j << 24), sd->status.inventory[i].amount); - pc_setreg (sd, add_str ("@inventorylist_equip") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_equip") + (j << 24), sd->status.inventory[i].equip); - pc_setreg (sd, add_str ("@inventorylist_refine") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_refine") + (j << 24), sd->status.inventory[i].refine); - pc_setreg (sd, add_str ("@inventorylist_identify") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_identify") + (j << 24), sd->status.inventory[i].identify); - pc_setreg (sd, add_str ("@inventorylist_attribute") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_attribute") + (j << 24), sd->status.inventory[i].attribute); - pc_setreg (sd, add_str ("@inventorylist_card1") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_card1") + (j << 24), sd->status.inventory[i].card[0]); - pc_setreg (sd, add_str ("@inventorylist_card2") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_card2") + (j << 24), sd->status.inventory[i].card[1]); - pc_setreg (sd, add_str ("@inventorylist_card3") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_card3") + (j << 24), sd->status.inventory[i].card[2]); - pc_setreg (sd, add_str ("@inventorylist_card4") + (j << 24), + pc_setreg(sd, add_str("@inventorylist_card4") + (j << 24), sd->status.inventory[i].card[3]); j++; } } - pc_setreg (sd, add_str ("@inventorylist_count"), j); + pc_setreg(sd, add_str("@inventorylist_count"), j); } -void builtin_getskilllist (ScriptState *st) +void builtin_getskilllist(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int i, j = 0; + struct map_session_data *sd = script_rid2sd(st); + int i, j = 0; if (!sd) return; for (i = 0; i < MAX_SKILL; i++) { if (sd->status.skill[i].id > 0 && sd->status.skill[i].lv > 0) { - pc_setreg (sd, add_str ("@skilllist_id") + (j << 24), + pc_setreg(sd, add_str("@skilllist_id") + (j << 24), sd->status.skill[i].id); - pc_setreg (sd, add_str ("@skilllist_lv") + (j << 24), + pc_setreg(sd, add_str("@skilllist_lv") + (j << 24), sd->status.skill[i].lv); - pc_setreg (sd, add_str ("@skilllist_flag") + (j << 24), + pc_setreg(sd, add_str("@skilllist_flag") + (j << 24), sd->status.skill[i].flags); j++; } } - pc_setreg (sd, add_str ("@skilllist_count"), j); + pc_setreg(sd, add_str("@skilllist_count"), j); } -void builtin_get_activated_pool_skills (ScriptState *st) +void builtin_get_activated_pool_skills(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int pool_skills[MAX_SKILL_POOL]; - int skill_pool_size = skill_pool (sd, pool_skills); - int i, count = 0; + struct map_session_data *sd = script_rid2sd(st); + int pool_skills[MAX_SKILL_POOL]; + int skill_pool_size = skill_pool(sd, pool_skills); + int i, count = 0; if (!sd) return; for (i = 0; i < skill_pool_size; i++) { - int skill_id = pool_skills[i]; + int skill_id = pool_skills[i]; if (sd->status.skill[skill_id].id == skill_id) { - pc_setreg (sd, add_str ("@skilllist_id") + (count << 24), + pc_setreg(sd, add_str("@skilllist_id") + (count << 24), sd->status.skill[skill_id].id); - pc_setreg (sd, add_str ("@skilllist_lv") + (count << 24), + pc_setreg(sd, add_str("@skilllist_lv") + (count << 24), sd->status.skill[skill_id].lv); - pc_setreg (sd, add_str ("@skilllist_flag") + (count << 24), + pc_setreg(sd, add_str("@skilllist_flag") + (count << 24), sd->status.skill[skill_id].flags); - pc_setregstr (sd, add_str ("@skilllist_name$") + (count << 24), - skill_name (skill_id)); + pc_setregstr(sd, add_str("@skilllist_name$") + (count << 24), + skill_name(skill_id)); ++count; } } - pc_setreg (sd, add_str ("@skilllist_count"), count); + pc_setreg(sd, add_str("@skilllist_count"), count); } extern int skill_pool_skills[]; extern int skill_pool_skills_size; -void builtin_get_unactivated_pool_skills (ScriptState *st) +void builtin_get_unactivated_pool_skills(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int i, count = 0; + struct map_session_data *sd = script_rid2sd(st); + int i, count = 0; if (!sd) return; for (i = 0; i < skill_pool_skills_size; i++) { - int skill_id = skill_pool_skills[i]; + int skill_id = skill_pool_skills[i]; if (sd->status.skill[skill_id].id == skill_id && !(sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED)) { - pc_setreg (sd, add_str ("@skilllist_id") + (count << 24), + pc_setreg(sd, add_str("@skilllist_id") + (count << 24), sd->status.skill[skill_id].id); - pc_setreg (sd, add_str ("@skilllist_lv") + (count << 24), + pc_setreg(sd, add_str("@skilllist_lv") + (count << 24), sd->status.skill[skill_id].lv); - pc_setreg (sd, add_str ("@skilllist_flag") + (count << 24), + pc_setreg(sd, add_str("@skilllist_flag") + (count << 24), sd->status.skill[skill_id].flags); - pc_setregstr (sd, add_str ("@skilllist_name$") + (count << 24), - skill_name (skill_id)); + pc_setregstr(sd, add_str("@skilllist_name$") + (count << 24), + skill_name(skill_id)); ++count; } } - pc_setreg (sd, add_str ("@skilllist_count"), count); + pc_setreg(sd, add_str("@skilllist_count"), count); } -void builtin_get_pool_skills (ScriptState *st) +void builtin_get_pool_skills(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int i, count = 0; + struct map_session_data *sd = script_rid2sd(st); + int i, count = 0; if (!sd) return; for (i = 0; i < skill_pool_skills_size; i++) { - int skill_id = skill_pool_skills[i]; + int skill_id = skill_pool_skills[i]; if (sd->status.skill[skill_id].id == skill_id) { - pc_setreg (sd, add_str ("@skilllist_id") + (count << 24), + pc_setreg(sd, add_str("@skilllist_id") + (count << 24), sd->status.skill[skill_id].id); - pc_setreg (sd, add_str ("@skilllist_lv") + (count << 24), + pc_setreg(sd, add_str("@skilllist_lv") + (count << 24), sd->status.skill[skill_id].lv); - pc_setreg (sd, add_str ("@skilllist_flag") + (count << 24), + pc_setreg(sd, add_str("@skilllist_flag") + (count << 24), sd->status.skill[skill_id].flags); - pc_setregstr (sd, add_str ("@skilllist_name$") + (count << 24), - skill_name (skill_id)); + pc_setregstr(sd, add_str("@skilllist_name$") + (count << 24), + skill_name(skill_id)); ++count; } } - pc_setreg (sd, add_str ("@skilllist_count"), count); + pc_setreg(sd, add_str("@skilllist_count"), count); } -void builtin_activate_pool_skill (ScriptState *st) +void builtin_activate_pool_skill(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int skill_id = conv_num (st, &(st->stack->stack_data[st->start + 2])); + struct map_session_data *sd = script_rid2sd(st); + int skill_id = conv_num(st, &(st->stack->stack_data[st->start + 2])); - skill_pool_activate (sd, skill_id); - clif_skillinfoblock (sd); + skill_pool_activate(sd, skill_id); + clif_skillinfoblock(sd); } -void builtin_deactivate_pool_skill (ScriptState *st) +void builtin_deactivate_pool_skill(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int skill_id = conv_num (st, &(st->stack->stack_data[st->start + 2])); + struct map_session_data *sd = script_rid2sd(st); + int skill_id = conv_num(st, &(st->stack->stack_data[st->start + 2])); - skill_pool_deactivate (sd, skill_id); - clif_skillinfoblock (sd); + skill_pool_deactivate(sd, skill_id); + clif_skillinfoblock(sd); } -void builtin_check_pool_skill (ScriptState *st) +void builtin_check_pool_skill(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int skill_id = conv_num (st, &(st->stack->stack_data[st->start + 2])); + struct map_session_data *sd = script_rid2sd(st); + int skill_id = conv_num(st, &(st->stack->stack_data[st->start + 2])); - push_val (st->stack, ScriptCode::INT, skill_pool_is_activated (sd, skill_id)); + push_val(st->stack, ScriptCode::INT, skill_pool_is_activated(sd, skill_id)); } -void builtin_clearitem (ScriptState *st) +void builtin_clearitem(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int i; + struct map_session_data *sd = script_rid2sd(st); + int i; if (sd == NULL) return; for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].amount) - pc_delitem (sd, i, sd->status.inventory[i].amount, 0); + pc_delitem(sd, i, sd->status.inventory[i].amount, 0); } } @@ -5747,17 +5726,17 @@ void builtin_clearitem (ScriptState *st) * typeは通常0なのかな？ *------------------------------------------ */ -void builtin_classchange (ScriptState *st) +void builtin_classchange(ScriptState *st) { - int npc_class, type; - struct block_list *bl = map_id2bl (st->oid); + int npc_class, type; + struct block_list *bl = map_id2bl(st->oid); if (bl == NULL) return; - npc_class = conv_num (st, &(st->stack->stack_data[st->start + 2])); - type = conv_num (st, &(st->stack->stack_data[st->start + 3])); - clif_npc_class_change (bl, npc_class, type); + npc_class = conv_num(st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 3])); + clif_npc_class_change(bl, npc_class, type); } /*========================================== @@ -5771,46 +5750,46 @@ void builtin_classchange (ScriptState *st) * the current NPC or invoking PC. *------------------------------------------ */ -void builtin_misceffect (ScriptState *st) +void builtin_misceffect(ScriptState *st) { - int type; - int id = 0; + int type; + int id = 0; const char *name = NULL; struct block_list *bl = NULL; - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (st->end > st->start + 3) { struct script_data *sdata = &(st->stack->stack_data[st->start + 3]); - get_val (st, sdata); + get_val(st, sdata); if (sdata->type == ScriptCode::STR || sdata->type == ScriptCode::CONSTSTR) - name = conv_str (st, sdata); + name = conv_str(st, sdata); else - id = conv_num (st, sdata); + id = conv_num(st, sdata); } if (name) { - struct map_session_data *sd = map_nick2sd (name); + struct map_session_data *sd = map_nick2sd(name); if (sd) bl = &sd->bl; } else if (id) - bl = map_id2bl (id); + bl = map_id2bl(id); else if (st->oid) - bl = map_id2bl (st->oid); + bl = map_id2bl(st->oid); else { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); if (sd) bl = &sd->bl; } if (bl) - clif_misceffect (bl, type); + clif_misceffect(bl, type); } @@ -5818,20 +5797,20 @@ void builtin_misceffect (ScriptState *st) * サウンドエフェクト *------------------------------------------ */ -void builtin_soundeffect (ScriptState *st) +void builtin_soundeffect(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int type = 0; + struct map_session_data *sd = script_rid2sd(st); + int type = 0; - const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2])); - type = conv_num (st, &(st->stack->stack_data[st->start + 3])); + const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 3])); if (sd) { if (st->oid) - clif_soundeffect (sd, map_id2bl (st->oid), name, type); + clif_soundeffect(sd, map_id2bl(st->oid), name, type); else { - clif_soundeffect (sd, &sd->bl, name, type); + clif_soundeffect(sd, &sd->bl, name, type); } } } @@ -5840,16 +5819,16 @@ void builtin_soundeffect (ScriptState *st) * NPC skill effects [Valaris] *------------------------------------------ */ -void builtin_npcskilleffect (ScriptState *st) +void builtin_npcskilleffect(ScriptState *st) { - struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid); + struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid); - int skillid = conv_num (st, &(st->stack->stack_data[st->start + 2])); - int skilllv = conv_num (st, &(st->stack->stack_data[st->start + 3])); - int x = conv_num (st, &(st->stack->stack_data[st->start + 4])); - int y = conv_num (st, &(st->stack->stack_data[st->start + 5])); + int skillid = conv_num(st, &(st->stack->stack_data[st->start + 2])); + int skilllv = conv_num(st, &(st->stack->stack_data[st->start + 3])); + int x = conv_num(st, &(st->stack->stack_data[st->start + 4])); + int y = conv_num(st, &(st->stack->stack_data[st->start + 5])); - clif_skill_poseffect (&nd->bl, skillid, skilllv, x, y, gettick ()); + clif_skill_poseffect(&nd->bl, skillid, skilllv, x, y, gettick()); } @@ -5857,29 +5836,29 @@ void builtin_npcskilleffect (ScriptState *st) * Special effects [Valaris] *------------------------------------------ */ -void builtin_specialeffect (ScriptState *st) +void builtin_specialeffect(ScriptState *st) { - struct block_list *bl = map_id2bl (st->oid); + struct block_list *bl = map_id2bl(st->oid); if (bl == NULL) return; - clif_specialeffect (bl, - conv_num (st, + clif_specialeffect(bl, + conv_num(st, &(st->stack->stack_data[st->start + 2])), 0); } -void builtin_specialeffect2 (ScriptState *st) +void builtin_specialeffect2(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); if (sd == NULL) return; - clif_specialeffect (&sd->bl, - conv_num (st, + clif_specialeffect(&sd->bl, + conv_num(st, &(st->stack->stack_data[st->start + 2])), 0); @@ -5890,18 +5869,18 @@ void builtin_specialeffect2 (ScriptState *st) *------------------------------------------ */ -void builtin_nude (ScriptState *st) +void builtin_nude(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); - int i; + struct map_session_data *sd = script_rid2sd(st); + int i; if (sd == NULL) return; for (i = 0; i < 11; i++) if (sd->equip_index[i] >= 0) - pc_unequipitem (sd, sd->equip_index[i], i); - pc_calcstatus (sd, 0); + pc_unequipitem(sd, sd->equip_index[i], i); + pc_calcstatus(sd, 0); } @@ -5910,18 +5889,18 @@ void builtin_nude (ScriptState *st) *------------------------------------------ */ -void builtin_unequip_by_id (ScriptState *st) +void builtin_unequip_by_id(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); if (sd == NULL) return; - int slot_id = conv_num (st, &(st->stack->stack_data[st->start + 2])); + int slot_id = conv_num(st, &(st->stack->stack_data[st->start + 2])); if (slot_id >= 0 && slot_id < 11 && sd->equip_index[slot_id] >= 0) - pc_unequipitem (sd, sd->equip_index[slot_id], slot_id); + pc_unequipitem(sd, sd->equip_index[slot_id], slot_id); - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); } @@ -5932,14 +5911,14 @@ void builtin_unequip_by_id (ScriptState *st) *------------------------------------------ */ -void builtin_gmcommand (ScriptState *st) +void builtin_gmcommand(ScriptState *st) { struct map_session_data *sd; - sd = script_rid2sd (st); - const char *cmd = conv_str (st, &(st->stack->stack_data[st->start + 2])); + sd = script_rid2sd(st); + const char *cmd = conv_str(st, &(st->stack->stack_data[st->start + 2])); - is_atcommand (sd->fd, sd, cmd, 99); + is_atcommand(sd->fd, sd, cmd, 99); } @@ -5948,17 +5927,17 @@ void builtin_gmcommand (ScriptState *st) *------------------------------------------ */ -void builtin_movenpc (ScriptState *st) +void builtin_movenpc(ScriptState *st) { struct map_session_data *sd; - int x, y; + int x, y; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y = conv_num (st, &(st->stack->stack_data[st->start + 4])); - const char *npc = conv_str (st, &(st->stack->stack_data[st->start + 5])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y = conv_num(st, &(st->stack->stack_data[st->start + 4])); + const char *npc = conv_str(st, &(st->stack->stack_data[st->start + 5])); } @@ -5967,15 +5946,15 @@ void builtin_movenpc (ScriptState *st) * Move NPC to a new position on the same map. *------------------------------------------ */ -void builtin_npcwarp (ScriptState *st) +void builtin_npcwarp(ScriptState *st) { - int x, y; + int x, y; struct npc_data *nd = NULL; - x = conv_num (st, &(st->stack->stack_data[st->start + 2])); - y = conv_num (st, &(st->stack->stack_data[st->start + 3])); - const char *npc = conv_str (st, &(st->stack->stack_data[st->start + 4])); - nd = npc_name2id (npc); + x = conv_num(st, &(st->stack->stack_data[st->start + 2])); + y = conv_num(st, &(st->stack->stack_data[st->start + 3])); + const char *npc = conv_str(st, &(st->stack->stack_data[st->start + 4])); + nd = npc_name2id(npc); if (!nd) return; @@ -5988,12 +5967,12 @@ void builtin_npcwarp (ScriptState *st) || y < 0 || y > map[m].ys - 1) return; - npc_enable (npc, 0); + npc_enable(npc, 0); map_delblock(&nd->bl); /* [Freeyorp] */ nd->bl.x = x; nd->bl.y = y; map_addblock(&nd->bl); - npc_enable (npc, 1); + npc_enable(npc, 1); } @@ -6002,16 +5981,16 @@ void builtin_npcwarp (ScriptState *st) *------------------------------------------ */ -void builtin_message (ScriptState *st) +void builtin_message(ScriptState *st) { struct map_session_data *pl_sd = NULL; - const char *player = conv_str (st, &(st->stack->stack_data[st->start + 2])); - const char *msg = conv_str (st, &(st->stack->stack_data[st->start + 3])); + const char *player = conv_str(st, &(st->stack->stack_data[st->start + 2])); + const char *msg = conv_str(st, &(st->stack->stack_data[st->start + 3])); - if ((pl_sd = map_nick2sd ((char *) player)) == NULL) + if ((pl_sd = map_nick2sd((char *) player)) == NULL) return; - clif_displaymessage (pl_sd->fd, msg); + clif_displaymessage(pl_sd->fd, msg); } @@ -6021,19 +6000,19 @@ void builtin_message (ScriptState *st) *------------------------------------------ */ -void builtin_npctalk (ScriptState *st) +void builtin_npctalk(ScriptState *st) { char message[255]; - struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); + struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); if (nd) { - memcpy (message, nd->name, 24); - strcat (message, " : "); - strcat (message, str); - clif_message (&(nd->bl), message); + memcpy(message, nd->name, 24); + strcat(message, " : "); + strcat(message, str); + clif_message(&(nd->bl), message); } } @@ -6045,23 +6024,23 @@ void builtin_npctalk (ScriptState *st) *------------------------------------------ */ -void builtin_hasitems (ScriptState *st) +void builtin_hasitems(ScriptState *st) { - int i; + int i; struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].amount) { - push_val (st->stack, ScriptCode::INT, 1); + push_val(st->stack, ScriptCode::INT, 1); return; } } - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } @@ -6069,13 +6048,13 @@ void builtin_hasitems (ScriptState *st) * getlook char info. getlook(arg) *------------------------------------------ */ -void builtin_getlook (ScriptState *st) +void builtin_getlook(ScriptState *st) { - int type, val; + int type, val; struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); val = -1; switch (type) { @@ -6107,37 +6086,37 @@ void builtin_getlook (ScriptState *st) break; } - push_val (st->stack, ScriptCode::INT, val); + push_val(st->stack, ScriptCode::INT, val); } /*========================================== * get char save point. argument: 0- map name, 1- x, 2- y *------------------------------------------ */ -void builtin_getsavepoint (ScriptState *st) +void builtin_getsavepoint(ScriptState *st) { - int x, y, type; + int x, y, type; char *mapname; struct map_session_data *sd; - sd = script_rid2sd (st); + sd = script_rid2sd(st); - type = conv_num (st, &(st->stack->stack_data[st->start + 2])); + type = conv_num(st, &(st->stack->stack_data[st->start + 2])); x = sd->status.save_point.x; y = sd->status.save_point.y; switch (type) { case 0: - mapname = (char*)calloc (24, 1); - strncpy (mapname, sd->status.save_point.map, 23); - push_str (st->stack, ScriptCode::STR, mapname); + mapname = (char*)calloc(24, 1); + strncpy(mapname, sd->status.save_point.map, 23); + push_str(st->stack, ScriptCode::STR, mapname); break; case 1: - push_val (st->stack, ScriptCode::INT, x); + push_val(st->stack, ScriptCode::INT, x); break; case 2: - push_val (st->stack, ScriptCode::INT, y); + push_val(st->stack, ScriptCode::INT, y); break; } } @@ -6147,32 +6126,32 @@ void builtin_getsavepoint (ScriptState *st) *------------------------------------------ */ static -void builtin_areatimer_sub (struct block_list *bl, va_list ap) +void builtin_areatimer_sub(struct block_list *bl, va_list ap) { - int tick; + int tick; char *event; - tick = va_arg (ap, int); - event = va_arg (ap, char *); - pc_addeventtimer ((struct map_session_data *) bl, tick, event); + tick = va_arg(ap, int); + event = va_arg(ap, char *); + pc_addeventtimer((struct map_session_data *) bl, tick, event); } -void builtin_areatimer (ScriptState *st) +void builtin_areatimer(ScriptState *st) { - int tick, m; - int x0, y0, x1, y1; + int tick, m; + int x0, y0, x1, y1; - const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x0 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y0 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - x1 = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y1 = conv_num (st, &(st->stack->stack_data[st->start + 6])); - tick = conv_num (st, &(st->stack->stack_data[st->start + 7])); - const char *event = conv_str (st, &(st->stack->stack_data[st->start + 8])); + const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x0 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y0 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + x1 = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y1 = conv_num(st, &(st->stack->stack_data[st->start + 6])); + tick = conv_num(st, &(st->stack->stack_data[st->start + 7])); + const char *event = conv_str(st, &(st->stack->stack_data[st->start + 8])); - if ((m = map_mapname2mapid (mapname)) < 0) + if ((m = map_mapname2mapid(mapname)) < 0) return; - map_foreachinarea (builtin_areatimer_sub, + map_foreachinarea(builtin_areatimer_sub, m, x0, y0, x1, y1, BL_PC, tick, event); } @@ -6180,77 +6159,77 @@ void builtin_areatimer (ScriptState *st) * Check whether the PC is in the specified rectangle *------------------------------------------ */ -void builtin_isin (ScriptState *st) +void builtin_isin(ScriptState *st) { - int x1, y1, x2, y2; - struct map_session_data *sd = script_rid2sd (st); + int x1, y1, x2, y2; + struct map_session_data *sd = script_rid2sd(st); - const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2])); - x1 = conv_num (st, &(st->stack->stack_data[st->start + 3])); - y1 = conv_num (st, &(st->stack->stack_data[st->start + 4])); - x2 = conv_num (st, &(st->stack->stack_data[st->start + 5])); - y2 = conv_num (st, &(st->stack->stack_data[st->start + 6])); + const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2])); + x1 = conv_num(st, &(st->stack->stack_data[st->start + 3])); + y1 = conv_num(st, &(st->stack->stack_data[st->start + 4])); + x2 = conv_num(st, &(st->stack->stack_data[st->start + 5])); + y2 = conv_num(st, &(st->stack->stack_data[st->start + 6])); if (!sd) return; - push_val (st->stack, ScriptCode::INT, + push_val(st->stack, ScriptCode::INT, (sd->bl.x >= x1 && sd->bl.x <= x2) && (sd->bl.y >= y1 && sd->bl.y <= y2) - && (!strcmp (str, map[sd->bl.m].name))); + && (!strcmp(str, map[sd->bl.m].name))); } // Trigger the shop on a (hopefully) nearby shop NPC -void builtin_shop (ScriptState *st) +void builtin_shop(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); struct npc_data *nd; if (!sd) return; - nd = npc_name2id (conv_str (st, &(st->stack->stack_data[st->start + 2]))); + nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2]))); if (!nd) return; - builtin_close (st); - clif_npcbuysell (sd, nd->bl.id); + builtin_close(st); + clif_npcbuysell(sd, nd->bl.id); } /*========================================== * Check whether the PC is dead *------------------------------------------ */ -void builtin_isdead (ScriptState *st) +void builtin_isdead(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); - push_val (st->stack, ScriptCode::INT, pc_isdead (sd)); + push_val(st->stack, ScriptCode::INT, pc_isdead(sd)); } /*======================================== * Changes a NPC name, and sprite *---------------------------------------- */ -void builtin_fakenpcname (ScriptState *st) +void builtin_fakenpcname(ScriptState *st) { - int newsprite; + int newsprite; struct npc_data *nd; - const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2])); - const char *newname = conv_str (st, &(st->stack->stack_data[st->start + 3])); - newsprite = conv_num (st, &(st->stack->stack_data[st->start + 4])); - nd = npc_name2id (name); + const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2])); + const char *newname = conv_str(st, &(st->stack->stack_data[st->start + 3])); + newsprite = conv_num(st, &(st->stack->stack_data[st->start + 4])); + nd = npc_name2id(name); if (!nd) return; - strncpy (nd->name, newname, sizeof(nd->name)-1); + strncpy(nd->name, newname, sizeof(nd->name)-1); nd->name[sizeof(nd->name)-1] = '\0'; nd->npc_class = newsprite; // Refresh this npc - npc_enable (name, 0); - npc_enable (name, 1); + npc_enable(name, 0); + npc_enable(name, 1); } @@ -6259,33 +6238,33 @@ void builtin_fakenpcname (ScriptState *st) *---------------------------- */ -void builtin_getx (ScriptState *st) +void builtin_getx(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); - push_val (st->stack, ScriptCode::INT, sd->bl.x); + push_val(st->stack, ScriptCode::INT, sd->bl.x); } /*============================ * Gets the PC's y pos *---------------------------- */ -void builtin_gety (ScriptState *st) +void builtin_gety(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); - push_val (st->stack, ScriptCode::INT, sd->bl.y); + push_val(st->stack, ScriptCode::INT, sd->bl.y); } /* * Get the PC's current map's name */ -void builtin_getmap (ScriptState *st) +void builtin_getmap(ScriptState *st) { - struct map_session_data *sd = script_rid2sd (st); + struct map_session_data *sd = script_rid2sd(st); // A map_data lives essentially forever. - push_str (st->stack, ScriptCode::CONSTSTR, map[sd->bl.m].name); + push_str(st->stack, ScriptCode::CONSTSTR, map[sd->bl.m].name); } // @@ -6296,7 +6275,7 @@ void builtin_getmap (ScriptState *st) *------------------------------------------ */ static -ScriptCode get_com (const ScriptCode *script, int *pos_) +ScriptCode get_com(const ScriptCode *script, int *pos_) { if (static_cast<uint8_t>(script[*pos_]) >= 0x80) { @@ -6310,10 +6289,10 @@ ScriptCode get_com (const ScriptCode *script, int *pos_) *------------------------------------------ */ static -int get_num (const ScriptCode *scr, int *pos_) +int get_num(const ScriptCode *scr, int *pos_) { const uint8_t *script = reinterpret_cast<const uint8_t *>(scr); - int i, j; + int i, j; i = 0; j = 0; while (script[*pos_] >= 0xc0) @@ -6329,12 +6308,12 @@ int get_num (const ScriptCode *scr, int *pos_) *------------------------------------------ */ static -int pop_val (ScriptState *st) +int pop_val(ScriptState *st) { if (st->stack->sp <= 0) return 0; st->stack->sp--; - get_val (st, &(st->stack->stack_data[st->stack->sp])); + get_val(st, &(st->stack->stack_data[st->stack->sp])); if (st->stack->stack_data[st->stack->sp].type == ScriptCode::INT) return st->stack->stack_data[st->stack->sp].u.num; return 0; @@ -6347,17 +6326,17 @@ int pop_val (ScriptState *st) *------------------------------------------ */ static -void op_add (ScriptState *st) +void op_add(ScriptState *st) { st->stack->sp--; - get_val (st, &(st->stack->stack_data[st->stack->sp])); - get_val (st, &(st->stack->stack_data[st->stack->sp - 1])); + get_val(st, &(st->stack->stack_data[st->stack->sp])); + get_val(st, &(st->stack->stack_data[st->stack->sp - 1])); - if (isstr (st->stack->stack_data[st->stack->sp]) - || isstr (st->stack->stack_data[st->stack->sp - 1])) + if (isstr(st->stack->stack_data[st->stack->sp]) + || isstr(st->stack->stack_data[st->stack->sp - 1])) { - conv_str (st, &(st->stack->stack_data[st->stack->sp])); - conv_str (st, &(st->stack->stack_data[st->stack->sp - 1])); + conv_str(st, &(st->stack->stack_data[st->stack->sp])); + conv_str(st, &(st->stack->stack_data[st->stack->sp - 1])); } if (st->stack->stack_data[st->stack->sp].type == ScriptCode::INT) { // ii @@ -6368,11 +6347,11 @@ void op_add (ScriptState *st) { // ssの予定 char *buf; buf = (char *) - calloc (strlen (st->stack->stack_data[st->stack->sp - 1].u.str) + - strlen (st->stack->stack_data[st->stack->sp].u.str) + 1, + calloc(strlen(st->stack->stack_data[st->stack->sp - 1].u.str) + + strlen(st->stack->stack_data[st->stack->sp].u.str) + 1, 1); - strcpy (buf, st->stack->stack_data[st->stack->sp - 1].u.str); - strcat (buf, st->stack->stack_data[st->stack->sp].u.str); + strcpy(buf, st->stack->stack_data[st->stack->sp - 1].u.str); + strcat(buf, st->stack->stack_data[st->stack->sp].u.str); if (st->stack->stack_data[st->stack->sp - 1].type == ScriptCode::STR) free(const_cast<char *>(st->stack->stack_data[st->stack->sp - 1].u.str)); if (st->stack->stack_data[st->stack->sp].type == ScriptCode::STR) @@ -6387,38 +6366,38 @@ void op_add (ScriptState *st) *------------------------------------------ */ static -void op_2str (ScriptState *st, ScriptCode op, int sp1, int sp2) +void op_2str(ScriptState *st, ScriptCode op, int sp1, int sp2) { const char *s1 = st->stack->stack_data[sp1].u.str; const char *s2 = st->stack->stack_data[sp2].u.str; - int a = 0; + int a = 0; switch (op) { case ScriptCode::EQ: - a = (strcmp (s1, s2) == 0); + a = (strcmp(s1, s2) == 0); break; case ScriptCode::NE: - a = (strcmp (s1, s2) != 0); + a = (strcmp(s1, s2) != 0); break; case ScriptCode::GT: - a = (strcmp (s1, s2) > 0); + a = (strcmp(s1, s2) > 0); break; case ScriptCode::GE: - a = (strcmp (s1, s2) >= 0); + a = (strcmp(s1, s2) >= 0); break; case ScriptCode::LT: - a = (strcmp (s1, s2) < 0); + a = (strcmp(s1, s2) < 0); break; case ScriptCode::LE: - a = (strcmp (s1, s2) <= 0); + a = (strcmp(s1, s2) <= 0); break; default: - printf ("illegal string operater\n"); + printf("illegal string operater\n"); break; } - push_val (st->stack, ScriptCode::INT, a); + push_val(st->stack, ScriptCode::INT, a); if (st->stack->stack_data[sp1].type == ScriptCode::STR) free(const_cast<char *>(s1)); @@ -6431,7 +6410,7 @@ void op_2str (ScriptState *st, ScriptCode op, int sp1, int sp2) *------------------------------------------ */ static -void op_2num (ScriptState *st, ScriptCode op, int i1, int i2) +void op_2num(ScriptState *st, ScriptCode op, int i1, int i2) { switch (op) { @@ -6487,7 +6466,7 @@ void op_2num (ScriptState *st, ScriptCode op, int i1, int i2) i1 = i1 << i2; break; } - push_val (st->stack, ScriptCode::INT, i1); + push_val(st->stack, ScriptCode::INT, i1); } /*========================================== @@ -6495,34 +6474,34 @@ void op_2num (ScriptState *st, ScriptCode op, int i1, int i2) *------------------------------------------ */ static -void op_2 (ScriptState *st, ScriptCode op) +void op_2(ScriptState *st, ScriptCode op) { - int i1, i2; + int i1, i2; const char *s1 = NULL, *s2 = NULL; - i2 = pop_val (st); - if (isstr (st->stack->stack_data[st->stack->sp])) + i2 = pop_val(st); + if (isstr(st->stack->stack_data[st->stack->sp])) s2 = st->stack->stack_data[st->stack->sp].u.str; - i1 = pop_val (st); - if (isstr (st->stack->stack_data[st->stack->sp])) + i1 = pop_val(st); + if (isstr(st->stack->stack_data[st->stack->sp])) s1 = st->stack->stack_data[st->stack->sp].u.str; if (s1 != NULL && s2 != NULL) { // ss => op_2str - op_2str (st, op, st->stack->sp, st->stack->sp + 1); + op_2str(st, op, st->stack->sp, st->stack->sp + 1); } else if (s1 == NULL && s2 == NULL) { // ii => op_2num - op_2num (st, op, i1, i2); + op_2num(st, op, i1, i2); } else { // si,is => error - printf ("script: op_2: int&str, str&int not allow."); - push_val (st->stack, ScriptCode::INT, 0); + printf("script: op_2: int&str, str&int not allow."); + push_val(st->stack, ScriptCode::INT, 0); } } @@ -6531,10 +6510,10 @@ void op_2 (ScriptState *st, ScriptCode op) *------------------------------------------ */ static -void op_1num (ScriptState *st, ScriptCode op) +void op_1num(ScriptState *st, ScriptCode op) { - int i1; - i1 = pop_val (st); + int i1; + i1 = pop_val(st); switch (op) { case ScriptCode::NEG: @@ -6547,16 +6526,16 @@ void op_1num (ScriptState *st, ScriptCode op) i1 = !i1; break; } - push_val (st->stack, ScriptCode::INT, i1); + push_val(st->stack, ScriptCode::INT, i1); } /*========================================== * 関数の実行 *------------------------------------------ */ -void run_func (ScriptState *st) +void run_func(ScriptState *st) { - int i, start_sp, end_sp, func; + int i, start_sp, end_sp, func; end_sp = st->stack->sp; for (i = end_sp - 1; i >= 0 && st->stack->stack_data[i].type != ScriptCode::ARG; @@ -6564,7 +6543,7 @@ void run_func (ScriptState *st) if (i == 0) { if (battle_config.error_log) - printf ("function not found\n"); + printf("function not found\n"); // st->stack->sp=0; st->state = END; return; @@ -6577,7 +6556,7 @@ void run_func (ScriptState *st) if (st->stack->stack_data[st->start].type != ScriptCode::NAME || str_data[func].type != ScriptCode::FUNC) { - printf ("run_func: not function and command! \n"); + printf("run_func: not function and command! \n"); // st->stack->sp=0; st->state = END; return; @@ -6585,69 +6564,68 @@ void run_func (ScriptState *st) #ifdef DEBUG_RUN if (battle_config.etc_log) { - printf ("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str, + printf("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str, func, str_data[func].type); - printf ("stack dump :"); + printf("stack dump :"); for (i = 0; i < end_sp; i++) { switch (st->stack->stack_data[i].type) { case ScriptCode::INT: - printf (" int(%d)", st->stack->stack_data[i].u.num); + printf(" int(%d)", st->stack->stack_data[i].u.num); break; case ScriptCode::NAME: - printf (" name(%s)", + printf(" name(%s)", str_buf + str_data[st->stack->stack_data[i].u.num].str); break; case ScriptCode::ARG: - printf (" arg"); + printf(" arg"); break; case ScriptCode::POS: - printf (" pos(%d)", st->stack->stack_data[i].u.num); + printf(" pos(%d)", st->stack->stack_data[i].u.num); break; default: - printf (" %d,%d", st->stack->stack_data[i].type, + printf(" %d,%d", st->stack->stack_data[i].type, st->stack->stack_data[i].u.num); } } - printf ("\n"); + printf("\n"); } #endif if (str_data[func].func) { - str_data[func].func (st); + str_data[func].func(st); } else { if (battle_config.error_log) - printf ("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str, + printf("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str, func, str_data[func].type); - push_val (st->stack, ScriptCode::INT, 0); + push_val(st->stack, ScriptCode::INT, 0); } - pop_stack (st->stack, start_sp, end_sp); + pop_stack(st->stack, start_sp, end_sp); if (st->state == RETFUNC) { // ユーザー定義関数からの復帰 - int olddefsp = st->defsp; + int olddefsp = st->defsp; - pop_stack (st->stack, st->defsp, start_sp); // 復帰に邪魔なスタック削除 + pop_stack(st->stack, st->defsp, start_sp); // 復帰に邪魔なスタック削除 if (st->defsp < 4 || st->stack->stack_data[st->defsp - 1].type != ScriptCode::RETINFO) { - printf - ("script:run_func(return) return without callfunc or callsub!\n"); + printf("script:run_func (return) return without callfunc or callsub!\n"); st->state = END; return; } - i = conv_num (st, &(st->stack->stack_data[st->defsp - 4])); // 引数の数所得 - st->pos = conv_num (st, &(st->stack->stack_data[st->defsp - 1])); // スクリプト位置の復元 - st->script = (ScriptCode *) conv_num (st, &(st->stack->stack_data[st->defsp - 2])); // スクリプトを復元 - st->defsp = conv_num (st, &(st->stack->stack_data[st->defsp - 3])); // 基準スタックポインタを復元 + i = conv_num(st, &(st->stack->stack_data[st->defsp - 4])); // 引数の数所得 + st->pos = conv_num(st, &(st->stack->stack_data[st->defsp - 1])); // スクリプト位置の復元 + st->script = (ScriptCode *) conv_num(st, &(st->stack->stack_data[st->defsp - 2])); // スクリプトを復元 + st->defsp = conv_num(st, &(st->stack->stack_data[st->defsp - 3])); // 基準スタックポインタを復元 - pop_stack (st->stack, olddefsp - 4 - i, olddefsp); // 要らなくなったスタック(引数と復帰用データ)削除 + pop_stack(st->stack, olddefsp - 4 - i, olddefsp); // 要らなくなったスタック(引数と復帰用データ)削除 st->state = GOTO; } @@ -6658,12 +6636,12 @@ void run_func (ScriptState *st) *------------------------------------------ */ static -void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, +void run_script_main(const ScriptCode *script, int pos_, int rid, int oid, ScriptState *st, const ScriptCode *rootscript) { int rerun_pos; - int cmdcount = script_config.check_cmdcount; - int gotocount = script_config.check_gotocount; + int cmdcount = script_config.check_cmdcount; + int gotocount = script_config.check_gotocount; struct script_stack *stack = st->stack; st->defsp = stack->sp; @@ -6672,35 +6650,35 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, rerun_pos = st->pos; for (st->state = 0; st->state == 0;) { - switch (ScriptCode c = get_com (script, &st->pos)) + switch (ScriptCode c = get_com(script, &st->pos)) { case ScriptCode::EOL: if (stack->sp != st->defsp) { if (battle_config.error_log) - printf ("stack.sp(%d) != default(%d)\n", stack->sp, + printf("stack.sp (%d) != default (%d)\n", stack->sp, st->defsp); stack->sp = st->defsp; } rerun_pos = st->pos; break; case ScriptCode::INT: - push_val (stack, ScriptCode::INT, get_num (script, &st->pos)); + push_val(stack, ScriptCode::INT, get_num(script, &st->pos)); break; case ScriptCode::POS: case ScriptCode::NAME: - push_val (stack, c, (*(int *) (script + st->pos)) & 0xffffff); + push_val(stack, c, (*(int *)(script + st->pos)) & 0xffffff); st->pos += 3; break; case ScriptCode::ARG: - push_val (stack, c, 0); + push_val(stack, c, 0); break; case ScriptCode::STR: - push_str (stack, ScriptCode::CONSTSTR, reinterpret_cast<const char *>(script + st->pos)); + push_str(stack, ScriptCode::CONSTSTR, reinterpret_cast<const char *>(script + st->pos)); while (script[st->pos++] != ScriptCode::NOP); break; case ScriptCode::FUNC: - run_func (st); + run_func(st); if (st->state == GOTO) { rerun_pos = st->pos; @@ -6708,14 +6686,14 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, st->state = 0; if (gotocount > 0 && (--gotocount) <= 0) { - printf ("run_script: infinity loop !\n"); + printf("run_script: infinity loop !\n"); st->state = END; } } break; case ScriptCode::ADD: - op_add (st); + op_add(st); break; case ScriptCode::SUB: @@ -6735,13 +6713,13 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, case ScriptCode::LOR: case ScriptCode::R_SHIFT: case ScriptCode::L_SHIFT: - op_2 (st, c); + op_2(st, c); break; case ScriptCode::NEG: case ScriptCode::NOT: case ScriptCode::LNOT: - op_1num (st, c); + op_1num(st, c); break; case ScriptCode::NOP: @@ -6750,13 +6728,13 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, default: if (battle_config.error_log) - printf ("unknown command : %d @ %d\n", c, pos_); + printf("unknown command : %d @ %d\n", c, pos_); st->state = END; break; } if (cmdcount > 0 && (--cmdcount) <= 0) { - printf ("run_script: infinity loop !\n"); + printf("run_script: infinity loop !\n"); st->state = END; } } @@ -6766,10 +6744,10 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, break; case END: { - struct map_session_data *sd = map_id2sd (st->rid); + struct map_session_data *sd = map_id2sd(st->rid); st->pos = -1; if (sd && sd->npc_id == st->oid) - npc_event_dequeue (sd); + npc_event_dequeue(sd); } break; case RERUNLINE: @@ -6782,15 +6760,15 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, if (st->state != END) { // 再開するためにスタック情報を保存 - struct map_session_data *sd = map_id2sd (st->rid); + struct map_session_data *sd = map_id2sd(st->rid); if (sd /* && sd->npc_stackbuf==NULL */ ) { if (sd->npc_stackbuf) - free (sd->npc_stackbuf); + free(sd->npc_stackbuf); sd->npc_stackbuf = (char *) - calloc (sizeof (stack->stack_data[0]) * stack->sp_max, 1); - memcpy (sd->npc_stackbuf, stack->stack_data, - sizeof (stack->stack_data[0]) * stack->sp_max); + calloc(sizeof(stack->stack_data[0]) * stack->sp_max, 1); + memcpy(sd->npc_stackbuf, stack->stack_data, + sizeof(stack->stack_data[0]) * stack->sp_max); sd->npc_stack = stack->sp; sd->npc_stackmax = stack->sp_max; sd->npc_script = script; @@ -6804,19 +6782,19 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid, * スクリプトの実行 *------------------------------------------ */ -int run_script (const ScriptCode *script, int pos_, int rid, int oid) +int run_script(const ScriptCode *script, int pos_, int rid, int oid) { - return run_script_l (script, pos_, rid, oid, 0, NULL); + return run_script_l(script, pos_, rid, oid, 0, NULL); } -int run_script_l (const ScriptCode *script, int pos_, int rid, int oid, +int run_script_l(const ScriptCode *script, int pos_, int rid, int oid, int args_nr, argrec_t * args) { struct script_stack stack; ScriptState st; - struct map_session_data *sd = map_id2sd (rid); + struct map_session_data *sd = map_id2sd(rid); const ScriptCode *rootscript = script; - int i; + int i; if (script == NULL || pos_ < 0) return -1; @@ -6827,10 +6805,10 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid, stack.sp = sd->npc_stack; stack.sp_max = sd->npc_stackmax; stack.stack_data = (struct script_data *) - calloc (stack.sp_max, sizeof (stack.stack_data[0])); - memcpy (stack.stack_data, sd->npc_stackbuf, - sizeof (stack.stack_data[0]) * stack.sp_max); - free (sd->npc_stackbuf); + calloc(stack.sp_max, sizeof(stack.stack_data[0])); + memcpy(stack.stack_data, sd->npc_stackbuf, + sizeof(stack.stack_data[0]) * stack.sp_max); + free(sd->npc_stackbuf); sd->npc_stackbuf = NULL; } else @@ -6839,7 +6817,7 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid, stack.sp = 0; stack.sp_max = 64; stack.stack_data = (struct script_data *) - calloc (stack.sp_max, sizeof (stack.stack_data[0])); + calloc(stack.sp_max, sizeof(stack.stack_data[0])); } st.stack = &stack; st.pos = pos_; @@ -6847,14 +6825,14 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid, st.oid = oid; for (i = 0; i < args_nr; i++) { - if (args[i].name[strlen (args[i].name) - 1] == '$') - pc_setregstr (sd, add_str (args[i].name), args[i].v.s); + if (args[i].name[strlen(args[i].name) - 1] == '$') + pc_setregstr(sd, add_str(args[i].name), args[i].v.s); else - pc_setreg (sd, add_str (args[i].name), args[i].v.i); + pc_setreg(sd, add_str(args[i].name), args[i].v.i); } - run_script_main (script, pos_, rid, oid, &st, rootscript); + run_script_main(script, pos_, rid, oid, &st, rootscript); - free (stack.stack_data); + free(stack.stack_data); stack.stack_data = NULL; return st.pos; } @@ -6863,12 +6841,12 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid, * マップ変数の変更 *------------------------------------------ */ -void mapreg_setreg (int num, int val) +void mapreg_setreg(int num, int val) { if (val != 0) - numdb_insert (mapreg_db, num, val); + numdb_insert(mapreg_db, num, val); else - numdb_erase (mapreg_db, num); + numdb_erase(mapreg_db, num); mapreg_dirty = 1; } @@ -6877,22 +6855,22 @@ void mapreg_setreg (int num, int val) * 文字列型マップ変数の変更 *------------------------------------------ */ -void mapreg_setregstr (int num, const char *str) +void mapreg_setregstr(int num, const char *str) { char *p; - if ((p = (char *)numdb_search (mapregstr_db, num)) != NULL) - free (p); + if ((p = (char *)numdb_search(mapregstr_db, num)) != NULL) + free(p); if (str == NULL || *str == 0) { - numdb_erase (mapregstr_db, num); + numdb_erase(mapregstr_db, num); mapreg_dirty = 1; return; } - p = (char *) calloc (strlen (str) + 1, 1); - strcpy (p, str); - numdb_insert (mapregstr_db, num, p); + p = (char *) calloc(strlen(str) + 1, 1); + strcpy(p, str); + numdb_insert(mapregstr_db, num, p); mapreg_dirty = 1; } @@ -6901,45 +6879,45 @@ void mapreg_setregstr (int num, const char *str) *------------------------------------------ */ static -void script_load_mapreg (void) +void script_load_mapreg(void) { FILE *fp; char line[1024]; - if ((fp = fopen_ (mapreg_txt, "rt")) == NULL) + if ((fp = fopen_(mapreg_txt, "rt")) == NULL) return; - while (fgets (line, sizeof (line), fp)) + while (fgets(line, sizeof(line), fp)) { char buf1[256], buf2[1024], *p; - int n, v, s, i; - if (sscanf (line, "%255[^,],%d\t%n", buf1, &i, &n) != 2 && - (i = 0, sscanf (line, "%[^\t]\t%n", buf1, &n) != 1)) + int n, v, s, i; + if (sscanf(line, "%255[^,],%d\t%n", buf1, &i, &n) != 2 && + (i = 0, sscanf(line, "%[^\t]\t%n", buf1, &n) != 1)) continue; - if (buf1[strlen (buf1) - 1] == '$') + if (buf1[strlen(buf1) - 1] == '$') { - if (sscanf (line + n, "%[^\n\r]", buf2) != 1) + if (sscanf(line + n, "%[^\n\r]", buf2) != 1) { - printf ("%s: %s broken data !\n", mapreg_txt, buf1); + printf("%s: %s broken data !\n", mapreg_txt, buf1); continue; } - p = (char *) calloc (strlen (buf2) + 1, 1); - strcpy (p, buf2); - s = add_str (buf1); - numdb_insert (mapregstr_db, (i << 24) | s, p); + p = (char *) calloc(strlen(buf2) + 1, 1); + strcpy(p, buf2); + s = add_str(buf1); + numdb_insert(mapregstr_db, (i << 24) | s, p); } else { - if (sscanf (line + n, "%d", &v) != 1) + if (sscanf(line + n, "%d", &v) != 1) { - printf ("%s: %s broken data !\n", mapreg_txt, buf1); + printf("%s: %s broken data !\n", mapreg_txt, buf1); continue; } - s = add_str (buf1); - numdb_insert (mapreg_db, (i << 24) | s, v); + s = add_str(buf1); + numdb_insert(mapreg_db, (i << 24) | s, v); } } - fclose_ (fp); + fclose_(fp); mapreg_dirty = 0; } @@ -6947,53 +6925,53 @@ void script_load_mapreg (void) * 永続的マップ変数の書き込み *------------------------------------------ */ -static void script_save_mapreg_intsub (db_key_t key, db_val_t data, va_list ap) +static void script_save_mapreg_intsub(db_key_t key, db_val_t data, va_list ap) { - FILE *fp = va_arg (ap, FILE *); - int num = key.i & 0x00ffffff, i = key.i >> 24; + FILE *fp = va_arg(ap, FILE *); + int num = key.i & 0x00ffffff, i = key.i >> 24; char *name = str_buf + str_data[num].str; if (name[1] != '@') { if (i == 0) - fprintf (fp, "%s\t%d\n", name, (int) data); + fprintf(fp, "%s\t%d\n", name, (int) data); else - fprintf (fp, "%s,%d\t%d\n", name, i, (int) data); + fprintf(fp, "%s,%d\t%d\n", name, i, (int) data); } } -static void script_save_mapreg_strsub (db_key_t key, db_val_t data, va_list ap) +static void script_save_mapreg_strsub(db_key_t key, db_val_t data, va_list ap) { - FILE *fp = va_arg (ap, FILE *); - int num = key.i & 0x00ffffff, i = key.i >> 24; + FILE *fp = va_arg(ap, FILE *); + int num = key.i & 0x00ffffff, i = key.i >> 24; char *name = str_buf + str_data[num].str; if (name[1] != '@') { if (i == 0) - fprintf (fp, "%s\t%s\n", name, (char *) data); + fprintf(fp, "%s\t%s\n", name, (char *) data); else - fprintf (fp, "%s,%d\t%s\n", name, i, (char *) data); + fprintf(fp, "%s,%d\t%s\n", name, i, (char *) data); } } static -void script_save_mapreg (void) +void script_save_mapreg(void) { FILE *fp; - int lock; + int lock; - if ((fp = lock_fopen (mapreg_txt, &lock)) == NULL) + if ((fp = lock_fopen(mapreg_txt, &lock)) == NULL) return; - numdb_foreach (mapreg_db, script_save_mapreg_intsub, fp); - numdb_foreach (mapregstr_db, script_save_mapreg_strsub, fp); - lock_fclose (fp, mapreg_txt, &lock); + numdb_foreach(mapreg_db, script_save_mapreg_intsub, fp); + numdb_foreach(mapregstr_db, script_save_mapreg_strsub, fp); + lock_fclose(fp, mapreg_txt, &lock); mapreg_dirty = 0; } -static void script_autosave_mapreg (timer_id tid, tick_t tick, custom_id_t id, +static void script_autosave_mapreg(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { if (mapreg_dirty) - script_save_mapreg (); + script_save_mapreg(); } /*========================================== @@ -7001,13 +6979,13 @@ static void script_autosave_mapreg (timer_id tid, tick_t tick, custom_id_t id, *------------------------------------------ */ static -void set_posword (char *p) +void set_posword(char *p) { char *np, *str[15]; - int i = 0; + int i = 0; for (i = 0; i < 11; i++) { - if ((np = strchr (p, ',')) != NULL) + if ((np = strchr(p, ',')) != NULL) { str[i] = p; *np = 0; @@ -7016,16 +6994,16 @@ void set_posword (char *p) else { str[i] = p; - p += strlen (p); + p += strlen(p); } if (str[i]) - strcpy (pos[i], str[i]); + strcpy(pos[i], str[i]); } } -void script_config_read (const char *cfgName) +void script_config_read(const char *cfgName) { - int i; + int i; char line[1024], w1[1024], w2[1024]; FILE *fp; @@ -7036,29 +7014,29 @@ void script_config_read (const char *cfgName) script_config.check_cmdcount = 8192; script_config.check_gotocount = 512; - fp = fopen_ (cfgName, "r"); + fp = fopen_(cfgName, "r"); if (fp == NULL) { - printf ("file not found: %s\n", cfgName); + printf("file not found: %s\n", cfgName); return; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { if (line[0] == '/' && line[1] == '/') continue; - i = sscanf (line, "%[^:]: %[^\r\n]", w1, w2); + i = sscanf(line, "%[^:]: %[^\r\n]", w1, w2); if (i != 2) continue; - if (strcasecmp (w1, "refine_posword") == 0) + if (strcasecmp(w1, "refine_posword") == 0) { - set_posword (w2); + set_posword(w2); } - if (strcasecmp (w1, "import") == 0) + if (strcasecmp(w1, "import") == 0) { - script_config_read (w2); + script_config_read(w2); } } - fclose_ (fp); + fclose_(fp); } /*========================================== @@ -7066,52 +7044,52 @@ void script_config_read (const char *cfgName) *------------------------------------------ */ -static void mapregstr_db_final (db_key_t key, db_val_t data, va_list ap) +static void mapregstr_db_final(db_key_t key, db_val_t data, va_list ap) { - free (data); + free(data); } -static void userfunc_db_final (db_key_t key, db_val_t data, va_list ap) +static void userfunc_db_final(db_key_t key, db_val_t data, va_list ap) { - free ((char*)key.s); - free (data); + free((char*)key.s); + free(data); } -void do_final_script (void) +void do_final_script(void) { if (mapreg_dirty >= 0) - script_save_mapreg (); + script_save_mapreg(); if (script_buf) - free (script_buf); + free(script_buf); if (mapreg_db) - numdb_final (mapreg_db, NULL); + numdb_final(mapreg_db, NULL); if (mapregstr_db) - strdb_final (mapregstr_db, mapregstr_db_final); + strdb_final(mapregstr_db, mapregstr_db_final); if (scriptlabel_db) - strdb_final (scriptlabel_db, NULL); + strdb_final(scriptlabel_db, NULL); if (userfunc_db) - strdb_final (userfunc_db, userfunc_db_final); + strdb_final(userfunc_db, userfunc_db_final); if (str_data) - free (str_data); + free(str_data); if (str_buf) - free (str_buf); + free(str_buf); } /*========================================== * 初期化 *------------------------------------------ */ -void do_init_script (void) +void do_init_script(void) { - mapreg_db = numdb_init (); - mapregstr_db = numdb_init (); - script_load_mapreg (); + mapreg_db = numdb_init(); + mapregstr_db = numdb_init(); + script_load_mapreg(); - add_timer_interval (gettick () + MAPREG_AUTOSAVE_INTERVAL, + add_timer_interval(gettick() + MAPREG_AUTOSAVE_INTERVAL, script_autosave_mapreg, 0, 0, MAPREG_AUTOSAVE_INTERVAL); - scriptlabel_db = strdb_init (50); + scriptlabel_db = strdb_init(50); } diff --git a/src/map/script.hpp b/src/map/script.hpp index e1803c2..6f6c910 100644 --- a/src/map/script.hpp +++ b/src/map/script.hpp @@ -42,14 +42,14 @@ struct script_data ScriptCode type; union { - int num; + int num; const char *str; } u; }; struct script_stack { - int sp, sp_max; + int sp, sp_max; struct script_data *stack_data; }; @@ -58,20 +58,20 @@ class ScriptState { public: struct script_stack *stack; - int start, end; - int pos, state; - int rid, oid; + int start, end; + int pos, state; + int rid, oid; const ScriptCode *script, *new_script; - int defsp, new_pos, new_defsp; + int defsp, new_pos, new_defsp; }; -const ScriptCode *parse_script (const char *, int); +const ScriptCode *parse_script(const char *, int); typedef struct argrec { const char *name; union _aru { - int i; + int i; const char *s; _aru() = default; @@ -79,15 +79,15 @@ typedef struct argrec _aru(const char *z) : s(z) {} } v; } argrec_t; -int run_script_l (const ScriptCode *, int, int, int, int, argrec_t * args); -int run_script (const ScriptCode *, int, int, int); +int run_script_l(const ScriptCode *, int, int, int, int, argrec_t * args); +int run_script(const ScriptCode *, int, int, int); -struct dbt *script_get_label_db (void); -struct dbt *script_get_userfunc_db (void); +struct dbt *script_get_label_db(void); +struct dbt *script_get_userfunc_db(void); -void script_config_read (const char *cfgName); -void do_init_script (void); -void do_final_script (void); +void script_config_read(const char *cfgName); +void do_init_script(void); +void do_final_script(void); extern char mapreg_txt[]; diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp index 204036d..f827427 100644 --- a/src/map/skill-pools.cpp +++ b/src/map/skill-pools.cpp @@ -24,14 +24,14 @@ #include "memwatch.hpp" #endif -int skill_pool_skills[MAX_POOL_SKILLS]; -int skill_pool_skills_size = 0; +int skill_pool_skills[MAX_POOL_SKILLS]; +int skill_pool_skills_size = 0; void skill_pool_register(int id) { if (skill_pool_skills_size + 1 >= MAX_POOL_SKILLS) { - fprintf (stderr, + fprintf(stderr, "Too many pool skills! Increase MAX_POOL_SKILLS and recompile."); return; } @@ -39,7 +39,7 @@ void skill_pool_register(int id) skill_pool_skills[skill_pool_skills_size++] = id; } -const char *skill_name (int skill) +const char *skill_name(int skill) { if (skill > 0 && skill < MAX_SKILL_DB) return skill_names[skill].desc; @@ -47,13 +47,13 @@ const char *skill_name (int skill) return NULL; } -int skill_pool (struct map_session_data *sd, int *skills) +int skill_pool(struct map_session_data *sd, int *skills) { - int i, count = 0; + int i, count = 0; for (i = 0; count < MAX_SKILL_POOL && i < skill_pool_skills_size; i++) { - int skill_id = skill_pool_skills[i]; + int skill_id = skill_pool_skills[i]; if (sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED) { if (skills) @@ -65,38 +65,38 @@ int skill_pool (struct map_session_data *sd, int *skills) return count; } -void skill_pool_empty (struct map_session_data *sd) +void skill_pool_empty(struct map_session_data *sd) { - int i; + int i; for (i = 0; i < skill_pool_skills_size; i++) { - int skill_id = skill_pool_skills[i]; + int skill_id = skill_pool_skills[i]; sd->status.skill[skill_id].flags = 0; } } -int skill_pool_size (struct map_session_data *sd) +int skill_pool_size(struct map_session_data *sd) { - return skill_pool (sd, NULL); + return skill_pool(sd, NULL); } -int skill_pool_max (struct map_session_data *sd) +int skill_pool_max(struct map_session_data *sd) { return sd->status.skill[TMW_SKILLPOOL].lv; } -int skill_pool_activate (struct map_session_data *sd, int skill_id) +int skill_pool_activate(struct map_session_data *sd, int skill_id) { if (sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED) return 0; // Already there else if (sd->status.skill[skill_id].id == skill_id // knows the skill - && (skill_pool_size (sd) < skill_pool_max (sd))) + && (skill_pool_size(sd) < skill_pool_max(sd))) { sd->status.skill[skill_id].flags |= SKILL_POOL_ACTIVATED; - pc_calcstatus (sd, 0); - MAP_LOG_PC (sd, "SKILL-ACTIVATE %d %d %d", skill_id, - sd->status.skill[skill_id].lv, skill_power (sd, + pc_calcstatus(sd, 0); + MAP_LOG_PC(sd, "SKILL-ACTIVATE %d %d %d", skill_id, + sd->status.skill[skill_id].lv, skill_power(sd, skill_id)); return 0; } @@ -104,39 +104,39 @@ int skill_pool_activate (struct map_session_data *sd, int skill_id) return 1; // failed } -int skill_pool_is_activated (struct map_session_data *sd, int skill_id) +int skill_pool_is_activated(struct map_session_data *sd, int skill_id) { return sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED; } -int skill_pool_deactivate (struct map_session_data *sd, int skill_id) +int skill_pool_deactivate(struct map_session_data *sd, int skill_id) { if (sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED) { sd->status.skill[skill_id].flags &= ~SKILL_POOL_ACTIVATED; - MAP_LOG_PC (sd, "SKILL-DEACTIVATE %d", skill_id); - pc_calcstatus (sd, 0); + MAP_LOG_PC(sd, "SKILL-DEACTIVATE %d", skill_id); + pc_calcstatus(sd, 0); return 0; } return 1; } -int skill_stat (int skill_id) +int skill_stat(int skill_id) { return skill_db[skill_id].stat; } -int skill_power (struct map_session_data *sd, int skill_id) +int skill_power(struct map_session_data *sd, int skill_id) { - int stat = skill_stat (skill_id); - int stat_value, skill_value; - int result; + int stat = skill_stat(skill_id); + int stat_value, skill_value; + int result; - if (stat == 0 || !skill_pool_is_activated (sd, skill_id)) + if (stat == 0 || !skill_pool_is_activated(sd, skill_id)) return 0; - stat_value = battle_get_stat (stat, &(sd->bl)); + stat_value = battle_get_stat(stat, &(sd->bl)); skill_value = sd->status.skill[skill_id].lv; if ((skill_value * 10) - 1 > stat_value) @@ -149,10 +149,10 @@ int skill_power (struct map_session_data *sd, int skill_id) return result; } -int skill_power_bl (struct block_list *bl, int skill) +int skill_power_bl(struct block_list *bl, int skill) { if (bl->type == BL_PC) - return skill_power ((struct map_session_data *) bl, skill); + return skill_power((struct map_session_data *) bl, skill); else return 0; } diff --git a/src/map/skill.cpp b/src/map/skill.cpp index cc4f709..4cd0c06 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -27,12 +27,12 @@ #include "memwatch.hpp" #endif -#define SKILLUNITTIMER_INVERVAL 100 +#define SKILLUNITTIMER_INVERVAL 100 #define STATE_BLIND 0x10 /* スキル番号＝＞ステータス異常番号変換テーブル */ -int SkillStatusChangeTable[] = { /* skill.hのenumのSC_***とあわせること */ +int SkillStatusChangeTable[] = { /* skill.hのenumのSC_***とあわせること */ /* 0- */ -1, -1, -1, -1, -1, -1, SC_PROVOKE, /* プロボック */ @@ -722,139 +722,139 @@ static int rdamage; /* スキルデータベース */ struct skill_db skill_db[MAX_SKILL_DB]; -#define UNARMED_PLAYER_DAMAGE_MIN(bl) (skill_power_bl((bl), TMW_BRAWLING) >> 4) // +50 for 200 -#define UNARMED_PLAYER_DAMAGE_MAX(bl) (skill_power_bl((bl), TMW_BRAWLING)) // +200 for 200 +#define UNARMED_PLAYER_DAMAGE_MIN(bl) (skill_power_bl((bl), TMW_BRAWLING) >> 4) // +50 for 200 +#define UNARMED_PLAYER_DAMAGE_MAX(bl) (skill_power_bl((bl), TMW_BRAWLING)) // +200 for 200 -int skill_get_hit (int id) +int skill_get_hit(int id) { return skill_db[id].hit; } -int skill_get_inf (int id) +int skill_get_inf(int id) { return skill_db[id].inf; } -int skill_get_pl (int id) +int skill_get_pl(int id) { return skill_db[id].pl; } -int skill_get_nk (int id) +int skill_get_nk(int id) { return skill_db[id].nk; } -int skill_get_max (int id) +int skill_get_max(int id) { return skill_db[id].max; } -int skill_get_max_raise (int id) +int skill_get_max_raise(int id) { return skill_db[id].max_raise; } -int skill_get_range (int id, int lv) +int skill_get_range(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].range[lv - 1]; } -int skill_get_hp (int id, int lv) +int skill_get_hp(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].hp[lv - 1]; } -int skill_get_sp (int id, int lv) +int skill_get_sp(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].sp[lv - 1]; } -int skill_get_zeny (int id, int lv) +int skill_get_zeny(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].zeny[lv - 1]; } -int skill_get_num (int id, int lv) +int skill_get_num(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].num[lv - 1]; } -int skill_get_cast (int id, int lv) +int skill_get_cast(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].cast[lv - 1]; } -int skill_get_delay (int id, int lv) +int skill_get_delay(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].delay[lv - 1]; } -int skill_get_time (int id, int lv) +int skill_get_time(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].upkeep_time[lv - 1]; } -int skill_get_time2 (int id, int lv) +int skill_get_time2(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].upkeep_time2[lv - 1]; } -int skill_get_castdef (int id) +int skill_get_castdef(int id) { return skill_db[id].cast_def_rate; } -int skill_get_weapontype (int id) +int skill_get_weapontype(int id) { return skill_db[id].weapon; } -int skill_get_inf2 (int id) +int skill_get_inf2(int id) { return skill_db[id].inf2; } -int skill_get_maxcount (int id) +int skill_get_maxcount(int id) { return skill_db[id].maxcount; } -int skill_get_blewcount (int id, int lv) +int skill_get_blewcount(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].blewcount[lv - 1]; } -int skill_get_mhp (int id, int lv) +int skill_get_mhp(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].mhp[lv - 1]; } static -int skill_get_castnodex (int id, int lv) +int skill_get_castnodex(int id, int lv) { return (lv <= 0) ? 0 : skill_db[id].castnodex[lv - 1]; } /* プロトタイプ */ -struct skill_unit_group *skill_unitsetting (struct block_list *src, +struct skill_unit_group *skill_unitsetting(struct block_list *src, int skillid, int skilllv, int x, int y, int flag); -int skill_check_condition (struct map_session_data *sd, int type); -void skill_frostjoke_scream (struct block_list *bl, va_list ap); -void skill_status_change_timer_sub (struct block_list *bl, va_list ap); -void skill_attack_area (struct block_list *bl, va_list ap); -void skill_clear_element_field (struct block_list *bl); -void skill_landprotector (struct block_list *bl, va_list ap); -void skill_trap_splash (struct block_list *bl, va_list ap); -void skill_count_target (struct block_list *bl, va_list ap); +int skill_check_condition(struct map_session_data *sd, int type); +void skill_frostjoke_scream(struct block_list *bl, va_list ap); +void skill_status_change_timer_sub(struct block_list *bl, va_list ap); +void skill_attack_area(struct block_list *bl, va_list ap); +void skill_clear_element_field(struct block_list *bl); +void skill_landprotector(struct block_list *bl, va_list ap); +void skill_trap_splash(struct block_list *bl, va_list ap); +void skill_count_target(struct block_list *bl, va_list ap); // [MouseJstr] - skill ok to cast? and when? -static int skillnotok (int skillid, struct map_session_data *sd) +static int skillnotok(int skillid, struct map_session_data *sd) { if (sd == 0) return 0; - if (pc_isGM (sd) >= 20) + if (pc_isGM(sd) >= 20) return 0; // gm's can do anything damn thing they want switch (skillid) { @@ -867,17 +867,17 @@ static int skillnotok (int skillid, struct map_session_data *sd) } } -static int distance (int x0, int y0, int x1, int y1) +static int distance(int x0, int y0, int x1, int y1) { - int dx, dy; + int dx, dy; - dx = abs (x0 - x1); - dy = abs (y0 - y1); + dx = abs(x0 - x1); + dy = abs(y0 - y1); return dx > dy ? dx : dy; } /* スキルユニットIDを返す（これもデータベースに入れたいな） */ -int skill_get_unit_id (int id, int flag) +int skill_get_unit_id(int id, int flag) { switch (id) @@ -1022,7 +1022,7 @@ int skill_get_unit_id (int id, int flag) * スキル追加効果 *------------------------------------------ */ -int skill_additional_effect (struct block_list *src, struct block_list *bl, +int skill_additional_effect(struct block_list *src, struct block_list *bl, int skillid, int skilllv, int attack_type, unsigned int tick) { @@ -1042,44 +1042,44 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, struct mob_data *md = NULL; struct mob_data *dstmd = NULL; - int skill, skill2; - int rate, luk; + int skill, skill2; + int rate, luk; - int sc_def_mdef, sc_def_vit, sc_def_int, sc_def_luk; - int sc_def_mdef2, sc_def_vit2, sc_def_int2, sc_def_luk2; - int sc_def_phys_shield_spell; + int sc_def_mdef, sc_def_vit, sc_def_int, sc_def_luk; + int sc_def_mdef2, sc_def_vit2, sc_def_int2, sc_def_luk2; + int sc_def_phys_shield_spell; - nullpo_retr (0, src); - nullpo_retr (0, bl); + nullpo_retr(0, src); + nullpo_retr(0, bl); if (skilllv < 0) return 0; if (src->type == BL_PC) { - nullpo_retr (0, sd = (struct map_session_data *) src); + nullpo_retr(0, sd = (struct map_session_data *) src); } else if (src->type == BL_MOB) { - nullpo_retr (0, md = (struct mob_data *) src); //未使用？ + nullpo_retr(0, md = (struct mob_data *) src); //未使用？ } sc_def_phys_shield_spell = 0; - if (battle_get_sc_data (bl)[SC_PHYS_SHIELD].timer != -1) + if (battle_get_sc_data(bl)[SC_PHYS_SHIELD].timer != -1) sc_def_phys_shield_spell = - battle_get_sc_data (bl)[SC_PHYS_SHIELD].val1; + battle_get_sc_data(bl)[SC_PHYS_SHIELD].val1; //対象の耐性 - luk = battle_get_luk (bl); - sc_def_mdef = 100 - (3 + battle_get_mdef (bl) + luk / 3); - sc_def_vit = 100 - (3 + battle_get_vit (bl) + luk / 3); - sc_def_int = 100 - (3 + battle_get_int (bl) + luk / 3); + luk = battle_get_luk(bl); + sc_def_mdef = 100 - (3 + battle_get_mdef(bl) + luk / 3); + sc_def_vit = 100 - (3 + battle_get_vit(bl) + luk / 3); + sc_def_int = 100 - (3 + battle_get_int(bl) + luk / 3); sc_def_luk = 100 - (3 + luk); //自分の耐性 - luk = battle_get_luk (src); - sc_def_mdef2 = 100 - (3 + battle_get_mdef (src) + luk / 3); - sc_def_vit2 = 100 - (3 + battle_get_vit (src) + luk / 3); - sc_def_int2 = 100 - (3 + battle_get_int (src) + luk / 3); + luk = battle_get_luk(src); + sc_def_mdef2 = 100 - (3 + battle_get_mdef(src) + luk / 3); + sc_def_vit2 = 100 - (3 + battle_get_vit(src) + luk / 3); + sc_def_int2 = 100 - (3 + battle_get_int(src) + luk / 3); sc_def_luk2 = 100 - (3 + luk); if (bl->type == BL_PC) dstsd = (struct map_session_data *) bl; @@ -1106,64 +1106,64 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, { case 0: /* 通常攻撃 */ /* 自動鷹 */ - if (sd && pc_isfalcon (sd) && sd->status.weapon == 11 - && (skill = pc_checkskill (sd, HT_BLITZBEAT)) > 0 - && MRAND (1000) <= sd->paramc[5] * 10 / 3 + 1) + if (sd && pc_isfalcon(sd) && sd->status.weapon == 11 + && (skill = pc_checkskill(sd, HT_BLITZBEAT)) > 0 + && MRAND(1000) <= sd->paramc[5] * 10 / 3 + 1) { - int lv = (sd->status.job_level + 9) / 10; - skill_castend_damage_id (src, bl, HT_BLITZBEAT, + int lv = (sd->status.job_level + 9) / 10; + skill_castend_damage_id(src, bl, HT_BLITZBEAT, (skill < lv) ? skill : lv, tick, 0xf00000); } // スナッチャー if (sd && sd->status.weapon != 11 - && (skill = pc_checkskill (sd, RG_SNATCHER)) > 0) + && (skill = pc_checkskill(sd, RG_SNATCHER)) > 0) if ((skill * 15 + 55) + (skill2 = - pc_checkskill (sd, TF_STEAL)) * 10 > MRAND (1000)) + pc_checkskill(sd, TF_STEAL)) * 10 > MRAND(1000)) { - if (pc_steal_item (sd, bl)) - clif_skill_nodamage (src, bl, TF_STEAL, skill2, 1); + if (pc_steal_item(sd, bl)) + clif_skill_nodamage(src, bl, TF_STEAL, skill2, 1); else - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_fail(sd, skillid, 0, 0); } break; case SM_BASH: /* バッシュ（急所攻撃） */ - if (sd && (skill = pc_checkskill (sd, SM_FATALBLOW)) > 0) + if (sd && (skill = pc_checkskill(sd, SM_FATALBLOW)) > 0) { - if (MRAND (100) < 6 * (skilllv - 5) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (SM_FATALBLOW, + if (MRAND(100) < 6 * (skilllv - 5) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(SM_FATALBLOW, skilllv), 0); } break; case TF_POISON: /* インベナム */ case AS_SPLASHER: /* ベナムスプラッシャー */ - if (MRAND (100) < (2 * skilllv + 10) * sc_def_vit / 100) - skill_status_change_start (bl, SC_POISON, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (2 * skilllv + 10) * sc_def_vit / 100) + skill_status_change_start(bl, SC_POISON, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); else { if (sd && skillid == TF_POISON) - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_fail(sd, skillid, 0, 0); } break; case AS_SONICBLOW: /* ソニックブロー */ - if (MRAND (100) < (2 * skilllv + 10) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (2 * skilllv + 10) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case HT_FREEZINGTRAP: /* フリージングトラップ */ rate = skilllv * 3 + 35; - if (MRAND (100) < rate * sc_def_mdef / 100) - skill_status_change_start (bl, SC_FREEZE, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < rate * sc_def_mdef / 100) + skill_status_change_start(bl, SC_FREEZE, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; @@ -1171,25 +1171,25 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, case WZ_FROSTNOVA: /* フロストノヴァ */ rate = (skilllv * 3 + 35) * sc_def_mdef / 100 - - (battle_get_int (bl) + battle_get_luk (bl)) / 15; + (battle_get_int(bl) + battle_get_luk(bl)) / 15; rate = rate <= 5 ? 5 : rate; - if (MRAND (100) < rate) - skill_status_change_start (bl, SC_FREEZE, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < rate) + skill_status_change_start(bl, SC_FREEZE, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); else if (sd) - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_fail(sd, skillid, 0, 0); break; case WZ_STORMGUST: /* ストームガスト */ { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); if (sc_data) { sc_data[SC_FREEZE].val3++; if (sc_data[SC_FREEZE].val3 >= 3) - skill_status_change_start (bl, SC_FREEZE, skilllv, 0, 0, - 0, skill_get_time2 (skillid, + skill_status_change_start(bl, SC_FREEZE, skilllv, 0, 0, + 0, skill_get_time2(skillid, skilllv), 0); } @@ -1197,9 +1197,9 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, break; case HT_LANDMINE: /* ランドマイン */ - if (MRAND (100) < (5 * skilllv + 30) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (5 * skilllv + 30) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; @@ -1208,220 +1208,220 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, { dstsd->status.sp -= dstsd->status.sp * (5 + 15 * skilllv) / 100; - pc_calcstatus (dstsd, 0); + pc_calcstatus(dstsd, 0); } break; case HT_SANDMAN: /* サンドマン */ - if (MRAND (100) < (5 * skilllv + 30) * sc_def_int / 100) - skill_status_change_start (bl, SC_SLEEP, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (5 * skilllv + 30) * sc_def_int / 100) + skill_status_change_start(bl, SC_SLEEP, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case TF_SPRINKLESAND: /* 砂まき */ - if (MRAND (100) < 15 * sc_def_int / 100) - skill_status_change_start (bl, SC_BLIND, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < 15 * sc_def_int / 100) + skill_status_change_start(bl, SC_BLIND, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case TF_THROWSTONE: /* 石投げ */ - if (MRAND (100) < 5 * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < 5 * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case CR_HOLYCROSS: /* ホーリークロス */ - if (MRAND (100) < 3 * skilllv * sc_def_int / 100) - skill_status_change_start (bl, SC_BLIND, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < 3 * skilllv * sc_def_int / 100) + skill_status_change_start(bl, SC_BLIND, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case CR_GRANDCROSS: /* グランドクロス */ { - int race = battle_get_race (bl); - if ((battle_check_undead (race, battle_get_elem_type (bl)) || race == 6) && MRAND (100) < 100000 * sc_def_int / 100) //強制付与だが完全耐性には無効 - skill_status_change_start (bl, SC_BLIND, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + int race = battle_get_race(bl); + if ((battle_check_undead(race, battle_get_elem_type(bl)) || race == 6) && MRAND(100) < 100000 * sc_def_int / 100) //強制付与だが完全耐性には無効 + skill_status_change_start(bl, SC_BLIND, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); } break; case CR_SHIELDCHARGE: /* シールドチャージ */ - if (MRAND (100) < (15 + skilllv * 5) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (15 + skilllv * 5) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case RG_RAID: /* サプライズアタック */ - if (MRAND (100) < (10 + 3 * skilllv) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (10 + 3 * skilllv) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); - if (MRAND (100) < (10 + 3 * skilllv) * sc_def_int / 100) - skill_status_change_start (bl, SC_BLIND, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (10 + 3 * skilllv) * sc_def_int / 100) + skill_status_change_start(bl, SC_BLIND, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case BA_FROSTJOKE: - if (MRAND (100) < (15 + 5 * skilllv) * sc_def_mdef / 100) - skill_status_change_start (bl, SC_FREEZE, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (15 + 5 * skilllv) * sc_def_mdef / 100) + skill_status_change_start(bl, SC_FREEZE, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case DC_SCREAM: - if (MRAND (100) < (25 + 5 * skilllv) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (25 + 5 * skilllv) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case BD_LULLABY: /* 子守唄 */ - if (MRAND (100) < 15 * sc_def_int / 100) - skill_status_change_start (bl, SC_SLEEP, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < 15 * sc_def_int / 100) + skill_status_change_start(bl, SC_SLEEP, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; /* MOBの追加効果付きスキル */ case NPC_PETRIFYATTACK: - if (MRAND (100) < sc_def_mdef) - skill_status_change_start (bl, sc[skillid - NPC_POISON], + if (MRAND(100) < sc_def_mdef) + skill_status_change_start(bl, sc[skillid - NPC_POISON], skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + skill_get_time2(skillid, skilllv), 0); break; case NPC_POISON: case NPC_SILENCEATTACK: case NPC_STUNATTACK: - if (MRAND (100) < + if (MRAND(100) < 50 - (sc_def_vit >> 2) - (sc_def_phys_shield_spell) + (skilllv >> 2)) - skill_status_change_start (bl, sc[skillid - NPC_POISON], + skill_status_change_start(bl, sc[skillid - NPC_POISON], skilllv, 0, 0, 0, skilllv, 0); break; case NPC_CURSEATTACK: - if (MRAND (100) < sc_def_luk) - skill_status_change_start (bl, sc[skillid - NPC_POISON], + if (MRAND(100) < sc_def_luk) + skill_status_change_start(bl, sc[skillid - NPC_POISON], skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + skill_get_time2(skillid, skilllv), 0); break; case NPC_SLEEPATTACK: case NPC_BLINDATTACK: - if (MRAND (100) < sc_def_int) - skill_status_change_start (bl, sc[skillid - NPC_POISON], + if (MRAND(100) < sc_def_int) + skill_status_change_start(bl, sc[skillid - NPC_POISON], skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + skill_get_time2(skillid, skilllv), 0); break; case NPC_MENTALBREAKER: if (dstsd) { - int sp = dstsd->status.max_sp * (10 + skilllv) / 100; + int sp = dstsd->status.max_sp * (10 + skilllv) / 100; if (sp < 1) sp = 1; - pc_heal (dstsd, 0, -sp); + pc_heal(dstsd, 0, -sp); } break; // -- moonsoul (adding status effect chance given to wizard aoe skills meteor and vermillion) // case WZ_METEOR: - if (MRAND (100) < sc_def_vit) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < sc_def_vit) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case WZ_VERMILION: - if (MRAND (100) < sc_def_int) - skill_status_change_start (bl, SC_BLIND, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < sc_def_int) + skill_status_change_start(bl, SC_BLIND, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; // -- moonsoul (stun ability of new champion skill tigerfist) // case CH_TIGERFIST: - if (MRAND (100) < (5 + skilllv * 5) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (5 + skilllv * 5) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case LK_SPIRALPIERCE: - if (MRAND (100) < (15 + skilllv * 5) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (15 + skilllv * 5) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case ST_REJECTSWORD: /* フリージングトラップ */ - if (MRAND (100) < (10 + skilllv * 5)) - skill_status_change_start (bl, SC_AUTOCOUNTER, skilllv, 0, 0, - 0, skill_get_time2 (skillid, + if (MRAND(100) < (10 + skilllv * 5)) + skill_status_change_start(bl, SC_AUTOCOUNTER, skilllv, 0, 0, + 0, skill_get_time2(skillid, skilllv), 0); break; case PF_FOGWALL: /* ホーリークロス */ - if (MRAND (100) < 3 * skilllv * sc_def_int / 100) - skill_status_change_start (bl, SC_BLIND, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < 3 * skilllv * sc_def_int / 100) + skill_status_change_start(bl, SC_BLIND, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case LK_HEADCRUSH: /* ヘッドクラッシュ */ { //条件が良く分からないので適当に - int race = battle_get_race (bl); + int race = battle_get_race(bl); if (! - (battle_check_undead (race, battle_get_elem_type (bl)) + (battle_check_undead(race, battle_get_elem_type(bl)) || race == 6) - && MRAND (100) < (2 * skilllv + 10) * sc_def_vit / 100) - skill_status_change_start (bl, SC_HEADCRUSH, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + && MRAND(100) < (2 * skilllv + 10) * sc_def_vit / 100) + skill_status_change_start(bl, SC_HEADCRUSH, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); } break; case LK_JOINTBEAT: /* ジョイントビート */ //条件が良く分からないので適当に - if (MRAND (100) < (2 * skilllv + 10) * sc_def_vit / 100) - skill_status_change_start (bl, SC_JOINTBEAT, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (2 * skilllv + 10) * sc_def_vit / 100) + skill_status_change_start(bl, SC_JOINTBEAT, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case PF_SPIDERWEB: /* スパイダーウェッブ */ { - int sec = skill_get_time2 (skillid, skilllv); + int sec = skill_get_time2(skillid, skilllv); if (map[src->m].flag.pvp) //PvPでは拘束時間半減？ sec = sec / 2; - battle_stopwalking (bl, 1); - skill_status_change_start (bl, SC_SPIDERWEB, skilllv, 0, 0, 0, + battle_stopwalking(bl, 1); + skill_status_change_start(bl, SC_SPIDERWEB, skilllv, 0, 0, 0, sec, 0); } break; case ASC_METEORASSAULT: /* メテオアサルト */ - if (MRAND (100) < (15 + skilllv * 5) * sc_def_vit / 100) //状態異常は詳細が分からないので適当に - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (15 + skilllv * 5) * sc_def_vit / 100) //状態異常は詳細が分からないので適当に + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); - if (MRAND (100) < (10 + 3 * skilllv) * sc_def_int / 100) - skill_status_change_start (bl, SC_BLIND, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < (10 + 3 * skilllv) * sc_def_int / 100) + skill_status_change_start(bl, SC_BLIND, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case MO_EXTREMITYFIST: /* 阿修羅覇凰拳 */ //阿修羅を使うと5分間自然回復しないようになる - skill_status_change_start (src, SkillStatusChangeTable[skillid], + skill_status_change_start(src, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), 0); + skill_get_time2(skillid, skilllv), 0); break; } if (sd && skillid != MC_CARTREVOLUTION && attack_type & BF_WEAPON) { /* カードによる追加効果 */ - int i; - int sc_def_card = 100; + int i; + int sc_def_card = 100; for (i = SC_STONE; i <= SC_BLIND; i++) { @@ -1437,18 +1437,17 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, if (!sd->state.arrow_atk) { - if (MRAND (10000) < + if (MRAND(10000) < (sd->addeff[i - SC_STONE]) * sc_def_card / 100) { if (battle_config.battle_log) - printf - ("PC %d skill_addeff: cardによる異常発動 %d %d\n", + printf("PC %d skill_addeff: cardによる異常発動 %d %d\n", sd->bl.id, i, sd->addeff[i - SC_STONE]); - skill_status_change_start (bl, i, 7, 0, 0, 0, + skill_status_change_start(bl, i, 7, 0, 0, 0, (i == SC_CONFUSION) ? 10000 + 7000 : - skill_get_time2 (sc2 + skill_get_time2(sc2 [i - SC_STONE], 7), 0); @@ -1456,19 +1455,18 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, } else { - if (MRAND (10000) < + if (MRAND(10000) < (sd->addeff[i - SC_STONE] + sd->arrow_addeff[i - SC_STONE]) * sc_def_card / 100) { if (battle_config.battle_log) - printf - ("PC %d skill_addeff: cardによる異常発動 %d %d\n", + printf("PC %d skill_addeff: cardによる異常発動 %d %d\n", sd->bl.id, i, sd->addeff[i - SC_STONE]); - skill_status_change_start (bl, i, 7, 0, 0, 0, + skill_status_change_start(bl, i, 7, 0, 0, 0, (i == SC_CONFUSION) ? 10000 + 7000 : - skill_get_time2 (sc2 + skill_get_time2(sc2 [i - SC_STONE], 7), 0); @@ -1486,18 +1484,17 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, if (!sd->state.arrow_atk) { - if (MRAND (10000) < + if (MRAND(10000) < (sd->addeff2[i - SC_STONE]) * sc_def_card / 100) { if (battle_config.battle_log) - printf - ("PC %d skill_addeff: cardによる異常発動 %d %d\n", + printf("PC %d skill_addeff: cardによる異常発動 %d %d\n", src->id, i, sd->addeff2[i - SC_STONE]); - skill_status_change_start (src, i, 7, 0, 0, 0, + skill_status_change_start(src, i, 7, 0, 0, 0, (i == SC_CONFUSION) ? 10000 + 7000 : - skill_get_time2 (sc2 + skill_get_time2(sc2 [i - SC_STONE], 7), 0); @@ -1505,19 +1502,18 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, } else { - if (MRAND (10000) < + if (MRAND(10000) < (sd->addeff2[i - SC_STONE] + sd->arrow_addeff2[i - SC_STONE]) * sc_def_card / 100) { if (battle_config.battle_log) - printf - ("PC %d skill_addeff: cardによる異常発動 %d %d\n", + printf("PC %d skill_addeff: cardによる異常発動 %d %d\n", src->id, i, sd->addeff2[i - SC_STONE]); - skill_status_change_start (src, i, 7, 0, 0, 0, + skill_status_change_start(src, i, 7, 0, 0, 0, (i == SC_CONFUSION) ? 10000 + 7000 : - skill_get_time2 (sc2 + skill_get_time2(sc2 [i - SC_STONE], 7), 0); @@ -1532,30 +1528,30 @@ int skill_additional_effect (struct block_list *src, struct block_list *bl, スキル攻撃吹き飛ばし処理 -------------------------------------------------------------------------*/ static -int skill_blown (struct block_list *src, struct block_list *target, int count) +int skill_blown(struct block_list *src, struct block_list *target, int count) { - int dx = 0, dy = 0, nx, ny; - int x = target->x, y = target->y; - int ret, prev_state = MS_IDLE; - int moveblock; + int dx = 0, dy = 0, nx, ny; + int x = target->x, y = target->y; + int ret, prev_state = MS_IDLE; + int moveblock; struct map_session_data *sd = NULL; struct mob_data *md = NULL; struct skill_unit *su = NULL; - nullpo_retr (0, src); - nullpo_retr (0, target); + nullpo_retr(0, src); + nullpo_retr(0, target); if (target->type == BL_PC) { - nullpo_retr (0, sd = (struct map_session_data *) target); + nullpo_retr(0, sd = (struct map_session_data *) target); } else if (target->type == BL_MOB) { - nullpo_retr (0, md = (struct mob_data *) target); + nullpo_retr(0, md = (struct mob_data *) target); } else if (target->type == BL_SKILL) { - nullpo_retr (0, su = (struct skill_unit *) target); + nullpo_retr(0, su = (struct skill_unit *) target); } else return 0; @@ -1569,7 +1565,7 @@ int skill_blown (struct block_list *src, struct block_list *target, int count) } if (dx == 0 && dy == 0) { - int dir = battle_get_dir (target); + int dir = battle_get_dir(target); if (dir >= 0 && dir < 8) { dx = -dirx[dir]; @@ -1577,7 +1573,7 @@ int skill_blown (struct block_list *src, struct block_list *target, int count) } } - ret = path_blownpos (target->m, x, y, dx, dy, count & 0xffff); + ret = path_blownpos(target->m, x, y, dx, dy, count & 0xffff); nx = ret >> 16; ny = ret & 0xffff; moveblock = (x / BLOCK_SIZE != nx / BLOCK_SIZE @@ -1585,14 +1581,14 @@ int skill_blown (struct block_list *src, struct block_list *target, int count) if (count & 0x20000) { - battle_stopwalking (target, 1); + battle_stopwalking(target, 1); if (sd) { sd->to_x = nx; sd->to_y = ny; sd->walktimer = 1; - clif_walkok (sd); - clif_movechar (sd); + clif_walkok(sd); + clif_movechar(sd); } else if (md) { @@ -1600,49 +1596,49 @@ int skill_blown (struct block_list *src, struct block_list *target, int count) md->to_y = ny; prev_state = md->state.state; md->state.state = MS_WALK; - clif_fixmobpos (md); + clif_fixmobpos(md); } } else - battle_stopwalking (target, 2); + battle_stopwalking(target, 2); dx = nx - x; dy = ny - y; if (sd) /* 画面外に出たので消去 */ - map_foreachinmovearea (clif_pcoutsight, target->m, x - AREA_SIZE, + map_foreachinmovearea(clif_pcoutsight, target->m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, dx, dy, 0, sd); else if (md) - map_foreachinmovearea (clif_moboutsight, target->m, x - AREA_SIZE, + map_foreachinmovearea(clif_moboutsight, target->m, x - AREA_SIZE, y - AREA_SIZE, x + AREA_SIZE, y + AREA_SIZE, dx, dy, BL_PC, md); if (su) { - skill_unit_move_unit_group (su->group, target->m, dx, dy); + skill_unit_move_unit_group(su->group, target->m, dx, dy); } else { // struct status_change *sc_data=battle_get_sc_data(target); if (moveblock) - map_delblock (target); + map_delblock(target); target->x = nx; target->y = ny; if (moveblock) - map_addblock (target); + map_addblock(target); /*ダンス中にエフェクトは移動しないらしい - if(sc_data && sc_data[SC_DANCING].timer!=-1){ //対象がダンス中なのでエフェクトも移動 - struct skill_unit_group *sg=(struct skill_unit_group *)sc_data[SC_DANCING].val2; - if(sg) - skill_unit_move_unit_group(sg,target->m,dx,dy); - } + if (sc_data && sc_data[SC_DANCING].timer!=-1){ //対象がダンス中なのでエフェクトも移動 + struct skill_unit_group *sg= (struct skill_unit_group *)sc_data[SC_DANCING].val2; + if (sg) + skill_unit_move_unit_group(sg,target->m,dx,dy); + } */ } if (sd) { /* 画面内に入ってきたので表示 */ - map_foreachinmovearea (clif_pcinsight, target->m, nx - AREA_SIZE, + map_foreachinmovearea(clif_pcinsight, target->m, nx - AREA_SIZE, ny - AREA_SIZE, nx + AREA_SIZE, ny + AREA_SIZE, -dx, -dy, 0, sd); if (count & 0x20000) @@ -1650,14 +1646,14 @@ int skill_blown (struct block_list *src, struct block_list *target, int count) } else if (md) { - map_foreachinmovearea (clif_mobinsight, target->m, nx - AREA_SIZE, + map_foreachinmovearea(clif_mobinsight, target->m, nx - AREA_SIZE, ny - AREA_SIZE, nx + AREA_SIZE, ny + AREA_SIZE, -dx, -dy, BL_PC, md); if (count & 0x20000) md->state.state = prev_state; } - skill_unit_move (target, gettick (), (count & 0xffff) + 7); /* スキルユニットの判定 */ + skill_unit_move(target, gettick(), (count & 0xffff) + 7); /* スキルユニットの判定 */ return 0; } @@ -1666,45 +1662,45 @@ int skill_blown (struct block_list *src, struct block_list *target, int count) * ========================================================================= * スキル攻撃効果処理まとめ * flagの説明。16進図 - * 00XRTTff - * ff = magicで計算に渡される） - * TT = パケットのtype部分(0でデフォルト） + * 00XRTTff + * ff = magicで計算に渡される） + * TT = パケットのtype部分(0でデフォルト） * X = パケットのスキルLv - * R = 予約（skill_area_subで使用する） + * R = 予約（skill_area_subで使用する） *------------------------------------------------------------------------- */ -int skill_attack (int attack_type, struct block_list *src, +int skill_attack(int attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag) { struct Damage dmg; struct status_change *sc_data; - int type, lv, damage; + int type, lv, damage; rdamage = 0; - nullpo_retr (0, src); - nullpo_retr (0, dsrc); - nullpo_retr (0, bl); + nullpo_retr(0, src); + nullpo_retr(0, dsrc); + nullpo_retr(0, bl); - sc_data = battle_get_sc_data (bl); + sc_data = battle_get_sc_data(bl); //何もしない判定ここから if (dsrc->m != bl->m) //対象が同じマップにいなければ何もしない return 0; if (src->prev == NULL || dsrc->prev == NULL || bl->prev == NULL) //prevよくわからない※ return 0; - if (src->type == BL_PC && pc_isdead ((struct map_session_data *) src)) //術者？がPCですでに死んでいたら何もしない + if (src->type == BL_PC && pc_isdead((struct map_session_data *) src)) //術者？がPCですでに死んでいたら何もしない return 0; - if (dsrc->type == BL_PC && pc_isdead ((struct map_session_data *) dsrc)) //術者？がPCですでに死んでいたら何もしない + if (dsrc->type == BL_PC && pc_isdead((struct map_session_data *) dsrc)) //術者？がPCですでに死んでいたら何もしない return 0; - if (bl->type == BL_PC && pc_isdead ((struct map_session_data *) bl)) //対象がPCですでに死んでいたら何もしない + if (bl->type == BL_PC && pc_isdead((struct map_session_data *) bl)) //対象がPCですでに死んでいたら何もしない return 0; - if (skillnotok (skillid, (struct map_session_data *) bl)) + if (skillnotok(skillid, (struct map_session_data *) bl)) return 0; // [MouseJstr] if (sc_data && sc_data[SC_HIDING].timer != -1) { //ハイディング状態で - if (skill_get_pl (skillid) != 2) //スキルの属性が地属性でなければ何もしない + if (skill_get_pl(skillid) != 2) //スキルの属性が地属性でなければ何もしない return 0; } if (sc_data && sc_data[SC_TRICKDEAD].timer != -1) //死んだふり中は何もしない @@ -1725,7 +1721,7 @@ int skill_attack (int attack_type, struct block_list *src, type = -1; lv = (flag >> 20) & 0xf; - dmg = battle_calc_attack (attack_type, src, bl, skillid, skilllv, flag & 0xff); //ダメージ計算 + dmg = battle_calc_attack(attack_type, src, bl, skillid, skilllv, flag & 0xff); //ダメージ計算 //マジックロッド処理ここから if (attack_type & BF_MAGIC && sc_data && sc_data[SC_MAGICROD].timer != -1 @@ -1734,7 +1730,7 @@ int skill_attack (int attack_type, struct block_list *src, dmg.damage = dmg.damage2 = 0; //ダメージ0 if (bl->type == BL_PC) { //対象がPCの場合 - int sp = skill_get_sp (skillid, skilllv); //使用されたスキルのSPを吸収 + int sp = skill_get_sp(skillid, skilllv); //使用されたスキルのSPを吸収 sp = sp * sc_data[SC_MAGICROD].val2 / 100; //吸収率計算 if (skillid == WZ_WATERBALL && skilllv > 1) //ウォーターボールLv1以上 sp = sp / ((skilllv | 1) * (skilllv | 1)); //さらに計算？ @@ -1750,10 +1746,10 @@ int skill_attack (int attack_type, struct block_list *src, } else //回復SP+現在のSPがMSPより小さい場合は回復SPを加算 ((struct map_session_data *) bl)->status.sp += sp; - clif_heal (((struct map_session_data *) bl)->fd, SP_SP, sp); //SP回復エフェクトの表示 - ((struct map_session_data *) bl)->canact_tick = tick + skill_delayfix (bl, skill_get_delay (SA_MAGICROD, sc_data[SC_MAGICROD].val1)); // + clif_heal(((struct map_session_data *) bl)->fd, SP_SP, sp); //SP回復エフェクトの表示 + ((struct map_session_data *) bl)->canact_tick = tick + skill_delayfix(bl, skill_get_delay(SA_MAGICROD, sc_data[SC_MAGICROD].val1)); // } - clif_skill_nodamage (bl, bl, SA_MAGICROD, sc_data[SC_MAGICROD].val1, 1); //マジックロッドエフェクトを表示 + clif_skill_nodamage(bl, bl, SA_MAGICROD, sc_data[SC_MAGICROD].val1, 1); //マジックロッドエフェクトを表示 } //マジックロッド処理ここまで @@ -1780,79 +1776,79 @@ int skill_attack (int attack_type, struct block_list *src, if (src->type == BL_PC) { struct map_session_data *sd = (struct map_session_data *) src; - nullpo_retr (0, sd); + nullpo_retr(0, sd); //連打掌(MO_CHAINCOMBO)ここから if (skillid == MO_CHAINCOMBO) { - int delay = 1000 - 4 * battle_get_agi (src) - 2 * battle_get_dex (src); //基本ディレイの計算 - if (damage < battle_get_hp (bl)) + int delay = 1000 - 4 * battle_get_agi(src) - 2 * battle_get_dex(src); //基本ディレイの計算 + if (damage < battle_get_hp(bl)) { //ダメージが対象のHPより小さい場合 - if (pc_checkskill (sd, MO_COMBOFINISH) > 0 && sd->spiritball > 0) //猛龍拳(MO_COMBOFINISH)取得＆気球保持時は+300ms + if (pc_checkskill(sd, MO_COMBOFINISH) > 0 && sd->spiritball > 0) //猛龍拳(MO_COMBOFINISH)取得＆気球保持時は+300ms delay += 300 * battle_config.combo_delay_rate / 100; //追加ディレイをconfにより調整 - skill_status_change_start (src, SC_COMBO, MO_CHAINCOMBO, skilllv, 0, 0, delay, 0); //コンボ状態に + skill_status_change_start(src, SC_COMBO, MO_CHAINCOMBO, skilllv, 0, 0, delay, 0); //コンボ状態に } sd->attackabletime = sd->canmove_tick = tick + delay; - clif_combo_delay (src, delay); //コンボディレイパケットの送信 + clif_combo_delay(src, delay); //コンボディレイパケットの送信 } //連打掌(MO_CHAINCOMBO)ここまで //猛龍拳(MO_COMBOFINISH)ここから else if (skillid == MO_COMBOFINISH) { - int delay = - 700 - 4 * battle_get_agi (src) - 2 * battle_get_dex (src); - if (damage < battle_get_hp (bl)) + int delay = + 700 - 4 * battle_get_agi(src) - 2 * battle_get_dex(src); + if (damage < battle_get_hp(bl)) { //阿修羅覇凰拳(MO_EXTREMITYFIST)取得＆気球4個保持＆爆裂波動(MO_EXPLOSIONSPIRITS)状態時は+300ms //伏虎拳(CH_TIGERFIST)取得時も+300ms - if ((pc_checkskill (sd, MO_EXTREMITYFIST) > 0 + if ((pc_checkskill(sd, MO_EXTREMITYFIST) > 0 && sd->spiritball >= 4 && sd->sc_data[SC_EXPLOSIONSPIRITS].timer != -1) - || (pc_checkskill (sd, CH_TIGERFIST) > 0 + || (pc_checkskill(sd, CH_TIGERFIST) > 0 && sd->spiritball > 0) - || (pc_checkskill (sd, CH_CHAINCRUSH) > 0 + || (pc_checkskill(sd, CH_CHAINCRUSH) > 0 && sd->spiritball > 1)) delay += 300 * battle_config.combo_delay_rate / 100; //追加ディレイをconfにより調整 - skill_status_change_start (src, SC_COMBO, MO_COMBOFINISH, skilllv, 0, 0, delay, 0); //コンボ状態に + skill_status_change_start(src, SC_COMBO, MO_COMBOFINISH, skilllv, 0, 0, delay, 0); //コンボ状態に } sd->attackabletime = sd->canmove_tick = tick + delay; - clif_combo_delay (src, delay); //コンボディレイパケットの送信 + clif_combo_delay(src, delay); //コンボディレイパケットの送信 } //猛龍拳(MO_COMBOFINISH)ここまで //伏虎拳(CH_TIGERFIST)ここから else if (skillid == CH_TIGERFIST) { - int delay = - 1000 - 4 * battle_get_agi (src) - 2 * battle_get_dex (src); - if (damage < battle_get_hp (bl)) + int delay = + 1000 - 4 * battle_get_agi(src) - 2 * battle_get_dex(src); + if (damage < battle_get_hp(bl)) { - if (pc_checkskill (sd, CH_CHAINCRUSH) > 0) //連柱崩撃(CH_CHAINCRUSH)取得時は+300ms + if (pc_checkskill(sd, CH_CHAINCRUSH) > 0) //連柱崩撃(CH_CHAINCRUSH)取得時は+300ms delay += 300 * battle_config.combo_delay_rate / 100; //追加ディレイをconfにより調整 - skill_status_change_start (src, SC_COMBO, CH_TIGERFIST, skilllv, 0, 0, delay, 0); //コンボ状態に + skill_status_change_start(src, SC_COMBO, CH_TIGERFIST, skilllv, 0, 0, delay, 0); //コンボ状態に } sd->attackabletime = sd->canmove_tick = tick + delay; - clif_combo_delay (src, delay); //コンボディレイパケットの送信 + clif_combo_delay(src, delay); //コンボディレイパケットの送信 } //伏虎拳(CH_TIGERFIST)ここまで //連柱崩撃(CH_CHAINCRUSH)ここから else if (skillid == CH_CHAINCRUSH) { - int delay = - 1000 - 4 * battle_get_agi (src) - 2 * battle_get_dex (src); - if (damage < battle_get_hp (bl)) + int delay = + 1000 - 4 * battle_get_agi(src) - 2 * battle_get_dex(src); + if (damage < battle_get_hp(bl)) { //阿修羅覇凰拳(MO_EXTREMITYFIST)取得＆気球4個保持＆爆裂波動(MO_EXPLOSIONSPIRITS)状態時は+300ms - if (pc_checkskill (sd, MO_EXTREMITYFIST) > 0 + if (pc_checkskill(sd, MO_EXTREMITYFIST) > 0 && sd->spiritball >= 4 && sd->sc_data[SC_EXPLOSIONSPIRITS].timer != -1) delay += 300 * battle_config.combo_delay_rate / 100; //追加ディレイをconfにより調整 - skill_status_change_start (src, SC_COMBO, CH_CHAINCRUSH, skilllv, 0, 0, delay, 0); //コンボ状態に + skill_status_change_start(src, SC_COMBO, CH_CHAINCRUSH, skilllv, 0, 0, delay, 0); //コンボ状態に } sd->attackabletime = sd->canmove_tick = tick + delay; - clif_combo_delay (src, delay); //コンボディレイパケットの送信 + clif_combo_delay(src, delay); //コンボディレイパケットの送信 } //連柱崩撃(CH_CHAINCRUSH)ここまで } @@ -1880,7 +1876,7 @@ int skill_attack (int attack_type, struct block_list *src, if (bl->type == BL_PC) { //対象がPCの時 struct map_session_data *tsd = (struct map_session_data *) bl; - nullpo_retr (0, tsd); + nullpo_retr(0, tsd); if (tsd->short_weapon_damage_return > 0) { //近距離攻撃跳ね返し？※ rdamage += damage * tsd->short_weapon_damage_return / 100; @@ -1900,7 +1896,7 @@ int skill_attack (int attack_type, struct block_list *src, if (bl->type == BL_PC) { //対象がPCの時 struct map_session_data *tsd = (struct map_session_data *) bl; - nullpo_retr (0, tsd); + nullpo_retr(0, tsd); if (tsd->long_weapon_damage_return > 0) { //遠距離攻撃跳ね返し？※ rdamage += damage * tsd->long_weapon_damage_return / 100; @@ -1910,26 +1906,26 @@ int skill_attack (int attack_type, struct block_list *src, } } if (rdamage > 0) - clif_damage (src, src, tick, dmg.amotion, 0, rdamage, 1, 4, 0); + clif_damage(src, src, tick, dmg.amotion, 0, rdamage, 1, 4, 0); } //武器スキル？ここまで switch (skillid) { case WZ_SIGHTRASHER: - clif_skill_damage (src, bl, tick, dmg.amotion, dmg.dmotion, + clif_skill_damage(src, bl, tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skillid, (lv != 0) ? lv : skilllv, 5); break; case AS_SPLASHER: - clif_skill_damage (dsrc, bl, tick, dmg.amotion, dmg.dmotion, + clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skillid, -1, 5); break; case NPC_SELFDESTRUCTION: case NPC_SELFDESTRUCTION2: break; default: - clif_skill_damage (dsrc, bl, tick, dmg.amotion, dmg.dmotion, + clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skillid, (lv != 0) ? lv : skilllv, (skillid == 0) ? 5 : type); @@ -1937,76 +1933,76 @@ int skill_attack (int attack_type, struct block_list *src, if (dmg.blewcount > 0) { /* 吹き飛ばし処理とそのパケット */ if (skillid == WZ_SIGHTRASHER) - skill_blown (src, bl, dmg.blewcount); + skill_blown(src, bl, dmg.blewcount); else - skill_blown (dsrc, bl, dmg.blewcount); + skill_blown(dsrc, bl, dmg.blewcount); if (bl->type == BL_MOB) - clif_fixmobpos ((struct mob_data *) bl); + clif_fixmobpos((struct mob_data *) bl); else - clif_fixpos (bl); + clif_fixpos(bl); } - map_freeblock_lock (); + map_freeblock_lock(); /* 実際にダメージ処理を行う */ if (skillid != KN_BOWLINGBASH || flag) - battle_damage (src, bl, damage, 0); + battle_damage(src, bl, damage, 0); if (skillid == RG_INTIMIDATE && damage > 0 - && !(battle_get_mode (bl) & 0x20)) + && !(battle_get_mode(bl) & 0x20)) { - int s_lv = battle_get_lv (src), t_lv = battle_get_lv (bl); - int rate = 50 + skilllv * 5; + int s_lv = battle_get_lv(src), t_lv = battle_get_lv(bl); + int rate = 50 + skilllv * 5; rate = rate + (s_lv - t_lv); - if (MRAND (100) < rate) - skill_addtimerskill (src, tick + 800, bl->id, 0, 0, skillid, + if (MRAND(100) < rate) + skill_addtimerskill(src, tick + 800, bl->id, 0, 0, skillid, skilllv, 0, flag); } /* - if(damage > 0 && dmg.flag&BF_SKILL && bl->type==BL_PC && pc_checkskill((struct map_session_data *)bl,RG_PLAGIARISM)){ - struct map_session_data *tsd = (struct map_session_data *)bl; - nullpo_retr(0, tsd); - if(!tsd->status.skill[skillid].id && !tsd->status.skill[skillid].id - && !(skillid > NPC_PIERCINGATT && skillid < NPC_SUMMONMONSTER) ){ - //既に盗んでいるスキルがあれば該当スキルを消す - if (tsd->cloneskill_id && tsd->cloneskill_lv && tsd->status.skill[tsd->cloneskill_id].flag==13){ - tsd->status.skill[tsd->cloneskill_id].id=0; - tsd->status.skill[tsd->cloneskill_id].lv=0; - tsd->status.skill[tsd->cloneskill_id].flag=0; - } - tsd->cloneskill_id=skillid; - tsd->cloneskill_lv=skilllv; - tsd->status.skill[skillid].id=skillid; - tsd->status.skill[skillid].lv=(pc_checkskill(tsd,RG_PLAGIARISM) > skill_get_max(skillid))? - skill_get_max(skillid):pc_checkskill(tsd,RG_PLAGIARISM); - tsd->status.skill[skillid].flag=13;//cloneskill flag - clif_skillinfoblock(tsd); - } - } + if (damage > 0 && dmg.flag&BF_SKILL && bl->type==BL_PC && pc_checkskill((struct map_session_data *)bl,RG_PLAGIARISM)){ + struct map_session_data *tsd = (struct map_session_data *)bl; + nullpo_retr(0, tsd); + if (!tsd->status.skill[skillid].id && !tsd->status.skill[skillid].id + && !(skillid > NPC_PIERCINGATT && skillid < NPC_SUMMONMONSTER) ){ + //既に盗んでいるスキルがあれば該当スキルを消す + if (tsd->cloneskill_id && tsd->cloneskill_lv && tsd->status.skill[tsd->cloneskill_id].flag==13){ + tsd->status.skill[tsd->cloneskill_id].id=0; + tsd->status.skill[tsd->cloneskill_id].lv=0; + tsd->status.skill[tsd->cloneskill_id].flag=0; + } + tsd->cloneskill_id=skillid; + tsd->cloneskill_lv=skilllv; + tsd->status.skill[skillid].id=skillid; + tsd->status.skill[skillid].lv= (pc_checkskill(tsd,RG_PLAGIARISM) > skill_get_max(skillid))? + skill_get_max(skillid):pc_checkskill(tsd,RG_PLAGIARISM); + tsd->status.skill[skillid].flag=13;//cloneskill flag + clif_skillinfoblock(tsd); + } + } */ /* ダメージがあるなら追加効果判定 */ if (bl->prev != NULL) { struct map_session_data *sd = (struct map_session_data *) bl; - nullpo_retr (0, sd); - if (bl->type != BL_PC || (sd && !pc_isdead (sd))) + nullpo_retr(0, sd); + if (bl->type != BL_PC || (sd && !pc_isdead(sd))) { if (damage > 0) - skill_additional_effect (src, bl, skillid, skilllv, + skill_additional_effect(src, bl, skillid, skilllv, attack_type, tick); if (bl->type == BL_MOB && src != bl) /* スキル使用条件のMOBスキル */ { struct mob_data *md = (struct mob_data *) bl; - nullpo_retr (0, md); + nullpo_retr(0, md); if (battle_config.mob_changetarget_byskill == 1) { - int target; + int target; target = md->target_id; if (src->type == BL_PC) md->target_id = src->id; - mobskill_use (md, tick, MSC_SKILLUSED | (skillid << 16)); + mobskill_use(md, tick, MSC_SKILLUSED | (skillid << 16)); md->target_id = target; } else - mobskill_use (md, tick, MSC_SKILLUSED | (skillid << 16)); + mobskill_use(md, tick, MSC_SKILLUSED | (skillid << 16)); } } } @@ -2015,46 +2011,46 @@ int skill_attack (int attack_type, struct block_list *src, && damage > 0) { struct map_session_data *sd = (struct map_session_data *) src; - int hp = 0, sp = 0; - nullpo_retr (0, sd); + int hp = 0, sp = 0; + nullpo_retr(0, sd); if (sd->hp_drain_rate && dmg.damage > 0 - && MRAND (100) < sd->hp_drain_rate) + && MRAND(100) < sd->hp_drain_rate) { hp += (dmg.damage * sd->hp_drain_per) / 100; } if (sd->hp_drain_rate_ && dmg.damage2 > 0 - && MRAND (100) < sd->hp_drain_rate_) + && MRAND(100) < sd->hp_drain_rate_) { hp += (dmg.damage2 * sd->hp_drain_per_) / 100; } if (sd->sp_drain_rate > 0 && dmg.damage > 0 - && MRAND (100) < sd->sp_drain_rate) + && MRAND(100) < sd->sp_drain_rate) { sp += (dmg.damage * sd->sp_drain_per) / 100; } if (sd->sp_drain_rate_ > 0 && dmg.damage2 > 0 - && MRAND (100) < sd->sp_drain_rate_) + && MRAND(100) < sd->sp_drain_rate_) { sp += (dmg.damage2 * sd->sp_drain_per_) / 100; } if (hp || sp) - pc_heal (sd, hp, sp); + pc_heal(sd, hp, sp); } if ((skillid != KN_BOWLINGBASH || flag) && rdamage > 0) - battle_damage (bl, src, rdamage, 0); + battle_damage(bl, src, rdamage, 0); if (attack_type & BF_WEAPON && sc_data && sc_data[SC_AUTOCOUNTER].timer != -1 && sc_data[SC_AUTOCOUNTER].val4 > 0) { if (sc_data[SC_AUTOCOUNTER].val3 == dsrc->id) - battle_weapon_attack (bl, dsrc, tick, + battle_weapon_attack(bl, dsrc, tick, 0x8000 | sc_data[SC_AUTOCOUNTER].val1); - skill_status_change_end (bl, SC_AUTOCOUNTER, -1); + skill_status_change_end(bl, SC_AUTOCOUNTER, -1); } - map_freeblock_unlock (); + map_freeblock_unlock(); return (dmg.damage + dmg.damage2); /* 与ダメを返す */ } @@ -2063,51 +2059,51 @@ int skill_attack (int attack_type, struct block_list *src, * スキル範囲攻撃用(map_foreachinareaから呼ばれる) * flagについて：16進図を確認 * MSB <- 00fTffff ->LSB - * T =ターゲット選択用(BCT_*) + * T =ターゲット選択用(BCT_*) * ffff=自由に使用可能 - * 0 =予約。0に固定 + * 0 =予約。0に固定 *------------------------------------------ */ static int skill_area_temp[8]; /* 一時変数。必要なら使う。 */ -typedef int (*SkillFunc) (struct block_list *, struct block_list *, int, int, +typedef int(*SkillFunc)(struct block_list *, struct block_list *, int, int, unsigned int, int); static -void skill_area_sub (struct block_list *bl, va_list ap) +void skill_area_sub(struct block_list *bl, va_list ap) { struct block_list *src; - int skill_id, skill_lv, flag; + int skill_id, skill_lv, flag; unsigned int tick; SkillFunc func; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); if (bl->type != BL_PC && bl->type != BL_MOB && bl->type != BL_SKILL) return; - src = va_arg (ap, struct block_list *); //ここではsrcの値を参照していないのでNULLチェックはしない - skill_id = va_arg (ap, int); - skill_lv = va_arg (ap, int); - tick = va_arg (ap, unsigned int); - flag = va_arg (ap, int); - func = va_arg (ap, SkillFunc); + src = va_arg(ap, struct block_list *); //ここではsrcの値を参照していないのでNULLチェックはしない + skill_id = va_arg(ap, int); + skill_lv = va_arg(ap, int); + tick = va_arg(ap, unsigned int); + flag = va_arg(ap, int); + func = va_arg(ap, SkillFunc); - if (battle_check_target (src, bl, flag) > 0) - func (src, bl, skill_id, skill_lv, tick, flag); + if (battle_check_target(src, bl, flag) > 0) + func(src, bl, skill_id, skill_lv, tick, flag); } static -void skill_check_unit_range_sub (struct block_list *bl, va_list ap) +void skill_check_unit_range_sub(struct block_list *bl, va_list ap) { struct skill_unit *unit; int *c, x, y, range, sx[4], sy[4]; - int t_range, tx[4], ty[4]; - int i, r_flag, skillid; + int t_range, tx[4], ty[4]; + int i, r_flag, skillid; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (unit = (struct skill_unit *) bl); - nullpo_retv (c = va_arg (ap, int *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(unit = (struct skill_unit *) bl); + nullpo_retv(c = va_arg(ap, int *)); if (bl->prev == NULL || bl->type != BL_SKILL) return; @@ -2115,10 +2111,10 @@ void skill_check_unit_range_sub (struct block_list *bl, va_list ap) if (!unit->alive) return; - x = va_arg (ap, int); - y = va_arg (ap, int); - range = va_arg (ap, int); - skillid = va_arg (ap, int); + x = va_arg(ap, int); + y = va_arg(ap, int); + range = va_arg(ap, int); + skillid = va_arg(ap, int); if (skillid == MG_SAFETYWALL || skillid == AL_PNEUMA) { @@ -2173,39 +2169,39 @@ void skill_check_unit_range_sub (struct block_list *bl, va_list ap) (*c)++; } -int skill_check_unit_range (int m, int x, int y, int range, int skillid) +int skill_check_unit_range(int m, int x, int y, int range, int skillid) { - int c = 0; + int c = 0; - map_foreachinarea (skill_check_unit_range_sub, m, x - 10, y - 10, x + 10, + map_foreachinarea(skill_check_unit_range_sub, m, x - 10, y - 10, x + 10, y + 10, BL_SKILL, &c, x, y, range, skillid); return c; } static -void skill_check_unit_range2_sub (struct block_list *bl, va_list ap) +void skill_check_unit_range2_sub(struct block_list *bl, va_list ap) { int *c; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (c = va_arg (ap, int *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(c = va_arg(ap, int *)); if (bl->prev == NULL || (bl->type != BL_PC && bl->type != BL_MOB)) return; - if (bl->type == BL_PC && pc_isdead ((struct map_session_data *) bl)) + if (bl->type == BL_PC && pc_isdead((struct map_session_data *) bl)) return; (*c)++; } -int skill_check_unit_range2 (int m, int x, int y, int range) +int skill_check_unit_range2(int m, int x, int y, int range) { - int c = 0; + int c = 0; - map_foreachinarea (skill_check_unit_range2_sub, m, x - range, y - range, + map_foreachinarea(skill_check_unit_range2_sub, m, x - range, y - range, x + range, y + range, 0, &c); return c; @@ -2216,7 +2212,7 @@ int skill_check_unit_range2 (int m, int x, int y, int range) */ /* 対象の数をカウントする。（skill_area_temp[0]を初期化しておくこと） */ static -int skill_area_sub_count (struct block_list *src, struct block_list *target, +int skill_area_sub_count(struct block_list *src, struct block_list *target, int skillid, int skilllv, unsigned int tick, int flag) { @@ -2229,40 +2225,40 @@ int skill_area_sub_count (struct block_list *src, struct block_list *target, * *------------------------------------------ */ -static void skill_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +static void skill_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct map_session_data *sd = NULL; struct mob_data *md = NULL; - struct block_list *src = map_id2bl (id), *target; + struct block_list *src = map_id2bl(id), *target; struct skill_timerskill *skl = NULL; - int range; + int range; - nullpo_retv (src); + nullpo_retv(src); if (src->prev == NULL) return; if (src->type == BL_PC) { - nullpo_retv (sd = (struct map_session_data *) src); + nullpo_retv(sd = (struct map_session_data *) src); skl = &sd->skilltimerskill[data]; } else if (src->type == BL_MOB) { - nullpo_retv (md = (struct mob_data *) src); + nullpo_retv(md = (struct mob_data *) src); skl = &md->skilltimerskill[data]; } else return; - nullpo_retv (skl); + nullpo_retv(skl); skl->timer = -1; if (skl->target_id) { struct block_list tbl; - target = map_id2bl (skl->target_id); + target = map_id2bl(skl->target_id); if (skl->skill_id == RG_INTIMIDATE) { if (target == NULL) @@ -2279,30 +2275,30 @@ static void skill_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_ return; if (src->m != target->m) return; - if (sd && pc_isdead (sd)) + if (sd && pc_isdead(sd)) return; if (target->type == BL_PC - && pc_isdead ((struct map_session_data *) target) + && pc_isdead((struct map_session_data *) target) && skl->skill_id != RG_INTIMIDATE) return; switch (skl->skill_id) { case TF_BACKSLIDING: - clif_skill_nodamage (src, src, skl->skill_id, skl->skill_lv, + clif_skill_nodamage(src, src, skl->skill_id, skl->skill_lv, 1); break; case RG_INTIMIDATE: if (sd && !map[src->m].flag.noteleport) { - int x, y, i, j, c; - pc_randomwarp (sd, 3); + int x, y, i, j, c; + pc_randomwarp(sd, 3); for (i = 0; i < 16; i++) { - j = MRAND (8); + j = MRAND(8); x = sd->bl.x + dirx[j]; y = sd->bl.y + diry[j]; - if ((c = map_getcell (sd->bl.m, x, y)) != 1 && c != 5) + if ((c = map_getcell(sd->bl.m, x, y)) != 1 && c != 5) break; } if (i >= 16) @@ -2313,25 +2309,25 @@ static void skill_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_ if (target->prev != NULL) { if (target->type == BL_PC - && !pc_isdead ((struct map_session_data *) + && !pc_isdead((struct map_session_data *) target)) - pc_setpos ((struct map_session_data *) target, + pc_setpos((struct map_session_data *) target, map[sd->bl.m].name, x, y, 3); else if (target->type == BL_MOB) - mob_warp ((struct mob_data *) target, -1, x, y, + mob_warp((struct mob_data *) target, -1, x, y, 3); } } else if (md && !map[src->m].flag.monster_noteleport) { - int x, y, i, j, c; - mob_warp (md, -1, -1, -1, 3); + int x, y, i, j, c; + mob_warp(md, -1, -1, -1, 3); for (i = 0; i < 16; i++) { - j = MRAND (8); + j = MRAND(8); x = md->bl.x + dirx[j]; y = md->bl.y + diry[j]; - if ((c = map_getcell (md->bl.m, x, y)) != 1 && c != 5) + if ((c = map_getcell(md->bl.m, x, y)) != 1 && c != 5) break; } if (i >= 16) @@ -2342,12 +2338,12 @@ static void skill_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_ if (target->prev != NULL) { if (target->type == BL_PC - && !pc_isdead ((struct map_session_data *) + && !pc_isdead((struct map_session_data *) target)) - pc_setpos ((struct map_session_data *) target, + pc_setpos((struct map_session_data *) target, map[md->bl.m].name, x, y, 3); else if (target->type == BL_MOB) - mob_warp ((struct mob_data *) target, -1, x, y, + mob_warp((struct mob_data *) target, -1, x, y, 3); } } @@ -2356,14 +2352,14 @@ static void skill_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_ case BA_FROSTJOKE: /* 寒いジョーク */ case DC_SCREAM: /* スクリーム */ range = 15; //視界全体 - map_foreachinarea (skill_frostjoke_scream, src->m, + map_foreachinarea(skill_frostjoke_scream, src->m, src->x - range, src->y - range, src->x + range, src->y + range, 0, src, skl->skill_id, skl->skill_lv, tick); break; default: - skill_attack (skl->type, src, src, target, skl->skill_id, + skill_attack(skl->type, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag); break; } @@ -2377,14 +2373,14 @@ static void skill_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_ case WZ_METEOR: if (skl->type >= 0) { - skill_unitsetting (src, skl->skill_id, skl->skill_lv, + skill_unitsetting(src, skl->skill_id, skl->skill_lv, skl->type >> 16, skl->type & 0xFFFF, 0); - clif_skill_poseffect (src, skl->skill_id, skl->skill_lv, + clif_skill_poseffect(src, skl->skill_id, skl->skill_lv, skl->x, skl->y, tick); } else - skill_unitsetting (src, skl->skill_id, skl->skill_lv, + skill_unitsetting(src, skl->skill_id, skl->skill_lv, skl->x, skl->y, 0); break; } @@ -2395,24 +2391,24 @@ static void skill_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_ * *------------------------------------------ */ -int skill_addtimerskill (struct block_list *src, unsigned int tick, +int skill_addtimerskill(struct block_list *src, unsigned int tick, int target, int x, int y, int skill_id, int skill_lv, int type, int flag) { - int i; + int i; - nullpo_retr (1, src); + nullpo_retr(1, src); if (src->type == BL_PC) { struct map_session_data *sd = (struct map_session_data *) src; - nullpo_retr (1, sd); + nullpo_retr(1, sd); for (i = 0; i < MAX_SKILLTIMERSKILL; i++) { if (sd->skilltimerskill[i].timer == -1) { sd->skilltimerskill[i].timer = - add_timer (tick, skill_timer, src->id, i); + add_timer(tick, skill_timer, src->id, i); sd->skilltimerskill[i].src_id = src->id; sd->skilltimerskill[i].target_id = target; sd->skilltimerskill[i].skill_id = skill_id; @@ -2431,13 +2427,13 @@ int skill_addtimerskill (struct block_list *src, unsigned int tick, else if (src->type == BL_MOB) { struct mob_data *md = (struct mob_data *) src; - nullpo_retr (1, md); + nullpo_retr(1, md); for (i = 0; i < MAX_MOBSKILLTIMERSKILL; i++) { if (md->skilltimerskill[i].timer == -1) { md->skilltimerskill[i].timer = - add_timer (tick, skill_timer, src->id, i); + add_timer(tick, skill_timer, src->id, i); md->skilltimerskill[i].src_id = src->id; md->skilltimerskill[i].target_id = target; md->skilltimerskill[i].skill_id = skill_id; @@ -2461,21 +2457,21 @@ int skill_addtimerskill (struct block_list *src, unsigned int tick, * *------------------------------------------ */ -int skill_cleartimerskill (struct block_list *src) +int skill_cleartimerskill(struct block_list *src) { - int i; + int i; - nullpo_retr (0, src); + nullpo_retr(0, src); if (src->type == BL_PC) { struct map_session_data *sd = (struct map_session_data *) src; - nullpo_retr (0, sd); + nullpo_retr(0, sd); for (i = 0; i < MAX_SKILLTIMERSKILL; i++) { if (sd->skilltimerskill[i].timer != -1) { - delete_timer (sd->skilltimerskill[i].timer, skill_timer); + delete_timer(sd->skilltimerskill[i].timer, skill_timer); sd->skilltimerskill[i].timer = -1; } } @@ -2483,12 +2479,12 @@ int skill_cleartimerskill (struct block_list *src) else if (src->type == BL_MOB) { struct mob_data *md = (struct mob_data *) src; - nullpo_retr (0, md); + nullpo_retr(0, md); for (i = 0; i < MAX_MOBSKILLTIMERSKILL; i++) { if (md->skilltimerskill[i].timer != -1) { - delete_timer (md->skilltimerskill[i].timer, skill_timer); + delete_timer(md->skilltimerskill[i].timer, skill_timer); md->skilltimerskill[i].timer = -1; } } @@ -2506,27 +2502,27 @@ int skill_cleartimerskill (struct block_list *src) * （スパゲッティに向けて１歩前進！(ダメポ)） *------------------------------------------ */ -int skill_castend_damage_id (struct block_list *src, struct block_list *bl, +int skill_castend_damage_id(struct block_list *src, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag) { struct map_session_data *sd = NULL; - nullpo_retr (1, src); - nullpo_retr (1, bl); + nullpo_retr(1, src); + nullpo_retr(1, bl); if (src->type == BL_PC) sd = (struct map_session_data *) src; - if (sd && pc_isdead (sd)) + if (sd && pc_isdead(sd)) return 1; if ((skillid == WZ_SIGHTRASHER || skillid == CR_GRANDCROSS) && src != bl) bl = src; if (bl->prev == NULL) return 1; - if (bl->type == BL_PC && pc_isdead ((struct map_session_data *) bl)) + if (bl->type == BL_PC && pc_isdead((struct map_session_data *) bl)) return 1; - map_freeblock_lock (); + map_freeblock_lock(); switch (skillid) { /* 武器攻撃系スキル */ @@ -2587,119 +2583,119 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, case CG_ARROWVULCAN: /* アローバルカン */ case ASC_BREAKER: /* ソウルブレーカー */ case HW_MAGICCRASHER: /* マジッククラッシャー */ - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); break; case NPC_DARKBREATH: - clif_emotion (src, 7); - skill_attack (BF_MISC, src, src, bl, skillid, skilllv, tick, + clif_emotion(src, 7); + skill_attack(BF_MISC, src, src, bl, skillid, skilllv, tick, flag); break; case MO_INVESTIGATE: /* 発勁 */ { - struct status_change *sc_data = battle_get_sc_data (src); - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + struct status_change *sc_data = battle_get_sc_data(src); + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); if (sc_data[SC_BLADESTOP].timer != -1) - skill_status_change_end (src, SC_BLADESTOP, -1); + skill_status_change_end(src, SC_BLADESTOP, -1); } break; case SN_FALCONASSAULT: /* ファルコンアサルト */ - skill_attack (BF_MISC, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_MISC, src, src, bl, skillid, skilllv, tick, flag); break; case KN_BRANDISHSPEAR: /* ブランディッシュスピア */ { struct mob_data *md = (struct mob_data *) bl; - nullpo_retr (1, md); - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + nullpo_retr(1, md); + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); if (md->hp > 0) { - skill_blown (src, bl, skill_get_blewcount (skillid, skilllv)); + skill_blown(src, bl, skill_get_blewcount(skillid, skilllv)); if (bl->type == BL_MOB) - clif_fixmobpos ((struct mob_data *) bl); + clif_fixmobpos((struct mob_data *) bl); else - clif_fixpos (bl); + clif_fixpos(bl); } } break; case RG_BACKSTAP: /* バックスタブ */ { - int dir = map_calc_dir (src, bl->x, bl->y), t_dir = - battle_get_dir (bl); - int dist = distance (src->x, src->y, bl->x, bl->y); - if ((dist > 0 && !map_check_dir (dir, t_dir)) + int dir = map_calc_dir(src, bl->x, bl->y), t_dir = + battle_get_dir(bl); + int dist = distance(src->x, src->y, bl->x, bl->y); + if ((dist > 0 && !map_check_dir(dir, t_dir)) || bl->type == BL_SKILL) { - struct status_change *sc_data = battle_get_sc_data (src); + struct status_change *sc_data = battle_get_sc_data(src); if (sc_data && sc_data[SC_HIDING].timer != -1) - skill_status_change_end (src, SC_HIDING, -1); // ハイディング解除 - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_status_change_end(src, SC_HIDING, -1); // ハイディング解除 + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); - skill_blown (src, bl, skill_get_blewcount (skillid, skilllv)); + skill_blown(src, bl, skill_get_blewcount(skillid, skilllv)); } else if (src->type == BL_PC) - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); } break; case AM_ACIDTERROR: /* アシッドテラー */ - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); if (bl->type == BL_PC - && MRAND (100) < skill_get_time (skillid, skilllv) + && MRAND(100) < skill_get_time(skillid, skilllv) && battle_config.equipment_breaking) - pc_breakarmor ((struct map_session_data *) bl); + pc_breakarmor((struct map_session_data *) bl); break; case MO_FINGEROFFENSIVE: /* 指弾 */ { - struct status_change *sc_data = battle_get_sc_data (src); + struct status_change *sc_data = battle_get_sc_data(src); if (!battle_config.finger_offensive_type) - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); else { - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); if (sd) { for (int i = 1; i < sd->spiritball_old; i++) - skill_addtimerskill (src, tick + i * 200, bl->id, 0, + skill_addtimerskill(src, tick + i * 200, bl->id, 0, 0, skillid, skilllv, BF_WEAPON, flag); sd->canmove_tick = tick + (sd->spiritball_old - 1) * 200; } } if (sc_data && sc_data[SC_BLADESTOP].timer != -1) - skill_status_change_end (src, SC_BLADESTOP, -1); + skill_status_change_end(src, SC_BLADESTOP, -1); } break; case MO_CHAINCOMBO: /* 連打掌 */ { - struct status_change *sc_data = battle_get_sc_data (src); - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + struct status_change *sc_data = battle_get_sc_data(src); + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); if (sc_data && sc_data[SC_BLADESTOP].timer != -1) - skill_status_change_end (src, SC_BLADESTOP, -1); + skill_status_change_end(src, SC_BLADESTOP, -1); } break; case MO_COMBOFINISH: /* 猛龍拳 */ case CH_TIGERFIST: /* 伏虎拳 */ case CH_CHAINCRUSH: /* 連柱崩撃 */ case CH_PALMSTRIKE: /* 猛虎硬派山 */ - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); break; case MO_EXTREMITYFIST: /* 阿修羅覇鳳拳 */ { - struct status_change *sc_data = battle_get_sc_data (src); + struct status_change *sc_data = battle_get_sc_data(src); if (sd) { struct walkpath_data wpd; - int dx, dy; + int dx, dy; dx = bl->x - sd->bl.x; dy = bl->y - sd->bl.y; @@ -2713,26 +2709,24 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, dy--; if (dx == 0 && dy == 0) dx++; - if (path_search - (&wpd, src->m, sd->bl.x, sd->bl.y, sd->bl.x + dx, + if (path_search(&wpd, src->m, sd->bl.x, sd->bl.y, sd->bl.x + dx, sd->bl.y + dy, 1) == -1) { dx = bl->x - sd->bl.x; dy = bl->y - sd->bl.y; - if (path_search - (&wpd, src->m, sd->bl.x, sd->bl.y, sd->bl.x + dx, + if (path_search(&wpd, src->m, sd->bl.x, sd->bl.y, sd->bl.x + dx, sd->bl.y + dy, 1) == -1) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); break; } } sd->to_x = sd->bl.x + dx; sd->to_y = sd->bl.y + dy; - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); - clif_walkok (sd); - clif_movechar (sd); + clif_walkok(sd); + clif_movechar(sd); if (dx < 0) dx = -dx; if (dy < 0) @@ -2741,15 +2735,15 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, tick + 100 + sd->speed * ((dx > dy) ? dx : dy); if (sd->canact_tick < sd->canmove_tick) sd->canact_tick = sd->canmove_tick; - pc_movepos (sd, sd->to_x, sd->to_y); - skill_status_change_end (&sd->bl, SC_COMBO, -1); + pc_movepos(sd, sd->to_x, sd->to_y); + skill_status_change_end(&sd->bl, SC_COMBO, -1); } else - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag); - skill_status_change_end (src, SC_EXPLOSIONSPIRITS, -1); + skill_status_change_end(src, SC_EXPLOSIONSPIRITS, -1); if (sc_data && sc_data[SC_BLADESTOP].timer != -1) - skill_status_change_end (src, SC_BLADESTOP, -1); + skill_status_change_end(src, SC_BLADESTOP, -1); } break; /* 武器系範囲攻撃スキル */ @@ -2765,21 +2759,21 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, /* 個別にダメージを与える */ if (bl->id != skill_area_temp[1]) { - int dist = 0; + int dist = 0; if (skillid == SM_MAGNUM) { /* マグナムブレイクなら中心からの距離を計算 */ - int dx = abs (bl->x - skill_area_temp[2]); - int dy = abs (bl->y - skill_area_temp[3]); + int dx = abs(bl->x - skill_area_temp[2]); + int dy = abs(bl->y - skill_area_temp[3]); dist = ((dx > dy) ? dx : dy); } - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, 0x0500 | dist); } } else { - int ar = 1; - int x = bl->x, y = bl->y; + int ar = 1; + int x = bl->x, y = bl->y; if (skillid == SM_MAGNUM) { x = src->x; @@ -2795,10 +2789,10 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, skill_area_temp[2] = x; skill_area_temp[3] = y; /* まずターゲットに攻撃を加える */ - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, 0); /* その後ターゲット以外の範囲内の敵全体に処理を行う */ - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, x - ar, y - ar, x + ar, y + ar, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, @@ -2811,29 +2805,29 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, { /* 個別にダメージを与える */ if (bl->id != skill_area_temp[1]) - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, 0x0500); } else { - int damage; - map_freeblock_lock (); + int damage; + map_freeblock_lock(); damage = - skill_attack (BF_WEAPON, src, src, bl, skillid, skilllv, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, 0); if (damage > 0) { - int i, c; /* 他人から聞いた動きなので間違ってる可能性大＆効率が悪いっす＞＜ */ - c = skill_get_blewcount (skillid, skilllv); + int i, c; /* 他人から聞いた動きなので間違ってる可能性大＆効率が悪いっす＞＜ */ + c = skill_get_blewcount(skillid, skilllv); for (i = 0; i < c; i++) { - skill_blown (src, bl, 1); + skill_blown(src, bl, 1); if (bl->type == BL_MOB) - clif_fixmobpos ((struct mob_data *) bl); + clif_fixmobpos((struct mob_data *) bl); else - clif_fixpos (bl); + clif_fixpos(bl); skill_area_temp[0] = 0; - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - 1, bl->y - 1, bl->x + 1, bl->y + 1, 0, src, skillid, skilllv, tick, @@ -2846,29 +2840,29 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, skill_area_temp[2] = bl->x; skill_area_temp[3] = bl->y; /* その後ターゲット以外の範囲内の敵全体に処理を行う */ - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - 1, bl->y - 1, bl->x + 1, bl->y + 1, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, skill_castend_damage_id); - battle_damage (src, bl, damage, 1); + battle_damage(src, bl, damage, 1); if (rdamage > 0) - battle_damage (bl, src, rdamage, 0); + battle_damage(bl, src, rdamage, 0); } - map_freeblock_unlock (); + map_freeblock_unlock(); } break; case ALL_RESURRECTION: /* リザレクション */ case PR_TURNUNDEAD: /* ターンアンデッド */ if (bl->type != BL_PC - && battle_check_undead (battle_get_race (bl), - battle_get_elem_type (bl))) - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, tick, + && battle_check_undead(battle_get_race(bl), + battle_get_elem_type(bl))) + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, flag); else { - map_freeblock_unlock (); + map_freeblock_unlock(); return 1; } break; @@ -2885,21 +2879,21 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, case WZ_JUPITEL: /* ユピテルサンダー */ case NPC_MAGICALATTACK: /* MOB:魔法打撃攻撃 */ case PR_ASPERSIO: /* アスペルシオ */ - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, flag); break; case WZ_WATERBALL: /* ウォーターボール */ - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, flag); if (skilllv > 1) - skill_status_change_start (src, SC_WATERBALL, skilllv, bl->id, + skill_status_change_start(src, SC_WATERBALL, skilllv, bl->id, 0, 0, 0, 0); break; case PR_BENEDICTIO: /* 聖体降福 */ - if (battle_get_race (bl) == 1 || battle_get_race (bl) == 6) - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, tick, + if (battle_get_race(bl) == 1 || battle_get_race(bl) == 6) + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, flag); break; @@ -2913,22 +2907,22 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, { if (skillid == MG_FIREBALL) { /* ファイヤーボールなら中心からの距離を計算 */ - int dx = abs (bl->x - skill_area_temp[2]); - int dy = abs (bl->y - skill_area_temp[3]); + int dx = abs(bl->x - skill_area_temp[2]); + int dy = abs(bl->y - skill_area_temp[3]); skill_area_temp[0] = ((dx > dy) ? dx : dy); } - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, skill_area_temp[0] | 0x0500); } } else { - int ar = (skillid == MG_NAPALMBEAT) ? 1 : 2; + int ar = (skillid == MG_NAPALMBEAT) ? 1 : 2; skill_area_temp[1] = bl->id; if (skillid == MG_NAPALMBEAT) { /* ナパームでは先に数える */ skill_area_temp[0] = 0; - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - 1, bl->y - 1, bl->x + 1, bl->y + 1, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY, @@ -2941,10 +2935,10 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, skill_area_temp[3] = bl->y; } /* まずターゲットに攻撃を加える */ - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, skill_area_temp[0]); /* その後ターゲット以外の範囲内の敵全体に処理を行う */ - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - ar, bl->y - ar, bl->x + ar, bl->y + ar, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, @@ -2957,18 +2951,18 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, { if (bl->id != skill_area_temp[1]) { - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, skill_area_temp[0]); } } else { - int ar = (skillid == HW_NAPALMVULCAN) ? 1 : 2; + int ar = (skillid == HW_NAPALMVULCAN) ? 1 : 2; skill_area_temp[1] = bl->id; if (skillid == HW_NAPALMVULCAN) { skill_area_temp[0] = 0; - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - 1, bl->y - 1, bl->x + 1, bl->y + 1, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY, @@ -2980,9 +2974,9 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, skill_area_temp[2] = bl->x; skill_area_temp[3] = bl->y; } - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, skill_area_temp[0]); - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - ar, bl->y - ar, bl->x + ar, bl->y + ar, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, @@ -2991,15 +2985,15 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, break; case WZ_FROSTNOVA: /* フロストノヴァ */ - skill_castend_pos2 (src, bl->x, bl->y, skillid, skilllv, tick, 0); - skill_attack (BF_MAGIC, src, src, bl, skillid, skilllv, tick, + skill_castend_pos2(src, bl->x, bl->y, skillid, skilllv, tick, 0); + skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, flag); break; case WZ_SIGHTRASHER: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_castend_pos2 (src, bl->x, bl->y, skillid, skilllv, tick, 0); - skill_status_change_end (src, SC_SIGHT, -1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_castend_pos2(src, bl->x, bl->y, skillid, skilllv, tick, 0); + skill_status_change_end(src, SC_SIGHT, -1); break; /* その他 */ @@ -3008,7 +3002,7 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, { /* 個別にダメージを与える */ if (bl->id != skill_area_temp[1]) - skill_attack (BF_MISC, src, src, bl, skillid, skilllv, + skill_attack(BF_MISC, src, src, bl, skillid, skilllv, tick, skill_area_temp[0] | (flag & 0xf00000)); } @@ -3017,16 +3011,16 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, skill_area_temp[0] = 0; skill_area_temp[1] = bl->id; if (flag & 0xf00000) - map_foreachinarea (skill_area_sub, bl->m, bl->x - 1, + map_foreachinarea(skill_area_sub, bl->m, bl->x - 1, bl->y - 1, bl->x + 1, bl->y + 1, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY, skill_area_sub_count); /* まずターゲットに攻撃を加える */ - skill_attack (BF_MISC, src, src, bl, skillid, skilllv, tick, + skill_attack(BF_MISC, src, src, bl, skillid, skilllv, tick, skill_area_temp[0] | (flag & 0xf00000)); /* その後ターゲット以外の範囲内の敵全体に処理を行う */ - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - 1, bl->y - 1, bl->x + 1, bl->y + 1, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, @@ -3036,16 +3030,16 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, case CR_GRANDCROSS: /* グランドクロス */ /* スキルユニット配置 */ - skill_castend_pos2 (src, bl->x, bl->y, skillid, skilllv, tick, 0); + skill_castend_pos2(src, bl->x, bl->y, skillid, skilllv, tick, 0); if (sd) sd->canmove_tick = tick + 1000; else if (src->type == BL_MOB) - mob_changestate ((struct mob_data *) src, MS_DELAY, 1000); + mob_changestate((struct mob_data *) src, MS_DELAY, 1000); break; case TF_THROWSTONE: /* 石投げ */ case NPC_SMOKING: /* スモーキング */ - skill_attack (BF_MISC, src, src, bl, skillid, skilllv, tick, 0); + skill_attack(BF_MISC, src, src, bl, skillid, skilllv, tick, 0); break; case NPC_SELFDESTRUCTION: /* 自爆 */ @@ -3056,10 +3050,10 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, if (src->type == BL_MOB) { struct mob_data *mb = (struct mob_data *) src; - nullpo_retr (1, mb); + nullpo_retr(1, mb); mb->hp = skill_area_temp[2]; if (bl->id != skill_area_temp[1]) - skill_attack (BF_MISC, src, src, bl, + skill_attack(BF_MISC, src, src, bl, NPC_SELFDESTRUCTION, skilllv, tick, flag); mb->hp = 1; @@ -3071,15 +3065,15 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, if ((md = (struct mob_data *) src)) { skill_area_temp[1] = bl->id; - skill_area_temp[2] = battle_get_hp (src); - clif_skill_nodamage (src, src, NPC_SELFDESTRUCTION, -1, + skill_area_temp[2] = battle_get_hp(src); + clif_skill_nodamage(src, src, NPC_SELFDESTRUCTION, -1, 1); - map_foreachinarea (skill_area_sub, bl->m, bl->x - 5, + map_foreachinarea(skill_area_sub, bl->m, bl->x - 5, bl->y - 5, bl->x + 5, bl->y + 5, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, skill_castend_damage_id); - battle_damage (src, src, md->hp, 0); + battle_damage(src, src, md->hp, 0); } } break; @@ -3088,9 +3082,9 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, case NPC_BLOODDRAIN: case NPC_ENERGYDRAIN: { - int heal; + int heal; heal = - skill_attack ((skillid == + skill_attack((skillid == NPC_BLOODDRAIN) ? BF_WEAPON : BF_MAGIC, src, src, bl, skillid, skilllv, tick, flag); if (heal > 0) @@ -3100,8 +3094,8 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, tbl.m = src->m; tbl.x = src->x; tbl.y = src->y; - clif_skill_nodamage (&tbl, src, AL_HEAL, heal, 1); - battle_heal (NULL, src, heal, 0, 0); + clif_skill_nodamage(&tbl, src, AL_HEAL, heal, 1); + battle_heal(NULL, src, heal, 0, 0); } } break; @@ -3111,14 +3105,14 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, if (flag & 3) { if (bl->id != skill_area_temp[1]) - skill_attack (BF_WEAPON, src, src, bl, skillid, + skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, 0x0500); } else { - int ar = sd->splash_range; + int ar = sd->splash_range; skill_area_temp[1] = bl->id; - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, bl->x - ar, bl->y - ar, bl->x + ar, bl->y + ar, 0, src, skillid, skilllv, tick, @@ -3129,10 +3123,10 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, break; default: - map_freeblock_unlock (); + map_freeblock_unlock(); return 1; } - map_freeblock_unlock (); + map_freeblock_unlock(); return 0; } @@ -3141,7 +3135,7 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, * スキル使用（詠唱完了、ID指定支援系） *------------------------------------------ */ -int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, +int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag) { @@ -3149,37 +3143,37 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, struct map_session_data *dstsd = NULL; struct mob_data *md = NULL; struct mob_data *dstmd = NULL; - int sc_def_vit, sc_def_mdef, strip_fix, strip_time, strip_per; - int sc_dex, sc_luk; + int sc_def_vit, sc_def_mdef, strip_fix, strip_time, strip_per; + int sc_dex, sc_luk; //クラスチェンジ用ボスモンスターID - int changeclass[] = + int changeclass[] = { 1038, 1039, 1046, 1059, 1086, 1087, 1112, 1115, 1157, 1159, 1190, 1272, 1312, 1373, 1492 }; - int poringclass[] = { 1002 }; + int poringclass[] = { 1002 }; - nullpo_retr (1, src); - nullpo_retr (1, bl); + nullpo_retr(1, src); + nullpo_retr(1, bl); if (src->type == BL_PC) sd = (struct map_session_data *) src; else if (src->type == BL_MOB) md = (struct mob_data *) src; - sc_dex = battle_get_mdef (bl); - sc_luk = battle_get_luk (bl); - sc_def_vit = 100 - (3 + battle_get_vit (bl) + battle_get_luk (bl) / 3); - sc_def_vit = 100 - (3 + battle_get_vit (bl) + battle_get_luk (bl) / 3); - sc_def_mdef = 100 - (3 + battle_get_mdef (bl) + battle_get_luk (bl) / 3); - strip_fix = battle_get_dex (src) - battle_get_dex (bl); + sc_dex = battle_get_mdef(bl); + sc_luk = battle_get_luk(bl); + sc_def_vit = 100 - (3 + battle_get_vit(bl) + battle_get_luk(bl) / 3); + sc_def_vit = 100 - (3 + battle_get_vit(bl) + battle_get_luk(bl) / 3); + sc_def_mdef = 100 - (3 + battle_get_mdef(bl) + battle_get_luk(bl) / 3); + strip_fix = battle_get_dex(src) - battle_get_dex(bl); if (bl->type == BL_PC) { - nullpo_retr (1, dstsd = (struct map_session_data *) bl); + nullpo_retr(1, dstsd = (struct map_session_data *) bl); } else if (bl->type == BL_MOB) { - nullpo_retr (1, dstmd = (struct mob_data *) bl); + nullpo_retr(1, dstmd = (struct mob_data *) bl); if (sc_def_vit > 50) sc_def_vit = 50; if (sc_def_mdef > 50) @@ -3194,38 +3188,38 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (bl == NULL || bl->prev == NULL) return 1; - if (sd && pc_isdead (sd)) + if (sd && pc_isdead(sd)) return 1; - if (dstsd && pc_isdead (dstsd) && skillid != ALL_RESURRECTION) + if (dstsd && pc_isdead(dstsd) && skillid != ALL_RESURRECTION) return 1; - if (battle_get_class (bl) == 1288) + if (battle_get_class(bl) == 1288) return 1; - if (skillnotok (skillid, (struct map_session_data *) bl)) // [MouseJstr] + if (skillnotok(skillid, (struct map_session_data *) bl)) // [MouseJstr] return 0; - map_freeblock_lock (); + map_freeblock_lock(); switch (skillid) { case AL_HEAL: /* ヒール */ { - int heal = skill_calc_heal (src, skilllv); - int heal_get_jobexp; - int skill; + int heal = skill_calc_heal(src, skilllv); + int heal_get_jobexp; + int skill; struct pc_base_job s_class; if (dstsd && dstsd->special_state.no_magic_damage) heal = 0; /* 黄金蟲カード（ヒール量０） */ if (sd) { - s_class = pc_calc_base_job (sd->status.pc_class); - if ((skill = pc_checkskill (sd, HP_MEDITATIO)) > 0) // メディテイティオ + s_class = pc_calc_base_job(sd->status.pc_class); + if ((skill = pc_checkskill(sd, HP_MEDITATIO)) > 0) // メディテイティオ heal += heal * (skill * 2 / 100); if (sd && dstsd && sd->status.partner_id == dstsd->status.char_id && s_class.job == 23 && sd->status.sex == 0) //自分も対象もPC、対象が自分のパートナー、自分がスパノビ、自分が♀なら heal = heal * 2; //スパノビの嫁が旦那にヒールすると2倍になる } - clif_skill_nodamage (src, bl, skillid, heal, 1); - heal_get_jobexp = battle_heal (NULL, bl, heal, 0, 0); + clif_skill_nodamage(src, bl, skillid, heal, 1); + heal_get_jobexp = battle_heal(NULL, bl, heal, 0, 0); // JOB経験値獲得 if (src->type == BL_PC && bl->type == BL_PC && heal > 0 @@ -3235,7 +3229,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, heal_get_jobexp * battle_config.heal_exp / 100; if (heal_get_jobexp <= 0) heal_get_jobexp = 1; - pc_gainexp ((struct map_session_data *) src, 0, + pc_gainexp((struct map_session_data *) src, 0, heal_get_jobexp); } } @@ -3244,15 +3238,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case ALL_RESURRECTION: /* リザレクション */ if (bl->type == BL_PC) { - int per = 0; + int per = 0; struct map_session_data *tsd = (struct map_session_data *) bl; - nullpo_retr (1, tsd); + nullpo_retr(1, tsd); if ((map[bl->m].flag.pvp) && tsd->pvp_point < 0) break; /* PVPで復活不可能状態 */ - if (pc_isdead (tsd)) + if (pc_isdead(tsd)) { /* 死亡判定 */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); switch (skilllv) { case 1: @@ -3276,23 +3270,23 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, tsd->status.hp = tsd->status.max_hp; tsd->status.sp = tsd->status.max_sp; } - pc_setstand (tsd); + pc_setstand(tsd); if (battle_config.pc_invincible_time > 0) - pc_setinvincibletimer (tsd, + pc_setinvincibletimer(tsd, battle_config.pc_invincible_time); - clif_updatestatus (tsd, SP_HP); - clif_resurrection (&tsd->bl, 1); + clif_updatestatus(tsd, SP_HP); + clif_resurrection(&tsd->bl, 1); if (src != bl && sd && battle_config.resurrection_exp > 0) { - int exp = 0, jexp = 0; - int lv = + int exp = 0, jexp = 0; + int lv = tsd->status.base_level - sd->status.base_level, jlv = tsd->status.job_level - sd->status.job_level; if (lv > 0) { exp = - (int) ((double) tsd->status.base_exp * + (int)((double) tsd->status.base_exp * (double) lv * (double) battle_config.resurrection_exp / 1000000.); @@ -3302,7 +3296,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (jlv > 0) { jexp = - (int) ((double) tsd->status.job_exp * + (int)((double) tsd->status.job_exp * (double) lv * (double) battle_config.resurrection_exp / 1000000.); @@ -3310,7 +3304,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, jexp = 1; } if (exp > 0 || jexp > 0) - pc_gainexp (sd, exp, jexp); + pc_gainexp(sd, exp, jexp); } } } @@ -3321,16 +3315,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - if (MRAND (100) < + if (MRAND(100) < (50 + skilllv * 3 + - (battle_get_lv (src) + battle_get_int (src) / 5) - + (battle_get_lv(src) + battle_get_int(src) / 5) - sc_def_mdef)) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), + skill_get_time(skillid, skilllv), 0); } break; @@ -3338,16 +3332,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case AL_CRUCIS: if (flag & 1) { - int race = battle_get_race (bl), ele = - battle_get_elem_type (bl); - if (battle_check_target (src, bl, BCT_ENEMY) - && (race == 6 || battle_check_undead (race, ele))) + int race = battle_get_race(bl), ele = + battle_get_elem_type(bl); + if (battle_check_target(src, bl, BCT_ENEMY) + && (race == 6 || battle_check_undead(race, ele))) { - int slv = battle_get_lv (src), tlv = - battle_get_lv (bl), rate; + int slv = battle_get_lv(src), tlv = + battle_get_lv(bl), rate; rate = 25 + skilllv * 2 + slv - tlv; - if (MRAND (100) < rate) - skill_status_change_start (bl, + if (MRAND(100) < rate) + skill_status_change_start(bl, SkillStatusChangeTable [skillid], skilllv, 0, 0, 0, 0, 0); @@ -3355,9 +3349,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, } else { - int range = 15; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - map_foreachinarea (skill_area_sub, + int range = 15; + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + map_foreachinarea(skill_area_sub, src->m, src->x - range, src->y - range, src->x + range, src->y + range, 0, src, skillid, skilllv, tick, @@ -3368,20 +3362,20 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case PR_LEXDIVINA: /* レックスディビーナ */ { - struct status_change *sc_data = battle_get_sc_data (bl); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + struct status_change *sc_data = battle_get_sc_data(bl); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; if (sc_data && sc_data[SC_DIVINA].timer != -1) - skill_status_change_end (bl, SC_DIVINA, -1); - else if (MRAND (100) < sc_def_vit) + skill_status_change_end(bl, SC_DIVINA, -1); + else if (MRAND(100) < sc_def_vit) { - skill_status_change_start (bl, + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), + skill_get_time(skillid, skilllv), 0); } } @@ -3389,7 +3383,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case SA_ABRACADABRA: break; case SA_COMA: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) @@ -3398,71 +3392,71 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, { dstsd->status.hp = 1; dstsd->status.sp = 1; - clif_updatestatus (dstsd, SP_HP); - clif_updatestatus (dstsd, SP_SP); + clif_updatestatus(dstsd, SP_HP); + clif_updatestatus(dstsd, SP_SP); } if (dstmd) dstmd->hp = 1; break; case SA_FULLRECOVERY: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; if (dstsd) - pc_heal (dstsd, dstsd->status.max_hp, dstsd->status.max_sp); + pc_heal(dstsd, dstsd->status.max_hp, dstsd->status.max_sp); if (dstmd) - dstmd->hp = battle_get_max_hp (&dstmd->bl); + dstmd->hp = battle_get_max_hp(&dstmd->bl); break; case SA_SUMMONMONSTER: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (sd) - mob_once_spawn (sd, map[sd->bl.m].name, sd->bl.x, sd->bl.y, + mob_once_spawn(sd, map[sd->bl.m].name, sd->bl.x, sd->bl.y, "--ja--", -1, 1, ""); break; case SA_LEVELUP: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - if (sd && pc_nextbaseexp (sd)) - pc_gainexp (sd, pc_nextbaseexp (sd) * 10 / 100, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + if (sd && pc_nextbaseexp(sd)) + pc_gainexp(sd, pc_nextbaseexp(sd) * 10 / 100, 0); break; case SA_INSTANTDEATH: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (sd) - pc_damage (NULL, sd, sd->status.max_hp); + pc_damage(NULL, sd, sd->status.max_hp); break; case SA_QUESTION: case SA_GRAVITY: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); break; case SA_CLASSCHANGE: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (dstmd) - mob_class_change (dstmd, changeclass); + mob_class_change(dstmd, changeclass); break; case SA_MONOCELL: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (dstmd) - mob_class_change (dstmd, poringclass); + mob_class_change(dstmd, poringclass); break; case SA_DEATH: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (dstsd) - pc_damage (NULL, dstsd, dstsd->status.max_hp); + pc_damage(NULL, dstsd, dstsd->status.max_hp); if (dstmd) - mob_damage (NULL, dstmd, dstmd->hp, 1); + mob_damage(NULL, dstmd, dstmd->hp, 1); break; case SA_REVERSEORCISH: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (dstsd) - pc_setoption (dstsd, dstsd->status.option | 0x0800); + pc_setoption(dstsd, dstsd->status.option | 0x0800); break; case SA_FORTUNE: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (sd) - pc_getzeny (sd, battle_get_lv (bl) * 100); + pc_getzeny(sd, battle_get_lv(bl) * 100); break; case AL_INCAGI: /* 速度増加 */ case AL_BLESSING: /* ブレッシング */ @@ -3477,16 +3471,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, && ((struct map_session_data *) bl)-> special_state.no_magic_damage) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); } else { - skill_status_change_start (bl, + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), + skill_get_time(skillid, skilllv), 0); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); } break; @@ -3498,7 +3492,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, && ((struct map_session_data *) bl)-> special_state.no_magic_damage) { - clif_skill_nodamage (src, bl, skillid, skilllv, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 0); break; } if (bl->type == BL_PC) @@ -3511,58 +3505,58 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, || sd2->sc_data[SC_SEISMICWEAPON].timer != -1 || sd2->sc_data[SC_ENCPOISON].timer != -1) { - clif_skill_fail (sd, skillid, 0, 0); - clif_skill_nodamage (src, bl, skillid, skilllv, 0); + clif_skill_fail(sd, skillid, 0, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 0); break; } } - if (MRAND (100) > (75 + skilllv * 1) && (skilllv != 5)) + if (MRAND(100) > (75 + skilllv * 1) && (skilllv != 5)) { - clif_skill_fail (sd, skillid, 0, 0); - clif_skill_nodamage (src, bl, skillid, skilllv, 0); + clif_skill_fail(sd, skillid, 0, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 0); if (bl->type == BL_PC && battle_config.equipment_breaking) { struct map_session_data *sd2 = (struct map_session_data *) bl; if (sd != sd2) - clif_displaymessage (sd->fd, + clif_displaymessage(sd->fd, "You broke target's weapon"); - pc_breakweapon (sd2); + pc_breakweapon(sd2); } break; } else { - skill_status_change_start (bl, + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), + skill_get_time(skillid, skilllv), 0); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); } break; case PR_ASPERSIO: /* アスペルシオ */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; if (bl->type == BL_MOB) break; - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case PR_KYRIE: /* キリエエレイソン */ - clif_skill_nodamage (bl, bl, skillid, skilllv, 1); + clif_skill_nodamage(bl, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case KN_AUTOCOUNTER: /* オートカウンター */ case KN_TWOHANDQUICKEN: /* ツーハンドクイッケン */ @@ -3587,10 +3581,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case ST_REJECTSWORD: /* リジェクトソード */ case HW_MAGICPOWER: /* 魔法力増幅 */ case PF_MEMORIZE: /* メモライズ */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case AS_ENCHANTPOISON: // Prevent spamming [Valaris] if (bl->type == BL_PC) @@ -3602,35 +3596,35 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, || sd2->sc_data[SC_SEISMICWEAPON].timer != -1 || sd2->sc_data[SC_ENCPOISON].timer != -1) { - clif_skill_nodamage (src, bl, skillid, skilllv, 0); - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 0); + clif_skill_fail(sd, skillid, 0, 0); break; } } - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case LK_TENSIONRELAX: /* テンションリラックス */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - pc_setsit (sd); - clif_sitting (sd->fd, sd); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + pc_setsit(sd); + clif_sitting(sd->fd, sd); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case MC_CHANGECART: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); break; case AC_CONCENTRATION: /* 集中力向上 */ { - int range = 1; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + int range = 1; + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); - map_foreachinarea (skill_status_change_timer_sub, src->m, + skill_get_time(skillid, skilllv), 0); + map_foreachinarea(skill_status_change_timer_sub, src->m, src->x - range, src->y - range, src->x + range, src->y + range, 0, src, SkillStatusChangeTable[skillid], tick); @@ -3638,45 +3632,45 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, break; case SM_PROVOKE: /* プロボック */ { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); /* MVPmobと不死には効かない */ - if ((bl->type == BL_MOB && battle_get_mode (bl) & 0x20) || battle_check_undead (battle_get_race (bl), battle_get_elem_type (bl))) //不死には効かない + if ((bl->type == BL_MOB && battle_get_mode(bl) & 0x20) || battle_check_undead(battle_get_race(bl), battle_get_elem_type(bl))) //不死には効かない { - map_freeblock_unlock (); + map_freeblock_unlock(); return 1; } - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); if (dstmd && dstmd->skilltimer != -1 && dstmd->state.skillcastcancel) // 詠唱妨害 - skill_castcancel (bl, 0); + skill_castcancel(bl, 0); if (dstsd && dstsd->skilltimer != -1 && !dstsd->special_state.no_castcancel && dstsd->state.skillcastcancel && !dstsd->special_state.no_castcancel2) - skill_castcancel (bl, 0); + skill_castcancel(bl, 0); if (sc_data) { if (sc_data[SC_FREEZE].timer != -1) - skill_status_change_end (bl, SC_FREEZE, -1); + skill_status_change_end(bl, SC_FREEZE, -1); if (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0) - skill_status_change_end (bl, SC_STONE, -1); + skill_status_change_end(bl, SC_STONE, -1); if (sc_data[SC_SLEEP].timer != -1) - skill_status_change_end (bl, SC_SLEEP, -1); + skill_status_change_end(bl, SC_SLEEP, -1); } if (bl->type == BL_MOB) { - int range = skill_get_range (skillid, skilllv); + int range = skill_get_range(skillid, skilllv); if (range < 0) - range = battle_get_range (src) - (range + 1); - mob_target ((struct mob_data *) bl, src, range); + range = battle_get_range(src) - (range + 1); + mob_target((struct mob_data *) bl, src, range); } } break; @@ -3686,7 +3680,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, { //転生や養子の場合の元の職業を算出する - int lv = sd->status.base_level - dstsd->status.base_level; + int lv = sd->status.base_level - dstsd->status.base_level; lv = (lv < 0) ? -lv : lv; if ((dstsd->bl.type != BL_PC) // 相手はPCじゃないとだめ || (sd->bl.id == dstsd->bl.id) // 相手が自分はだめ @@ -3698,8 +3692,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, || dstsd->status.pc_class == 4015 || dstsd->status.pc_class == 4022)) { // クルセだめ - clif_skill_fail (sd, skillid, 0, 0); - map_freeblock_unlock (); + clif_skill_fail(sd, skillid, 0, 0); + map_freeblock_unlock(); return 1; } for (int i = 0; i < skilllv; i++) @@ -3712,43 +3706,43 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, } else if (i == skilllv - 1) { // 空きがなかった - clif_skill_fail (sd, skillid, 0, 0); - map_freeblock_unlock (); + clif_skill_fail(sd, skillid, 0, 0); + map_freeblock_unlock(); return 1; } } - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - clif_devotion (sd, bl->id); - skill_status_change_start (bl, + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + clif_devotion(sd, bl->id); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], src->id, 1, 0, 0, 1000 * (15 + 15 * skilllv), 0); } else - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_fail(sd, skillid, 0, 0); break; case MO_CALLSPIRITS: // 気功 if (sd) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - pc_addspiritball (sd, skill_get_time (skillid, skilllv), + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + pc_addspiritball(sd, skill_get_time(skillid, skilllv), skilllv); } break; case CH_SOULCOLLECT: // 狂気功 if (sd) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); for (int i = 0; i < 5; i++) - pc_addspiritball (sd, skill_get_time (skillid, skilllv), + pc_addspiritball(sd, skill_get_time(skillid, skilllv), 5); } break; case MO_BLADESTOP: // 白刃取り - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (src, SkillStatusChangeTable[skillid], + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(src, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case MO_ABSORBSPIRITS: // 気奪 { @@ -3759,9 +3753,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, { if (dstsd->spiritball > 0) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); i = dstsd->spiritball * 7; - pc_delspiritball (dstsd, dstsd->spiritball, 0); + pc_delspiritball(dstsd, dstsd->spiritball, 0); if (i > 0x7FFF) i = 0x7FFF; if (sd->status.sp + i > sd->status.max_sp) @@ -3772,92 +3766,92 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, else if (sd && dstmd) { //対象がモンスターの場合 //20%の確率で対象のLv*2のSPを回復する。成功したときはターゲット(σﾟДﾟ)σｹﾞｯﾂ!! - if (MRAND (100) < 20) + if (MRAND(100) < 20) { i = 2 * mob_db[dstmd->mob_class].lv; - mob_target (dstmd, src, 0); + mob_target(dstmd, src, 0); } } if (i) { sd->status.sp += i; - clif_heal (sd->fd, SP_SP, i); + clif_heal(sd->fd, SP_SP, i); } else - clif_skill_nodamage (src, bl, skillid, skilllv, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 0); break; } case AC_MAKINGARROW: /* 矢作成 */ -/* if(sd) { - clif_arrow_create_list(sd); - clif_skill_nodamage(src,bl,skillid,skilllv,1); - }*/ +/* if (sd) { + clif_arrow_create_list(sd); + clif_skill_nodamage(src,bl,skillid,skilllv,1); + }*/ break; case AM_PHARMACY: /* ポーション作成 */ -/* if(sd) { - clif_skill_produce_mix_list(sd,32); - clif_skill_nodamage(src,bl,skillid,skilllv,1); - }*/ +/* if (sd) { + clif_skill_produce_mix_list(sd,32); + clif_skill_nodamage(src,bl,skillid,skilllv,1); + }*/ break; case WS_CREATECOIN: /* クリエイトコイン */ -/* if(sd) { - clif_skill_produce_mix_list(sd,64); - clif_skill_nodamage(src,bl,skillid,skilllv,1); - }*/ +/* if (sd) { + clif_skill_produce_mix_list(sd,64); + clif_skill_nodamage(src,bl,skillid,skilllv,1); + }*/ break; case WS_CREATENUGGET: /* 塊製造 */ -/* if(sd) { - clif_skill_produce_mix_list(sd,128); - clif_skill_nodamage(src,bl,skillid,skilllv,1); - }*/ +/* if (sd) { + clif_skill_produce_mix_list(sd,128); + clif_skill_nodamage(src,bl,skillid,skilllv,1); + }*/ break; case BS_HAMMERFALL: /* ハンマーフォール */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_weapon_damage) break; - if (MRAND (100) < (20 + 10 * skilllv) * sc_def_vit / 100) + if (MRAND(100) < (20 + 10 * skilllv) * sc_def_vit / 100) { - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); } break; case RG_RAID: /* サプライズアタック */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); { - int x = bl->x, y = bl->y; + int x = bl->x, y = bl->y; skill_area_temp[1] = bl->id; skill_area_temp[2] = x; skill_area_temp[3] = y; - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, x - 1, y - 1, x + 1, y + 1, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, skill_castend_damage_id); } - skill_status_change_end (src, SC_HIDING, -1); // ハイディング解除 + skill_status_change_end(src, SC_HIDING, -1); // ハイディング解除 break; case KN_BRANDISHSPEAR: /*ブランディッシュスピア */ { - int c, n = 4, ar; - int dir = map_calc_dir (src, bl->x, bl->y); + int c, n = 4, ar; + int dir = map_calc_dir(src, bl->x, bl->y); struct square tc; - int x = bl->x, y = bl->y; + int x = bl->x, y = bl->y; ar = skilllv / 3; - skill_brandishspear_first (&tc, dir, x, y); - skill_brandishspear_dir (&tc, dir, 4); + skill_brandishspear_first(&tc, dir, x, y); + skill_brandishspear_dir(&tc, dir, 4); /* 範囲C */ if (skilllv == 10) { for (c = 1; c < 4; c++) { - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, tc.val1[c], tc.val2[c], tc.val1[c], tc.val2[c], 0, src, skillid, skilllv, tick, @@ -3868,12 +3862,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, /* 範囲BA */ if (skilllv > 6) { - skill_brandishspear_dir (&tc, dir, -1); + skill_brandishspear_dir(&tc, dir, -1); n--; } else { - skill_brandishspear_dir (&tc, dir, -2); + skill_brandishspear_dir(&tc, dir, -2); n -= 2; } @@ -3881,7 +3875,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, { for (c = 0; c < 5; c++) { - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, bl->m, tc.val1[c], tc.val2[c], tc.val1[c], tc.val2[c], 0, src, skillid, skilllv, tick, @@ -3889,7 +3883,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, skill_castend_damage_id); if (skilllv > 6 && n == 3 && c == 4) { - skill_brandishspear_dir (&tc, dir, -1); + skill_brandishspear_dir(&tc, dir, -1); n--; c = -1; } @@ -3899,8 +3893,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, for (c = 0; c < 10; c++) { if (c == 0 || c == 5) - skill_brandishspear_dir (&tc, dir, -1); - map_foreachinarea (skill_area_sub, + skill_brandishspear_dir(&tc, dir, -1); + map_foreachinarea(skill_area_sub, bl->m, tc.val1[c % 5], tc.val2[c % 5], tc.val1[c % 5], tc.val2[c % 5], 0, src, skillid, skilllv, tick, @@ -3918,21 +3912,21 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (sd == NULL || sd->status.party_id == 0 || (flag & 1)) { /* 個別の処理 */ - clif_skill_nodamage (bl, bl, skillid, skilllv, 1); + clif_skill_nodamage(bl, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - skill_status_change_start (bl, + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), + skill_get_time(skillid, skilllv), 0); } else { /* パーティ全体への処理 */ - party_foreachsamemap (skill_area_sub, + party_foreachsamemap(skill_area_sub, sd, 1, src, skillid, skilllv, tick, flag | BCT_PARTY | 1, @@ -3945,17 +3939,17 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (sd == NULL || sd->status.party_id == 0 || (flag & 1)) { /* 個別の処理 */ - clif_skill_nodamage (bl, bl, skillid, skilllv, 1); - skill_status_change_start (bl, + clif_skill_nodamage(bl, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, (src == bl) ? 1 : 0, 0, 0, - skill_get_time (skillid, skilllv), + skill_get_time(skillid, skilllv), 0); } else { /* パーティ全体への処理 */ - party_foreachsamemap (skill_area_sub, + party_foreachsamemap(skill_area_sub, sd, 1, src, skillid, skilllv, tick, flag | BCT_PARTY | 1, @@ -3969,78 +3963,78 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case CR_DEFENDER: /* ディフェンダー */ case CR_AUTOGUARD: /* オートガード */ { - struct status_change *tsc_data = battle_get_sc_data (bl); - int sc = SkillStatusChangeTable[skillid]; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + int sc = SkillStatusChangeTable[skillid]; + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (tsc_data) { if (tsc_data[sc].timer == -1) /* 付加する */ - skill_status_change_start (bl, sc, skilllv, 0, 0, 0, - skill_get_time (skillid, + skill_status_change_start(bl, sc, skilllv, 0, 0, 0, + skill_get_time(skillid, skilllv), 0); else /* 解除する */ - skill_status_change_end (bl, sc, -1); + skill_status_change_end(bl, sc, -1); } } break; case TF_HIDING: /* ハイディング */ { - struct status_change *tsc_data = battle_get_sc_data (bl); - int sc = SkillStatusChangeTable[skillid]; - clif_skill_nodamage (src, bl, skillid, -1, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + int sc = SkillStatusChangeTable[skillid]; + clif_skill_nodamage(src, bl, skillid, -1, 1); if (tsc_data) { if (tsc_data[sc].timer == -1) /* 付加する */ - skill_status_change_start (bl, sc, skilllv, 0, 0, 0, - skill_get_time (skillid, + skill_status_change_start(bl, sc, skilllv, 0, 0, 0, + skill_get_time(skillid, skilllv), 0); else /* 解除する */ - skill_status_change_end (bl, sc, -1); + skill_status_change_end(bl, sc, -1); } } break; case AS_CLOAKING: /* クローキング */ { - struct status_change *tsc_data = battle_get_sc_data (bl); - int sc = SkillStatusChangeTable[skillid]; - clif_skill_nodamage (src, bl, skillid, -1, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + int sc = SkillStatusChangeTable[skillid]; + clif_skill_nodamage(src, bl, skillid, -1, 1); if (tsc_data) { if (tsc_data[sc].timer == -1) /* 付加する */ - skill_status_change_start (bl, sc, skilllv, 0, 0, 0, - skill_get_time (skillid, + skill_status_change_start(bl, sc, skilllv, 0, 0, 0, + skill_get_time(skillid, skilllv), 0); else /* 解除する */ - skill_status_change_end (bl, sc, -1); + skill_status_change_end(bl, sc, -1); } - skill_check_cloaking (bl); + skill_check_cloaking(bl); } break; case ST_CHASEWALK: /* ハイディング */ { - struct status_change *tsc_data = battle_get_sc_data (bl); - int sc = SkillStatusChangeTable[skillid]; - clif_skill_nodamage (src, bl, skillid, -1, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + int sc = SkillStatusChangeTable[skillid]; + clif_skill_nodamage(src, bl, skillid, -1, 1); if (tsc_data) { if (tsc_data[sc].timer == -1) /* 付加する */ - skill_status_change_start (bl, sc, skilllv, 0, 0, 0, - skill_get_time (skillid, + skill_status_change_start(bl, sc, skilllv, 0, 0, 0, + skill_get_time(skillid, skilllv), 0); else /* 解除する */ - skill_status_change_end (bl, sc, -1); + skill_status_change_end(bl, sc, -1); } } break; @@ -4065,134 +4059,132 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case DC_FORTUNEKISS: /* 幸運のキス */ case DC_SERVICEFORYOU: /* サービスフォーユー */ case CG_MOONLIT: /* 月明りの泉に落ちる花びら */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_unitsetting (src, skillid, skilllv, src->x, src->y, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_unitsetting(src, skillid, skilllv, src->x, src->y, 0); break; case HP_BASILICA: /* バジリカ */ case PA_GOSPEL: /* ゴスペル */ - skill_clear_unitgroup (src); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_unitsetting (src, skillid, skilllv, src->x, src->y, 0); + skill_clear_unitgroup(src); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_unitsetting(src, skillid, skilllv, src->x, src->y, 0); break; case BD_ADAPTATION: /* アドリブ */ { - struct status_change *sc_data = battle_get_sc_data (src); + struct status_change *sc_data = battle_get_sc_data(src); if (sc_data && sc_data[SC_DANCING].timer != -1) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_stop_dancing (src, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_stop_dancing(src, 0); } } break; case BA_FROSTJOKE: /* 寒いジョーク */ case DC_SCREAM: /* スクリーム */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_addtimerskill (src, tick + 3000, bl->id, 0, 0, skillid, + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_addtimerskill(src, tick + 3000, bl->id, 0, 0, skillid, skilllv, 0, flag); break; case TF_STEAL: // スティール if (sd) { - if (pc_steal_item (sd, bl)) - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + if (pc_steal_item(sd, bl)) + clif_skill_nodamage(src, bl, skillid, skilllv, 1); else - clif_skill_nodamage (src, bl, skillid, skilllv, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 0); } break; case RG_STEALCOIN: // スティールコイン if (sd) { - if (pc_steal_coin (sd, bl)) + if (pc_steal_coin(sd, bl)) { - int range = skill_get_range (skillid, skilllv); + int range = skill_get_range(skillid, skilllv); if (range < 0) - range = battle_get_range (src) - (range + 1); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - mob_target ((struct mob_data *) bl, src, range); + range = battle_get_range(src) - (range + 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + mob_target((struct mob_data *) bl, src, range); } else - clif_skill_nodamage (src, bl, skillid, skilllv, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 0); } break; case MG_STONECURSE: /* ストーンカース */ - if (bl->type == BL_MOB && battle_get_mode (bl) & 0x20) + if (bl->type == BL_MOB && battle_get_mode(bl) & 0x20) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); break; } - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - if (MRAND (100) < skilllv * 4 + 20 - && !battle_check_undead (battle_get_race (bl), - battle_get_elem_type (bl))) - skill_status_change_start (bl, SC_STONE, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + if (MRAND(100) < skilllv * 4 + 20 + && !battle_check_undead(battle_get_race(bl), + battle_get_elem_type(bl))) + skill_status_change_start(bl, SC_STONE, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); else if (sd) - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_fail(sd, skillid, 0, 0); break; case NV_FIRSTAID: /* 応急手当 */ - clif_skill_nodamage (src, bl, skillid, 5, 1); - battle_heal (NULL, bl, 5, 0, 0); + clif_skill_nodamage(src, bl, skillid, 5, 1); + battle_heal(NULL, bl, 5, 0, 0); break; case AL_CURE: /* キュアー */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - skill_status_change_end (bl, SC_SILENCE, -1); - skill_status_change_end (bl, SC_BLIND, -1); - skill_status_change_end (bl, SC_CONFUSION, -1); - if (battle_check_undead - (battle_get_race (bl), battle_get_elem_type (bl))) + skill_status_change_end(bl, SC_SILENCE, -1); + skill_status_change_end(bl, SC_BLIND, -1); + skill_status_change_end(bl, SC_CONFUSION, -1); + if (battle_check_undead(battle_get_race(bl), battle_get_elem_type(bl))) { //アンデッドなら暗闇効果 - skill_status_change_start (bl, SC_CONFUSION, 1, 0, 0, 0, 6000, + skill_status_change_start(bl, SC_CONFUSION, 1, 0, 0, 0, 6000, 0); } break; case TF_DETOXIFY: /* 解毒 */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_end (bl, SC_POISON, -1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_end(bl, SC_POISON, -1); break; case PR_STRECOVERY: /* リカバリー */ { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - skill_status_change_end (bl, SC_FREEZE, -1); - skill_status_change_end (bl, SC_STONE, -1); - skill_status_change_end (bl, SC_SLEEP, -1); - skill_status_change_end (bl, SC_STAN, -1); - if (battle_check_undead - (battle_get_race (bl), battle_get_elem_type (bl))) + skill_status_change_end(bl, SC_FREEZE, -1); + skill_status_change_end(bl, SC_STONE, -1); + skill_status_change_end(bl, SC_SLEEP, -1); + skill_status_change_end(bl, SC_STAN, -1); + if (battle_check_undead(battle_get_race(bl), battle_get_elem_type(bl))) { //アンデッドなら暗闇効果 - int blind_time; + int blind_time; //blind_time=30-battle_get_vit(bl)/10-battle_get_int/15; blind_time = 30 * (100 - - (battle_get_int (bl) + - battle_get_vit (bl)) / 2) / 100; - if (MRAND (100) < + (battle_get_int(bl) + + battle_get_vit(bl)) / 2) / 100; + if (MRAND(100) < (100 - - (battle_get_int (bl) / 2 + battle_get_vit (bl) / 3 + - battle_get_luk (bl) / 10))) - skill_status_change_start (bl, SC_BLIND, 1, 0, 0, 0, + (battle_get_int(bl) / 2 + battle_get_vit(bl) / 3 + + battle_get_luk(bl) / 10))) + skill_status_change_start(bl, SC_BLIND, 1, 0, 0, 0, blind_time, 0); } if (dstmd) @@ -4201,7 +4193,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, dstmd->target_id = 0; dstmd->state.targettype = NONE_ATTACKABLE; dstmd->state.skillstate = MSS_IDLE; - dstmd->next_walktime = tick + MRAND (3000) + 3000; + dstmd->next_walktime = tick + MRAND(3000) + 3000; } } break; @@ -4209,14 +4201,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case WZ_ESTIMATION: /* モンスター情報 */ if (src->type == BL_PC) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - clif_skill_estimation ((struct map_session_data *) src, bl); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + clif_skill_estimation((struct map_session_data *) src, bl); } break; case MC_IDENTIFY: /* アイテム鑑定 */ if (sd) - clif_item_identify_list (sd); + clif_item_identify_list(sd); break; case BS_REPAIRWEAPON: /* 武器修理 */ @@ -4230,30 +4222,30 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, { if (map[sd->bl.m].flag.noteleport) { /* テレポ禁止 */ - clif_skill_teleportmessage (sd, 0); + clif_skill_teleportmessage(sd, 0); break; } - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (sd->skilllv == 1) - clif_skill_warppoint (sd, sd->skillid, "Random", "", "", + clif_skill_warppoint(sd, sd->skillid, "Random", "", "", ""); else { - clif_skill_warppoint (sd, sd->skillid, "Random", + clif_skill_warppoint(sd, sd->skillid, "Random", sd->status.save_point.map, "", ""); } } else if (bl->type == BL_MOB) - mob_warp ((struct mob_data *) bl, -1, -1, -1, 3); + mob_warp((struct mob_data *) bl, -1, -1, -1, 3); break; case AL_HOLYWATER: /* アクアベネディクタ */ if (sd) { - int eflag; + int eflag; struct item item_tmp; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - memset (&item_tmp, 0, sizeof (item_tmp)); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = 523; item_tmp.identify = 1; if (battle_config.holywater_name_input) @@ -4262,11 +4254,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, item_tmp.card[1] = 0; *((unsigned long *) (&item_tmp.card[2])) = sd->char_id; /* キャラID */ } - eflag = pc_additem (sd, &item_tmp, 1); + eflag = pc_additem(sd, &item_tmp, 1); if (eflag) { - clif_additem (sd, 0, 0, eflag); - map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, + clif_additem(sd, 0, 0, eflag); + map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } } @@ -4274,21 +4266,21 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case TF_PICKSTONE: if (sd) { - int eflag; + int eflag; struct item item_tmp; struct block_list tbl; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - memset (&item_tmp, 0, sizeof (item_tmp)); - memset (&tbl, 0, sizeof (tbl)); // [MouseJstr] + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + memset(&item_tmp, 0, sizeof(item_tmp)); + memset(&tbl, 0, sizeof(tbl)); // [MouseJstr] item_tmp.nameid = 7049; item_tmp.identify = 1; tbl.id = 0; - clif_takeitem (&sd->bl, &tbl); - eflag = pc_additem (sd, &item_tmp, 1); + clif_takeitem(&sd->bl, &tbl); + eflag = pc_additem(sd, &item_tmp, 1); if (eflag) { - clif_additem (sd, 0, 0, eflag); - map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, + clif_additem(sd, 0, 0, eflag); + map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } } @@ -4296,16 +4288,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case RG_STRIPWEAPON: /* ストリップウェポン */ { - struct status_change *tsc_data = battle_get_sc_data (bl); + struct status_change *tsc_data = battle_get_sc_data(bl); if (tsc_data && tsc_data[SC_CP_WEAPON].timer != -1) break; strip_per = 5 + 2 * skilllv + strip_fix / 5; - strip_time = skill_get_time (skillid, skilllv) + strip_fix / 2; - if (MRAND (100) < strip_per) + strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2; + if (MRAND(100) < strip_per) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, strip_time, 0); if (dstsd) @@ -4315,7 +4307,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (dstsd->status.inventory[i].equip && dstsd->status.inventory[i].equip & 0x0002) { - pc_unequipitem (dstsd, i, 0); + pc_unequipitem(dstsd, i, 0); break; } } @@ -4326,16 +4318,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case RG_STRIPSHIELD: /* ストリップシールド */ { - struct status_change *tsc_data = battle_get_sc_data (bl); + struct status_change *tsc_data = battle_get_sc_data(bl); if (tsc_data && tsc_data[SC_CP_SHIELD].timer != -1) break; strip_per = 5 + 2 * skilllv + strip_fix / 5; - strip_time = skill_get_time (skillid, skilllv) + strip_fix / 2; - if (MRAND (100) < strip_per) + strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2; + if (MRAND(100) < strip_per) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, strip_time, 0); if (dstsd) @@ -4345,7 +4337,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (dstsd->status.inventory[i].equip && dstsd->status.inventory[i].equip & 0x0020) { - pc_unequipitem (dstsd, i, 0); + pc_unequipitem(dstsd, i, 0); break; } } @@ -4356,16 +4348,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case RG_STRIPARMOR: /* ストリップアーマー */ { - struct status_change *tsc_data = battle_get_sc_data (bl); + struct status_change *tsc_data = battle_get_sc_data(bl); if (tsc_data && tsc_data[SC_CP_ARMOR].timer != -1) break; strip_per = 5 + 2 * skilllv + strip_fix / 5; - strip_time = skill_get_time (skillid, skilllv) + strip_fix / 2; - if (MRAND (100) < strip_per) + strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2; + if (MRAND(100) < strip_per) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, strip_time, 0); if (dstsd) @@ -4375,7 +4367,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (dstsd->status.inventory[i].equip && dstsd->status.inventory[i].equip & 0x0010) { - pc_unequipitem (dstsd, i, 0); + pc_unequipitem(dstsd, i, 0); break; } } @@ -4385,16 +4377,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, break; case RG_STRIPHELM: /* ストリップヘルム */ { - struct status_change *tsc_data = battle_get_sc_data (bl); + struct status_change *tsc_data = battle_get_sc_data(bl); if (tsc_data && tsc_data[SC_CP_HELM].timer != -1) break; strip_per = 5 + 2 * skilllv + strip_fix / 5; - strip_time = skill_get_time (skillid, skilllv) + strip_fix / 2; - if (MRAND (100) < strip_per) + strip_time = skill_get_time(skillid, skilllv) + strip_fix / 2; + if (MRAND(100) < strip_per) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, strip_time, 0); if (dstsd) @@ -4404,7 +4396,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (dstsd->status.inventory[i].equip && dstsd->status.inventory[i].equip & 0x0100) { - pc_unequipitem (dstsd, i, 0); + pc_unequipitem(dstsd, i, 0); break; } } @@ -4416,53 +4408,53 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case AM_POTIONPITCHER: /* ポーションピッチャー */ { struct block_list tbl; - int i, x, hp = 0, sp = 0; + int i, x, hp = 0, sp = 0; if (sd) { if (sd == dstsd) { // cancel use on oneself - map_freeblock_unlock (); + map_freeblock_unlock(); return 1; } x = skilllv % 11 - 1; - i = pc_search_inventory (sd, skill_db[skillid].itemid[x]); + i = pc_search_inventory(sd, skill_db[skillid].itemid[x]); if (i < 0 || skill_db[skillid].itemid[x] <= 0) { - clif_skill_fail (sd, skillid, 0, 0); - map_freeblock_unlock (); + clif_skill_fail(sd, skillid, 0, 0); + map_freeblock_unlock(); return 1; } if (sd->inventory_data[i] == NULL || sd->status.inventory[i].amount < skill_db[skillid].amount[x]) { - clif_skill_fail (sd, skillid, 0, 0); - map_freeblock_unlock (); + clif_skill_fail(sd, skillid, 0, 0); + map_freeblock_unlock(); return 1; } sd->state.potionpitcher_flag = 1; sd->potion_hp = sd->potion_sp = sd->potion_per_hp = sd->potion_per_sp = 0; sd->skilltarget = bl->id; - run_script (sd->inventory_data[i]->use_script, 0, sd->bl.id, + run_script(sd->inventory_data[i]->use_script, 0, sd->bl.id, 0); - pc_delitem (sd, i, skill_db[skillid].amount[x], 0); + pc_delitem(sd, i, skill_db[skillid].amount[x], 0); sd->state.potionpitcher_flag = 0; if (sd->potion_per_hp > 0 || sd->potion_per_sp > 0) { - hp = battle_get_max_hp (bl) * sd->potion_per_hp / 100; + hp = battle_get_max_hp(bl) * sd->potion_per_hp / 100; hp = hp * (100 + - pc_checkskill (sd, + pc_checkskill(sd, AM_POTIONPITCHER) * 10 + - pc_checkskill (sd, + pc_checkskill(sd, AM_LEARNINGPOTION) * 5) / 100; if (dstsd) { sp = dstsd->status.max_sp * sd->potion_per_sp / 100; sp = sp * (100 + - pc_checkskill (sd, + pc_checkskill(sd, AM_POTIONPITCHER) + - pc_checkskill (sd, + pc_checkskill(sd, AM_LEARNINGPOTION) * 5) / 100; } @@ -4472,30 +4464,30 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (sd->potion_hp > 0) { hp = sd->potion_hp * (100 + - pc_checkskill (sd, + pc_checkskill(sd, AM_POTIONPITCHER) - * 10 + pc_checkskill (sd, + * 10 + pc_checkskill(sd, AM_LEARNINGPOTION) * 5) / 100; - hp = hp * (100 + (battle_get_vit (bl) << 1)) / 100; + hp = hp * (100 + (battle_get_vit(bl) << 1)) / 100; if (dstsd) hp = hp * (100 + - pc_checkskill (dstsd, + pc_checkskill(dstsd, SM_RECOVERY) * 10) / 100; } if (sd->potion_sp > 0) { sp = sd->potion_sp * (100 + - pc_checkskill (sd, + pc_checkskill(sd, AM_POTIONPITCHER) - + pc_checkskill (sd, + + pc_checkskill(sd, AM_LEARNINGPOTION) * 5) / 100; - sp = sp * (100 + (battle_get_int (bl) << 1)) / 100; + sp = sp * (100 + (battle_get_int(bl) << 1)) / 100; if (dstsd) sp = sp * (100 + - pc_checkskill (dstsd, + pc_checkskill(dstsd, MG_SRECOVERY) * 10) / 100; } @@ -4503,72 +4495,72 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, } else { - hp = (1 + MRAND (400)) * (100 + skilllv * 10) / 100; - hp = hp * (100 + (battle_get_vit (bl) << 1)) / 100; + hp = (1 + MRAND(400)) * (100 + skilllv * 10) / 100; + hp = hp * (100 + (battle_get_vit(bl) << 1)) / 100; if (dstsd) hp = hp * (100 + - pc_checkskill (dstsd, SM_RECOVERY) * 10) / 100; + pc_checkskill(dstsd, SM_RECOVERY) * 10) / 100; } tbl.id = 0; tbl.m = src->m; tbl.x = src->x; tbl.y = src->y; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (hp > 0 || (hp <= 0 && sp <= 0)) - clif_skill_nodamage (&tbl, bl, AL_HEAL, hp, 1); + clif_skill_nodamage(&tbl, bl, AL_HEAL, hp, 1); if (sp > 0) - clif_skill_nodamage (&tbl, bl, MG_SRECOVERY, sp, 1); - battle_heal (src, bl, hp, sp, 0); + clif_skill_nodamage(&tbl, bl, MG_SRECOVERY, sp, 1); + battle_heal(src, bl, hp, sp, 0); } break; case AM_CP_WEAPON: { - struct status_change *tsc_data = battle_get_sc_data (bl); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (tsc_data && tsc_data[SC_STRIPWEAPON].timer != -1) - skill_status_change_end (bl, SC_STRIPWEAPON, -1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_end(bl, SC_STRIPWEAPON, -1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); } break; case AM_CP_SHIELD: { - struct status_change *tsc_data = battle_get_sc_data (bl); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (tsc_data && tsc_data[SC_STRIPSHIELD].timer != -1) - skill_status_change_end (bl, SC_STRIPSHIELD, -1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_end(bl, SC_STRIPSHIELD, -1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); } break; case AM_CP_ARMOR: { - struct status_change *tsc_data = battle_get_sc_data (bl); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (tsc_data && tsc_data[SC_STRIPARMOR].timer != -1) - skill_status_change_end (bl, SC_STRIPARMOR, -1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_end(bl, SC_STRIPARMOR, -1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); } break; case AM_CP_HELM: { - struct status_change *tsc_data = battle_get_sc_data (bl); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + struct status_change *tsc_data = battle_get_sc_data(bl); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (tsc_data && tsc_data[SC_STRIPHELM].timer != -1) - skill_status_change_end (bl, SC_STRIPHELM, -1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_end(bl, SC_STRIPHELM, -1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); } break; case SA_DISPELL: /* ディスペル */ { - int i; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + int i; + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) @@ -4582,44 +4574,44 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, || i == SC_CP_WEAPON || i == SC_CP_SHIELD || i == SC_CP_ARMOR || i == SC_CP_HELM || i == SC_COMBO) continue; - skill_status_change_end (bl, i, -1); + skill_status_change_end(bl, i, -1); } } break; case TF_BACKSLIDING: /* バックステップ */ - battle_stopwalking (src, 1); - skill_blown (src, bl, - skill_get_blewcount (skillid, skilllv) | 0x10000); + battle_stopwalking(src, 1); + skill_blown(src, bl, + skill_get_blewcount(skillid, skilllv) | 0x10000); if (src->type == BL_MOB) - clif_fixmobpos ((struct mob_data *) src); + clif_fixmobpos((struct mob_data *) src); else if (src->type == BL_PC) - clif_fixpos (src); - skill_addtimerskill (src, tick + 200, src->id, 0, 0, skillid, + clif_fixpos(src); + skill_addtimerskill(src, tick + 200, src->id, 0, 0, skillid, skilllv, 0, flag); break; case SA_CASTCANCEL: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_castcancel (src, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_castcancel(src, 1); if (sd) { - int sp = skill_get_sp (sd->skillid_old, sd->skilllv_old); + int sp = skill_get_sp(sd->skillid_old, sd->skilllv_old); sp = sp * (90 - (skilllv - 1) * 20) / 100; if (sp < 0) sp = 0; - pc_heal (sd, 0, -sp); + pc_heal(sd, 0, -sp); } break; case SA_SPELLBREAKER: // スペルブレイカー { - struct status_change *sc_data = battle_get_sc_data (bl); - int sp; + struct status_change *sc_data = battle_get_sc_data(bl); + int sp; if (sc_data && sc_data[SC_MAGICROD].timer != -1) { if (dstsd) { - sp = skill_get_sp (skillid, skilllv); + sp = skill_get_sp(skillid, skilllv); sp = sp * sc_data[SC_MAGICROD].val2 / 100; if (sp > 0x7fff) sp = 0x7fff; @@ -4632,21 +4624,21 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, } else dstsd->status.sp += sp; - clif_heal (dstsd->fd, SP_SP, sp); + clif_heal(dstsd->fd, SP_SP, sp); } - clif_skill_nodamage (bl, bl, SA_MAGICROD, + clif_skill_nodamage(bl, bl, SA_MAGICROD, sc_data[SC_MAGICROD].val1, 1); if (sd) { sp = sd->status.max_sp / 5; if (sp < 1) sp = 1; - pc_heal (sd, 0, -sp); + pc_heal(sd, 0, -sp); } } else { - int bl_skillid = 0, bl_skilllv = 0; + int bl_skillid = 0, bl_skilllv = 0; if (bl->type == BL_PC) { if (dstsd && dstsd->skilltimer != -1) @@ -4666,11 +4658,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (bl_skillid > 0 && skill_db[bl_skillid].skill_type == BF_MAGIC) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_castcancel (bl, 0); - sp = skill_get_sp (bl_skillid, bl_skilllv); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_castcancel(bl, 0); + sp = skill_get_sp(bl_skillid, bl_skilllv); if (dstsd) - pc_heal (dstsd, 0, -sp); + pc_heal(dstsd, 0, -sp); if (sd) { sp = sp * (25 * (skilllv - 1)) / 100; @@ -4687,11 +4679,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, } else sd->status.sp += sp; - clif_heal (sd->fd, SP_SP, sp); + clif_heal(sd->fd, SP_SP, sp); } } else if (sd) - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_fail(sd, skillid, 0, 0); } } break; @@ -4700,17 +4692,17 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case SA_AUTOSPELL: /* オートスペル */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (sd) - clif_autospell (sd, skilllv); + clif_autospell(sd, skilllv); else { - int maxlv = 1, spellid = 0; + int maxlv = 1, spellid = 0; static const int spellarray[3] = { MG_COLDBOLT, MG_FIREBOLT, MG_LIGHTNINGBOLT }; if (skilllv >= 10) @@ -4730,7 +4722,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, } else if (skilllv >= 2) { - int i = MRAND (3); + int i = MRAND(3); spellid = spellarray[i]; maxlv = skilllv - 1; } @@ -4740,9 +4732,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, maxlv = 3; } if (spellid > 0) - skill_status_change_start (src, SC_AUTOSPELL, skilllv, + skill_status_change_start(src, SC_AUTOSPELL, skilllv, spellid, maxlv, 0, - skill_get_time (SA_AUTOSPELL, + skill_get_time(SA_AUTOSPELL, skilllv), 0); } break; @@ -4760,52 +4752,52 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case NPC_CHANGETELEKINESIS: if (md) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - md->def_ele = skill_get_pl (skillid); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + md->def_ele = skill_get_pl(skillid); if (md->def_ele == 0) /* ランダム変化、ただし、 */ - md->def_ele = MRAND (10); /* 不死属性は除く */ - md->def_ele += (1 + MRAND (4)) * 20; /* 属性レベルはランダム */ + md->def_ele = MRAND(10); /* 不死属性は除く */ + md->def_ele += (1 + MRAND(4)) * 20; /* 属性レベルはランダム */ } break; case NPC_HALLUCINATION: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case NPC_KEEPING: case NPC_BARRIER: { - int skill_time = skill_get_time (skillid, skilllv); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + int skill_time = skill_get_time(skillid, skilllv); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, skill_time, 0); - mob_changestate ((struct mob_data *) src, MS_DELAY, skill_time); + mob_changestate((struct mob_data *) src, MS_DELAY, skill_time); } break; case NPC_DARKBLESSING: { - int sc_def = 100 - battle_get_mdef (bl); - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + int sc_def = 100 - battle_get_mdef(bl); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - if (battle_get_elem_type (bl) == 7 || battle_get_race (bl) == 6) + if (battle_get_elem_type(bl) == 7 || battle_get_race(bl) == 6) break; - if (MRAND (100) < sc_def * (50 + skilllv * 5) / 100) + if (MRAND(100) < sc_def * (50 + skilllv * 5) / 100) { if (dstsd) { - int hp = battle_get_hp (bl) - 1; - pc_heal (dstsd, -hp, 0); + int hp = battle_get_hp(bl) - 1; + pc_heal(dstsd, -hp, 0); } else if (dstmd) dstmd->hp = 1; @@ -4815,29 +4807,29 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case NPC_SELFDESTRUCTION: /* 自爆 */ case NPC_SELFDESTRUCTION2: /* 自爆2 */ - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, skillid, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case NPC_LICK: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_weapon_damage) break; if (dstsd) - pc_heal (dstsd, 0, -100); - if (MRAND (100) < (skilllv * 5) * sc_def_vit / 100) - skill_status_change_start (bl, SC_STAN, skilllv, 0, 0, 0, - skill_get_time2 (skillid, skilllv), + pc_heal(dstsd, 0, -100); + if (MRAND(100) < (skilllv * 5) * sc_def_vit / 100) + skill_status_change_start(bl, SC_STAN, skilllv, 0, 0, 0, + skill_get_time2(skillid, skilllv), 0); break; case NPC_SUICIDE: /* 自決 */ if (src && bl && md) { - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - mob_damage (NULL, md, md->hp, 0); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + mob_damage(NULL, md, md->hp, 0); } break; @@ -4845,7 +4837,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case NPC_SUMMONMONSTER: /* MOB召喚 */ if (md && !md->master_id) { - mob_summonslave (md, + mob_summonslave(md, mob_db[md->mob_class].skill[md->skillidx].val, skilllv, (skillid == NPC_SUMMONSLAVE) ? 1 : 0); @@ -4855,40 +4847,40 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case NPC_TRANSFORMATION: case NPC_METAMORPHOSIS: if (md) - mob_class_change (md, + mob_class_change(md, mob_db[md->mob_class].skill[md->skillidx].val); break; case NPC_EMOTION: /* エモーション */ if (md) - clif_emotion (&md->bl, + clif_emotion(&md->bl, mob_db[md->mob_class].skill[md->skillidx].val[0]); break; case NPC_DEFENDER: - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); break; case WE_MALE: /* 君だけは護るよ */ if (sd && dstsd) { - int hp_rate = + int hp_rate = (skilllv <= 0) ? 0 : skill_db[skillid].hp_rate[skilllv - 1]; - int gain_hp = sd->status.max_hp * abs (hp_rate) / 100; // 15% - clif_skill_nodamage (src, bl, skillid, gain_hp, 1); - battle_heal (NULL, bl, gain_hp, 0, 0); + int gain_hp = sd->status.max_hp * abs(hp_rate) / 100; // 15% + clif_skill_nodamage(src, bl, skillid, gain_hp, 1); + battle_heal(NULL, bl, gain_hp, 0, 0); } break; case WE_FEMALE: /* あなたの為に犠牲になります */ if (sd && dstsd) { - int sp_rate = + int sp_rate = (skilllv <= 0) ? 0 : skill_db[skillid].sp_rate[skilllv - 1]; - int gain_sp = sd->status.max_sp * abs (sp_rate) / 100; // 15% - clif_skill_nodamage (src, bl, skillid, gain_sp, 1); - battle_heal (NULL, bl, 0, gain_sp, 0); + int gain_sp = sd->status.max_sp * abs(sp_rate) / 100; // 15% + clif_skill_nodamage(src, bl, skillid, gain_sp, 1); + battle_heal(NULL, bl, 0, gain_sp, 0); } break; @@ -4897,24 +4889,24 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, { if (map[sd->bl.m].flag.nomemo) { - clif_skill_teleportmessage (sd, 1); + clif_skill_teleportmessage(sd, 1); return 0; } - if ((dstsd = pc_get_partner (sd)) == NULL) + if ((dstsd = pc_get_partner(sd)) == NULL) { - clif_skill_fail (sd, skillid, 0, 0); + clif_skill_fail(sd, skillid, 0, 0); return 0; } - skill_unitsetting (src, skillid, skilllv, sd->bl.x, sd->bl.y, + skill_unitsetting(src, skillid, skilllv, sd->bl.x, sd->bl.y, 0); } break; case PF_HPCONVERSION: /* ライフ置き換え */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (sd) { - int conv_hp = 0, conv_sp = 0; + int conv_hp = 0, conv_sp = 0; conv_hp = sd->status.hp / 10; //基本はHPの10% sd->status.hp -= conv_hp; //HPを減らす conv_sp = conv_hp * 20 * skilllv / 100; @@ -4923,12 +4915,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, sd->status.max_sp) ? sd->status.max_sp - sd->status.sp : conv_sp; sd->status.sp += conv_sp; //SPを増やす - pc_heal (sd, -conv_hp, conv_sp); - clif_heal (sd->fd, SP_SP, conv_sp); + pc_heal(sd, -conv_hp, conv_sp); + clif_heal(sd->fd, SP_SP, conv_sp); } break; case HT_REMOVETRAP: /* リムーブトラップ */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); { struct skill_unit *su = NULL; struct item item_tmp; @@ -4948,7 +4940,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (skill_db[su->group->skill_id].itemid[i] > 0) { - memset (&item_tmp, 0, sizeof (item_tmp)); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = skill_db[su->group-> skill_id].itemid[i]; @@ -4956,13 +4948,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, int item_flag; if (item_tmp.nameid && (item_flag = - pc_additem (sd, &item_tmp, + pc_additem(sd, &item_tmp, skill_db[su-> group->skill_id].amount [i]))) { - clif_additem (sd, 0, 0, item_flag); - map_addflooritem (&item_tmp, + clif_additem(sd, 0, 0, item_flag); + map_addflooritem(&item_tmp, skill_db[su-> group->skill_id].amount [i], sd->bl.m, @@ -4975,15 +4967,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, } else { - memset (&item_tmp, 0, sizeof (item_tmp)); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = 1065; item_tmp.identify = 1; int item_flag; if (item_tmp.nameid - && (item_flag = pc_additem (sd, &item_tmp, 1))) + && (item_flag = pc_additem(sd, &item_tmp, 1))) { - clif_additem (sd, 0, 0, item_flag); - map_addflooritem (&item_tmp, 1, sd->bl.m, + clif_additem(sd, 0, 0, item_flag); + map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, NULL, NULL, NULL, 0); } @@ -4993,18 +4985,18 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, if (su->group->unit_id == 0x91 && su->group->val2) { struct block_list *target = - map_id2bl (su->group->val2); + map_id2bl(su->group->val2); if (target && (target->type == BL_PC || target->type == BL_MOB)) - skill_status_change_end (target, SC_ANKLE, -1); + skill_status_change_end(target, SC_ANKLE, -1); } - skill_delunit (su); + skill_delunit(su); } } break; case HT_SPRINGTRAP: /* スプリングトラップ */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); { struct skill_unit *su = NULL; if ((bl->type == BL_SKILL) && (su = (struct skill_unit *) bl) @@ -5022,77 +5014,77 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, case 0x98: /* クレイモアートラップ */ case 0x99: /* トーキーボックス */ su->group->unit_id = 0x8c; - clif_changelook (bl, LOOK_BASE, + clif_changelook(bl, LOOK_BASE, su->group->unit_id); su->group->limit = - DIFF_TICK (tick + 1500, su->group->tick); + DIFF_TICK(tick + 1500, su->group->tick); su->limit = - DIFF_TICK (tick + 1500, su->group->tick); + DIFF_TICK(tick + 1500, su->group->tick); } } } break; case BD_ENCORE: /* アンコール */ - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); if (sd) - skill_use_id (sd, src->id, sd->skillid_dance, + skill_use_id(sd, src->id, sd->skillid_dance, sd->skilllv_dance); break; case AS_SPLASHER: /* ベナムスプラッシャー */ - if ((double) battle_get_max_hp (bl) * 2 / 3 < battle_get_hp (bl)) //HPが2/3以上残っていたら失敗 + if ((double) battle_get_max_hp(bl) * 2 / 3 < battle_get_hp(bl)) //HPが2/3以上残っていたら失敗 return 1; - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, skillid, src->id, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); break; case PF_MINDBREAKER: /* プロボック */ { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); /* MVPmobと不死には効かない */ - if ((bl->type == BL_MOB && battle_get_mode (bl) & 0x20) || battle_check_undead (battle_get_race (bl), battle_get_elem_type (bl))) //不死には効かない + if ((bl->type == BL_MOB && battle_get_mode(bl) & 0x20) || battle_check_undead(battle_get_race(bl), battle_get_elem_type(bl))) //不死には効かない { - map_freeblock_unlock (); + map_freeblock_unlock(); return 1; } - clif_skill_nodamage (src, bl, skillid, skilllv, 1); - skill_status_change_start (bl, SkillStatusChangeTable[skillid], + clif_skill_nodamage(src, bl, skillid, skilllv, 1); + skill_status_change_start(bl, SkillStatusChangeTable[skillid], skilllv, 0, 0, 0, - skill_get_time (skillid, skilllv), 0); + skill_get_time(skillid, skilllv), 0); if (dstmd && dstmd->skilltimer != -1 && dstmd->state.skillcastcancel) // 詠唱妨害 - skill_castcancel (bl, 0); + skill_castcancel(bl, 0); if (dstsd && dstsd->skilltimer != -1 && !dstsd->special_state.no_castcancel && dstsd->state.skillcastcancel && !dstsd->special_state.no_castcancel2) - skill_castcancel (bl, 0); + skill_castcancel(bl, 0); if (sc_data) { if (sc_data[SC_FREEZE].timer != -1) - skill_status_change_end (bl, SC_FREEZE, -1); + skill_status_change_end(bl, SC_FREEZE, -1); if (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0) - skill_status_change_end (bl, SC_STONE, -1); + skill_status_change_end(bl, SC_STONE, -1); if (sc_data[SC_SLEEP].timer != -1) - skill_status_change_end (bl, SC_SLEEP, -1); + skill_status_change_end(bl, SC_SLEEP, -1); } if (bl->type == BL_MOB) { - int range = skill_get_range (skillid, skilllv); + int range = skill_get_range(skillid, skilllv); if (range < 0) - range = battle_get_range (src) - (range + 1); - mob_target ((struct mob_data *) bl, src, range); + range = battle_get_range(src) - (range + 1); + mob_target((struct mob_data *) bl, src, range); } } break; case RG_CLEANER: //AppleGirl - clif_skill_nodamage (src, bl, skillid, skilllv, 1); + clif_skill_nodamage(src, bl, skillid, skilllv, 1); { struct skill_unit *su = NULL; if ((bl->type == BL_SKILL) && @@ -5101,17 +5093,17 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, && (su->group->unit_id == 0xb0)) { //罠を取り返す if (sd) - skill_delunit (su); + skill_delunit(su); } } break; default: - printf ("Unknown skill used:%d\n", skillid); - map_freeblock_unlock (); + printf("Unknown skill used:%d\n", skillid); + map_freeblock_unlock(); return 1; } - map_freeblock_unlock (); + map_freeblock_unlock(); return 0; } @@ -5120,13 +5112,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, *------------------------------------------ */ static -void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void skill_castend_id(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - struct map_session_data *sd = map_id2sd (id) /*,*target_sd=NULL */ ; + struct map_session_data *sd = map_id2sd(id) /*,*target_sd=NULL */ ; struct block_list *bl; - int range, inf2; + int range, inf2; - nullpo_retv ( sd); + nullpo_retv( sd); if (sd->bl.prev == NULL) //prevが無いのはありなの？ return; @@ -5134,22 +5126,22 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t if (sd->skillid != SA_CASTCANCEL && sd->skilltimer != tid) /* タイマIDの確認 */ return; if (sd->skillid != SA_CASTCANCEL && sd->skilltimer != -1 - && pc_checkskill (sd, SA_FREECAST) > 0) + && pc_checkskill(sd, SA_FREECAST) > 0) { sd->speed = sd->prev_speed; - clif_updatestatus (sd, SP_SPEED); + clif_updatestatus(sd, SP_SPEED); } if (sd->skillid != SA_CASTCANCEL) sd->skilltimer = -1; - if ((bl = map_id2bl (sd->skilltarget)) == NULL || bl->prev == NULL) + if ((bl = map_id2bl(sd->skilltarget)) == NULL || bl->prev == NULL) { sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; return; } - if (sd->bl.m != bl->m || pc_isdead (sd)) + if (sd->bl.m != bl->m || pc_isdead(sd)) { //マップが違うか自分が死んでいる sd->canact_tick = tick; sd->canmove_tick = tick; @@ -5159,13 +5151,13 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t if (sd->skillid == PR_LEXAETERNA) { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); if (sc_data && (sc_data[SC_FREEZE].timer != -1 || (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0))) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; @@ -5174,12 +5166,12 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } else if (sd->skillid == RG_BACKSTAP) { - int dir = map_calc_dir (&sd->bl, bl->x, bl->y), t_dir = - battle_get_dir (bl); - int dist = distance (sd->bl.x, sd->bl.y, bl->x, bl->y); - if (bl->type != BL_SKILL && (dist == 0 || map_check_dir (dir, t_dir))) + int dir = map_calc_dir(&sd->bl, bl->x, bl->y), t_dir = + battle_get_dir(bl); + int dist = distance(sd->bl.x, sd->bl.y, bl->x, bl->y); + if (bl->type != BL_SKILL && (dist == 0 || map_check_dir(dir, t_dir))) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; @@ -5187,9 +5179,9 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } } - inf2 = skill_get_inf2 (sd->skillid); - if (((skill_get_inf (sd->skillid) & 1) || inf2 & 4) && // 彼我敵対関係チェック - battle_check_target (&sd->bl, bl, BCT_ENEMY) <= 0) + inf2 = skill_get_inf2(sd->skillid); + if (((skill_get_inf(sd->skillid) & 1) || inf2 & 4) && // 彼我敵対関係チェック + battle_check_target(&sd->bl, bl, BCT_ENEMY) <= 0) { sd->canact_tick = tick; sd->canmove_tick = tick; @@ -5198,12 +5190,12 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } if (inf2 & 0xC00 && sd->bl.id != bl->id) { - int fail_flag = 1; - if (inf2 & 0x400 && battle_check_target (&sd->bl, bl, BCT_PARTY) > 0) + int fail_flag = 1; + if (inf2 & 0x400 && battle_check_target(&sd->bl, bl, BCT_PARTY) > 0) fail_flag = 0; if (fail_flag) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; @@ -5211,9 +5203,9 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } } - range = skill_get_range (sd->skillid, sd->skilllv); + range = skill_get_range(sd->skillid, sd->skilllv); if (range < 0) - range = battle_get_range (&sd->bl) - (range + 1); + range = battle_get_range(&sd->bl) - (range + 1); range += battle_config.pc_skill_add_range; if ((sd->skillid == MO_EXTREMITYFIST && sd->sc_data[SC_COMBO].timer != -1 && sd->sc_data[SC_COMBO].val1 == MO_COMBOFINISH) @@ -5224,19 +5216,19 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t || (sd->skillid == CH_CHAINCRUSH && sd->sc_data[SC_COMBO].timer != -1 && sd->sc_data[SC_COMBO].val1 == CH_TIGERFIST)) range += - skill_get_blewcount (MO_COMBOFINISH, sd->sc_data[SC_COMBO].val2); + skill_get_blewcount(MO_COMBOFINISH, sd->sc_data[SC_COMBO].val2); if (battle_config.skill_out_range_consume) { // changed to allow casting when target walks out of range [Valaris] - if (range < distance (sd->bl.x, sd->bl.y, bl->x, bl->y)) + if (range < distance(sd->bl.x, sd->bl.y, bl->x, bl->y)) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; return; } } - if (!skill_check_condition (sd, 1)) + if (!skill_check_condition(sd, 1)) { /* 使用条件チェック */ sd->canact_tick = tick; sd->canmove_tick = tick; @@ -5246,9 +5238,9 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t sd->skillitem = sd->skillitemlv = -1; if (battle_config.skill_out_range_consume) { - if (range < distance (sd->bl.x, sd->bl.y, bl->x, bl->y)) + if (range < distance(sd->bl.x, sd->bl.y, bl->x, bl->y)) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; return; @@ -5256,27 +5248,27 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } if (battle_config.pc_skill_log) - printf ("PC %d skill castend skill=%d\n", sd->bl.id, sd->skillid); - pc_stop_walking (sd, 0); + printf("PC %d skill castend skill=%d\n", sd->bl.id, sd->skillid); + pc_stop_walking(sd, 0); - switch (skill_get_nk (sd->skillid)) + switch (skill_get_nk(sd->skillid)) { /* 攻撃系/吹き飛ばし系 */ case 0: case 2: - skill_castend_damage_id (&sd->bl, bl, sd->skillid, sd->skilllv, + skill_castend_damage_id(&sd->bl, bl, sd->skillid, sd->skilllv, tick, 0); break; case 1: /* 支援系 */ if ((sd->skillid == AL_HEAL || (sd->skillid == ALL_RESURRECTION && bl->type != BL_PC) || sd->skillid == PR_ASPERSIO) - && battle_check_undead (battle_get_race (bl), - battle_get_elem_type (bl))) - skill_castend_damage_id (&sd->bl, bl, sd->skillid, + && battle_check_undead(battle_get_race(bl), + battle_get_elem_type(bl))) + skill_castend_damage_id(&sd->bl, bl, sd->skillid, sd->skilllv, tick, 0); else - skill_castend_nodamage_id (&sd->bl, bl, sd->skillid, + skill_castend_nodamage_id(&sd->bl, bl, sd->skillid, sd->skilllv, tick, 0); break; } @@ -5286,36 +5278,36 @@ void skill_castend_id (timer_id tid, tick_t tick, custom_id_t id, custom_data_t * スキル使用（詠唱完了、場所指定の実際の処理） *------------------------------------------ */ -int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, +int skill_castend_pos2(struct block_list *src, int x, int y, int skillid, int skilllv, unsigned int tick, int flag) { struct map_session_data *sd = NULL; - int i, tmpx = 0, tmpy = 0, x1 = 0, y1 = 0; + int i, tmpx = 0, tmpy = 0, x1 = 0, y1 = 0; - nullpo_retr (0, src); + nullpo_retr(0, src); if (src->type == BL_PC) { - nullpo_retr (0, sd = (struct map_session_data *) src); + nullpo_retr(0, sd = (struct map_session_data *) src); } if (skillid != WZ_METEOR && skillid != WZ_SIGHTRASHER && skillid != AM_CANNIBALIZE && skillid != AM_SPHEREMINE) - clif_skill_poseffect (src, skillid, skilllv, x, y, tick); + clif_skill_poseffect(src, skillid, skilllv, x, y, tick); - if (skillnotok (skillid, sd)) // [MouseJstr] + if (skillnotok(skillid, sd)) // [MouseJstr] return 0; switch (skillid) { case PR_BENEDICTIO: /* 聖体降福 */ skill_area_temp[1] = src->id; - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, src->m, x - 1, y - 1, x + 1, y + 1, 0, src, skillid, skilllv, tick, flag | BCT_NOENEMY | 1, skill_castend_nodamage_id); - map_foreachinarea (skill_area_sub, src->m, x - 1, y - 1, x + 1, + map_foreachinarea(skill_area_sub, src->m, x - 1, y - 1, x + 1, y + 1, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 1, skill_castend_damage_id); break; @@ -5324,7 +5316,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, skill_area_temp[1] = src->id; skill_area_temp[2] = x; skill_area_temp[3] = y; - map_foreachinarea (skill_area_sub, + map_foreachinarea(skill_area_sub, src->m, x - 2, y - 2, x + 2, y + 2, 0, src, skillid, skilllv, tick, flag | BCT_ENEMY | 2, @@ -5334,7 +5326,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, case HT_DETECTING: /* ディテクティング */ { const int range = 7; - map_foreachinarea (skill_status_change_timer_sub, + map_foreachinarea(skill_status_change_timer_sub, src->m, src->x - range, src->y - range, src->x + range, src->y + range, 0, src, SC_SIGHT, tick); @@ -5370,20 +5362,20 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, case PF_SPIDERWEB: /* スパイダーウェッブ */ case PF_FOGWALL: /* フォグウォール */ case HT_TALKIEBOX: /* トーキーボックス */ - skill_unitsetting (src, skillid, skilllv, x, y, 0); + skill_unitsetting(src, skillid, skilllv, x, y, 0); break; case RG_GRAFFITI: /* Graffiti [Valaris] */ - skill_clear_unitgroup (src); - skill_unitsetting (src, skillid, skilllv, x, y, 0); + skill_clear_unitgroup(src); + skill_unitsetting(src, skillid, skilllv, x, y, 0); break; case SA_VOLCANO: /* ボルケーノ */ case SA_DELUGE: /* デリュージ */ case SA_VIOLENTGALE: /* バイオレントゲイル */ case SA_LANDPROTECTOR: /* ランドプロテクター */ - skill_clear_element_field (src); //既に自分が発動している属性場をクリア - skill_unitsetting (src, skillid, skilllv, x, y, 0); + skill_clear_element_field(src); //既に自分が発動している属性場をクリア + skill_unitsetting(src, skillid, skilllv, x, y, 0); break; case WZ_METEOR: //メテオストーム @@ -5391,11 +5383,11 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int flag_ = 0; for (i = 0; i < 2 + (skilllv >> 1); i++) { - int j = 0, c; + int j = 0, c; do { - tmpx = x + (MRAND (7) - 3); - tmpy = y + (MRAND (7) - 3); + tmpx = x + (MRAND(7) - 3); + tmpy = y + (MRAND(7) - 3); if (tmpx < 0) tmpx = 0; else if (tmpx >= map[src->m].xs) @@ -5406,24 +5398,24 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, tmpy = map[src->m].ys - 1; j++; } - while (((c = map_getcell (src->m, tmpx, tmpy)) == 1 || c == 5) + while (((c = map_getcell(src->m, tmpx, tmpy)) == 1 || c == 5) && j < 100); if (j >= 100) continue; if (flag_ == 0) { - clif_skill_poseffect (src, skillid, skilllv, tmpx, tmpy, + clif_skill_poseffect(src, skillid, skilllv, tmpx, tmpy, tick); flag_ = 1; } if (i > 0) - skill_addtimerskill (src, tick + i * 1000, 0, tmpx, tmpy, + skill_addtimerskill(src, tick + i * 1000, 0, tmpx, tmpy, skillid, skilllv, (x1 << 16) | y1, flag_); x1 = tmpx; y1 = tmpy; } - skill_addtimerskill (src, tick + i * 1000, 0, tmpx, tmpy, skillid, + skill_addtimerskill(src, tick + i * 1000, 0, tmpx, tmpy, skillid, skilllv, -1, flag_); } break; @@ -5433,7 +5425,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, { if (map[sd->bl.m].flag.noteleport) /* テレポ禁止 */ break; - clif_skill_warppoint (sd, sd->skillid, + clif_skill_warppoint(sd, sd->skillid, sd->status.save_point.map, (sd->skilllv > 1) ? sd->status.memo_point[0].map : "", @@ -5447,55 +5439,55 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, case MO_BODYRELOCATION: if (sd) { - pc_movepos (sd, x, y); + pc_movepos(sd, x, y); } else if (src->type == BL_MOB) - mob_warp ((struct mob_data *) src, -1, x, y, 0); + mob_warp((struct mob_data *) src, -1, x, y, 0); break; case AM_CANNIBALIZE: // バイオプラント if (sd) { - int mx, my, id = 0; + int mx, my, id = 0; struct mob_data *md; mx = x; // + (rand()%10 - 5); my = y; // + (rand()%10 - 5); - id = mob_once_spawn (sd, "this", mx, my, "--ja--", 1118, 1, + id = mob_once_spawn(sd, "this", mx, my, "--ja--", 1118, 1, ""); - if ((md = (struct mob_data *) map_id2bl (id)) != NULL) + if ((md = (struct mob_data *) map_id2bl(id)) != NULL) { md->master_id = sd->bl.id; md->hp = 2210 + skilllv * 200; md->state.special_mob_ai = 1; md->deletetimer = - add_timer (gettick () + - skill_get_time (skillid, skilllv), + add_timer(gettick() + + skill_get_time(skillid, skilllv), mob_timer_delete, id, 0); } - clif_skill_poseffect (src, skillid, skilllv, x, y, tick); + clif_skill_poseffect(src, skillid, skilllv, x, y, tick); } break; case AM_SPHEREMINE: // スフィアーマイン if (sd) { - int mx, my, id = 0; + int mx, my, id = 0; struct mob_data *md; mx = x; // + (rand()%10 - 5); my = y; // + (rand()%10 - 5); - id = mob_once_spawn (sd, "this", mx, my, "--ja--", 1142, 1, + id = mob_once_spawn(sd, "this", mx, my, "--ja--", 1142, 1, ""); - if ((md = (struct mob_data *) map_id2bl (id)) != NULL) + if ((md = (struct mob_data *) map_id2bl(id)) != NULL) { md->master_id = sd->bl.id; md->hp = 1000 + skilllv * 200; md->state.special_mob_ai = 2; md->deletetimer = - add_timer (gettick () + - skill_get_time (skillid, skilllv), + add_timer(gettick() + + skill_get_time(skillid, skilllv), mob_timer_delete, id, 0); } - clif_skill_poseffect (src, skillid, skilllv, x, y, tick); + clif_skill_poseffect(src, skillid, skilllv, x, y, tick); } break; } @@ -5507,13 +5499,13 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, * スキル使用（詠唱完了、map指定） *------------------------------------------ */ -int skill_castend_map (struct map_session_data *sd, int skill_num, +int skill_castend_map(struct map_session_data *sd, int skill_num, const char *mapname) { - int x = 0, y = 0; + int x = 0, y = 0; - nullpo_retr (0, sd); - if (sd->bl.prev == NULL || pc_isdead (sd)) + nullpo_retr(0, sd); + if (sd->bl.prev == NULL || pc_isdead(sd)) return 0; if (sd->opt1 > 0 || sd->status.option & 2) @@ -5533,23 +5525,23 @@ int skill_castend_map (struct map_session_data *sd, int skill_num, if (skill_num != sd->skillid) /* 不正パケットらしい */ return 0; - pc_stopattack (sd); + pc_stopattack(sd); if (battle_config.pc_skill_log) - printf ("PC %d skill castend skill =%d map=%s\n", sd->bl.id, + printf("PC %d skill castend skill =%d map=%s\n", sd->bl.id, skill_num, mapname); - pc_stop_walking (sd, 0); + pc_stop_walking(sd, 0); - if (strcmp (mapname, "cancel") == 0) + if (strcmp(mapname, "cancel") == 0) return 0; switch (skill_num) { case AL_TELEPORT: /* テレポート */ - if (strcmp (mapname, "Random") == 0) - pc_randomwarp (sd, 3); + if (strcmp(mapname, "Random") == 0) + pc_randomwarp(sd, 3); else - pc_setpos (sd, sd->status.save_point.map, + pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 3); break; @@ -5561,12 +5553,12 @@ int skill_castend_map (struct map_session_data *sd, int skill_num, &sd->status.memo_point[1], &sd->status.memo_point[2], }; struct skill_unit_group *group; - int i; - int maxcount = 0; + int i; + int maxcount = 0; - if ((maxcount = skill_get_maxcount (sd->skillid)) > 0) + if ((maxcount = skill_get_maxcount(sd->skillid)) > 0) { - int c; + int c; for (i = c = 0; i < MAX_SKILLUNITGROUP; i++) { if (sd->skillunit[i].alive_count > 0 @@ -5575,9 +5567,9 @@ int skill_castend_map (struct map_session_data *sd, int skill_num, } if (c >= maxcount) { - clif_skill_fail (sd, sd->skillid, 0, 0); - sd->canact_tick = gettick (); - sd->canmove_tick = gettick (); + clif_skill_fail(sd, sd->skillid, 0, 0); + sd->canact_tick = gettick(); + sd->canmove_tick = gettick(); sd->skillitem = sd->skillitemlv = -1; return 0; } @@ -5585,7 +5577,7 @@ int skill_castend_map (struct map_session_data *sd, int skill_num, for (i = 0; i < sd->skilllv; i++) { - if (strcmp (mapname, p[i]->map) == 0) + if (strcmp(mapname, p[i]->map) == 0) { x = p[i]->x; y = p[i]->y; @@ -5595,14 +5587,14 @@ int skill_castend_map (struct map_session_data *sd, int skill_num, if (x == 0 || y == 0) /* 不正パケット？ */ return 0; - if (!skill_check_condition (sd, 3)) + if (!skill_check_condition(sd, 3)) return 0; if ((group = - skill_unitsetting (&sd->bl, sd->skillid, sd->skilllv, + skill_unitsetting(&sd->bl, sd->skillid, sd->skilllv, sd->skillx, sd->skilly, 0)) == NULL) return 0; - CREATE (group->valstr, char, 24); - memcpy (group->valstr, map, 24); + CREATE(group->valstr, char, 24); + memcpy(group->valstr, map, 24); group->val2 = (x << 16) | y; } break; @@ -5615,22 +5607,22 @@ int skill_castend_map (struct map_session_data *sd, int skill_num, * スキルユニット設定処理 *------------------------------------------ */ -struct skill_unit_group *skill_unitsetting (struct block_list *src, +struct skill_unit_group *skill_unitsetting(struct block_list *src, int skillid, int skilllv, int x, int y, int flag) { struct skill_unit_group *group; - int i, count = 1, limit_ = 10000, val1_ = 0, val2_ = 0; - int target = BCT_ENEMY, interval = 1000, range_ = 0; - int dir = 0, aoe_diameter = 0; // -- aoe_diameter (moonsoul) added for sage Area Of Effect skills + int i, count = 1, limit_ = 10000, val1_ = 0, val2_ = 0; + int target = BCT_ENEMY, interval = 1000, range_ = 0; + int dir = 0, aoe_diameter = 0; // -- aoe_diameter (moonsoul) added for sage Area Of Effect skills - nullpo_retr (0, src); + nullpo_retr(0, src); switch (skillid) { /* 設定 */ case MG_SAFETYWALL: /* セイフティウォール */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); val2_ = skilllv + 1; interval = -1; target = (battle_config.defnotenemy) ? BCT_NOENEMY : BCT_ALL; @@ -5640,18 +5632,18 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, if (src->x == x && src->y == y) dir = 2; else - dir = map_calc_dir (src, x, y); + dir = map_calc_dir(src, x, y); if (dir & 1) count = 5; else count = 3; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); val2_ = 4 + skilllv; interval = 1; break; case AL_PNEUMA: /* ニューマ */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); interval = -1; target = (battle_config.defnotenemy) ? BCT_NOENEMY : BCT_ALL; count = 9; @@ -5663,12 +5655,12 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, if (flag == 0) limit_ = 2000; else - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); break; case PR_SANCTUARY: /* サンクチュアリ */ count = 21; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); val1_ = skilllv + 3; val2_ = (skilllv > 6) ? 777 : skilllv * 100; target = BCT_ALL; @@ -5677,13 +5669,13 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, case PR_MAGNUS: /* マグヌスエクソシズム */ count = 33; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); interval = 3000; break; case WZ_FIREPILLAR: /* ファイアーピラー */ if (flag == 0) - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); else limit_ = 1000; interval = 2000; @@ -5722,7 +5714,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, break; case WZ_ICEWALL: /* アイスウォール */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); count = 5; break; @@ -5733,7 +5725,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, break; case WZ_QUAGMIRE: /* クァグマイア */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); interval = 200; count = 25; break; @@ -5747,24 +5739,24 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, case HT_FREEZINGTRAP: /* フリージングトラップ */ case HT_BLASTMINE: /* ブラストマイン */ case HT_CLAYMORETRAP: /* クレイモアートラップ */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 1; break; case HT_TALKIEBOX: /* トーキーボックス */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 1; target = BCT_ALL; break; case HT_SHOCKWAVE: /* ショックウェーブトラップ */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 1; val1_ = skilllv * 15 + 10; break; case AS_VENOMDUST: /* ベノムダスト */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); interval = 1000; count = 5; break; @@ -5778,13 +5770,13 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, case SA_VOLCANO: /* ボルケーノ */ case SA_DELUGE: /* デリュージ */ case SA_VIOLENTGALE: /* バイオレントゲイル */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); count = skilllv <= 2 ? 25 : (skilllv <= 4 ? 49 : 81); target = BCT_ALL; break; case SA_LANDPROTECTOR: /* グランドクロス */ - limit_ = skill_get_time (skillid, skilllv); // changed to get duration from cast_db (moonsoul) + limit_ = skill_get_time(skillid, skilllv); // changed to get duration from cast_db (moonsoul) val1_ = skilllv * 15 + 10; aoe_diameter = skilllv + skilllv % 2 + 5; target = BCT_ALL; @@ -5795,7 +5787,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, case BD_ETERNALCHAOS: /* エターナルカオス */ case BD_ROKISWEIL: /* ロキの叫び */ count = 81; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_ALL; break; @@ -5805,149 +5797,142 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, case BD_INTOABYSS: /* 深淵の中に */ case BD_SIEGFRIED: /* 不死身のジークフリード */ count = 81; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_PARTY; break; case BA_WHISTLE: /* 口笛 */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_NOENEMY; if (src->type == BL_PC) val1_ = - (pc_checkskill - ((struct map_session_data *) src, + (pc_checkskill((struct map_session_data *) src, BA_MUSICALLESSON) + 1) >> 1; - val2_ = ((battle_get_agi (src) / 10) & 0xffff) << 16; - val2_ |= (battle_get_luk (src) / 10) & 0xffff; + val2_ = ((battle_get_agi(src) / 10) & 0xffff) << 16; + val2_ |= (battle_get_luk(src) / 10) & 0xffff; break; case DC_HUMMING: /* ハミング */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_NOENEMY; if (src->type == BL_PC) val1_ = - (pc_checkskill - ((struct map_session_data *) src, + (pc_checkskill((struct map_session_data *) src, DC_DANCINGLESSON) + 1) >> 1; - val2_ = battle_get_dex (src) / 10; + val2_ = battle_get_dex(src) / 10; break; case BA_DISSONANCE: /* 不協和音 */ case DC_UGLYDANCE: /* 自分勝手なダンス */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_ENEMY; break; case DC_DONTFORGETME: /* 私を忘れないで… */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_ENEMY; if (src->type == BL_PC) val1_ = - (pc_checkskill - ((struct map_session_data *) src, + (pc_checkskill((struct map_session_data *) src, DC_DANCINGLESSON) + 1) >> 1; - val2_ = ((battle_get_str (src) / 20) & 0xffff) << 16; - val2_ |= (battle_get_agi (src) / 10) & 0xffff; + val2_ = ((battle_get_str(src) / 20) & 0xffff) << 16; + val2_ |= (battle_get_agi(src) / 10) & 0xffff; break; case BA_POEMBRAGI: /* ブラギの詩 */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_NOENEMY; if (src->type == BL_PC) val1_ = - pc_checkskill ((struct map_session_data *) src, + pc_checkskill((struct map_session_data *) src, BA_MUSICALLESSON); - val2_ = ((battle_get_dex (src) / 10) & 0xffff) << 16; - val2_ |= (battle_get_int (src) / 5) & 0xffff; + val2_ = ((battle_get_dex(src) / 10) & 0xffff) << 16; + val2_ |= (battle_get_int(src) / 5) & 0xffff; break; case BA_APPLEIDUN: /* イドゥンの林檎 */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_NOENEMY; if (src->type == BL_PC) val1_ = - ((pc_checkskill - ((struct map_session_data *) src, + ((pc_checkskill((struct map_session_data *) src, BA_MUSICALLESSON)) & 0xffff) << 16; else val1_ = 0; - val1_ |= (battle_get_vit (src)) & 0xffff; + val1_ |= (battle_get_vit(src)) & 0xffff; val2_ = 0; //回復用タイムカウンタ(6秒毎に1増加) break; case DC_SERVICEFORYOU: /* サービスフォーユー */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_PARTY; if (src->type == BL_PC) val1_ = - (pc_checkskill - ((struct map_session_data *) src, + (pc_checkskill((struct map_session_data *) src, DC_DANCINGLESSON) + 1) >> 1; - val2_ = battle_get_int (src) / 10; + val2_ = battle_get_int(src) / 10; break; case BA_ASSASSINCROSS: /* 夕陽のアサシンクロス */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_NOENEMY; if (src->type == BL_PC) val1_ = - (pc_checkskill - ((struct map_session_data *) src, + (pc_checkskill((struct map_session_data *) src, BA_MUSICALLESSON) + 1) >> 1; - val2_ = battle_get_agi (src) / 20; + val2_ = battle_get_agi(src) / 20; break; case DC_FORTUNEKISS: /* 幸運のキス */ count = 49; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = 5; target = BCT_NOENEMY; if (src->type == BL_PC) val1_ = - (pc_checkskill - ((struct map_session_data *) src, + (pc_checkskill((struct map_session_data *) src, DC_DANCINGLESSON) + 1) >> 1; - val2_ = battle_get_luk (src) / 10; + val2_ = battle_get_luk(src) / 10; break; case AM_DEMONSTRATION: /* デモンストレーション */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); interval = 1000; range_ = 1; target = BCT_ENEMY; break; case WE_CALLPARTNER: /* あなたに逢いたい */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); range_ = -1; break; case HP_BASILICA: /* バジリカ */ - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); target = BCT_ALL; range_ = 3; //Fix to prevent the priest from walking while Basilica is up. - battle_stopwalking (src, 1); - skill_status_change_start (src, SC_ANKLE, skilllv, 0, 0, 0, limit_, + battle_stopwalking(src, 1); + skill_status_change_start(src, SC_ANKLE, skilllv, 0, 0, 0, limit_, 0); break; case PA_GOSPEL: /* ゴスペル */ count = 49; target = BCT_PARTY; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); break; case PF_FOGWALL: /* フォグウォール */ count = 15; - limit_ = skill_get_time (skillid, skilllv); + limit_ = skill_get_time(skillid, skilllv); break; case RG_GRAFFITI: /* Graffiti */ count = 1; // Leave this at 1 [Valaris] @@ -5955,9 +5940,9 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, break; }; - nullpo_retr (NULL, group = - skill_initunitgroup (src, count, skillid, skilllv, - skill_get_unit_id (skillid, flag & 1))); + nullpo_retr(NULL, group = + skill_initunitgroup(src, count, skillid, skilllv, + skill_get_unit_id(skillid, flag & 1))); group->limit = limit_; group->val1 = val1_; group->val2 = val2_; @@ -5966,15 +5951,15 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, group->range = range_; if (skillid == HT_TALKIEBOX || skillid == RG_GRAFFITI) { - CREATE (group->valstr, char, 80); - memcpy (group->valstr, talkie_mes, 80); + CREATE(group->valstr, char, 80); + memcpy(group->valstr, talkie_mes, 80); } for (i = 0; i < count; i++) { struct skill_unit *unit; - int ux = x, uy = y, val1 = skilllv, val2 = 0, limit = + int ux = x, uy = y, val1 = skilllv, val2 = 0, limit = group->limit, alive = 1; - int range = group->range; + int range = group->range; switch (skillid) { /* 設定 */ case AL_PNEUMA: /* ニューマ */ @@ -6068,7 +6053,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, if (src->x == x && src->y == y) dir = 2; else - dir = map_calc_dir (src, x, y); + dir = map_calc_dir(src, x, y); ux += (2 - i) * diry[dir]; uy += (i - 2) * dirx[dir]; } @@ -6111,7 +6096,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, case SA_DELUGE: /* デリュージ */ case SA_VIOLENTGALE: /* バイオレントゲイル */ { - int u_range = 0, central = 0; + int u_range = 0, central = 0; if (skilllv <= 2) { u_range = 2; @@ -6138,7 +6123,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, break; case SA_LANDPROTECTOR: /* ランドプロテクター */ { - int u_range = 0; + int u_range = 0; if (skilllv <= 2) u_range = 3; @@ -6202,24 +6187,24 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, } //直上スキルの場合設置座標上にランドプロテクターがないかチェック if (range <= 0) - map_foreachinarea (skill_landprotector, src->m, ux, uy, ux, uy, + map_foreachinarea(skill_landprotector, src->m, ux, uy, ux, uy, BL_SKILL, skillid, &alive); if (skillid == WZ_ICEWALL && alive) { - val2 = map_getcell (src->m, ux, uy); + val2 = map_getcell(src->m, ux, uy); if (val2 == 5 || val2 == 1) alive = 0; else { - map_setcell (src->m, ux, uy, 5); - clif_changemapcell (src->m, ux, uy, 5, 0); + map_setcell(src->m, ux, uy, 5); + clif_changemapcell(src->m, ux, uy, 5, 0); } } if (alive) { - nullpo_retr (NULL, unit = skill_initunit (group, i, ux, uy)); + nullpo_retr(NULL, unit = skill_initunit(group, i, ux, uy)); unit->val1 = val1; unit->val2 = val2; unit->limit = limit; @@ -6234,41 +6219,41 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, *------------------------------------------ */ static -int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, +int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, unsigned int tick) { struct skill_unit_group *sg; struct block_list *ss; struct skill_unit_group_tickset *ts; struct map_session_data *srcsd = NULL; - int diff, goflag, splash_count = 0; + int diff, goflag, splash_count = 0; - nullpo_retr (0, src); - nullpo_retr (0, bl); + nullpo_retr(0, src); + nullpo_retr(0, bl); if (bl->prev == NULL || !src->alive - || (bl->type == BL_PC && pc_isdead ((struct map_session_data *) bl))) + || (bl->type == BL_PC && pc_isdead((struct map_session_data *) bl))) return 0; - nullpo_retr (0, sg = src->group); - nullpo_retr (0, ss = map_id2bl (sg->src_id)); + nullpo_retr(0, sg = src->group); + nullpo_retr(0, ss = map_id2bl(sg->src_id)); if (ss->type == BL_PC) - nullpo_retr (0, srcsd = (struct map_session_data *) ss); + nullpo_retr(0, srcsd = (struct map_session_data *) ss); if (srcsd && srcsd->chatID) return 0; if (bl->type != BL_PC && bl->type != BL_MOB) return 0; - nullpo_retr (0, ts = skill_unitgrouptickset_search (bl, sg->group_id)); - diff = DIFF_TICK (tick, ts->tick); + nullpo_retr(0, ts = skill_unitgrouptickset_search(bl, sg->group_id)); + diff = DIFF_TICK(tick, ts->tick); goflag = (diff > sg->interval || diff < 0); if (sg->skill_id == CR_GRANDCROSS && !battle_config.gx_allhit) // 重なっていたら3HITしない - goflag = (diff > sg->interval * map_count_oncell (bl->m, bl->x, bl->y) + goflag = (diff > sg->interval * map_count_oncell(bl->m, bl->x, bl->y) || diff < 0); //対象がLP上に居る場合は無効 - map_foreachinarea (skill_landprotector, bl->m, bl->x, bl->y, bl->x, bl->y, + map_foreachinarea(skill_landprotector, bl->m, bl->x, bl->y, bl->x, bl->y, BL_SKILL, 0, &goflag); if (!goflag) @@ -6280,45 +6265,45 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, { case 0x83: /* サンクチュアリ */ { - int race = battle_get_race (bl); - int damage_flag = - (battle_check_undead (race, battle_get_elem_type (bl)) + int race = battle_get_race(bl); + int damage_flag = + (battle_check_undead(race, battle_get_elem_type(bl)) || race == 6) ? 1 : 0; - if (battle_get_hp (bl) >= battle_get_max_hp (bl) && !damage_flag) + if (battle_get_hp(bl) >= battle_get_max_hp(bl) && !damage_flag) break; if ((sg->val1--) <= 0) { - skill_delunitgroup (sg); + skill_delunitgroup(sg); return 0; } if (!damage_flag) { - int heal = sg->val2; + int heal = sg->val2; if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) heal = 0; /* 黄金蟲カード（ヒール量０） */ - clif_skill_nodamage (&src->bl, bl, AL_HEAL, heal, 1); - battle_heal (NULL, bl, heal, 0, 0); + clif_skill_nodamage(&src->bl, bl, AL_HEAL, heal, 1); + battle_heal(NULL, bl, heal, 0, 0); } else - skill_attack (BF_MAGIC, ss, &src->bl, bl, sg->skill_id, + skill_attack(BF_MAGIC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); } break; case 0x84: /* マグヌスエクソシズム */ { - int race = battle_get_race (bl); - int damage_flag = - (battle_check_undead (race, battle_get_elem_type (bl)) + int race = battle_get_race(bl); + int damage_flag = + (battle_check_undead(race, battle_get_elem_type(bl)) || race == 6) ? 1 : 0; if (!damage_flag) return 0; - skill_attack (BF_MAGIC, ss, &src->bl, bl, sg->skill_id, + skill_attack(BF_MAGIC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); } break; @@ -6326,16 +6311,16 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, case 0x85: /* ニューマ */ { struct skill_unit *unit2; - struct status_change *sc_data = battle_get_sc_data (bl); - int type = SC_PNEUMA; + struct status_change *sc_data = battle_get_sc_data(bl); + int type = SC_PNEUMA; if (sc_data && sc_data[type].timer == -1) - skill_status_change_start (bl, type, sg->skill_lv, (int) src, + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, 0, 0); else if ((unit2 = (struct skill_unit *) sc_data[type].val2) && unit2 != src) { - if (DIFF_TICK (sg->tick, unit2->group->tick) > 0) - skill_status_change_start (bl, type, sg->skill_lv, + if (DIFF_TICK(sg->tick, unit2->group->tick) > 0) + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, 0, 0); ts->tick -= sg->interval; } @@ -6344,16 +6329,16 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, case 0x7e: /* セイフティウォール */ { struct skill_unit *unit2; - struct status_change *sc_data = battle_get_sc_data (bl); - int type = SC_SAFETYWALL; + struct status_change *sc_data = battle_get_sc_data(bl); + int type = SC_SAFETYWALL; if (sc_data && sc_data[type].timer == -1) - skill_status_change_start (bl, type, sg->skill_lv, (int) src, + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, 0, 0); else if ((unit2 = (struct skill_unit *) sc_data[type].val2) && unit2 != src) { if (sg->val1 < unit2->group->val1) - skill_status_change_start (bl, type, sg->skill_lv, + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, 0, 0); ts->tick -= sg->interval; } @@ -6361,47 +6346,47 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, break; case 0x86: /* ロードオブヴァーミリオン(＆ストームガスト ＆グランドクロス) */ - skill_attack (BF_MAGIC, ss, &src->bl, bl, sg->skill_id, + skill_attack(BF_MAGIC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); break; case 0x7f: /* ファイヤーウォール */ if ((src->val2--) > 0) - skill_attack (BF_MAGIC, ss, &src->bl, bl, + skill_attack(BF_MAGIC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); if (src->val2 <= 0) - skill_delunit (src); + skill_delunit(src); break; case 0x87: /* ファイアーピラー(発動前) */ - skill_delunit (src); - skill_unitsetting (ss, sg->skill_id, sg->skill_lv, src->bl.x, + skill_delunit(src); + skill_unitsetting(ss, sg->skill_id, sg->skill_lv, src->bl.x, src->bl.y, 1); break; case 0x88: /* ファイアーピラー(発動後) */ - if (DIFF_TICK (tick, sg->tick) < 150) - skill_attack (BF_MAGIC, ss, &src->bl, bl, sg->skill_id, + if (DIFF_TICK(tick, sg->tick) < 150) + skill_attack(BF_MAGIC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); break; case 0x90: /* スキッドトラップ */ { - int i, c = skill_get_blewcount (sg->skill_id, sg->skill_lv); + int i, c = skill_get_blewcount(sg->skill_id, sg->skill_lv); for (i = 0; i < c; i++) - skill_blown (&src->bl, bl, 1 | 0x30000); + skill_blown(&src->bl, bl, 1 | 0x30000); sg->unit_id = 0x8c; - clif_changelook (&src->bl, LOOK_BASE, sg->unit_id); - sg->limit = DIFF_TICK (tick, sg->tick) + 1500; + clif_changelook(&src->bl, LOOK_BASE, sg->unit_id); + sg->limit = DIFF_TICK(tick, sg->tick) + 1500; } break; case 0x93: /* ランドマイン */ - skill_attack (BF_MISC, ss, &src->bl, bl, sg->skill_id, + skill_attack(BF_MISC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); sg->unit_id = 0x8c; - clif_changelook (&src->bl, LOOK_BASE, 0x88); - sg->limit = DIFF_TICK (tick, sg->tick) + 1500; + clif_changelook(&src->bl, LOOK_BASE, 0x88); + sg->limit = DIFF_TICK(tick, sg->tick) + 1500; break; case 0x8f: /* ブラストマイン */ @@ -6410,48 +6395,48 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, case 0x96: /* フラッシャー */ case 0x97: /* フリージングトラップ */ case 0x98: /* クレイモアートラップ */ - map_foreachinarea (skill_count_target, src->bl.m, + map_foreachinarea(skill_count_target, src->bl.m, src->bl.x - src->range, src->bl.y - src->range, src->bl.x + src->range, src->bl.y + src->range, 0, &src->bl, &splash_count); - map_foreachinarea (skill_trap_splash, src->bl.m, + map_foreachinarea(skill_trap_splash, src->bl.m, src->bl.x - src->range, src->bl.y - src->range, src->bl.x + src->range, src->bl.y + src->range, 0, &src->bl, tick, splash_count); sg->unit_id = 0x8c; - clif_changelook (&src->bl, LOOK_BASE, sg->unit_id); - sg->limit = DIFF_TICK (tick, sg->tick) + 1500; + clif_changelook(&src->bl, LOOK_BASE, sg->unit_id); + sg->limit = DIFF_TICK(tick, sg->tick) + 1500; break; case 0x91: /* アンクルスネア */ { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); if (sg->val2 == 0 && sc_data && sc_data[SC_ANKLE].timer == -1) { - int moveblock = (bl->x / BLOCK_SIZE != src->bl.x / BLOCK_SIZE + int moveblock = (bl->x / BLOCK_SIZE != src->bl.x / BLOCK_SIZE || bl->y / BLOCK_SIZE != src->bl.y / BLOCK_SIZE); - int sec = skill_get_time2 (sg->skill_id, + int sec = skill_get_time2(sg->skill_id, sg->skill_lv) - - (double) battle_get_agi (bl) * 0.1; - if (battle_get_mode (bl) & 0x20) + (double) battle_get_agi(bl) * 0.1; + if (battle_get_mode(bl) & 0x20) sec = sec / 5; - battle_stopwalking (bl, 1); - skill_status_change_start (bl, SC_ANKLE, sg->skill_lv, 0, 0, + battle_stopwalking(bl, 1); + skill_status_change_start(bl, SC_ANKLE, sg->skill_lv, 0, 0, 0, sec, 0); if (moveblock) - map_delblock (bl); + map_delblock(bl); bl->x = src->bl.x; bl->y = src->bl.y; if (moveblock) - map_addblock (bl); + map_addblock(bl); if (bl->type == BL_MOB) - clif_fixmobpos ((struct mob_data *) bl); + clif_fixmobpos((struct mob_data *) bl); else - clif_fixpos (bl); - clif_01ac (&src->bl); - sg->limit = DIFF_TICK (tick, sg->tick) + sec; + clif_fixpos(bl); + clif_01ac(&src->bl); + sg->limit = DIFF_TICK(tick, sg->tick) + sec; sg->val2 = bl->id; } } @@ -6469,51 +6454,51 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, { if ((sg->val1--) > 0) { - pc_setpos (sd, sg->valstr, sg->val2 >> 16, + pc_setpos(sd, sg->valstr, sg->val2 >> 16, sg->val2 & 0xffff, 3); if (sg->src_id == bl->id - || (strcmp (map[src->bl.m].name, sg->valstr) + || (strcmp(map[src->bl.m].name, sg->valstr) == 0 && src->bl.x == (sg->val2 >> 16) && src->bl.y == (sg->val2 & 0xffff))) - skill_delunitgroup (sg); + skill_delunitgroup(sg); } else - skill_delunitgroup (sg); + skill_delunitgroup(sg); } } } else if (bl->type == BL_MOB && battle_config.mob_warpportal) { - int m = map_mapname2mapid (sg->valstr); + int m = map_mapname2mapid(sg->valstr); struct mob_data *md; md = (struct mob_data *) bl; - mob_warp ((struct mob_data *) bl, m, sg->val2 >> 16, + mob_warp((struct mob_data *) bl, m, sg->val2 >> 16, sg->val2 & 0xffff, 3); } break; case 0x8e: /* クァグマイア */ { - int type = SkillStatusChangeTable[sg->skill_id]; + int type = SkillStatusChangeTable[sg->skill_id]; if (bl->type == BL_PC && ((struct map_session_data *) bl)-> special_state.no_magic_damage) break; - if (battle_get_sc_data (bl)[type].timer == -1) - skill_status_change_start (bl, type, sg->skill_lv, (int) src, + if (battle_get_sc_data(bl)[type].timer == -1) + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); } break; case 0x92: /* ベノムダスト */ { - struct status_change *sc_data = battle_get_sc_data (bl); - int type = SkillStatusChangeTable[sg->skill_id]; + struct status_change *sc_data = battle_get_sc_data(bl); + int type = SkillStatusChangeTable[sg->skill_id]; if (sc_data && sc_data[type].timer == -1) - skill_status_change_start (bl, type, sg->skill_lv, (int) src, + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); } break; @@ -6522,20 +6507,20 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, case 0x9c: /* バイオレントゲイル */ { struct skill_unit *unit2; - struct status_change *sc_data = battle_get_sc_data (bl); - int type = SkillStatusChangeTable[sg->skill_id]; + struct status_change *sc_data = battle_get_sc_data(bl); + int type = SkillStatusChangeTable[sg->skill_id]; if (sc_data && sc_data[type].timer == -1) - skill_status_change_start (bl, type, sg->skill_lv, (int) src, + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); else if ((unit2 = (struct skill_unit *) sc_data[type].val2) && unit2 != src) { - if (DIFF_TICK (sg->tick, unit2->group->tick) > 0) - skill_status_change_start (bl, type, sg->skill_lv, + if (DIFF_TICK(sg->tick, unit2->group->tick) > 0) + skill_status_change_start(bl, type, sg->skill_lv, (int) src, 0, 0, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); ts->tick -= sg->interval; @@ -6562,23 +6547,23 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, case 0xb4: { struct skill_unit *unit2; - struct status_change *sc_data = battle_get_sc_data (bl); - int type = SkillStatusChangeTable[sg->skill_id]; + struct status_change *sc_data = battle_get_sc_data(bl); + int type = SkillStatusChangeTable[sg->skill_id]; if (sg->src_id == bl->id) break; if (sc_data && sc_data[type].timer == -1) - skill_status_change_start (bl, type, sg->skill_lv, sg->val1, + skill_status_change_start(bl, type, sg->skill_lv, sg->val1, sg->val2, (int) src, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); else if ((unit2 = (struct skill_unit *) sc_data[type].val4) && unit2 != src) { if (unit2->group - && DIFF_TICK (sg->tick, unit2->group->tick) > 0) - skill_status_change_start (bl, type, sg->skill_lv, + && DIFF_TICK(sg->tick, unit2->group->tick) > 0) + skill_status_change_start(bl, type, sg->skill_lv, sg->val1, sg->val2, (int) src, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); ts->tick -= sg->interval; @@ -6588,24 +6573,24 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, case 0xaa: /* イドゥンの林檎 */ { struct skill_unit *unit2; - struct status_change *sc_data = battle_get_sc_data (bl); - int type = SkillStatusChangeTable[sg->skill_id]; + struct status_change *sc_data = battle_get_sc_data(bl); + int type = SkillStatusChangeTable[sg->skill_id]; if (sg->src_id == bl->id) break; if (sc_data && sc_data[type].timer == -1) - skill_status_change_start (bl, type, sg->skill_lv, + skill_status_change_start(bl, type, sg->skill_lv, (sg->val1) >> 16, (sg->val1) & 0xffff, (int) src, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); else if ((unit2 = (struct skill_unit *) sc_data[type].val4) && unit2 != src) { - if (DIFF_TICK (sg->tick, unit2->group->tick) > 0) - skill_status_change_start (bl, type, sg->skill_lv, + if (DIFF_TICK(sg->tick, unit2->group->tick) > 0) + skill_status_change_start(bl, type, sg->skill_lv, (sg->val1) >> 16, (sg->val1) & 0xffff, (int) src, - skill_get_time2 (sg->skill_id, + skill_get_time2(sg->skill_id, sg->skill_lv), 0); ts->tick -= sg->interval; @@ -6613,21 +6598,21 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, } break; case 0xb1: /* デモンストレーション */ - skill_attack (BF_WEAPON, ss, &src->bl, bl, sg->skill_id, + skill_attack(BF_WEAPON, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); - if (bl->type == BL_PC && MRAND (100) < sg->skill_lv + if (bl->type == BL_PC && MRAND(100) < sg->skill_lv && battle_config.equipment_breaking) - pc_breakweapon ((struct map_session_data *) bl); + pc_breakweapon((struct map_session_data *) bl); break; case 0x99: /* トーキーボックス */ if (sg->src_id == bl->id) //自分が踏んでも発動しない break; if (sg->val2 == 0) { - clif_talkiebox (&src->bl, sg->valstr); + clif_talkiebox(&src->bl, sg->valstr); sg->unit_id = 0x8c; - clif_changelook (&src->bl, LOOK_BASE, sg->unit_id); - sg->limit = DIFF_TICK (tick, sg->tick) + 5000; + clif_changelook(&src->bl, LOOK_BASE, sg->unit_id); + sg->limit = DIFF_TICK(tick, sg->tick) + 5000; sg->val2 = -1; //踏んだ } break; @@ -6640,48 +6625,48 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, case 0xb7: /* スパイダーウェッブ */ if (sg->val2 == 0) { - int moveblock = (bl->x / BLOCK_SIZE != src->bl.x / BLOCK_SIZE + int moveblock = (bl->x / BLOCK_SIZE != src->bl.x / BLOCK_SIZE || bl->y / BLOCK_SIZE != src->bl.y / BLOCK_SIZE); - skill_additional_effect (ss, bl, sg->skill_id, sg->skill_lv, + skill_additional_effect(ss, bl, sg->skill_id, sg->skill_lv, BF_MISC, tick); if (moveblock) - map_delblock (bl); + map_delblock(bl); bl->x = (&src->bl)->x; bl->y = (&src->bl)->y; if (moveblock) - map_addblock (bl); + map_addblock(bl); if (bl->type == BL_MOB) - clif_fixmobpos ((struct mob_data *) bl); + clif_fixmobpos((struct mob_data *) bl); else - clif_fixpos (bl); - clif_01ac (&src->bl); + clif_fixpos(bl); + clif_01ac(&src->bl); sg->limit = - DIFF_TICK (tick, - sg->tick) + skill_get_time2 (sg->skill_id, + DIFF_TICK(tick, + sg->tick) + skill_get_time2(sg->skill_id, sg->skill_lv); sg->val2 = bl->id; } break; -/* default: - if(battle_config.error_log) - printf("skill_unit_onplace: Unknown skill unit id=%d block=%d\n",sg->unit_id,bl->id); - break;*/ +/* default: + if (battle_config.error_log) + printf("skill_unit_onplace: Unknown skill unit id=%d block=%d\n",sg->unit_id,bl->id); + break;*/ } if (bl->type == BL_MOB && ss != bl) /* スキル使用条件のMOBスキル */ { if (battle_config.mob_changetarget_byskill == 1) { - int target = ((struct mob_data *) bl)->target_id; + int target = ((struct mob_data *) bl)->target_id; if (ss->type == BL_PC) ((struct mob_data *) bl)->target_id = ss->id; - mobskill_use ((struct mob_data *) bl, tick, + mobskill_use((struct mob_data *) bl, tick, MSC_SKILLUSED | (sg->skill_id << 16)); ((struct mob_data *) bl)->target_id = target; } else - mobskill_use ((struct mob_data *) bl, tick, + mobskill_use((struct mob_data *) bl, tick, MSC_SKILLUSED | (sg->skill_id << 16)); } @@ -6693,14 +6678,14 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, *------------------------------------------ */ static -int skill_unit_onout (struct skill_unit *src, struct block_list *bl, +int skill_unit_onout(struct skill_unit *src, struct block_list *bl, unsigned int tick) { struct skill_unit_group *sg; - nullpo_retr (0, src); - nullpo_retr (0, bl); - nullpo_retr (0, sg = src->group); + nullpo_retr(0, src); + nullpo_retr(0, bl); + nullpo_retr(0, sg = src->group); if (bl->prev == NULL || !src->alive) return 0; @@ -6714,57 +6699,57 @@ int skill_unit_onout (struct skill_unit *src, struct block_list *bl, case 0x85: /* ニューマ */ case 0x8e: /* クァグマイア */ { - struct status_change *sc_data = battle_get_sc_data (bl); - int type = + struct status_change *sc_data = battle_get_sc_data(bl); + int type = (sg->unit_id == 0x85) ? SC_PNEUMA : ((sg->unit_id == 0x7e) ? SC_SAFETYWALL : SC_QUAGMIRE); if ((type != SC_QUAGMIRE || bl->type != BL_MOB) && sc_data && sc_data[type].timer != -1 && ((struct skill_unit *) sc_data[type].val2) == src) { - skill_status_change_end (bl, type, -1); + skill_status_change_end(bl, type, -1); } } break; case 0x91: /* アンクルスネア */ { - struct block_list *target = map_id2bl (sg->val2); + struct block_list *target = map_id2bl(sg->val2); if (target && target == bl) { - skill_status_change_end (bl, SC_ANKLE, -1); - sg->limit = DIFF_TICK (tick, sg->tick) + 1000; + skill_status_change_end(bl, SC_ANKLE, -1); + sg->limit = DIFF_TICK(tick, sg->tick) + 1000; } } break; case 0xb5: case 0xb8: { - struct block_list *target = map_id2bl (sg->val2); + struct block_list *target = map_id2bl(sg->val2); if (target == bl) - skill_status_change_end (bl, SC_SPIDERWEB, -1); - sg->limit = DIFF_TICK (tick, sg->tick) + 1000; + skill_status_change_end(bl, SC_SPIDERWEB, -1); + sg->limit = DIFF_TICK(tick, sg->tick) + 1000; } break; case 0xb6: { - struct block_list *target = map_id2bl (sg->val2); + struct block_list *target = map_id2bl(sg->val2); if (target == bl) - skill_status_change_end (bl, SC_FOGWALL, -1); - sg->limit = DIFF_TICK (tick, sg->tick) + 1000; + skill_status_change_end(bl, SC_FOGWALL, -1); + sg->limit = DIFF_TICK(tick, sg->tick) + 1000; } break; case 0x9a: /* ボルケーノ */ case 0x9b: /* デリュージ */ case 0x9c: /* バイオレントゲイル */ { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); struct skill_unit *su; - int type = SkillStatusChangeTable[sg->skill_id]; + int type = SkillStatusChangeTable[sg->skill_id]; if (sc_data && sc_data[type].timer != -1 && (su = ((struct skill_unit *) sc_data[type].val2)) && su == src) { - skill_status_change_end (bl, type, -1); + skill_status_change_end(bl, type, -1); } } break; @@ -6789,32 +6774,32 @@ int skill_unit_onout (struct skill_unit *src, struct block_list *bl, case 0xaf: /* サービスフォーユー */ case 0xb4: { - struct status_change *sc_data = battle_get_sc_data (bl); + struct status_change *sc_data = battle_get_sc_data(bl); struct skill_unit *su; - int type = SkillStatusChangeTable[sg->skill_id]; + int type = SkillStatusChangeTable[sg->skill_id]; if (sc_data && sc_data[type].timer != -1 && (su = ((struct skill_unit *) sc_data[type].val4)) && su == src) { - skill_status_change_end (bl, type, -1); + skill_status_change_end(bl, type, -1); } } break; case 0xb7: /* スパイダーウェッブ */ { - struct block_list *target = map_id2bl (sg->val2); + struct block_list *target = map_id2bl(sg->val2); if (target && target == bl) - skill_status_change_end (bl, SC_SPIDERWEB, -1); - sg->limit = DIFF_TICK (tick, sg->tick) + 1000; + skill_status_change_end(bl, SC_SPIDERWEB, -1); + sg->limit = DIFF_TICK(tick, sg->tick) + 1000; } break; -/* default: - if(battle_config.error_log) - printf("skill_unit_onout: Unknown skill unit id=%d block=%d\n",sg->unit_id,bl->id); - break;*/ +/* default: + if (battle_config.error_log) + printf("skill_unit_onout: Unknown skill unit id=%d block=%d\n",sg->unit_id,bl->id); + break;*/ } - skill_unitgrouptickset_delete (bl, sg->group_id); + skill_unitgrouptickset_delete(bl, sg->group_id); return 0; } @@ -6823,14 +6808,14 @@ int skill_unit_onout (struct skill_unit *src, struct block_list *bl, *------------------------------------------ */ static -int skill_unit_ondelete (struct skill_unit *src, struct block_list *bl, +int skill_unit_ondelete(struct skill_unit *src, struct block_list *bl, unsigned int tick) { struct skill_unit_group *sg; - nullpo_retr (0, src); - nullpo_retr (0, bl); - nullpo_retr (0, sg = src->group); + nullpo_retr(0, src); + nullpo_retr(0, bl); + nullpo_retr(0, sg = src->group); if (bl->prev == NULL || !src->alive) return 0; @@ -6865,14 +6850,14 @@ int skill_unit_ondelete (struct skill_unit *src, struct block_list *bl, case 0xae: /* 幸運のキス */ case 0xaf: /* サービスフォーユー */ case 0xb4: - return skill_unit_onout (src, bl, tick); + return skill_unit_onout(src, bl, tick); -/* default: - if(battle_config.error_log) - printf("skill_unit_ondelete: Unknown skill unit id=%d block=%d\n",sg->unit_id,bl->id); - break;*/ +/* default: + if (battle_config.error_log) + printf("skill_unit_ondelete: Unknown skill unit id=%d block=%d\n",sg->unit_id,bl->id); + break;*/ } - skill_unitgrouptickset_delete (bl, sg->group_id); + skill_unitgrouptickset_delete(bl, sg->group_id); return 0; } @@ -6881,32 +6866,32 @@ int skill_unit_ondelete (struct skill_unit *src, struct block_list *bl, *------------------------------------------ */ static -int skill_unit_onlimit (struct skill_unit *src, unsigned int tick) +int skill_unit_onlimit(struct skill_unit *src, unsigned int tick) { struct skill_unit_group *sg; - nullpo_retr (0, src); - nullpo_retr (0, sg = src->group); + nullpo_retr(0, src); + nullpo_retr(0, sg = src->group); switch (sg->unit_id) { case 0x81: /* ワープポータル(発動前) */ { struct skill_unit_group *group = - skill_unitsetting (map_id2bl (sg->src_id), sg->skill_id, + skill_unitsetting(map_id2bl(sg->src_id), sg->skill_id, sg->skill_lv, src->bl.x, src->bl.y, 1); if (group == NULL) return 0; - CREATE (group->valstr, char, 24); - memcpy (group->valstr, sg->valstr, 24); + CREATE(group->valstr, char, 24); + memcpy(group->valstr, sg->valstr, 24); group->val2 = sg->val2; } break; case 0x8d: /* アイスウォール */ - map_setcell (src->bl.m, src->bl.x, src->bl.y, src->val2); - clif_changemapcell (src->bl.m, src->bl.x, src->bl.y, src->val2, + map_setcell(src->bl.m, src->bl.x, src->bl.y, src->val2); + clif_changemapcell(src->bl.m, src->bl.x, src->bl.y, src->val2, 1); break; case 0xb2: /* あなたに会いたい */ @@ -6914,13 +6899,13 @@ int skill_unit_onlimit (struct skill_unit *src, unsigned int tick) struct map_session_data *sd = NULL; struct map_session_data *p_sd = NULL; if ((sd = - (struct map_session_data *) (map_id2bl (sg->src_id))) == + (struct map_session_data *)(map_id2bl(sg->src_id))) == NULL) return 0; - if ((p_sd = pc_get_partner (sd)) == NULL) + if ((p_sd = pc_get_partner(sd)) == NULL) return 0; - pc_setpos (p_sd, map[src->bl.m].name, src->bl.x, src->bl.y, 3); + pc_setpos(p_sd, map[src->bl.m].name, src->bl.x, src->bl.y, 3); } break; } @@ -6931,13 +6916,13 @@ int skill_unit_onlimit (struct skill_unit *src, unsigned int tick) * スキルユニットのダメージイベント *------------------------------------------ */ -int skill_unit_ondamaged (struct skill_unit *src, struct block_list *bl, +int skill_unit_ondamaged(struct skill_unit *src, struct block_list *bl, int damage, unsigned int tick) { struct skill_unit_group *sg; - nullpo_retr (0, src); - nullpo_retr (0, sg = src->group); + nullpo_retr(0, src); + nullpo_retr(0, sg = src->group); switch (sg->unit_id) { @@ -6946,7 +6931,7 @@ int skill_unit_ondamaged (struct skill_unit *src, struct block_list *bl, break; case 0x8f: /* ブラストマイン */ case 0x98: /* クレイモアートラップ */ - skill_blown (bl, &src->bl, 2); //吹き飛ばしてみる + skill_blown(bl, &src->bl, 2); //吹き飛ばしてみる break; default: damage = 0; @@ -6962,24 +6947,24 @@ int skill_unit_ondamaged (struct skill_unit *src, struct block_list *bl, *------------------------------------------ */ static -void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void skill_castend_pos(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - struct map_session_data *sd = map_id2sd (id) /*,*target_sd=NULL */ ; - int range, maxcount; + struct map_session_data *sd = map_id2sd(id) /*,*target_sd=NULL */ ; + int range, maxcount; - nullpo_retv (sd); + nullpo_retv(sd); if (sd->bl.prev == NULL) return; if (sd->skilltimer != tid) /* タイマIDの確認 */ return; - if (sd->skilltimer != -1 && pc_checkskill (sd, SA_FREECAST) > 0) + if (sd->skilltimer != -1 && pc_checkskill(sd, SA_FREECAST) > 0) { sd->speed = sd->prev_speed; - clif_updatestatus (sd, SP_SPEED); + clif_updatestatus(sd, SP_SPEED); } sd->skilltimer = -1; - if (pc_isdead (sd)) + if (pc_isdead(sd)) { sd->canact_tick = tick; sd->canmove_tick = tick; @@ -7015,10 +7000,9 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } if (range >= 0) { - if (skill_check_unit_range - (sd->bl.m, sd->skillx, sd->skilly, range, sd->skillid) > 0) + if (skill_check_unit_range(sd->bl.m, sd->skillx, sd->skilly, range, sd->skillid) > 0) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; @@ -7052,10 +7036,9 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } if (range >= 0) { - if (skill_check_unit_range2 - (sd->bl.m, sd->skillx, sd->skilly, range) > 0) + if (skill_check_unit_range2(sd->bl.m, sd->skillx, sd->skilly, range) > 0) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; @@ -7066,10 +7049,10 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t if (battle_config.pc_land_skill_limit) { - maxcount = skill_get_maxcount (sd->skillid); + maxcount = skill_get_maxcount(sd->skillid); if (maxcount > 0) { - int i, c; + int i, c; for (i = c = 0; i < MAX_SKILLUNITGROUP; i++) { if (sd->skillunit[i].alive_count > 0 @@ -7078,7 +7061,7 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } if (c >= maxcount) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; @@ -7087,22 +7070,22 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } } - range = skill_get_range (sd->skillid, sd->skilllv); + range = skill_get_range(sd->skillid, sd->skilllv); if (range < 0) - range = battle_get_range (&sd->bl) - (range + 1); + range = battle_get_range(&sd->bl) - (range + 1); range += battle_config.pc_skill_add_range; if (battle_config.skill_out_range_consume) { // changed to allow casting when target walks out of range [Valaris] - if (range < distance (sd->bl.x, sd->bl.y, sd->skillx, sd->skilly)) + if (range < distance(sd->bl.x, sd->bl.y, sd->skillx, sd->skilly)) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; sd->skillitem = sd->skillitemlv = -1; return; } } - if (!skill_check_condition (sd, 1)) + if (!skill_check_condition(sd, 1)) { /* 使用条件チェック */ sd->canact_tick = tick; sd->canmove_tick = tick; @@ -7112,9 +7095,9 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t sd->skillitem = sd->skillitemlv = -1; if (battle_config.skill_out_range_consume) { - if (range < distance (sd->bl.x, sd->bl.y, sd->skillx, sd->skilly)) + if (range < distance(sd->bl.x, sd->bl.y, sd->skillx, sd->skilly)) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->canact_tick = tick; sd->canmove_tick = tick; return; @@ -7122,10 +7105,10 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t } if (battle_config.pc_skill_log) - printf ("PC %d skill castend skill=%d\n", sd->bl.id, sd->skillid); - pc_stop_walking (sd, 0); + printf("PC %d skill castend skill=%d\n", sd->bl.id, sd->skillid); + pc_stop_walking(sd, 0); - skill_castend_pos2 (&sd->bl, sd->skillx, sd->skilly, sd->skillid, + skill_castend_pos2(&sd->bl, sd->skillx, sd->skilly, sd->skillid, sd->skilllv, tick, 0); } @@ -7135,7 +7118,7 @@ void skill_castend_pos (timer_id tid, tick_t tick, custom_id_t id, custom_data_t */ static -void skill_check_condition_char_sub (struct block_list *bl, va_list ap) +void skill_check_condition_char_sub(struct block_list *bl, va_list ap) { int *c; struct block_list *src; @@ -7144,14 +7127,14 @@ void skill_check_condition_char_sub (struct block_list *bl, va_list ap) struct pc_base_job s_class; struct pc_base_job ss_class; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd = (struct map_session_data *) bl); - nullpo_retv (src = va_arg (ap, struct block_list *)); - nullpo_retv (c = va_arg (ap, int *)); - nullpo_retv (ssd = (struct map_session_data *) src); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd = (struct map_session_data *) bl); + nullpo_retv(src = va_arg(ap, struct block_list *)); + nullpo_retv(c = va_arg(ap, int *)); + nullpo_retv(ssd = (struct map_session_data *) src); - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); //チェックしない設定ならcにありえない大きな数字を返して終了 if (!battle_config.player_skill_partner_check) { //本当はforeachの前にやりたいけど設定適用箇所をまとめるためにここへ @@ -7160,7 +7143,7 @@ void skill_check_condition_char_sub (struct block_list *bl, va_list ap) } ; - ss_class = pc_calc_base_job (ssd->status.pc_class); + ss_class = pc_calc_base_job(ssd->status.pc_class); switch (ssd->skillid) { @@ -7190,11 +7173,11 @@ void skill_check_condition_char_sub (struct block_list *bl, va_list ap) (ssd->status.pc_class == 4021 && sd->status.pc_class == 4020) || (ssd->status.pc_class == 20 && sd->status.pc_class == 4020) || (ssd->status.pc_class == 19 && sd->status.pc_class == 4021)) && - pc_checkskill (sd, ssd->skillid) > 0 && + pc_checkskill(sd, ssd->skillid) > 0 && (*c) == 0 && sd->status.party_id == ssd->status.party_id && - !pc_issit (sd) && sd->sc_data[SC_DANCING].timer == -1) - (*c) = pc_checkskill (sd, ssd->skillid); + !pc_issit(sd) && sd->sc_data[SC_DANCING].timer == -1) + (*c) = pc_checkskill(sd, ssd->skillid); break; } return; @@ -7206,7 +7189,7 @@ void skill_check_condition_char_sub (struct block_list *bl, va_list ap) */ static -void skill_check_condition_use_sub (struct block_list *bl, va_list ap) +void skill_check_condition_use_sub(struct block_list *bl, va_list ap) { int *c; struct block_list *src; @@ -7214,16 +7197,16 @@ void skill_check_condition_use_sub (struct block_list *bl, va_list ap) struct map_session_data *ssd; struct pc_base_job s_class; struct pc_base_job ss_class; - int skillid, skilllv; + int skillid, skilllv; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (sd = (struct map_session_data *) bl); - nullpo_retv (src = va_arg (ap, struct block_list *)); - nullpo_retv (c = va_arg (ap, int *)); - nullpo_retv (ssd = (struct map_session_data *) src); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(sd = (struct map_session_data *) bl); + nullpo_retv(src = va_arg(ap, struct block_list *)); + nullpo_retv(c = va_arg(ap, int *)); + nullpo_retv(ssd = (struct map_session_data *) src); - s_class = pc_calc_base_job (sd->status.pc_class); + s_class = pc_calc_base_job(sd->status.pc_class); //チェックしない設定ならcにありえない大きな数字を返して終了 if (!battle_config.player_skill_partner_check) @@ -7232,7 +7215,7 @@ void skill_check_condition_use_sub (struct block_list *bl, va_list ap) return; } - ss_class = pc_calc_base_job (ssd->status.pc_class); + ss_class = pc_calc_base_job(ssd->status.pc_class); skillid = ssd->skillid; skilllv = ssd->skilllv; switch (skillid) @@ -7246,7 +7229,7 @@ void skill_check_condition_use_sub (struct block_list *bl, va_list ap) && sd->status.sp >= 10) { sd->status.sp -= 10; - pc_calcstatus (sd, 0); + pc_calcstatus(sd, 0); (*c)++; } break; @@ -7267,18 +7250,18 @@ void skill_check_condition_use_sub (struct block_list *bl, va_list ap) (ssd->status.pc_class == 4021 && sd->status.pc_class == 4020) || (ssd->status.pc_class == 20 && sd->status.pc_class == 4020) || (ssd->status.pc_class == 19 && sd->status.pc_class == 4021)) && //自分がダンサーならバードで - pc_checkskill (sd, skillid) > 0 && //スキルを持っていて + pc_checkskill(sd, skillid) > 0 && //スキルを持っていて (*c) == 0 && //最初の一人で sd->status.party_id == ssd->status.party_id && //パーティーが同じで - !pc_issit (sd) && //座ってない + !pc_issit(sd) && //座ってない sd->sc_data[SC_DANCING].timer == -1 //ダンス中じゃない ) { ssd->sc_data[SC_DANCING].val4 = bl->id; - clif_skill_nodamage (bl, src, skillid, skilllv, 1); - skill_status_change_start (bl, SC_DANCING, skillid, + clif_skill_nodamage(bl, src, skillid, skilllv, 1); + skill_status_change_start(bl, SC_DANCING, skillid, ssd->sc_data[SC_DANCING].val2, 0, - src->id, skill_get_time (skillid, + src->id, skill_get_time(skillid, skilllv) + 1000, 0); sd->skillid_dance = sd->skillid = skillid; @@ -7295,20 +7278,20 @@ void skill_check_condition_use_sub (struct block_list *bl, va_list ap) */ static -void skill_check_condition_mob_master_sub (struct block_list *bl, va_list ap) +void skill_check_condition_mob_master_sub(struct block_list *bl, va_list ap) { int *c, src_id = 0, mob_class = 0; struct mob_data *md; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (md = (struct mob_data *) bl); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(md = (struct mob_data *) bl); - if (!(src_id = va_arg (ap, int))) + if (!(src_id = va_arg(ap, int))) return; - if (!(mob_class = va_arg (ap, int))) + if (!(mob_class = va_arg(ap, int))) return; - nullpo_retv (c = va_arg (ap, int *)); + nullpo_retv(c = va_arg(ap, int *)); if (md->mob_class == mob_class && md->master_id == src_id) (*c)++; @@ -7318,16 +7301,16 @@ void skill_check_condition_mob_master_sub (struct block_list *bl, va_list ap) * スキル使用条件（偽で使用失敗） *------------------------------------------ */ -int skill_check_condition (struct map_session_data *sd, int type) +int skill_check_condition(struct map_session_data *sd, int type) { int hp, sp, hp_rate, sp_rate, zeny, weapon, state, spiritball, skill, lv, mhp; - int index[10], itemid[10], amount[10]; + int index[10], itemid[10], amount[10]; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (battle_config.gm_skilluncond > 0 - && pc_isGM (sd) >= battle_config.gm_skilluncond) + && pc_isGM(sd) >= battle_config.gm_skilluncond) { sd->skillitem = sd->skillitemlv = -1; return 1; @@ -7335,13 +7318,13 @@ int skill_check_condition (struct map_session_data *sd, int type) if (sd->opt1 > 0) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); sd->skillitem = sd->skillitemlv = -1; return 0; } - if (pc_is90overweight (sd)) + if (pc_is90overweight(sd)) { - clif_skill_fail (sd, sd->skillid, 9, 0); + clif_skill_fail(sd, sd->skillid, 9, 0); sd->skillitem = sd->skillitemlv = -1; return 0; } @@ -7351,7 +7334,7 @@ int skill_check_condition (struct map_session_data *sd, int type) sd->skillitem = sd->skillitemlv = -1; return 0; } - /*if(sd->skillid == AM_PHARMACY && sd->state.produce_flag == 1) { + /*if (sd->skillid == AM_PHARMACY && sd->state.produce_flag == 1) { * sd->skillitem = sd->skillitemlv = -1; * return 0; * } */ @@ -7364,7 +7347,7 @@ int skill_check_condition (struct map_session_data *sd, int type) } if (sd->opt1 > 0) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); return 0; } if (sd->sc_data) @@ -7376,23 +7359,23 @@ int skill_check_condition (struct map_session_data *sd, int type) || sd->sc_data[SC_STEELBODY].timer != -1 || sd->sc_data[SC_BERSERK].timer != -1) { - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); return 0; /* 状態異常や沈黙など */ } } skill = sd->skillid; lv = sd->skilllv; - hp = skill_get_hp (skill, lv); /* 消費HP */ - sp = skill_get_sp (skill, lv); /* 消費SP */ + hp = skill_get_hp(skill, lv); /* 消費HP */ + sp = skill_get_sp(skill, lv); /* 消費SP */ if ((sd->skillid_old == BD_ENCORE) && skill == sd->skillid_dance) sp = sp / 2; //アンコール時はSP消費が半分 hp_rate = (lv <= 0) ? 0 : skill_db[skill].hp_rate[lv - 1]; sp_rate = (lv <= 0) ? 0 : skill_db[skill].sp_rate[lv - 1]; - zeny = skill_get_zeny (skill, lv); + zeny = skill_get_zeny(skill, lv); weapon = skill_db[skill].weapon; state = skill_db[skill].state; spiritball = (lv <= 0) ? 0 : skill_db[skill].spiritball[lv - 1]; - mhp = skill_get_mhp (skill, lv); /* 消費HP */ + mhp = skill_get_mhp(skill, lv); /* 消費HP */ for (int i = 0; i < 10; i++) { itemid[i] = skill_db[skill].itemid[i]; @@ -7403,11 +7386,11 @@ int skill_check_condition (struct map_session_data *sd, int type) if (hp_rate > 0) hp += (sd->status.hp * hp_rate) / 100; else - hp += (sd->status.max_hp * abs (hp_rate)) / 100; + hp += (sd->status.max_hp * abs(hp_rate)) / 100; if (sp_rate > 0) sp += (sd->status.sp * sp_rate) / 100; else - sp += (sd->status.max_sp * abs (sp_rate)) / 100; + sp += (sd->status.max_sp * abs(sp_rate)) / 100; if (sd->dsprate != 100) sp = sp * sd->dsprate / 100; /* 消費SP修正 */ @@ -7416,7 +7399,7 @@ int skill_check_condition (struct map_session_data *sd, int type) case SA_CASTCANCEL: if (sd->skilltimer == -1) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; @@ -7434,21 +7417,21 @@ int skill_check_condition (struct map_session_data *sd, int type) case AL_WARP: if (map[sd->bl.m].flag.noteleport) { - clif_skill_teleportmessage (sd, 0); + clif_skill_teleportmessage(sd, 0); return 0; } break; case MO_CALLSPIRITS: /* 気功 */ if (sd->spiritball >= lv) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case CH_SOULCOLLECT: /* 狂気功 */ if (sd->spiritball >= 5) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; @@ -7501,35 +7484,34 @@ int skill_check_condition (struct map_session_data *sd, int type) ((group = (struct skill_unit_group *) sd->sc_data[SC_DANCING].val2) && - (skill_get_time - (sd->sc_data[SC_DANCING].val1, + (skill_get_time(sd->sc_data[SC_DANCING].val1, group->skill_lv) - sd->sc_data[SC_DANCING].val3 * 1000) <= - skill_get_time2 (skill, lv))) + skill_get_time2(skill, lv))) { //ダンス中で使用後5秒以上のみ？ - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } } break; case PR_BENEDICTIO: /* 聖体降福 */ { - int range = 1; - int c = 0; + int range = 1; + int c = 0; if (!(type & 1)) { - map_foreachinarea (skill_check_condition_char_sub, sd->bl.m, + map_foreachinarea(skill_check_condition_char_sub, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC, &sd->bl, &c); if (c < 2) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } } else { - map_foreachinarea (skill_check_condition_use_sub, sd->bl.m, + map_foreachinarea(skill_check_condition_use_sub, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC, &sd->bl, &c); @@ -7539,7 +7521,7 @@ int skill_check_condition (struct map_session_data *sd, int type) case WE_CALLPARTNER: /* あなたに逢いたい */ if (!sd->status.partner_id) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; @@ -7547,18 +7529,18 @@ int skill_check_condition (struct map_session_data *sd, int type) case AM_SPHEREMINE: /* スフィアーマイン */ if (type & 1) { - int c = 0; - int maxcount = skill_get_maxcount (skill); - int mob_class = (skill == AM_CANNIBALIZE) ? 1118 : 1142; + int c = 0; + int maxcount = skill_get_maxcount(skill); + int mob_class = (skill == AM_CANNIBALIZE) ? 1118 : 1142; if (battle_config.pc_land_skill_limit && maxcount > 0) { - map_foreachinarea (skill_check_condition_mob_master_sub, + map_foreachinarea(skill_check_condition_mob_master_sub, sd->bl.m, 0, 0, map[sd->bl.m].xs, map[sd->bl.m].ys, BL_MOB, sd->bl.id, mob_class, &c); if (c >= maxcount) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } } @@ -7568,10 +7550,10 @@ int skill_check_condition (struct map_session_data *sd, int type) /* 数制限 */ if (battle_config.pc_land_skill_limit) { - int maxcount = skill_get_maxcount (skill); + int maxcount = skill_get_maxcount(skill); if (maxcount > 0) { - int i, c; + int i, c; for (i = c = 0; i < MAX_SKILLUNITGROUP; i++) { if (sd->skillunit[i].alive_count > 0 @@ -7580,7 +7562,7 @@ int skill_check_condition (struct map_session_data *sd, int type) } if (c >= maxcount) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } } @@ -7592,27 +7574,27 @@ int skill_check_condition (struct map_session_data *sd, int type) { if (hp > 0 && sd->status.hp < hp) { /* HPチェック */ - clif_skill_fail (sd, skill, 2, 0); /* HP不足：失敗通知 */ + clif_skill_fail(sd, skill, 2, 0); /* HP不足：失敗通知 */ return 0; } if (sp > 0 && sd->status.sp < sp) { /* SPチェック */ - clif_skill_fail (sd, skill, 1, 0); /* SP不足：失敗通知 */ + clif_skill_fail(sd, skill, 1, 0); /* SP不足：失敗通知 */ return 0; } if (zeny > 0 && sd->status.zeny < zeny) { - clif_skill_fail (sd, skill, 5, 0); + clif_skill_fail(sd, skill, 5, 0); return 0; } if (!(weapon & (1 << sd->status.weapon))) { - clif_skill_fail (sd, skill, 6, 0); + clif_skill_fail(sd, skill, 6, 0); return 0; } if (spiritball > 0 && sd->spiritball < spiritball) { - clif_skill_fail (sd, skill, 0, 0); // 氣球不足 + clif_skill_fail(sd, skill, 0, 0); // 氣球不足 return 0; } } @@ -7622,63 +7604,63 @@ int skill_check_condition (struct map_session_data *sd, int type) case ST_HIDING: if (!(sd->status.option & 2)) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_CLOAKING: if (!(sd->status.option & 4)) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_HIDDEN: - if (!pc_ishiding (sd)) + if (!pc_ishiding(sd)) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_RIDING: - if (!pc_isriding (sd)) + if (!pc_isriding(sd)) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_FALCON: - if (!pc_isfalcon (sd)) + if (!pc_isfalcon(sd)) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_CART: - if (!pc_iscarton (sd)) + if (!pc_iscarton(sd)) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_SHIELD: if (sd->status.shield <= 0) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_SIGHT: if (sd->sc_data[SC_SIGHT].timer == -1 && type & 1) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_EXPLOSIONSPIRITS: if (sd->sc_data[SC_EXPLOSIONSPIRITS].timer == -1) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; @@ -7687,27 +7669,26 @@ int skill_check_condition (struct map_session_data *sd, int type) && sd->weight * 100 / sd->max_weight >= battle_config.natural_heal_weight_rate) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; case ST_MOVE_ENABLE: { struct walkpath_data wpd; - if (path_search - (&wpd, sd->bl.m, sd->bl.x, sd->bl.y, sd->skillx, sd->skilly, + if (path_search(&wpd, sd->bl.m, sd->bl.x, sd->bl.y, sd->skillx, sd->skilly, 1) == -1) { - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } } break; case ST_WATER: - if (map_getcell (sd->bl.m, sd->bl.x, sd->bl.y) != 3 + if (map_getcell(sd->bl.m, sd->bl.x, sd->bl.y) != 3 && (sd->sc_data[SC_DELUGE].timer == -1)) { //水場判定 - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } break; @@ -7715,7 +7696,7 @@ int skill_check_condition (struct map_session_data *sd, int type) for (int i = 0; i < 10; i++) { - int x = lv % 11 - 1; + int x = lv % 11 - 1; index[i] = -1; if (itemid[i] <= 0) continue; @@ -7728,13 +7709,13 @@ int skill_check_condition (struct map_session_data *sd, int type) if (skill == AM_POTIONPITCHER && i != x) continue; - index[i] = pc_search_inventory (sd, itemid[i]); + index[i] = pc_search_inventory(sd, itemid[i]); if (index[i] < 0 || sd->status.inventory[index[i]].amount < amount[i]) { if (itemid[i] == 716 || itemid[i] == 717) - clif_skill_fail (sd, skill, (7 + (itemid[i] - 716)), 0); + clif_skill_fail(sd, skill, (7 + (itemid[i] - 716)), 0); else - clif_skill_fail (sd, skill, 0, 0); + clif_skill_fail(sd, skill, 0, 0); return 0; } } @@ -7749,27 +7730,27 @@ int skill_check_condition (struct map_session_data *sd, int type) for (int i = 0; i < 10; i++) { if (index[i] >= 0) - pc_delitem (sd, index[i], amount[i], 0); // アイテム消費 + pc_delitem(sd, index[i], amount[i], 0); // アイテム消費 } } if (type & 2) return 1; - pc_heal (sd, -sp, -hp); // [Fate] This might suppress some dupe messages + pc_heal(sd, -sp, -hp); // [Fate] This might suppress some dupe messages -/* if(sp > 0) { // SP消費 */ -/* sd->status.sp-=sp; */ -/* clif_updatestatus(sd,SP_SP); */ -/* } */ -/* if(hp > 0) { // HP消費 */ -/* sd->status.hp-=hp; */ -/* clif_updatestatus(sd,SP_HP); */ -/* } */ +/* if (sp > 0) { // SP消費 */ +/* sd->status.sp-=sp; */ +/* clif_updatestatus(sd,SP_SP); */ +/* } */ +/* if (hp > 0) { // HP消費 */ +/* sd->status.hp-=hp; */ +/* clif_updatestatus(sd,SP_HP); */ +/* } */ if (zeny > 0) // Zeny消費 - pc_payzeny (sd, zeny); + pc_payzeny(sd, zeny); if (spiritball > 0) // 氣球消費 - pc_delspiritball (sd, spiritball, 0); + pc_delspiritball(sd, spiritball, 0); return 1; } @@ -7778,16 +7759,16 @@ int skill_check_condition (struct map_session_data *sd, int type) * 詠唱時間計算 *------------------------------------------ */ -int skill_castfix (struct block_list *bl, int time) +int skill_castfix(struct block_list *bl, int time) { struct map_session_data *sd; struct mob_data *md; // [Valaris] struct status_change *sc_data; - int dex; - int castrate = 100; - int skill, lv, castnodex; + int dex; + int castrate = 100; + int skill, lv, castnodex; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_MOB) { // Crash fix [Valaris] @@ -7803,13 +7784,13 @@ int skill_castfix (struct block_list *bl, int time) lv = sd->skilllv; } - sc_data = battle_get_sc_data (bl); - dex = battle_get_dex (bl); + sc_data = battle_get_sc_data(bl); + dex = battle_get_dex(bl); if (skill > MAX_SKILL_DB || skill < 0) return 0; - castnodex = skill_get_castnodex (skill, lv); + castnodex = skill_get_castnodex(skill, lv); if (time == 0) return 0; @@ -7829,7 +7810,7 @@ int skill_castfix (struct block_list *bl, int time) if (sc_data && sc_data[SC_SUFFRAGIUM].timer != -1) { time = time * (100 - sc_data[SC_SUFFRAGIUM].val1 * 15) / 100; - skill_status_change_end (bl, SC_SUFFRAGIUM, -1); + skill_status_change_end(bl, SC_SUFFRAGIUM, -1); } /* ブラギの詩 */ if (sc_data && sc_data[SC_POEMBRAGI].timer != -1) @@ -7846,13 +7827,13 @@ int skill_castfix (struct block_list *bl, int time) * ディレイ計算 *------------------------------------------ */ -int skill_delayfix (struct block_list *bl, int time) +int skill_delayfix(struct block_list *bl, int time) { struct status_change *sc_data; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - sc_data = battle_get_sc_data (bl); + sc_data = battle_get_sc_data(bl); if (time <= 0) return 0; @@ -7861,7 +7842,7 @@ int skill_delayfix (struct block_list *bl, int time) if (battle_config.delay_dependon_dex) /* dexの影響を計算する */ time = time * (battle_config.castrate_dex_scale - - battle_get_dex (bl)) / + battle_get_dex(bl)) / battle_config.castrate_dex_scale; time = time * battle_config.delay_rate / 100; } @@ -7881,35 +7862,35 @@ int skill_delayfix (struct block_list *bl, int time) * スキル使用（ID指定） *------------------------------------------ */ -int skill_use_id (struct map_session_data *sd, int target_id, +int skill_use_id(struct map_session_data *sd, int target_id, int skill_num, int skill_lv) { unsigned int tick; - int casttime = 0, delay = 0, skill, range_; + int casttime = 0, delay = 0, skill, range_; struct map_session_data *target_sd = NULL; - int forcecast = 0; + int forcecast = 0; struct block_list *bl; struct status_change *sc_data; - tick = gettick (); + tick = gettick(); - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if ((bl = map_id2bl (target_id)) == NULL) + if ((bl = map_id2bl(target_id)) == NULL) { -/* if(battle_config.error_log) - printf("skill target not found %d\n",target_id); */ +/* if (battle_config.error_log) + printf("skill target not found %d\n",target_id); */ return 0; } - if (sd->bl.m != bl->m || pc_isdead (sd)) + if (sd->bl.m != bl->m || pc_isdead(sd)) return 0; - if (skillnotok (skill_num, sd)) // [MouseJstr] + if (skillnotok(skill_num, sd)) // [MouseJstr] return 0; if (sd->skillid == WZ_ICEWALL && map[sd->bl.m].flag.noicewall && !map[sd->bl.m].flag.pvp) { // noicewall flag [Valaris] - clif_skill_fail (sd, sd->skillid, 0, 0); + clif_skill_fail(sd, sd->skillid, 0, 0); return 0; } sc_data = sd->sc_data; @@ -7943,7 +7924,7 @@ int skill_use_id (struct map_session_data *sd, int target_id, if (sc_data[SC_BLADESTOP].timer != -1) { - int lv = sc_data[SC_BLADESTOP].val1; + int lv = sc_data[SC_BLADESTOP].val1; if (sc_data[SC_BLADESTOP].val2 == 1) return 0; //白羽された側なのでダメ if (lv == 1) @@ -7984,7 +7965,7 @@ int skill_use_id (struct map_session_data *sd, int target_id, } } - if (skill_get_inf2 (skill_num) & 0x200 && sd->bl.id == target_id) + if (skill_get_inf2(skill_num) & 0x200 && sd->bl.id == target_id) return 0; //直前のスキルが何か覚える必要のあるスキル switch (skill_num) @@ -7999,7 +7980,7 @@ int skill_use_id (struct map_session_data *sd, int target_id, case BD_ENCORE: /* アンコール */ if (!sd->skillid_dance) { //前回使用した踊りがないとだめ - clif_skill_fail (sd, skill_num, 0, 0); + clif_skill_fail(sd, skill_num, 0, 0); return 0; } else @@ -8025,15 +8006,15 @@ int skill_use_id (struct map_session_data *sd, int target_id, case BD_RAGNAROK: /* 神々の黄昏 */ case CG_MOONLIT: /* 月明りの泉に落ちる花びら */ { - int range = 1; - int c = 0; - map_foreachinarea (skill_check_condition_char_sub, sd->bl.m, + int range = 1; + int c = 0; + map_foreachinarea(skill_check_condition_char_sub, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC, &sd->bl, &c); if (c < 1) { - clif_skill_fail (sd, skill_num, 0, 0); + clif_skill_fail(sd, skill_num, 0, 0); return 0; } else if (c == 99) @@ -8048,21 +8029,21 @@ int skill_use_id (struct map_session_data *sd, int target_id, break; } - if (!skill_check_condition (sd, 0)) + if (!skill_check_condition(sd, 0)) return 0; /* 射程と障害物チェック */ - range_ = skill_get_range (skill_num, skill_lv); + range_ = skill_get_range(skill_num, skill_lv); if (range_ < 0) - range_ = battle_get_range (&sd->bl) - (range_ + 1); - if (!battle_check_range (&sd->bl, bl, range_)) + range_ = battle_get_range(&sd->bl) - (range_ + 1); + if (!battle_check_range(&sd->bl, bl, range_)) return 0; if (bl->type == BL_PC) { target_sd = (struct map_session_data *) bl; if (target_sd && skill_num == ALL_RESURRECTION - && !pc_isdead (target_sd)) + && !pc_isdead(target_sd)) return 0; } if ((skill_num != MO_CHAINCOMBO && @@ -8071,12 +8052,12 @@ int skill_use_id (struct map_session_data *sd, int target_id, skill_num != CH_TIGERFIST && skill_num != CH_CHAINCRUSH) || (skill_num == MO_EXTREMITYFIST && sd->state.skill_flag)) - pc_stopattack (sd); + pc_stopattack(sd); - casttime = skill_castfix (&sd->bl, skill_get_cast (skill_num, skill_lv)); + casttime = skill_castfix(&sd->bl, skill_get_cast(skill_num, skill_lv)); if (skill_num != SA_MAGICROD) delay = - skill_delayfix (&sd->bl, skill_get_delay (skill_num, skill_lv)); + skill_delayfix(&sd->bl, skill_get_delay(skill_num, skill_lv)); sd->state.skillcastcancel = skill_db[skill_num].castcancel; switch (skill_num) @@ -8087,13 +8068,13 @@ int skill_use_id (struct map_session_data *sd, int target_id, // break; case ALL_RESURRECTION: /* リザレクション */ if (bl->type != BL_PC - && battle_check_undead (battle_get_race (bl), - battle_get_elem_type (bl))) + && battle_check_undead(battle_get_race(bl), + battle_get_elem_type(bl))) { /* 敵がアンデッドなら */ forcecast = 1; /* ターンアンデットと同じ詠唱時間 */ casttime = - skill_castfix (&sd->bl, - skill_get_cast (PR_TURNUNDEAD, skill_lv)); + skill_castfix(&sd->bl, + skill_get_cast(PR_TURNUNDEAD, skill_lv)); } break; case MO_FINGEROFFENSIVE: /* 指弾 */ @@ -8137,14 +8118,14 @@ int skill_use_id (struct map_session_data *sd, int target_id, case WE_FEMALE: { struct map_session_data *p_sd = NULL; - if ((p_sd = pc_get_partner (sd)) == NULL) + if ((p_sd = pc_get_partner(sd)) == NULL) return 0; target_id = p_sd->bl.id; //rangeをもう1回検査 - range_ = skill_get_range (skill_num, skill_lv); + range_ = skill_get_range(skill_num, skill_lv); if (range_ < 0) - range_ = battle_get_range (&sd->bl) - (range_ + 1); - if (!battle_check_range (&sd->bl, &p_sd->bl, range_)) + range_ = battle_get_range(&sd->bl) - (range_ + 1); + if (!battle_check_range(&sd->bl, &p_sd->bl, range_)) { return 0; } @@ -8152,10 +8133,10 @@ int skill_use_id (struct map_session_data *sd, int target_id, break; case AS_SPLASHER: /* ベナムスプラッシャー */ { - struct status_change *t_sc_data = battle_get_sc_data (bl); + struct status_change *t_sc_data = battle_get_sc_data(bl); if (t_sc_data && t_sc_data[SC_POISON].timer == -1) { - clif_skill_fail (sd, skill_num, 0, 10); + clif_skill_fail(sd, skill_num, 0, 10); return 0; } } @@ -8171,11 +8152,11 @@ int skill_use_id (struct map_session_data *sd, int target_id, { casttime = casttime / 3; if ((--sc_data[SC_MEMORIZE].val2) <= 0) - skill_status_change_end (&sd->bl, SC_MEMORIZE, -1); + skill_status_change_end(&sd->bl, SC_MEMORIZE, -1); } if (battle_config.pc_skill_log) - printf ("PC %d skill use target_id=%d skill=%d lv=%d cast=%d\n", + printf("PC %d skill use target_id=%d skill=%d lv=%d cast=%d\n", sd->bl.id, target_id, skill_num, skill_lv, casttime); // if(sd->skillitem == skill_num) @@ -8184,7 +8165,7 @@ int skill_use_id (struct map_session_data *sd, int target_id, if (casttime > 0 || forcecast) { /* 詠唱が必要 */ struct mob_data *md; - clif_skillcasting (&sd->bl, + clif_skillcasting(&sd->bl, sd->bl.id, target_id, 0, 0, skill_num, casttime); /* 詠唱反応モンスター */ @@ -8202,38 +8183,38 @@ int skill_use_id (struct map_session_data *sd, int target_id, sd->state.skillcastcancel = 0; sd->skilltarget = target_id; -/* sd->cast_target_bl = bl; */ +/* sd->cast_target_bl = bl; */ sd->skillx = 0; sd->skilly = 0; sd->canact_tick = tick + casttime + delay; sd->canmove_tick = tick; if (!(battle_config.pc_cloak_check_type & 2) && sc_data && sc_data[SC_CLOAKING].timer != -1 && sd->skillid != AS_CLOAKING) - skill_status_change_end (&sd->bl, SC_CLOAKING, -1); + skill_status_change_end(&sd->bl, SC_CLOAKING, -1); if (casttime > 0) { sd->skilltimer = - add_timer (tick + casttime, skill_castend_id, sd->bl.id, 0); - if ((skill = pc_checkskill (sd, SA_FREECAST)) > 0) + add_timer(tick + casttime, skill_castend_id, sd->bl.id, 0); + if ((skill = pc_checkskill(sd, SA_FREECAST)) > 0) { sd->prev_speed = sd->speed; sd->speed = sd->speed * (175 - skill * 5) / 100; - clif_updatestatus (sd, SP_SPEED); + clif_updatestatus(sd, SP_SPEED); } else - pc_stop_walking (sd, 0); + pc_stop_walking(sd, 0); } else { if (skill_num != SA_CASTCANCEL) sd->skilltimer = -1; - skill_castend_id (sd->skilltimer, tick, sd->bl.id, 0); + skill_castend_id(sd->skilltimer, tick, sd->bl.id, 0); } //マジックパワーの効果終了 if (sc_data && sc_data[SC_MAGICPOWER].timer != -1 && skill_num != HW_MAGICPOWER) - skill_status_change_end (&sd->bl, SC_MAGICPOWER, -1); + skill_status_change_end(&sd->bl, SC_MAGICPOWER, -1); return 0; } @@ -8242,20 +8223,20 @@ int skill_use_id (struct map_session_data *sd, int target_id, * スキル使用（場所指定） *------------------------------------------ */ -int skill_use_pos (struct map_session_data *sd, +int skill_use_pos(struct map_session_data *sd, int skill_x, int skill_y, int skill_num, int skill_lv) { struct block_list bl; struct status_change *sc_data; unsigned int tick; - int casttime = 0, delay = 0, skill, range; + int casttime = 0, delay = 0, skill, range; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (pc_isdead (sd)) + if (pc_isdead(sd)) return 0; - if (skillnotok (skill_num, sd)) // [MoueJstr] + if (skillnotok(skill_num, sd)) // [MoueJstr] return 0; sc_data = sd->sc_data; @@ -8280,7 +8261,7 @@ int skill_use_pos (struct map_session_data *sd, sd->skilllv = skill_lv; sd->skillx = skill_x; sd->skilly = skill_y; - if (!skill_check_condition (sd, 0)) + if (!skill_check_condition(sd, 0)) return 0; /* 射程と障害物チェック */ @@ -8288,20 +8269,20 @@ int skill_use_pos (struct map_session_data *sd, bl.m = sd->bl.m; bl.x = skill_x; bl.y = skill_y; - range = skill_get_range (skill_num, skill_lv); + range = skill_get_range(skill_num, skill_lv); if (range < 0) - range = battle_get_range (&sd->bl) - (range + 1); - if (!battle_check_range (&sd->bl, &bl, range)) + range = battle_get_range(&sd->bl) - (range + 1); + if (!battle_check_range(&sd->bl, &bl, range)) return 0; - pc_stopattack (sd); + pc_stopattack(sd); - casttime = skill_castfix (&sd->bl, skill_get_cast (skill_num, skill_lv)); - delay = skill_delayfix (&sd->bl, skill_get_delay (skill_num, skill_lv)); + casttime = skill_castfix(&sd->bl, skill_get_cast(skill_num, skill_lv)); + delay = skill_delayfix(&sd->bl, skill_get_delay(skill_num, skill_lv)); sd->state.skillcastcancel = skill_db[skill_num].castcancel; if (battle_config.pc_skill_log) - printf ("PC %d skill use target_pos=(%d,%d) skill=%d lv=%d cast=%d\n", + printf("PC %d skill use target_pos= (%d,%d) skill=%d lv=%d cast=%d\n", sd->bl.id, skill_x, skill_y, skill_num, skill_lv, casttime); // if(sd->skillitem == skill_num) @@ -8311,11 +8292,11 @@ int skill_use_pos (struct map_session_data *sd, { casttime = casttime / 3; if ((--sc_data[SC_MEMORIZE].val2) <= 0) - skill_status_change_end (&sd->bl, SC_MEMORIZE, -1); + skill_status_change_end(&sd->bl, SC_MEMORIZE, -1); } if (casttime > 0) /* 詠唱が必要 */ - clif_skillcasting (&sd->bl, + clif_skillcasting(&sd->bl, sd->bl.id, 0, skill_x, skill_y, skill_num, casttime); @@ -8323,35 +8304,35 @@ int skill_use_pos (struct map_session_data *sd, sd->state.skillcastcancel = 0; sd->skilltarget = 0; -/* sd->cast_target_bl = NULL; */ - tick = gettick (); +/* sd->cast_target_bl = NULL; */ + tick = gettick(); sd->canact_tick = tick + casttime + delay; sd->canmove_tick = tick; if (!(battle_config.pc_cloak_check_type & 2) && sc_data && sc_data[SC_CLOAKING].timer != -1) - skill_status_change_end (&sd->bl, SC_CLOAKING, -1); + skill_status_change_end(&sd->bl, SC_CLOAKING, -1); if (casttime > 0) { sd->skilltimer = - add_timer (tick + casttime, skill_castend_pos, sd->bl.id, 0); - if ((skill = pc_checkskill (sd, SA_FREECAST)) > 0) + add_timer(tick + casttime, skill_castend_pos, sd->bl.id, 0); + if ((skill = pc_checkskill(sd, SA_FREECAST)) > 0) { sd->prev_speed = sd->speed; sd->speed = sd->speed * (175 - skill * 5) / 100; - clif_updatestatus (sd, SP_SPEED); + clif_updatestatus(sd, SP_SPEED); } else - pc_stop_walking (sd, 0); + pc_stop_walking(sd, 0); } else { sd->skilltimer = -1; - skill_castend_pos (sd->skilltimer, tick, sd->bl.id, 0); + skill_castend_pos(sd->skilltimer, tick, sd->bl.id, 0); } //マジックパワーの効果終了 if (sc_data && sc_data[SC_MAGICPOWER].timer != -1 && skill_num != HW_MAGICPOWER) - skill_status_change_end (&sd->bl, SC_MAGICPOWER, -1); + skill_status_change_end(&sd->bl, SC_MAGICPOWER, -1); return 0; } @@ -8360,42 +8341,42 @@ int skill_use_pos (struct map_session_data *sd, * スキル詠唱キャンセル *------------------------------------------ */ -int skill_castcancel (struct block_list *bl, int type) +int skill_castcancel(struct block_list *bl, int type) { - int inf; + int inf; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) { struct map_session_data *sd = (struct map_session_data *) bl; - unsigned long tick = gettick (); - nullpo_retr (0, sd); + unsigned long tick = gettick(); + nullpo_retr(0, sd); sd->canact_tick = tick; sd->canmove_tick = tick; if (sd->skilltimer != -1) { - if (pc_checkskill (sd, SA_FREECAST) > 0) + if (pc_checkskill(sd, SA_FREECAST) > 0) { sd->speed = sd->prev_speed; - clif_updatestatus (sd, SP_SPEED); + clif_updatestatus(sd, SP_SPEED); } if (!type) { - if ((inf = skill_get_inf (sd->skillid)) == 2 || inf == 32) - delete_timer (sd->skilltimer, skill_castend_pos); + if ((inf = skill_get_inf(sd->skillid)) == 2 || inf == 32) + delete_timer(sd->skilltimer, skill_castend_pos); else - delete_timer (sd->skilltimer, skill_castend_id); + delete_timer(sd->skilltimer, skill_castend_id); } else { - if ((inf = skill_get_inf (sd->skillid_old)) == 2 || inf == 32) - delete_timer (sd->skilltimer, skill_castend_pos); + if ((inf = skill_get_inf(sd->skillid_old)) == 2 || inf == 32) + delete_timer(sd->skilltimer, skill_castend_pos); else - delete_timer (sd->skilltimer, skill_castend_id); + delete_timer(sd->skilltimer, skill_castend_id); } sd->skilltimer = -1; - clif_skillcastcancel (bl); + clif_skillcastcancel(bl); } return 0; @@ -8403,15 +8384,15 @@ int skill_castcancel (struct block_list *bl, int type) else if (bl->type == BL_MOB) { struct mob_data *md = (struct mob_data *) bl; - nullpo_retr (0, md); + nullpo_retr(0, md); if (md->skilltimer != -1) { - if ((inf = skill_get_inf (md->skillid)) == 2 || inf == 32) - delete_timer (md->skilltimer, mobskill_castend_pos); + if ((inf = skill_get_inf(md->skillid)) == 2 || inf == 32) + delete_timer(md->skilltimer, mobskill_castend_pos); else - delete_timer (md->skilltimer, mobskill_castend_id); + delete_timer(md->skilltimer, mobskill_castend_id); md->skilltimer = -1; - clif_skillcastcancel (bl); + clif_skillcastcancel(bl); } return 0; } @@ -8422,10 +8403,10 @@ int skill_castcancel (struct block_list *bl, int type) * ブランディッシュスピア 初期範囲決定 *---------------------------------------- */ -void skill_brandishspear_first (struct square *tc, int dir, int x, int y) +void skill_brandishspear_first(struct square *tc, int dir, int x, int y) { - nullpo_retv (tc); + nullpo_retv(tc); if (dir == 0) { @@ -8526,12 +8507,12 @@ void skill_brandishspear_first (struct square *tc, int dir, int x, int y) * ブランディッシュスピア 方向判定 範囲拡張 *----------------------------------------- */ -void skill_brandishspear_dir (struct square *tc, int dir, int are) +void skill_brandishspear_dir(struct square *tc, int dir, int are) { - int c; + int c; - nullpo_retv (tc); + nullpo_retv(tc); for (c = 0; c < 5; c++) { @@ -8578,73 +8559,73 @@ void skill_brandishspear_dir (struct square *tc, int dir, int are) * ディボーション 有効確認 *------------------------------------------ */ -void skill_devotion (struct map_session_data *md, int target) +void skill_devotion(struct map_session_data *md, int target) { // 総確認 - int n; + int n; - nullpo_retv (md); + nullpo_retv(md); for (n = 0; n < 5; n++) { if (md->dev.val1[n]) { - struct map_session_data *sd = map_id2sd (md->dev.val1[n]); + struct map_session_data *sd = map_id2sd(md->dev.val1[n]); // 相手が見つからない // 相手をディボしてるのが自分じゃない // 距離が離れてる if (sd == NULL || (sd->sc_data && (md->bl.id != sd->sc_data[SC_DEVOTION].val1)) - || skill_devotion3 (&md->bl, md->dev.val1[n])) + || skill_devotion3(&md->bl, md->dev.val1[n])) { - skill_devotion_end (md, sd, n); + skill_devotion_end(md, sd, n); } } } } -void skill_devotion2 (struct block_list *bl, int crusader) +void skill_devotion2(struct block_list *bl, int crusader) { // 被ディボーションが歩いた時の距離チェック - struct map_session_data *sd = map_id2sd (crusader); + struct map_session_data *sd = map_id2sd(crusader); - nullpo_retv (bl); + nullpo_retv(bl); if (sd) - skill_devotion3 (&sd->bl, bl->id); + skill_devotion3(&sd->bl, bl->id); } -int skill_devotion3 (struct block_list *bl, int target) +int skill_devotion3(struct block_list *bl, int target) { // クルセが歩いた時の距離チェック struct map_session_data *md; struct map_session_data *sd; - int n, r = 0; + int n, r = 0; - nullpo_retr (1, bl); + nullpo_retr(1, bl); if ((md = (struct map_session_data *) bl) == NULL - || (sd = map_id2sd (target)) == NULL) + || (sd = map_id2sd(target)) == NULL) return 1; else - r = distance (bl->x, bl->y, sd->bl.x, sd->bl.y); + r = distance(bl->x, bl->y, sd->bl.x, sd->bl.y); - if (pc_checkskill (sd, CR_DEVOTION) + 6 < r) + if (pc_checkskill(sd, CR_DEVOTION) + 6 < r) { // 許容範囲を超えてた for (n = 0; n < 5; n++) if (md->dev.val1[n] == target) md->dev.val2[n] = 0; // 離れた時は、糸を切るだけ - clif_devotion (md, sd->bl.id); + clif_devotion(md, sd->bl.id); return 1; } return 0; } -void skill_devotion_end (struct map_session_data *md, +void skill_devotion_end(struct map_session_data *md, struct map_session_data *sd, int target) { // クルセと被ディボキャラのリセット - nullpo_retv (md); - nullpo_retv (sd); + nullpo_retv(md); + nullpo_retv(sd); md->dev.val1[target] = md->dev.val2[target] = 0; if (sd && sd->sc_data) @@ -8652,8 +8633,8 @@ void skill_devotion_end (struct map_session_data *md, // skill_status_change_end(sd->bl,SC_DEVOTION,-1); sd->sc_data[SC_DEVOTION].val1 = 0; sd->sc_data[SC_DEVOTION].val2 = 0; - clif_status_change (&sd->bl, SC_DEVOTION, 0); - clif_devotion (md, sd->bl.id); + clif_status_change(&sd->bl, SC_DEVOTION, 0); + clif_devotion(md, sd->bl.id); } } @@ -8661,14 +8642,14 @@ void skill_devotion_end (struct map_session_data *md, * オートスペル *------------------------------------------ */ -int skill_autospell (struct map_session_data *sd, int skillid) +int skill_autospell(struct map_session_data *sd, int skillid) { - int skilllv; - int maxlv = 1, lv; + int skilllv; + int maxlv = 1, lv; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - skilllv = pc_checkskill (sd, SA_AUTOSPELL); + skilllv = pc_checkskill(sd, SA_AUTOSPELL); if (skillid == MG_NAPALMBEAT) maxlv = 3; @@ -8703,11 +8684,11 @@ int skill_autospell (struct map_session_data *sd, int skillid) else return 0; - if (maxlv > (lv = pc_checkskill (sd, skillid))) + if (maxlv > (lv = pc_checkskill(sd, skillid))) maxlv = lv; - skill_status_change_start (&sd->bl, SC_AUTOSPELL, skilllv, skillid, maxlv, 0, // val1:スキルID val2:使用最大Lv - skill_get_time (SA_AUTOSPELL, skilllv), 0); // にしてみたけどbscriptが書き易い・・・？ + skill_status_change_start(&sd->bl, SC_AUTOSPELL, skilllv, skillid, maxlv, 0, // val1:スキルID val2:使用最大Lv + skill_get_time(SA_AUTOSPELL, skilllv), 0); // にしてみたけどbscriptが書き易い・・・？ return 0; } @@ -8717,65 +8698,65 @@ int skill_autospell (struct map_session_data *sd, int skillid) */ static -void skill_gangster_count (struct block_list *bl, va_list ap) +void skill_gangster_count(struct block_list *bl, va_list ap) { int *c; struct map_session_data *sd; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); sd = (struct map_session_data *) bl; - c = va_arg (ap, int *); + c = va_arg(ap, int *); - if (sd && c && pc_issit (sd) && pc_checkskill (sd, RG_GANGSTER) > 0) + if (sd && c && pc_issit(sd) && pc_checkskill(sd, RG_GANGSTER) > 0) (*c)++; } static -void skill_gangster_in (struct block_list *bl, va_list ap) +void skill_gangster_in(struct block_list *bl, va_list ap) { struct map_session_data *sd; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); sd = (struct map_session_data *) bl; - if (sd && pc_issit (sd) && pc_checkskill (sd, RG_GANGSTER) > 0) + if (sd && pc_issit(sd) && pc_checkskill(sd, RG_GANGSTER) > 0) sd->state.gangsterparadise = 1; } static -void skill_gangster_out (struct block_list *bl, va_list ap) +void skill_gangster_out(struct block_list *bl, va_list ap) { struct map_session_data *sd; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); sd = (struct map_session_data *) bl; if (sd && sd->state.gangsterparadise) sd->state.gangsterparadise = 0; } -int skill_gangsterparadise (struct map_session_data *sd, int type) +int skill_gangsterparadise(struct map_session_data *sd, int type) { - int range = 1; - int c = 0; + int range = 1; + int c = 0; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - if (pc_checkskill (sd, RG_GANGSTER) <= 0) + if (pc_checkskill(sd, RG_GANGSTER) <= 0) return 0; if (type == 1) { /* 座った時の処理 */ - map_foreachinarea (skill_gangster_count, sd->bl.m, + map_foreachinarea(skill_gangster_count, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC, &c); if (c > 0) { /*ギャングスター成功したら自分にもギャングスター属性付与 */ - map_foreachinarea (skill_gangster_in, sd->bl.m, + map_foreachinarea(skill_gangster_in, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC); sd->state.gangsterparadise = 1; @@ -8784,11 +8765,11 @@ int skill_gangsterparadise (struct map_session_data *sd, int type) } else if (type == 0) { /* 立ち上がったときの処理 */ - map_foreachinarea (skill_gangster_count, sd->bl.m, + map_foreachinarea(skill_gangster_count, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC, &c); if (c < 1) - map_foreachinarea (skill_gangster_out, sd->bl.m, + map_foreachinarea(skill_gangster_out, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC); sd->state.gangsterparadise = 0; @@ -8801,29 +8782,29 @@ int skill_gangsterparadise (struct map_session_data *sd, int type) * 寒いジョーク・スクリーム判定処理(foreachinarea) *------------------------------------------ */ -void skill_frostjoke_scream (struct block_list *bl, va_list ap) +void skill_frostjoke_scream(struct block_list *bl, va_list ap) { struct block_list *src; - int skillnum, skilllv; + int skillnum, skilllv; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (src = va_arg (ap, struct block_list *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(src = va_arg(ap, struct block_list *)); - skillnum = va_arg (ap, int); - skilllv = va_arg (ap, int); - tick = va_arg (ap, unsigned int); + skillnum = va_arg(ap, int); + skilllv = va_arg(ap, int); + tick = va_arg(ap, unsigned int); if (src == bl) //自分には効かない return; - if (battle_check_target (src, bl, BCT_ENEMY) > 0) - skill_additional_effect (src, bl, skillnum, skilllv, BF_MISC, tick); - else if (battle_check_target (src, bl, BCT_PARTY) > 0) + if (battle_check_target(src, bl, BCT_ENEMY) > 0) + skill_additional_effect(src, bl, skillnum, skilllv, BF_MISC, tick); + else if (battle_check_target(src, bl, BCT_PARTY) > 0) { - if (MRAND (100) < 10) //PTメンバにも低確率でかかる(とりあえず10%) - skill_additional_effect (src, bl, skillnum, skilllv, BF_MISC, + if (MRAND(100) < 10) //PTメンバにも低確率でかかる(とりあえず10%) + skill_additional_effect(src, bl, skillnum, skilllv, BF_MISC, tick); } } @@ -8832,41 +8813,41 @@ void skill_frostjoke_scream (struct block_list *bl, va_list ap) * *------------------------------------------ */ -void skill_attack_area (struct block_list *bl, va_list ap) +void skill_attack_area(struct block_list *bl, va_list ap) { struct block_list *src, *dsrc; - int atk_type, skillid, skilllv, flag, type; + int atk_type, skillid, skilllv, flag, type; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); - atk_type = va_arg (ap, int); - if ((src = va_arg (ap, struct block_list *)) == NULL) + atk_type = va_arg(ap, int); + if ((src = va_arg(ap, struct block_list *)) == NULL) return; - if ((dsrc = va_arg (ap, struct block_list *)) == NULL) + if ((dsrc = va_arg(ap, struct block_list *)) == NULL) return; - skillid = va_arg (ap, int); - skilllv = va_arg (ap, int); - tick = va_arg (ap, unsigned int); - flag = va_arg (ap, int); - type = va_arg (ap, int); - - if (battle_check_target (dsrc, bl, type) > 0) - skill_attack (atk_type, src, dsrc, bl, skillid, skilllv, tick, flag); + skillid = va_arg(ap, int); + skilllv = va_arg(ap, int); + tick = va_arg(ap, unsigned int); + flag = va_arg(ap, int); + type = va_arg(ap, int); + + if (battle_check_target(dsrc, bl, type) > 0) + skill_attack(atk_type, src, dsrc, bl, skillid, skilllv, tick, flag); } /*========================================== * *------------------------------------------ */ -void skill_clear_element_field (struct block_list *bl) +void skill_clear_element_field(struct block_list *bl) { struct mob_data *md = NULL; struct map_session_data *sd = NULL; - int i, skillid; + int i, skillid; - nullpo_retv (bl); + nullpo_retv(bl); if (bl->type == BL_MOB) md = (struct mob_data *) bl; @@ -8880,14 +8861,14 @@ void skill_clear_element_field (struct block_list *bl) skillid = sd->skillunit[i].skill_id; if (skillid == SA_DELUGE || skillid == SA_VOLCANO || skillid == SA_VIOLENTGALE || skillid == SA_LANDPROTECTOR) - skill_delunitgroup (&sd->skillunit[i]); + skill_delunitgroup(&sd->skillunit[i]); } else if (md) { skillid = md->skillunit[i].skill_id; if (skillid == SA_DELUGE || skillid == SA_VOLCANO || skillid == SA_VIOLENTGALE || skillid == SA_LANDPROTECTOR) - skill_delunitgroup (&md->skillunit[i]); + skill_delunitgroup(&md->skillunit[i]); } } } @@ -8896,23 +8877,23 @@ void skill_clear_element_field (struct block_list *bl) * ランドプロテクターチェック(foreachinarea) *------------------------------------------ */ -void skill_landprotector (struct block_list *bl, va_list ap) +void skill_landprotector(struct block_list *bl, va_list ap) { - int skillid; + int skillid; int *alive; struct skill_unit *unit; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); - skillid = va_arg (ap, int); - alive = va_arg (ap, int *); + skillid = va_arg(ap, int); + alive = va_arg(ap, int *); if ((unit = (struct skill_unit *) bl) == NULL) return; if (skillid == SA_LANDPROTECTOR) { - skill_delunit (unit); + skill_delunit(unit); } else { @@ -8926,16 +8907,16 @@ void skill_landprotector (struct block_list *bl, va_list ap) *------------------------------------------ */ static -void skill_idun_heal (struct block_list *bl, va_list ap) +void skill_idun_heal(struct block_list *bl, va_list ap) { struct skill_unit *unit; struct skill_unit_group *sg; - int heal; + int heal; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (unit = va_arg (ap, struct skill_unit *)); - nullpo_retv (sg = unit->group); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(unit = va_arg(ap, struct skill_unit *)); + nullpo_retv(sg = unit->group); heal = 30 + sg->skill_lv * 5 + ((sg->val1) >> 16) * 5 + @@ -8946,8 +8927,8 @@ void skill_idun_heal (struct block_list *bl, va_list ap) if (bl->type == BL_PC || bl->type == BL_MOB) { - clif_skill_nodamage (&unit->bl, bl, AL_HEAL, heal, 1); - battle_heal (NULL, bl, heal, 0, 0); + clif_skill_nodamage(&unit->bl, bl, AL_HEAL, heal, 1); + battle_heal(NULL, bl, heal, 0, 0); } } @@ -8955,19 +8936,19 @@ void skill_idun_heal (struct block_list *bl, va_list ap) * 指定範囲内でsrcに対して有効なターゲットのblの数を数える(foreachinarea) *------------------------------------------ */ -void skill_count_target (struct block_list *bl, va_list ap) +void skill_count_target(struct block_list *bl, va_list ap) { struct block_list *src; int *c; - nullpo_retv (bl); - nullpo_retv (ap); + nullpo_retv(bl); + nullpo_retv(ap); - if ((src = va_arg (ap, struct block_list *)) == NULL) + if ((src = va_arg(ap, struct block_list *)) == NULL) return; - if ((c = va_arg (ap, int *)) == NULL) + if ((c = va_arg(ap, int *)) == NULL) return; - if (battle_check_target (src, bl, BCT_ENEMY) > 0) + if (battle_check_target(src, bl, BCT_ENEMY) > 0) (*c)++; } @@ -8975,46 +8956,46 @@ void skill_count_target (struct block_list *bl, va_list ap) * トラップ範囲処理(foreachinarea) *------------------------------------------ */ -void skill_trap_splash (struct block_list *bl, va_list ap) +void skill_trap_splash(struct block_list *bl, va_list ap) { struct block_list *src; - int tick; - int splash_count; + int tick; + int splash_count; struct skill_unit *unit; struct skill_unit_group *sg; struct block_list *ss; - int i; + int i; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (src = va_arg (ap, struct block_list *)); - nullpo_retv (unit = (struct skill_unit *) src); - nullpo_retv (sg = unit->group); - nullpo_retv (ss = map_id2bl (sg->src_id)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(src = va_arg(ap, struct block_list *)); + nullpo_retv(unit = (struct skill_unit *) src); + nullpo_retv(sg = unit->group); + nullpo_retv(ss = map_id2bl(sg->src_id)); - tick = va_arg (ap, int); - splash_count = va_arg (ap, int); + tick = va_arg(ap, int); + splash_count = va_arg(ap, int); - if (battle_check_target (src, bl, BCT_ENEMY) > 0) + if (battle_check_target(src, bl, BCT_ENEMY) > 0) { switch (sg->unit_id) { case 0x95: /* サンドマン */ case 0x96: /* フラッシャー */ case 0x94: /* ショックウェーブトラップ */ - skill_additional_effect (ss, bl, sg->skill_id, sg->skill_lv, + skill_additional_effect(ss, bl, sg->skill_id, sg->skill_lv, BF_MISC, tick); break; case 0x8f: /* ブラストマイン */ case 0x98: /* クレイモアートラップ */ for (i = 0; i < splash_count; i++) { - skill_attack (BF_MISC, ss, src, bl, sg->skill_id, + skill_attack(BF_MISC, ss, src, bl, sg->skill_id, sg->skill_lv, tick, (sg->val2) ? 0x0500 : 0); } case 0x97: /* フリージングトラップ */ - skill_attack (BF_WEAPON, ss, src, bl, sg->skill_id, + skill_attack(BF_WEAPON, ss, src, bl, sg->skill_id, sg->skill_lv, tick, (sg->val2) ? 0x0500 : 0); break; default: @@ -9032,17 +9013,17 @@ void skill_trap_splash (struct block_list *bl, va_list ap) * ステータス異常タイマー範囲処理 *------------------------------------------ */ -void skill_status_change_timer_sub (struct block_list *bl, va_list ap) +void skill_status_change_timer_sub(struct block_list *bl, va_list ap) { struct block_list *src; - int type; + int type; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (src = va_arg (ap, struct block_list *)); - type = va_arg (ap, int); - tick = va_arg (ap, unsigned int); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(src = va_arg(ap, struct block_list *)); + type = va_arg(ap, int); + tick = va_arg(ap, unsigned int); if (bl->type != BL_PC && bl->type != BL_MOB) return; @@ -9051,21 +9032,21 @@ void skill_status_change_timer_sub (struct block_list *bl, va_list ap) { case SC_SIGHT: /* サイト */ case SC_CONCENTRATE: - if ((*battle_get_option (bl)) & 6) + if ((*battle_get_option(bl)) & 6) { - skill_status_change_end (bl, SC_HIDING, -1); - skill_status_change_end (bl, SC_CLOAKING, -1); + skill_status_change_end(bl, SC_HIDING, -1); + skill_status_change_end(bl, SC_CLOAKING, -1); } break; case SC_RUWACH: /* ルアフ */ - if ((*battle_get_option (bl)) & 6) + if ((*battle_get_option(bl)) & 6) { - skill_status_change_end (bl, SC_HIDING, -1); - skill_status_change_end (bl, SC_CLOAKING, -1); - if (battle_check_target (src, bl, BCT_ENEMY) > 0) + skill_status_change_end(bl, SC_HIDING, -1); + skill_status_change_end(bl, SC_CLOAKING, -1); + if (battle_check_target(src, bl, BCT_ENEMY) > 0) { - struct status_change *sc_data = battle_get_sc_data (bl); - skill_attack (BF_MAGIC, src, src, bl, AL_RUWACH, + struct status_change *sc_data = battle_get_sc_data(bl); + skill_attack(BF_MAGIC, src, src, bl, AL_RUWACH, sc_data[type].val1, tick, 0); } } @@ -9077,49 +9058,49 @@ void skill_status_change_timer_sub (struct block_list *bl, va_list ap) * ステータス異常終了 *------------------------------------------ */ -int skill_status_change_active (struct block_list *bl, int type) +int skill_status_change_active(struct block_list *bl, int type) { struct status_change *sc_data; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type != BL_PC && bl->type != BL_MOB) { if (battle_config.error_log) - printf ("skill_status_change_active: neither MOB nor PC !\n"); + printf("skill_status_change_active: neither MOB nor PC !\n"); return 0; } - nullpo_retr (0, sc_data = battle_get_sc_data (bl)); + nullpo_retr(0, sc_data = battle_get_sc_data(bl)); return sc_data[type].timer != -1; } -int skill_status_change_end (struct block_list *bl, int type, int tid) +int skill_status_change_end(struct block_list *bl, int type, int tid) { struct status_change *sc_data; - int opt_flag = 0, calc_flag = 0; + int opt_flag = 0, calc_flag = 0; short *sc_count, *option, *opt1, *opt2, *opt3; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type != BL_PC && bl->type != BL_MOB) { if (battle_config.error_log) - printf ("skill_status_change_end: neither MOB nor PC !\n"); + printf("skill_status_change_end: neither MOB nor PC !\n"); return 0; } - nullpo_retr (0, sc_data = battle_get_sc_data (bl)); - nullpo_retr (0, sc_count = battle_get_sc_count (bl)); - nullpo_retr (0, option = battle_get_option (bl)); - nullpo_retr (0, opt1 = battle_get_opt1 (bl)); - nullpo_retr (0, opt2 = battle_get_opt2 (bl)); - nullpo_retr (0, opt3 = battle_get_opt3 (bl)); + nullpo_retr(0, sc_data = battle_get_sc_data(bl)); + nullpo_retr(0, sc_count = battle_get_sc_count(bl)); + nullpo_retr(0, option = battle_get_option(bl)); + nullpo_retr(0, opt1 = battle_get_opt1(bl)); + nullpo_retr(0, opt2 = battle_get_opt2(bl)); + nullpo_retr(0, opt3 = battle_get_opt3(bl)); if ((*sc_count) > 0 && sc_data[type].timer != -1 && (sc_data[type].timer == tid || tid == -1)) { if (tid == -1) // タイマから呼ばれていないならタイマ削除をする - delete_timer (sc_data[type].timer, skill_status_change_timer); + delete_timer(sc_data[type].timer, skill_status_change_timer); /* 該当の異常を正常に戻す */ sc_data[type].timer = -1; @@ -9186,29 +9167,29 @@ int skill_status_change_end (struct block_list *bl, int type, int tid) break; case SC_BERSERK: /* バーサーク */ calc_flag = 1; - clif_status_change (bl, SC_INCREASEAGI, 0); /* アイコン消去 */ + clif_status_change(bl, SC_INCREASEAGI, 0); /* アイコン消去 */ break; case SC_DEVOTION: /* ディボーション */ { - struct map_session_data *md = map_id2sd (sc_data[type].val1); + struct map_session_data *md = map_id2sd(sc_data[type].val1); sc_data[type].val1 = sc_data[type].val2 = 0; - skill_devotion (md, bl->id); + skill_devotion(md, bl->id); calc_flag = 1; } break; case SC_BLADESTOP: { struct status_change *t_sc_data = - battle_get_sc_data ((struct block_list *) + battle_get_sc_data((struct block_list *) sc_data[type].val4); //片方が切れたので相手の白刃状態が切れてないのなら解除 if (t_sc_data && t_sc_data[SC_BLADESTOP].timer != -1) - skill_status_change_end ((struct block_list *) + skill_status_change_end((struct block_list *) sc_data[type].val4, SC_BLADESTOP, -1); if (sc_data[type].val2 == 2) - clif_bladestop ((struct block_list *) sc_data[type].val3, + clif_bladestop((struct block_list *) sc_data[type].val3, (struct block_list *) sc_data[type].val4, 0); } @@ -9218,7 +9199,7 @@ int skill_status_change_end (struct block_list *bl, int type, int tid) struct map_session_data *dsd; struct status_change *d_sc_data; if (sc_data[type].val4 - && (dsd = map_id2sd (sc_data[type].val4))) + && (dsd = map_id2sd(sc_data[type].val4))) { d_sc_data = dsd->sc_data; //合奏で相手がいる場合相手のval4を0にする @@ -9232,7 +9213,7 @@ int skill_status_change_end (struct block_list *bl, int type, int tid) { struct skill_unit_group *sg = (struct skill_unit_group *) sc_data[type].val4; //val4がグラフィティのgroup_id if (sg) - skill_delunitgroup (sg); + skill_delunitgroup(sg); } break; case SC_NOCHAT: //チャット禁止状態 @@ -9242,18 +9223,18 @@ int skill_status_change_end (struct block_list *bl, int type, int tid) && (sd = (struct map_session_data *) bl)) { sd->status.manner = 0; - clif_updatestatus (sd, SP_MANNER); + clif_updatestatus(sd, SP_MANNER); } } break; case SC_SPLASHER: /* ベナムスプラッシャー */ { - struct block_list *src = map_id2bl (sc_data[type].val3); + struct block_list *src = map_id2bl(sc_data[type].val3); if (src && tid != -1) { //自分にダメージ＆周囲3*3にダメージ - skill_castend_damage_id (src, bl, sc_data[type].val2, - sc_data[type].val1, gettick (), + skill_castend_damage_id(src, bl, sc_data[type].val2, + sc_data[type].val1, gettick(), 0); } } @@ -9263,8 +9244,8 @@ int skill_status_change_end (struct block_list *bl, int type, int tid) //自分のダメージは0にして struct mob_data *md = NULL; if (bl->type == BL_MOB && (md = (struct mob_data *) bl)) - skill_castend_damage_id (bl, bl, sc_data[type].val2, - sc_data[type].val1, gettick (), + skill_castend_damage_id(bl, bl, sc_data[type].val2, + sc_data[type].val1, gettick(), 0); } break; @@ -9282,7 +9263,7 @@ int skill_status_change_end (struct block_list *bl, int type, int tid) } if (bl->type == BL_PC && type < SC_SENDMAX) - clif_status_change (bl, type, 0); /* アイコン消去 */ + clif_status_change(bl, type, 0); /* アイコン消去 */ switch (type) { /* 正常に戻るときなにか処理が必要 */ @@ -9388,22 +9369,22 @@ int skill_status_change_end (struct block_list *bl, int type, int tid) } if (opt_flag) /* optionの変更を伝える */ - clif_changeoption (bl); + clif_changeoption(bl); if (bl->type == BL_PC && calc_flag) - pc_calcstatus ((struct map_session_data *) bl, 0); /* ステータス再計算 */ + pc_calcstatus((struct map_session_data *) bl, 0); /* ステータス再計算 */ } return 0; } -int skill_update_heal_animation (struct map_session_data *sd) +int skill_update_heal_animation(struct map_session_data *sd) { const int mask = 0x100; - int was_active; - int is_active; + int was_active; + int is_active; - nullpo_retr (0, sd); + nullpo_retr(0, sd); was_active = sd->opt2 & mask; is_active = sd->quick_regeneration_hp.amount > 0; @@ -9415,24 +9396,24 @@ int skill_update_heal_animation (struct map_session_data *sd) else sd->opt2 &= ~mask; - return clif_changeoption (&sd->bl); + return clif_changeoption(&sd->bl); } /*========================================== * ステータス異常終了タイマー *------------------------------------------ */ -void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void skill_status_change_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - int type = data; + int type = data; struct block_list *bl; struct map_session_data *sd = NULL; struct status_change *sc_data; //short *sc_count; //使ってない？ - if ((bl = map_id2bl (id)) == NULL) + if ((bl = map_id2bl(id)) == NULL) return; //該当IDがすでに消滅しているというのはいかにもありそうなのでスルーしてみる - nullpo_retv (sc_data = battle_get_sc_data (bl)); + nullpo_retv(sc_data = battle_get_sc_data(bl)); if (bl->type == BL_PC) sd = (struct map_session_data *) bl; @@ -9442,13 +9423,13 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sc_data[type].timer != tid) { if (battle_config.error_log) - printf ("skill_status_change_timer %d != %d\n", tid, + printf("skill_status_change_timer %d != %d\n", tid, sc_data[type].timer); } if (sc_data[type].spell_invocation) { // Must report termination - spell_effect_report_termination (sc_data[type].spell_invocation, + spell_effect_report_termination(sc_data[type].spell_invocation, bl->id, type, 0); sc_data[type].spell_invocation = 0; } @@ -9463,8 +9444,8 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sd->status.sp > 0) { /* SP切れるまで持続 */ sd->status.sp--; - clif_updatestatus (sd, SP_SP); - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + clif_updatestatus(sd, SP_SP); + sc_data[type].timer = add_timer( /* タイマー再設定 */ sc_data[type].val2 + tick, skill_status_change_timer, @@ -9482,9 +9463,9 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sc_data[type].val2 % (sc_data[type].val1 + 3) == 0) { sd->status.sp--; - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); } - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + sc_data[type].timer = add_timer( /* タイマー再設定 */ 1000 + tick, skill_status_change_timer, bl->id, data); @@ -9496,14 +9477,14 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo case SC_SIGHT: /* サイト */ { const int range = 7; - map_foreachinarea (skill_status_change_timer_sub, + map_foreachinarea(skill_status_change_timer_sub, bl->m, bl->x - range, bl->y - range, bl->x + range, bl->y + range, 0, bl, type, tick); if ((--sc_data[type].val2) > 0) { - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + sc_data[type].timer = add_timer( /* タイマー再設定 */ 250 + tick, skill_status_change_timer, bl->id, data); @@ -9514,14 +9495,14 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo case SC_RUWACH: /* ルアフ */ { const int range = 5; - map_foreachinarea (skill_status_change_timer_sub, + map_foreachinarea(skill_status_change_timer_sub, bl->m, bl->x - range, bl->y - range, bl->x + range, bl->y + range, 0, bl, type, tick); if ((--sc_data[type].val2) > 0) { - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + sc_data[type].timer = add_timer( /* タイマー再設定 */ 250 + tick, skill_status_change_timer, bl->id, data); @@ -9532,12 +9513,12 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo case SC_SIGNUMCRUCIS: /* シグナムクルシス */ { - int race = battle_get_race (bl); + int race = battle_get_race(bl); if (race == 6 - || battle_check_undead (race, battle_get_elem_type (bl))) + || battle_check_undead(race, battle_get_elem_type(bl))) { sc_data[type].timer = - add_timer (1000 * 600 + tick, skill_status_change_timer, + add_timer(1000 * 600 + tick, skill_status_change_timer, bl->id, data); return; } @@ -9550,7 +9531,7 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sd && sd->status.hp > sd->status.max_hp >> 2) /* 停止 */ break; sc_data[type].timer = - add_timer (1000 + tick, skill_status_change_timer, bl->id, + add_timer(1000 + tick, skill_status_change_timer, bl->id, data); return; } @@ -9558,15 +9539,15 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo case SC_WATERBALL: /* ウォーターボール */ { - struct block_list *target = map_id2bl (sc_data[type].val2); + struct block_list *target = map_id2bl(sc_data[type].val2); if (target == NULL || target->prev == NULL) break; - skill_attack (BF_MAGIC, bl, bl, target, WZ_WATERBALL, + skill_attack(BF_MAGIC, bl, bl, target, WZ_WATERBALL, sc_data[type].val1, tick, 0); if ((--sc_data[type].val3) > 0) { sc_data[type].timer = - add_timer (150 + tick, skill_status_change_timer, bl->id, + add_timer(150 + tick, skill_status_change_timer, bl->id, data); return; } @@ -9577,7 +9558,7 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sd && sd->special_state.infinite_endure) { sc_data[type].timer = - add_timer (1000 * 600 + tick, skill_status_change_timer, + add_timer(1000 * 600 + tick, skill_status_change_timer, bl->id, data); sc_data[type].val2 = 1; return; @@ -9593,15 +9574,14 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (!unit || !unit->group) break; - src = map_id2bl (unit->group->src_id); + src = map_id2bl(unit->group->src_id); if (!src) break; - skill_attack (BF_MISC, src, &unit->bl, bl, + skill_attack(BF_MISC, src, &unit->bl, bl, unit->group->skill_id, sc_data[type].val1, tick, 0); sc_data[type].timer = - add_timer (skill_get_time2 - (unit->group->skill_id, + add_timer(skill_get_time2(unit->group->skill_id, unit->group->skill_lv) + tick, skill_status_change_timer, bl->id, data); return; @@ -9615,12 +9595,11 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo (struct skill_unit *) sc_data[type].val4; if (!unit || !unit->group || unit->group->src_id == bl->id) break; - skill_additional_effect (bl, bl, unit->group->skill_id, + skill_additional_effect(bl, bl, unit->group->skill_id, sc_data[type].val1, BF_LONG | BF_SKILL | BF_MISC, tick); sc_data[type].timer = - add_timer (skill_get_time - (unit->group->skill_id, + add_timer(skill_get_time(unit->group->skill_id, unit->group->skill_lv) / 10 + tick, skill_status_change_timer, bl->id, data); return; @@ -9630,31 +9609,31 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo case SC_STONE: if (sc_data[type].val2 != 0) { - short *opt1 = battle_get_opt1 (bl); + short *opt1 = battle_get_opt1(bl); sc_data[type].val2 = 0; sc_data[type].val4 = 0; - battle_stopwalking (bl, 1); + battle_stopwalking(bl, 1); if (opt1) { *opt1 = 1; - clif_changeoption (bl); + clif_changeoption(bl); } sc_data[type].timer = - add_timer (1000 + tick, skill_status_change_timer, bl->id, + add_timer(1000 + tick, skill_status_change_timer, bl->id, data); return; } else if ((--sc_data[type].val3) > 0) { - int hp = battle_get_max_hp (bl); + int hp = battle_get_max_hp(bl); if ((++sc_data[type].val4) % 5 == 0 - && battle_get_hp (bl) > hp >> 2) + && battle_get_hp(bl) > hp >> 2) { hp = hp / 100; if (hp < 1) hp = 1; if (bl->type == BL_PC) - pc_heal ((struct map_session_data *) bl, -hp, 0); + pc_heal((struct map_session_data *) bl, -hp, 0); else if (bl->type == BL_MOB) { struct mob_data *md; @@ -9664,7 +9643,7 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo } } sc_data[type].timer = - add_timer (1000 + tick, skill_status_change_timer, bl->id, + add_timer(1000 + tick, skill_status_change_timer, bl->id, data); return; } @@ -9673,20 +9652,20 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sc_data[SC_SLOWPOISON].timer == -1) { const int resist_poison = - skill_power_bl (bl, TMW_RESIST_POISON) >> 3; + skill_power_bl(bl, TMW_RESIST_POISON) >> 3; if (resist_poison) - sc_data[type].val1 -= MRAND (resist_poison + 1); + sc_data[type].val1 -= MRAND(resist_poison + 1); if ((--sc_data[type].val1) > 0) { - int hp = battle_get_max_hp (bl); - if (battle_get_hp (bl) > hp >> 4) + int hp = battle_get_max_hp(bl); + if (battle_get_hp(bl) > hp >> 4) { if (bl->type == BL_PC) { hp = 3 + hp * 3 / 200; - pc_heal ((struct map_session_data *) bl, -hp, 0); + pc_heal((struct map_session_data *) bl, -hp, 0); } else if (bl->type == BL_MOB) { @@ -9698,13 +9677,13 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo } } sc_data[type].timer = - add_timer (1000 + tick, skill_status_change_timer, + add_timer(1000 + tick, skill_status_change_timer, bl->id, data); } } else sc_data[type].timer = - add_timer (2000 + tick, skill_status_change_timer, bl->id, + add_timer(2000 + tick, skill_status_change_timer, bl->id, data); break; @@ -9716,16 +9695,16 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sc_data[type].val2 % (sc_data[type].val1 + 3) == 0) { sd->status.sp -= 12; - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); } - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + sc_data[type].timer = add_timer( /* タイマー再設定 */ 10000 + tick, skill_status_change_timer, bl->id, data); return; } if (sd->status.max_hp <= sd->status.hp) - skill_status_change_end (&sd->bl, SC_TENSIONRELAX, -1); + skill_status_change_end(&sd->bl, SC_TENSIONRELAX, -1); } break; @@ -9743,13 +9722,13 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo case SC_BROKNARMOR: if (sc_data[type].timer == tid) sc_data[type].timer = - add_timer (1000 * 600 + tick, skill_status_change_timer, + add_timer(1000 * 600 + tick, skill_status_change_timer, bl->id, data); return; case SC_DANCING: //ダンススキルの時間SP消費 { - int s = 0; + int s = 0; if (sd) { if (sd->status.sp > 0 && (--sc_data[type].val3) > 0) @@ -9789,9 +9768,9 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (s && ((sc_data[type].val3 % s) == 0)) { sd->status.sp--; - clif_updatestatus (sd, SP_SP); + clif_updatestatus(sd, SP_SP); } - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + sc_data[type].timer = add_timer( /* タイマー再設定 */ 1000 + tick, skill_status_change_timer, bl->id, data); @@ -9806,8 +9785,8 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if ((sd->status.hp - sd->status.hp / 100) > 100) { sd->status.hp -= sd->status.hp / 100; - clif_updatestatus (sd, SP_HP); - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + clif_updatestatus(sd, SP_HP); + sc_data[type].timer = add_timer( /* タイマー再設定 */ 15000 + tick, skill_status_change_timer, bl->id, data); @@ -9819,9 +9798,9 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo if (sd) { time_t timer; - if (time (&timer) < ((sc_data[type].val2) + 3600)) + if (time(&timer) < ((sc_data[type].val2) + 3600)) { //1時間たっていないので継続 - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + sc_data[type].timer = add_timer( /* タイマー再設定 */ 10000 + tick, skill_status_change_timer, bl->id, data); @@ -9834,11 +9813,11 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo { time_t timer; if ((++sd->status.manner) - && time (&timer) < + && time(&timer) < ((sc_data[type].val2) + 60 * (0 - sd->status.manner))) { //開始からstatus.manner分経ってないので継続 - clif_updatestatus (sd, SP_MANNER); - sc_data[type].timer = add_timer ( /* タイマー再設定(60秒) */ + clif_updatestatus(sd, SP_MANNER); + sc_data[type].timer = add_timer( /* タイマー再設定(60秒) */ 60000 + tick, skill_status_change_timer, bl->id, data); @@ -9856,7 +9835,7 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo md->stats[MOB_SPEED] -= 250; md->next_walktime = tick; } - sc_data[type].timer = add_timer ( /* タイマー再設定 */ + sc_data[type].timer = add_timer( /* タイマー再設定 */ 1000 + tick, skill_status_change_timer, bl->id, data); @@ -9865,37 +9844,37 @@ void skill_status_change_timer (timer_id tid, tick_t tick, custom_id_t id, custo break; case SC_FLYING_BACKPACK: - clif_updatestatus (sd, SP_WEIGHT); + clif_updatestatus(sd, SP_WEIGHT); break; } - skill_status_change_end (bl, type, tid); + skill_status_change_end(bl, type, tid); } /*========================================== * ステータス異常終了 *------------------------------------------ */ -int skill_encchant_eremental_end (struct block_list *bl, int type) +int skill_encchant_eremental_end(struct block_list *bl, int type) { struct status_change *sc_data; - nullpo_retr (0, bl); - nullpo_retr (0, sc_data = battle_get_sc_data (bl)); + nullpo_retr(0, bl); + nullpo_retr(0, sc_data = battle_get_sc_data(bl)); if (type != SC_ENCPOISON && sc_data[SC_ENCPOISON].timer != -1) /* エンチャントポイズン解除 */ - skill_status_change_end (bl, SC_ENCPOISON, -1); + skill_status_change_end(bl, SC_ENCPOISON, -1); if (type != SC_ASPERSIO && sc_data[SC_ASPERSIO].timer != -1) /* アスペルシオ解除 */ - skill_status_change_end (bl, SC_ASPERSIO, -1); + skill_status_change_end(bl, SC_ASPERSIO, -1); if (type != SC_FLAMELAUNCHER && sc_data[SC_FLAMELAUNCHER].timer != -1) /* フレイムランチャ解除 */ - skill_status_change_end (bl, SC_FLAMELAUNCHER, -1); + skill_status_change_end(bl, SC_FLAMELAUNCHER, -1); if (type != SC_FROSTWEAPON && sc_data[SC_FROSTWEAPON].timer != -1) /* フロストウェポン解除 */ - skill_status_change_end (bl, SC_FROSTWEAPON, -1); + skill_status_change_end(bl, SC_FROSTWEAPON, -1); if (type != SC_LIGHTNINGLOADER && sc_data[SC_LIGHTNINGLOADER].timer != -1) /* ライトニングローダー解除 */ - skill_status_change_end (bl, SC_LIGHTNINGLOADER, -1); + skill_status_change_end(bl, SC_LIGHTNINGLOADER, -1); if (type != SC_SEISMICWEAPON && sc_data[SC_SEISMICWEAPON].timer != -1) /* サイスミックウェポン解除 */ - skill_status_change_end (bl, SC_SEISMICWEAPON, -1); + skill_status_change_end(bl, SC_SEISMICWEAPON, -1); return 0; } @@ -9904,39 +9883,39 @@ int skill_encchant_eremental_end (struct block_list *bl, int type) * ステータス異常開始 *------------------------------------------ */ -int skill_status_change_start (struct block_list *bl, int type, int val1, +int skill_status_change_start(struct block_list *bl, int type, int val1, int val2, int val3, int val4, int tick, int flag) { - return skill_status_effect (bl, type, val1, val2, val3, val4, tick, flag, + return skill_status_effect(bl, type, val1, val2, val3, val4, tick, flag, 0); } -int skill_status_effect (struct block_list *bl, int type, int val1, int val2, +int skill_status_effect(struct block_list *bl, int type, int val1, int val2, int val3, int val4, int tick, int flag, int spell_invocation) { struct map_session_data *sd = NULL; struct status_change *sc_data; short *sc_count, *option, *opt1, *opt2, *opt3; - int opt_flag = 0, calc_flag = 0, updateflag = + int opt_flag = 0, calc_flag = 0, updateflag = 0, race, mode, elem, undead_flag; - int scdef = 0; + int scdef = 0; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_SKILL) return 0; - nullpo_retr (0, sc_data = battle_get_sc_data (bl)); - nullpo_retr (0, sc_count = battle_get_sc_count (bl)); - nullpo_retr (0, option = battle_get_option (bl)); - nullpo_retr (0, opt1 = battle_get_opt1 (bl)); - nullpo_retr (0, opt2 = battle_get_opt2 (bl)); - nullpo_retr (0, opt3 = battle_get_opt3 (bl)); - - race = battle_get_race (bl); - mode = battle_get_mode (bl); - elem = battle_get_elem_type (bl); - undead_flag = battle_check_undead (race, elem); + nullpo_retr(0, sc_data = battle_get_sc_data(bl)); + nullpo_retr(0, sc_count = battle_get_sc_count(bl)); + nullpo_retr(0, option = battle_get_option(bl)); + nullpo_retr(0, opt1 = battle_get_opt1(bl)); + nullpo_retr(0, opt2 = battle_get_opt2(bl)); + nullpo_retr(0, opt3 = battle_get_opt3(bl)); + + race = battle_get_race(bl); + mode = battle_get_mode(bl); + elem = battle_get_elem_type(bl); + undead_flag = battle_check_undead(race, elem); if (type == SC_AETERNA && (sc_data[SC_STONE].timer != -1 || sc_data[SC_FREEZE].timer != -1)) @@ -9946,19 +9925,19 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, { case SC_STONE: case SC_FREEZE: - scdef = 3 + battle_get_mdef (bl) + battle_get_luk (bl) / 3; + scdef = 3 + battle_get_mdef(bl) + battle_get_luk(bl) / 3; break; case SC_STAN: case SC_SILENCE: case SC_POISON: - scdef = 3 + battle_get_vit (bl) + battle_get_luk (bl) / 3; + scdef = 3 + battle_get_vit(bl) + battle_get_luk(bl) / 3; break; case SC_SLEEP: case SC_BLIND: - scdef = 3 + battle_get_int (bl) + battle_get_luk (bl) / 3; + scdef = 3 + battle_get_int(bl) + battle_get_luk(bl) / 3; break; case SC_CURSE: - scdef = 3 + battle_get_luk (bl); + scdef = 3 + battle_get_luk(bl); break; // case SC_CONFUSION: @@ -9971,17 +9950,17 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, { sd = (struct map_session_data *) bl; if (sd && type == SC_ADRENALINE - && !(skill_get_weapontype (BS_ADRENALINE) & + && !(skill_get_weapontype(BS_ADRENALINE) & (1 << sd->status.weapon))) return 0; if (SC_STONE <= type && type <= SC_BLIND) { /* カードによる耐性 */ if (sd && sd->reseff[type - SC_STONE] > 0 - && MRAND (10000) < sd->reseff[type - SC_STONE]) + && MRAND(10000) < sd->reseff[type - SC_STONE]) { if (battle_config.battle_log) - printf ("PC %d skill_sc_start: cardによる異常耐性発動\n", + printf("PC %d skill_sc_start: cardによる異常耐性発動\n", sd->bl.id); return 0; } @@ -9993,7 +9972,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, else { if (battle_config.error_log) - printf ("skill_status_change_start: neither MOB nor PC !\n"); + printf("skill_status_change_start: neither MOB nor PC !\n"); return 0; } @@ -10018,7 +9997,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, return 0; } if (type == SC_FREEZE || type == SC_STAN || type == SC_SLEEP) - battle_stopwalking (bl, 1); + battle_stopwalking(bl, 1); if (sc_data[type].timer != -1) { /* すでに同じ異常になっている場合タイマ解除 */ @@ -10028,12 +10007,12 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, return 0; /* 継ぎ足しができない状態異常である時は状態異常を行わない */ if (type == SC_GRAFFITI) { //異常中にもう一度状態異常になった時に解除してから再度かかる - skill_status_change_end (bl, type, -1); + skill_status_change_end(bl, type, -1); } else { (*sc_count)--; - delete_timer (sc_data[type].timer, skill_status_change_timer); + delete_timer(sc_data[type].timer, skill_status_change_timer); sc_data[type].timer = -1; } } @@ -10057,10 +10036,10 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, if (bl->type == BL_PC || (!undead_flag && race != 6)) { if (sc_data[SC_CURSE].timer != -1) - skill_status_change_end (bl, SC_CURSE, -1); + skill_status_change_end(bl, SC_CURSE, -1); if (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0) - skill_status_change_end (bl, SC_STONE, -1); + skill_status_change_end(bl, SC_STONE, -1); } calc_flag = 1; } @@ -10071,21 +10050,21 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_INCREASEAGI: /* 速度上昇 */ calc_flag = 1; if (sc_data[SC_DECREASEAGI].timer != -1) - skill_status_change_end (bl, SC_DECREASEAGI, -1); + skill_status_change_end(bl, SC_DECREASEAGI, -1); if (sc_data[SC_WINDWALK].timer != -1) /* ウインドウォーク */ - skill_status_change_end (bl, SC_WINDWALK, -1); + skill_status_change_end(bl, SC_WINDWALK, -1); break; case SC_DECREASEAGI: /* 速度減少 */ calc_flag = 1; if (sc_data[SC_INCREASEAGI].timer != -1) - skill_status_change_end (bl, SC_INCREASEAGI, -1); + skill_status_change_end(bl, SC_INCREASEAGI, -1); break; case SC_SIGNUMCRUCIS: /* シグナムクルシス */ calc_flag = 1; // val2 = 14 + val1; val2 = 10 + val1 * 2; tick = 600 * 1000; - clif_emotion (bl, 4); + clif_emotion(bl, 4); break; case SC_SLOWPOISON: if (sc_data[SC_POISON].timer == -1) @@ -10116,7 +10095,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_ENCPOISON: /* エンチャントポイズン */ calc_flag = 1; val2 = (((val1 - 1) / 2) + 3) * 100; /* 毒付与確率 */ - skill_encchant_eremental_end (bl, SC_ENCPOISON); + skill_encchant_eremental_end(bl, SC_ENCPOISON); break; case SC_POISONREACT: /* ポイズンリアクト */ break; @@ -10124,7 +10103,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, calc_flag = 1; break; case SC_ASPERSIO: /* アスペルシオ */ - skill_encchant_eremental_end (bl, SC_ASPERSIO); + skill_encchant_eremental_end(bl, SC_ASPERSIO); break; case SC_SUFFRAGIUM: /* サフラギム */ case SC_BENEDICTIO: /* 聖体 */ @@ -10138,11 +10117,11 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, val2 = val1 * 20; break; case SC_KYRIE: /* キリエエレイソン */ - val2 = battle_get_max_hp (bl) * (val1 * 2 + 10) / 100; /* 耐久度 */ + val2 = battle_get_max_hp(bl) * (val1 * 2 + 10) / 100; /* 耐久度 */ val3 = (val1 / 2 + 5); /* 回数 */ // -- moonsoul (added to undo assumptio status if target has it) if (sc_data[SC_ASSUMPTIO].timer != -1) - skill_status_change_end (bl, SC_ASSUMPTIO, -1); + skill_status_change_end(bl, SC_ASSUMPTIO, -1); break; case SC_MINDBREAKER: calc_flag = 1; @@ -10159,35 +10138,35 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_QUAGMIRE: /* クァグマイア */ calc_flag = 1; if (sc_data[SC_CONCENTRATE].timer != -1) /* 集中力向上解除 */ - skill_status_change_end (bl, SC_CONCENTRATE, -1); + skill_status_change_end(bl, SC_CONCENTRATE, -1); if (sc_data[SC_INCREASEAGI].timer != -1) /* 速度上昇解除 */ - skill_status_change_end (bl, SC_INCREASEAGI, -1); + skill_status_change_end(bl, SC_INCREASEAGI, -1); if (sc_data[SC_TWOHANDQUICKEN].timer != -1) - skill_status_change_end (bl, SC_TWOHANDQUICKEN, -1); + skill_status_change_end(bl, SC_TWOHANDQUICKEN, -1); if (sc_data[SC_SPEARSQUICKEN].timer != -1) - skill_status_change_end (bl, SC_SPEARSQUICKEN, -1); + skill_status_change_end(bl, SC_SPEARSQUICKEN, -1); if (sc_data[SC_ADRENALINE].timer != -1) - skill_status_change_end (bl, SC_ADRENALINE, -1); + skill_status_change_end(bl, SC_ADRENALINE, -1); if (sc_data[SC_LOUD].timer != -1) - skill_status_change_end (bl, SC_LOUD, -1); + skill_status_change_end(bl, SC_LOUD, -1); if (sc_data[SC_TRUESIGHT].timer != -1) /* トゥルーサイト */ - skill_status_change_end (bl, SC_TRUESIGHT, -1); + skill_status_change_end(bl, SC_TRUESIGHT, -1); if (sc_data[SC_WINDWALK].timer != -1) /* ウインドウォーク */ - skill_status_change_end (bl, SC_WINDWALK, -1); + skill_status_change_end(bl, SC_WINDWALK, -1); if (sc_data[SC_CARTBOOST].timer != -1) /* カートブースト */ - skill_status_change_end (bl, SC_CARTBOOST, -1); + skill_status_change_end(bl, SC_CARTBOOST, -1); break; case SC_FLAMELAUNCHER: /* フレームランチャー */ - skill_encchant_eremental_end (bl, SC_FLAMELAUNCHER); + skill_encchant_eremental_end(bl, SC_FLAMELAUNCHER); break; case SC_FROSTWEAPON: /* フロストウェポン */ - skill_encchant_eremental_end (bl, SC_FROSTWEAPON); + skill_encchant_eremental_end(bl, SC_FROSTWEAPON); break; case SC_LIGHTNINGLOADER: /* ライトニングローダー */ - skill_encchant_eremental_end (bl, SC_LIGHTNINGLOADER); + skill_encchant_eremental_end(bl, SC_LIGHTNINGLOADER); break; case SC_SEISMICWEAPON: /* サイズミックウェポン */ - skill_encchant_eremental_end (bl, SC_SEISMICWEAPON); + skill_encchant_eremental_end(bl, SC_SEISMICWEAPON); break; case SC_DEVOTION: /* ディボーション */ calc_flag = 1; @@ -10252,7 +10231,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, break; case SC_BLADESTOP: /* 白刃取り */ if (val2 == 2) - clif_bladestop ((struct block_list *) val3, + clif_bladestop((struct block_list *) val3, (struct block_list *) val4, 1); *opt3 |= 32; break; @@ -10307,21 +10286,21 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_DONTFORGETME: /* 私を忘れないで */ calc_flag = 1; if (sc_data[SC_INCREASEAGI].timer != -1) /* 速度上昇解除 */ - skill_status_change_end (bl, SC_INCREASEAGI, -1); + skill_status_change_end(bl, SC_INCREASEAGI, -1); if (sc_data[SC_TWOHANDQUICKEN].timer != -1) - skill_status_change_end (bl, SC_TWOHANDQUICKEN, -1); + skill_status_change_end(bl, SC_TWOHANDQUICKEN, -1); if (sc_data[SC_SPEARSQUICKEN].timer != -1) - skill_status_change_end (bl, SC_SPEARSQUICKEN, -1); + skill_status_change_end(bl, SC_SPEARSQUICKEN, -1); if (sc_data[SC_ADRENALINE].timer != -1) - skill_status_change_end (bl, SC_ADRENALINE, -1); + skill_status_change_end(bl, SC_ADRENALINE, -1); if (sc_data[SC_ASSNCROS].timer != -1) - skill_status_change_end (bl, SC_ASSNCROS, -1); + skill_status_change_end(bl, SC_ASSNCROS, -1); if (sc_data[SC_TRUESIGHT].timer != -1) /* トゥルーサイト */ - skill_status_change_end (bl, SC_TRUESIGHT, -1); + skill_status_change_end(bl, SC_TRUESIGHT, -1); if (sc_data[SC_WINDWALK].timer != -1) /* ウインドウォーク */ - skill_status_change_end (bl, SC_WINDWALK, -1); + skill_status_change_end(bl, SC_WINDWALK, -1); if (sc_data[SC_CARTBOOST].timer != -1) /* カートブースト */ - skill_status_change_end (bl, SC_CARTBOOST, -1); + skill_status_change_end(bl, SC_CARTBOOST, -1); break; case SC_FORTUNE: /* 幸運のキス */ calc_flag = 1; @@ -10373,7 +10352,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, calc_flag = 1; tick = 10000; if (!val2) - val2 = time (&timer); + val2 = time(&timer); } break; case SC_NOCHAT: //チャット禁止状態 @@ -10385,13 +10364,13 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, tick = 60000; if (!val2) - val2 = time (&timer); + val2 = time(&timer); updateflag = SP_MANNER; } break; case SC_SELFDESTRUCTION: //自爆 - clif_skillcasting (bl, bl->id, bl->id, 0, 0, 331, - skill_get_time (val2, val1)); + clif_skillcasting(bl, bl->id, bl->id, 0, 0, 331, + skill_get_time(val2, val1)); val3 = tick / 1000; tick = 1000; break; @@ -10400,7 +10379,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_STONE: /* 石化 */ if (!(flag & 2)) { - int sc_def = battle_get_mdef (bl) * 200; + int sc_def = battle_get_mdef(bl) * 200; tick = tick - sc_def; } val3 = tick / 1000; @@ -10421,15 +10400,15 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_FREEZE: /* 凍結 */ if (!(flag & 2)) { - int sc_def = 100 - battle_get_mdef (bl); + int sc_def = 100 - battle_get_mdef(bl); tick = tick * sc_def / 100; } break; case SC_STAN: /* スタン（val2にミリ秒セット） */ if (!(flag & 2)) { - int sc_def = - 100 - (battle_get_vit (bl) + battle_get_luk (bl) / 3); + int sc_def = + 100 - (battle_get_vit(bl) + battle_get_luk(bl) / 3); tick = tick * sc_def / 100; } break; @@ -10439,8 +10418,8 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, calc_flag = 1; if (!(flag & 2)) { - int sc_def = - 100 - (battle_get_vit (bl) + battle_get_luk (bl) / 5); + int sc_def = + 100 - (battle_get_vit(bl) + battle_get_luk(bl) / 5); tick = tick * sc_def / 100; } val3 = tick / 1000; @@ -10451,7 +10430,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_SILENCE: /* 沈黙（レックスデビーナ） */ if (!(flag & 2)) { - int sc_def = 100 - battle_get_vit (bl); + int sc_def = 100 - battle_get_vit(bl); tick = tick * sc_def / 100; } break; @@ -10459,8 +10438,8 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, calc_flag = 1; if (!(flag & 2)) { - int sc_def = - battle_get_lv (bl) / 10 + battle_get_int (bl) / 15; + int sc_def = + battle_get_lv(bl) / 10 + battle_get_int(bl) / 15; tick = 30000 - sc_def; } break; @@ -10468,7 +10447,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, calc_flag = 1; if (!(flag & 2)) { - int sc_def = 100 - battle_get_vit (bl); + int sc_def = 100 - battle_get_vit(bl); tick = tick * sc_def / 100; } break; @@ -10529,7 +10508,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_AUTOGUARD: { - int i, t; + int i, t; for (i = val2 = 0; i < val1; i++) { t = 5 - (i >> 1); @@ -10570,28 +10549,28 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, // -- moonsoul (for new upper class related skill status effects) /* - case SC_AURABLADE: - val2 = val1*10; - break; - case SC_PARRYING: - val2=val1*3; - break; - case SC_CONCENTRATION: - calc_flag=1; - val2=val1*10; - val3=val1*5; - break; - case SC_TENSIONRELAX: -// val2 = 10; -// val3 = 15; - break; - case SC_BERSERK: - calc_flag=1; - break; - case SC_ASSUMPTIO: - if(sc_data[SC_KYRIE].timer!=-1 ) - skill_status_change_end(bl,SC_KYRIE,-1); - break; + case SC_AURABLADE: + val2 = val1*10; + break; + case SC_PARRYING: + val2=val1*3; + break; + case SC_CONCENTRATION: + calc_flag=1; + val2=val1*10; + val3=val1*5; + break; + case SC_TENSIONRELAX: +// val2 = 10; +// val3 = 15; + break; + case SC_BERSERK: + calc_flag=1; + break; + case SC_ASSUMPTIO: + if (sc_data[SC_KYRIE].timer!=-1 ) + skill_status_change_end(bl,SC_KYRIE,-1); + break; */ case SC_WINDWALK: /* ウインドウォーク */ calc_flag = 1; @@ -10601,8 +10580,8 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, if (sd) { sd->status.sp = 0; - clif_updatestatus (sd, SP_SP); - clif_status_change (bl, SC_INCREASEAGI, 1); /* アイコン表示 */ + clif_updatestatus(sd, SP_SP); + clif_status_change(bl, SC_INCREASEAGI, 1); /* アイコン表示 */ } *opt3 |= 128; tick = 1000; @@ -10630,7 +10609,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_GRAFFITI: /* グラフィティ */ { struct skill_unit_group *sg = - skill_unitsetting (bl, RG_GRAFFITI, val1, val2, val3, 0); + skill_unitsetting(bl, RG_GRAFFITI, val1, val2, val3, 0); if (sg) val4 = (int) sg; } @@ -10648,12 +10627,12 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, break; default: if (battle_config.error_log) - printf ("UnknownStatusChange [%d]\n", type); + printf("UnknownStatusChange [%d]\n", type); return 0; } if (bl->type == BL_PC && type < SC_SENDMAX) - clif_status_change (bl, type, 1); /* アイコン表示 */ + clif_status_change(bl, type, 1); /* アイコン表示 */ /* optionの変更 */ switch (type) @@ -10662,16 +10641,16 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, case SC_FREEZE: case SC_STAN: case SC_SLEEP: - battle_stopattack (bl); /* 攻撃停止 */ - skill_stop_dancing (bl, 0); /* 演奏/ダンスの中断 */ + battle_stopattack(bl); /* 攻撃停止 */ + skill_stop_dancing(bl, 0); /* 演奏/ダンスの中断 */ { /* 同時に掛からないステータス異常を解除 */ - int i; + int i; for (i = SC_STONE; i <= SC_SLEEP; i++) { if (sc_data[i].timer != -1) { (*sc_count)--; - delete_timer (sc_data[i].timer, + delete_timer(sc_data[i].timer, skill_status_change_timer); sc_data[i].timer = -1; } @@ -10708,12 +10687,12 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, break; case SC_HIDING: case SC_CLOAKING: - battle_stopattack (bl); /* 攻撃停止 */ + battle_stopattack(bl); /* 攻撃停止 */ *option |= ((type == SC_HIDING) ? 2 : 4); opt_flag = 1; break; case SC_CHASEWALK: - battle_stopattack (bl); /* 攻撃停止 */ + battle_stopattack(bl); /* 攻撃停止 */ *option |= 16388; opt_flag = 1; break; @@ -10731,7 +10710,7 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, } if (opt_flag) /* optionの変更 */ - clif_changeoption (bl); + clif_changeoption(bl); (*sc_count)++; /* ステータス異常の数 */ @@ -10740,21 +10719,21 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, sc_data[type].val3 = val3; sc_data[type].val4 = val4; if (sc_data[type].spell_invocation) // Supplant by newer spell - spell_effect_report_termination (sc_data[type].spell_invocation, + spell_effect_report_termination(sc_data[type].spell_invocation, bl->id, type, 1); sc_data[type].spell_invocation = spell_invocation; /* タイマー設定 */ sc_data[type].timer = - add_timer (gettick () + tick, skill_status_change_timer, bl->id, + add_timer(gettick() + tick, skill_status_change_timer, bl->id, type); if (bl->type == BL_PC && calc_flag) - pc_calcstatus (sd, 0); /* ステータス再計算 */ + pc_calcstatus(sd, 0); /* ステータス再計算 */ if (bl->type == BL_PC && updateflag) - clif_updatestatus (sd, updateflag); /* ステータスをクライアントに送る */ + clif_updatestatus(sd, updateflag); /* ステータスをクライアントに送る */ return 0; } @@ -10763,19 +10742,19 @@ int skill_status_effect (struct block_list *bl, int type, int val1, int val2, * ステータス異常全解除 *------------------------------------------ */ -int skill_status_change_clear (struct block_list *bl, int type) +int skill_status_change_clear(struct block_list *bl, int type) { struct status_change *sc_data; short *sc_count, *option, *opt1, *opt2, *opt3; - int i; + int i; - nullpo_retr (0, bl); - nullpo_retr (0, sc_data = battle_get_sc_data (bl)); - nullpo_retr (0, sc_count = battle_get_sc_count (bl)); - nullpo_retr (0, option = battle_get_option (bl)); - nullpo_retr (0, opt1 = battle_get_opt1 (bl)); - nullpo_retr (0, opt2 = battle_get_opt2 (bl)); - nullpo_retr (0, opt3 = battle_get_opt3 (bl)); + nullpo_retr(0, bl); + nullpo_retr(0, sc_data = battle_get_sc_data(bl)); + nullpo_retr(0, sc_count = battle_get_sc_count(bl)); + nullpo_retr(0, option = battle_get_option(bl)); + nullpo_retr(0, opt1 = battle_get_opt1(bl)); + nullpo_retr(0, opt2 = battle_get_opt2(bl)); + nullpo_retr(0, opt3 = battle_get_opt3(bl)); if (*sc_count == 0) return 0; @@ -10784,14 +10763,14 @@ int skill_status_change_clear (struct block_list *bl, int type) if (sc_data[i].timer != -1) { /* 異常があるならタイマーを削除する */ /* - delete_timer(sc_data[i].timer, skill_status_change_timer); - sc_data[i].timer = -1; + delete_timer(sc_data[i].timer, skill_status_change_timer); + sc_data[i].timer = -1; - if (!type && i < SC_SENDMAX) - clif_status_change(bl, i, 0); + if (!type && i < SC_SENDMAX) + clif_status_change(bl, i, 0); */ - skill_status_change_end (bl, i, -1); + skill_status_change_end(bl, i, -1); } } *sc_count = 0; @@ -10804,37 +10783,37 @@ int skill_status_change_clear (struct block_list *bl, int type) *opt2 |= STATE_BLIND; if (!type || type & 2) - clif_changeoption (bl); + clif_changeoption(bl); return 0; } /* クローキング検査（周りに移動不可能地帯があるか） */ -int skill_check_cloaking (struct block_list *bl) +int skill_check_cloaking(struct block_list *bl) { struct map_session_data *sd = NULL; static int dx[] = { -1, 0, 1, -1, 1, -1, 0, 1 }; static int dy[] = { -1, -1, -1, 0, 0, 1, 1, 1 }; - int end = 1, i; + int end = 1, i; - nullpo_retr (0, bl); + nullpo_retr(0, bl); - if (pc_checkskill (sd, AS_CLOAKING) > 2) + if (pc_checkskill(sd, AS_CLOAKING) > 2) return 0; if (bl->type == BL_PC && battle_config.pc_cloak_check_type & 1) return 0; if (bl->type == BL_MOB && battle_config.monster_cloak_check_type & 1) return 0; - for (i = 0; i < sizeof (dx) / sizeof (dx[0]); i++) + for (i = 0; i < sizeof(dx) / sizeof(dx[0]); i++) { - int c = map_getcell (bl->m, bl->x + dx[i], bl->y + dy[i]); + int c = map_getcell(bl->m, bl->x + dx[i], bl->y + dy[i]); if (c == 1 || c == 5) end = 0; } if (end) { - skill_status_change_end (bl, SC_CLOAKING, -1); - *battle_get_option (bl) &= ~4; /* 念のための処理 */ + skill_status_change_end(bl, SC_CLOAKING, -1); + *battle_get_option(bl) &= ~4; /* 念のための処理 */ } return end; } @@ -10851,9 +10830,9 @@ int skill_check_cloaking (struct block_list *bl) * 戻り ダンスじゃない=0 合奏=2 それ以外のダンス=1 *------------------------------------------ */ -int skill_is_danceskill (int id) +int skill_is_danceskill(int id) { - int i; + int i; switch (id) { case BD_LULLABY: /* 子守歌 */ @@ -10894,20 +10873,20 @@ int skill_is_danceskill (int id) * *------------------------------------------ */ -void skill_stop_dancing (struct block_list *src, int flag) +void skill_stop_dancing(struct block_list *src, int flag) { struct status_change *sc_data; struct skill_unit_group *group; - nullpo_retv (src); + nullpo_retv(src); - sc_data = battle_get_sc_data (src); + sc_data = battle_get_sc_data(src); if (sc_data && sc_data[SC_DANCING].timer == -1) return; group = (struct skill_unit_group *) sc_data[SC_DANCING].val2; //ダンスのスキルユニットIDはval2に入ってる if (group && src->type == BL_PC && sc_data && sc_data[SC_DANCING].val4) { //合奏中断 - struct map_session_data *dsd = map_id2sd (sc_data[SC_DANCING].val4); //相方のsd取得 + struct map_session_data *dsd = map_id2sd(sc_data[SC_DANCING].val4); //相方のsd取得 if (flag) { //ログアウトなど片方が落ちても演奏が継続される if (dsd && src->id == group->src_id) @@ -10925,7 +10904,7 @@ void skill_stop_dancing (struct block_list *src, int flag) if (flag & 2) //ハエ飛びなど return; //合奏もダンス状態も終了させない＆スキルユニットは置いてけぼり } - skill_status_change_end (src, SC_DANCING, -1); //自分のステータスを終了させる + skill_status_change_end(src, SC_DANCING, -1); //自分のステータスを終了させる //そしてグループは消さない＆消さないのでステータス計算もいらない？ return; } @@ -10933,42 +10912,42 @@ void skill_stop_dancing (struct block_list *src, int flag) { if (dsd && src->id == group->src_id) { //グループを持ってるPCが止める - skill_status_change_end ((struct block_list *) dsd, SC_DANCING, -1); //相手のステータスを終了させる + skill_status_change_end((struct block_list *) dsd, SC_DANCING, -1); //相手のステータスを終了させる } if (dsd && dsd->bl.id == group->src_id) { //相方がグループを持っているPCが止める(自分はグループを持っていない) - skill_status_change_end (src, SC_DANCING, -1); //自分のステータスを終了させる + skill_status_change_end(src, SC_DANCING, -1); //自分のステータスを終了させる } } } if (flag & 2 && group && src->type == BL_PC) { //ハエで飛んだときとかはユニットも飛ぶ struct map_session_data *sd = (struct map_session_data *) src; - skill_unit_move_unit_group (group, sd->bl.m, (sd->to_x - sd->bl.x), + skill_unit_move_unit_group(group, sd->bl.m, (sd->to_x - sd->bl.x), (sd->to_y - sd->bl.y)); return; } - skill_delunitgroup (group); + skill_delunitgroup(group); if (src->type == BL_PC) - pc_calcstatus ((struct map_session_data *) src, 0); + pc_calcstatus((struct map_session_data *) src, 0); } /*========================================== * スキルユニット初期化 *------------------------------------------ */ -struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, +struct skill_unit *skill_initunit(struct skill_unit_group *group, int idx, int x, int y) { struct skill_unit *unit; - nullpo_retr (NULL, group); - nullpo_retr (NULL, unit = &group->unit[idx]); + nullpo_retr(NULL, group); + nullpo_retr(NULL, unit = &group->unit[idx]); if (!unit->alive) group->alive_count++; - unit->bl.id = map_addobject (&unit->bl); + unit->bl.id = map_addobject(&unit->bl); unit->bl.type = BL_SKILL; unit->bl.m = group->map; unit->bl.x = x; @@ -10977,43 +10956,43 @@ struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, unit->val1 = unit->val2 = 0; unit->alive = 1; - map_addblock (&unit->bl); - clif_skill_setunit (unit); + map_addblock(&unit->bl); + clif_skill_setunit(unit); return unit; } -void skill_unit_timer_sub_ondelete (struct block_list *bl, va_list ap); +void skill_unit_timer_sub_ondelete(struct block_list *bl, va_list ap); /*========================================== * スキルユニット削除 *------------------------------------------ */ -int skill_delunit (struct skill_unit *unit) +int skill_delunit(struct skill_unit *unit) { struct skill_unit_group *group; - int range; + int range; - nullpo_retr (0, unit); + nullpo_retr(0, unit); if (!unit->alive) return 0; - nullpo_retr (0, group = unit->group); + nullpo_retr(0, group = unit->group); /* onlimitイベント呼び出し */ - skill_unit_onlimit (unit, gettick ()); + skill_unit_onlimit(unit, gettick()); /* ondeleteイベント呼び出し */ range = group->range; - map_foreachinarea (skill_unit_timer_sub_ondelete, unit->bl.m, + map_foreachinarea(skill_unit_timer_sub_ondelete, unit->bl.m, unit->bl.x - range, unit->bl.y - range, unit->bl.x + range, unit->bl.y + range, 0, &unit->bl, - gettick ()); + gettick()); - clif_skill_delunit (unit); + clif_skill_delunit(unit); unit->group = NULL; unit->alive = 0; - map_delobjectnofree (unit->bl.id, BL_SKILL); + map_delobjectnofree(unit->bl.id, BL_SKILL); if (group->alive_count > 0 && (--group->alive_count) <= 0) - skill_delunitgroup (group); + skill_delunitgroup(group); return 0; } @@ -11023,15 +11002,15 @@ int skill_delunit (struct skill_unit *unit) *------------------------------------------ */ static int skill_unit_group_newid = 10; -struct skill_unit_group *skill_initunitgroup (struct block_list *src, +struct skill_unit_group *skill_initunitgroup(struct block_list *src, int count, int skillid, int skilllv, int unit_id) { - int i; + int i; struct skill_unit_group *group = NULL, *list = NULL; - int maxsug = 0; + int maxsug = 0; - nullpo_retr (NULL, src); + nullpo_retr(NULL, src); if (src->type == BL_PC) { @@ -11054,31 +11033,31 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, if (group == NULL) { /* 空いてないので古いもの検索 */ - int j = 0; - unsigned maxdiff = 0, x, tick = gettick (); + int j = 0; + unsigned maxdiff = 0, x, tick = gettick(); for (i = 0; i < maxsug; i++) - if ((x = DIFF_TICK (tick, list[i].tick)) > maxdiff) + if ((x = DIFF_TICK(tick, list[i].tick)) > maxdiff) { maxdiff = x; j = i; } - skill_delunitgroup (&list[j]); + skill_delunitgroup(&list[j]); group = &list[j]; } } if (group == NULL) { - printf ("skill_initunitgroup: error unit group !\n"); - exit (1); + printf("skill_initunitgroup: error unit group !\n"); + exit(1); } group->src_id = src->id; - group->party_id = battle_get_party_id (src); + group->party_id = battle_get_party_id(src); group->group_id = skill_unit_group_newid++; if (skill_unit_group_newid <= 0) skill_unit_group_newid = 10; - CREATE (group->unit, struct skill_unit, count); + CREATE(group->unit, struct skill_unit, count); group->unit_count = count; group->val1 = group->val2 = 0; group->skill_id = skillid; @@ -11088,10 +11067,10 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, group->range = 0; group->limit = 10000; group->interval = 1000; - group->tick = gettick (); + group->tick = gettick(); group->valstr = NULL; - if (skill_is_danceskill (skillid)) + if (skill_is_danceskill(skillid)) { struct map_session_data *sd = NULL; if (src->type == BL_PC && (sd = (struct map_session_data *) src)) @@ -11099,8 +11078,8 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, sd->skillid_dance = skillid; sd->skilllv_dance = skilllv; } - skill_status_change_start (src, SC_DANCING, skillid, (int) group, 0, - 0, skill_get_time (skillid, + skill_status_change_start(src, SC_DANCING, skillid, (int) group, 0, + 0, skill_get_time(skillid, skilllv) + 1000, 0); switch (skillid) { //合奏スキルは相方をダンス状態にする @@ -11115,11 +11094,11 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, case BD_RAGNAROK: /* 神々の黄昏 */ case CG_MOONLIT: /* 月明りの泉に落ちる花びら */ { - int range = 1; - int c = 0; + int range = 1; + int c = 0; if (sd) { - map_foreachinarea (skill_check_condition_use_sub, + map_foreachinarea(skill_check_condition_use_sub, sd->bl.m, sd->bl.x - range, sd->bl.y - range, sd->bl.x + range, sd->bl.y + range, BL_PC, &sd->bl, &c); @@ -11134,20 +11113,20 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, * スキルユニットグループ削除 *------------------------------------------ */ -int skill_delunitgroup (struct skill_unit_group *group) +int skill_delunitgroup(struct skill_unit_group *group) { struct block_list *src; - int i; + int i; - nullpo_retr (0, group); + nullpo_retr(0, group); if (group->unit_count <= 0) return 0; - src = map_id2bl (group->src_id); - if (skill_is_danceskill (group->skill_id)) + src = map_id2bl(group->src_id); + if (skill_is_danceskill(group->skill_id)) { //ダンススキルはダンス状態を解除する if (src) - skill_status_change_end (src, SC_DANCING, -1); + skill_status_change_end(src, SC_DANCING, -1); } group->alive_count = 0; @@ -11155,15 +11134,15 @@ int skill_delunitgroup (struct skill_unit_group *group) { for (i = 0; i < group->unit_count; i++) if (group->unit[i].alive) - skill_delunit (&group->unit[i]); + skill_delunit(&group->unit[i]); } if (group->valstr != NULL) { - map_freeblock (group->valstr); + map_freeblock(group->valstr); group->valstr = NULL; } - map_freeblock (group->unit); /* free()の替わり */ + map_freeblock(group->unit); /* free()の替わり */ group->unit = NULL; group->src_id = 0; group->group_id = 0; @@ -11175,12 +11154,12 @@ int skill_delunitgroup (struct skill_unit_group *group) * スキルユニットグループ全削除 *------------------------------------------ */ -int skill_clear_unitgroup (struct block_list *src) +int skill_clear_unitgroup(struct block_list *src) { struct skill_unit_group *group = NULL; - int maxsug = 0; + int maxsug = 0; - nullpo_retr (0, src); + nullpo_retr(0, src); if (src->type == BL_PC) { @@ -11194,10 +11173,10 @@ int skill_clear_unitgroup (struct block_list *src) } if (group) { - int i; + int i; for (i = 0; i < maxsug; i++) if (group[i].group_id > 0 && group[i].src_id == src->id) - skill_delunitgroup (&group[i]); + skill_delunitgroup(&group[i]); } return 0; } @@ -11206,15 +11185,15 @@ int skill_clear_unitgroup (struct block_list *src) * スキルユニットグループの被影響tick検索 *------------------------------------------ */ -struct skill_unit_group_tickset *skill_unitgrouptickset_search (struct +struct skill_unit_group_tickset *skill_unitgrouptickset_search(struct block_list *bl, int group_id) { - int i, j = 0, k, s = group_id % MAX_SKILLUNITGROUPTICKSET; + int i, j = 0, k, s = group_id % MAX_SKILLUNITGROUPTICKSET; struct skill_unit_group_tickset *set = NULL; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) { @@ -11240,12 +11219,12 @@ struct skill_unit_group_tickset *skill_unitgrouptickset_search (struct * スキルユニットグループの被影響tick削除 *------------------------------------------ */ -int skill_unitgrouptickset_delete (struct block_list *bl, int group_id) +int skill_unitgrouptickset_delete(struct block_list *bl, int group_id) { - int i, s = group_id % MAX_SKILLUNITGROUPTICKSET; + int i, s = group_id % MAX_SKILLUNITGROUPTICKSET; struct skill_unit_group_tickset *set = NULL, *ts; - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->type == BL_PC) { @@ -11274,25 +11253,25 @@ int skill_unitgrouptickset_delete (struct block_list *bl, int group_id) *------------------------------------------ */ static -void skill_unit_timer_sub_onplace (struct block_list *bl, va_list ap) +void skill_unit_timer_sub_onplace(struct block_list *bl, va_list ap) { struct block_list *src; struct skill_unit *su; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - src = va_arg (ap, struct block_list *); + nullpo_retv(bl); + nullpo_retv(ap); + src = va_arg(ap, struct block_list *); - tick = va_arg (ap, unsigned int); + tick = va_arg(ap, unsigned int); su = (struct skill_unit *) src; if (su && su->alive) { struct skill_unit_group *sg; sg = su->group; - if (sg && battle_check_target (src, bl, sg->target_flag) > 0) - skill_unit_onplace (su, bl, tick); + if (sg && battle_check_target(src, bl, sg->target_flag) > 0) + skill_unit_onplace(su, bl, tick); } } @@ -11300,25 +11279,25 @@ void skill_unit_timer_sub_onplace (struct block_list *bl, va_list ap) * スキルユニットタイマー削除処理用(foreachinarea) *------------------------------------------ */ -void skill_unit_timer_sub_ondelete (struct block_list *bl, va_list ap) +void skill_unit_timer_sub_ondelete(struct block_list *bl, va_list ap) { struct block_list *src; struct skill_unit *su; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - src = va_arg (ap, struct block_list *); + nullpo_retv(bl); + nullpo_retv(ap); + src = va_arg(ap, struct block_list *); - tick = va_arg (ap, unsigned int); + tick = va_arg(ap, unsigned int); su = (struct skill_unit *) src; if (su && su->alive) { struct skill_unit_group *sg; sg = su->group; - if (sg && battle_check_target (src, bl, sg->target_flag) > 0) - skill_unit_ondelete (su, bl, tick); + if (sg && battle_check_target(src, bl, sg->target_flag) > 0) + skill_unit_ondelete(su, bl, tick); } } @@ -11327,18 +11306,18 @@ void skill_unit_timer_sub_ondelete (struct block_list *bl, va_list ap) *------------------------------------------ */ static -void skill_unit_timer_sub (struct block_list *bl, va_list ap) +void skill_unit_timer_sub(struct block_list *bl, va_list ap) { struct skill_unit *unit; struct skill_unit_group *group; - int range; + int range; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (unit = (struct skill_unit *) bl); - nullpo_retv (group = unit->group); - tick = va_arg (ap, unsigned int); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(unit = (struct skill_unit *) bl); + nullpo_retv(group = unit->group); + tick = va_arg(ap, unsigned int); if (!unit->alive) return; @@ -11348,13 +11327,13 @@ void skill_unit_timer_sub (struct block_list *bl, va_list ap) /* onplaceイベント呼び出し */ if (unit->alive && unit->range >= 0) { - map_foreachinarea (skill_unit_timer_sub_onplace, bl->m, + map_foreachinarea(skill_unit_timer_sub_onplace, bl->m, bl->x - range, bl->y - range, bl->x + range, bl->y + range, 0, bl, tick); if (group->unit_id == 0xaa - && DIFF_TICK (tick, group->tick) >= 6000 * group->val2) + && DIFF_TICK(tick, group->tick) >= 6000 * group->val2) { - map_foreachinarea (skill_idun_heal, bl->m, + map_foreachinarea(skill_idun_heal, bl->m, bl->x - range, bl->y - range, bl->x + range, bl->y + range, 0, unit); group->val2++; @@ -11362,17 +11341,17 @@ void skill_unit_timer_sub (struct block_list *bl, va_list ap) } /* 時間切れ削除 */ if (unit->alive && - (DIFF_TICK (tick, group->tick) >= group->limit - || DIFF_TICK (tick, group->tick) >= unit->limit)) + (DIFF_TICK(tick, group->tick) >= group->limit + || DIFF_TICK(tick, group->tick) >= unit->limit)) { switch (group->unit_id) { case 0x8f: /* ブラストマイン */ group->unit_id = 0x8c; - clif_changelook (bl, LOOK_BASE, group->unit_id); - group->limit = DIFF_TICK (tick + 1500, group->tick); - unit->limit = DIFF_TICK (tick + 1500, group->tick); + clif_changelook(bl, LOOK_BASE, group->unit_id); + group->limit = DIFF_TICK(tick + 1500, group->tick); + unit->limit = DIFF_TICK(tick + 1500, group->tick); break; case 0x90: /* スキッドトラップ */ case 0x91: /* アンクルスネア */ @@ -11384,22 +11363,22 @@ void skill_unit_timer_sub (struct block_list *bl, va_list ap) case 0x98: /* クレイモアートラップ */ case 0x99: /* トーキーボックス */ { - struct block_list *src = map_id2bl (group->src_id); + struct block_list *src = map_id2bl(group->src_id); if (group->unit_id == 0x91 && group->val2); else { if (src && src->type == BL_PC) { struct item item_tmp; - memset (&item_tmp, 0, sizeof (item_tmp)); + memset(&item_tmp, 0, sizeof(item_tmp)); item_tmp.nameid = 1065; item_tmp.identify = 1; - map_addflooritem (&item_tmp, 1, bl->m, bl->x, bl->y, NULL, NULL, NULL, 0); // 罠返還 + map_addflooritem(&item_tmp, 1, bl->m, bl->x, bl->y, NULL, NULL, NULL, 0); // 罠返還 } } } default: - skill_delunit (unit); + skill_delunit(unit); } } @@ -11407,7 +11386,7 @@ void skill_unit_timer_sub (struct block_list *bl, va_list ap) { unit->val1 -= 5; if (unit->val1 <= 0 && unit->limit + group->tick > tick + 700) - unit->limit = DIFF_TICK (tick + 700, group->tick); + unit->limit = DIFF_TICK(tick + 700, group->tick); } } @@ -11416,13 +11395,13 @@ void skill_unit_timer_sub (struct block_list *bl, va_list ap) *------------------------------------------ */ static -void skill_unit_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +void skill_unit_timer(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { - map_freeblock_lock (); + map_freeblock_lock(); - map_foreachobject (skill_unit_timer_sub, BL_SKILL, tick); + map_foreachobject(skill_unit_timer_sub, BL_SKILL, tick); - map_freeblock_unlock (); + map_freeblock_unlock(); } /*========================================== @@ -11430,49 +11409,49 @@ void skill_unit_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t *------------------------------------------ */ static -void skill_unit_out_all_sub (struct block_list *bl, va_list ap) +void skill_unit_out_all_sub(struct block_list *bl, va_list ap) { struct skill_unit *unit; struct skill_unit_group *group; struct block_list *src; - int range; + int range; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (src = va_arg (ap, struct block_list *)); - nullpo_retv (unit = (struct skill_unit *) bl); - nullpo_retv (group = unit->group); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(src = va_arg(ap, struct block_list *)); + nullpo_retv(unit = (struct skill_unit *) bl); + nullpo_retv(group = unit->group); - tick = va_arg (ap, unsigned int); + tick = va_arg(ap, unsigned int); if (!unit->alive || src->prev == NULL) return; range = (unit->range != 0) ? unit->range : group->range; - if (range < 0 || battle_check_target (bl, src, group->target_flag) <= 0) + if (range < 0 || battle_check_target(bl, src, group->target_flag) <= 0) return; if (src->x >= bl->x - range && src->x <= bl->x + range && src->y >= bl->y - range && src->y <= bl->y + range) - skill_unit_onout (unit, src, tick); + skill_unit_onout(unit, src, tick); } /*========================================== * スキルユニット移動時処理 *------------------------------------------ */ -int skill_unit_out_all (struct block_list *bl, unsigned int tick, int range) +int skill_unit_out_all(struct block_list *bl, unsigned int tick, int range) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->prev == NULL) return 0; if (range < 7) range = 7; - map_foreachinarea (skill_unit_out_all_sub, + map_foreachinarea(skill_unit_out_all_sub, bl->m, bl->x - range, bl->y - range, bl->x + range, bl->y + range, BL_SKILL, bl, tick); @@ -11484,20 +11463,20 @@ int skill_unit_out_all (struct block_list *bl, unsigned int tick, int range) *------------------------------------------ */ static -void skill_unit_move_sub (struct block_list *bl, va_list ap) +void skill_unit_move_sub(struct block_list *bl, va_list ap) { struct skill_unit *unit; struct skill_unit_group *group; struct block_list *src; - int range; + int range; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (unit = (struct skill_unit *) bl); - nullpo_retv (src = va_arg (ap, struct block_list *)); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(unit = (struct skill_unit *) bl); + nullpo_retv(src = va_arg(ap, struct block_list *)); - tick = va_arg (ap, unsigned int); + tick = va_arg(ap, unsigned int); if (!unit->alive || src->prev == NULL) return; @@ -11506,30 +11485,30 @@ void skill_unit_move_sub (struct block_list *bl, va_list ap) return; range = (unit->range != 0) ? unit->range : group->range; - if (range < 0 || battle_check_target (bl, src, group->target_flag) <= 0) + if (range < 0 || battle_check_target(bl, src, group->target_flag) <= 0) return; if (src->x >= bl->x - range && src->x <= bl->x + range && src->y >= bl->y - range && src->y <= bl->y + range) - skill_unit_onplace (unit, src, tick); + skill_unit_onplace(unit, src, tick); else - skill_unit_onout (unit, src, tick); + skill_unit_onout(unit, src, tick); } /*========================================== * スキルユニット移動時処理 *------------------------------------------ */ -int skill_unit_move (struct block_list *bl, unsigned int tick, int range) +int skill_unit_move(struct block_list *bl, unsigned int tick, int range) { - nullpo_retr (0, bl); + nullpo_retr(0, bl); if (bl->prev == NULL) return 0; if (range < 7) range = 7; - map_foreachinarea (skill_unit_move_sub, + map_foreachinarea(skill_unit_move_sub, bl->m, bl->x - range, bl->y - range, bl->x + range, bl->y + range, BL_SKILL, bl, tick); @@ -11541,34 +11520,34 @@ int skill_unit_move (struct block_list *bl, unsigned int tick, int range) *------------------------------------------ */ static -void skill_unit_move_unit_group_sub (struct block_list *bl, va_list ap) +void skill_unit_move_unit_group_sub(struct block_list *bl, va_list ap) { struct skill_unit *unit; struct skill_unit_group *group; struct block_list *src; - int range; + int range; unsigned int tick; - nullpo_retv (bl); - nullpo_retv (ap); - nullpo_retv (src = va_arg (ap, struct block_list *)); - nullpo_retv (unit = (struct skill_unit *) src); - nullpo_retv (group = unit->group); + nullpo_retv(bl); + nullpo_retv(ap); + nullpo_retv(src = va_arg(ap, struct block_list *)); + nullpo_retv(unit = (struct skill_unit *) src); + nullpo_retv(group = unit->group); - tick = va_arg (ap, unsigned int); + tick = va_arg(ap, unsigned int); if (!unit->alive || bl->prev == NULL) return; range = (unit->range != 0) ? unit->range : group->range; - if (range < 0 || battle_check_target (src, bl, group->target_flag) <= 0) + if (range < 0 || battle_check_target(src, bl, group->target_flag) <= 0) return; if (bl->x >= src->x - range && bl->x <= src->x + range && bl->y >= src->y - range && bl->y <= src->y + range) - skill_unit_onplace (unit, bl, tick); + skill_unit_onplace(unit, bl, tick); else - skill_unit_onout (unit, bl, tick); + skill_unit_onout(unit, bl, tick); } /*========================================== @@ -11576,10 +11555,10 @@ void skill_unit_move_unit_group_sub (struct block_list *bl, va_list ap) * 引数はグループと移動量 *------------------------------------------ */ -int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, +int skill_unit_move_unit_group(struct skill_unit_group *group, int m, int dx, int dy) { - nullpo_retr (0, group); + nullpo_retr(0, group); if (group->unit_count <= 0) return 0; @@ -11588,49 +11567,49 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, { if (!battle_config.unit_movement_type) { - int i; + int i; for (i = 0; i < group->unit_count; i++) { struct skill_unit *unit = &group->unit[i]; if (unit->alive && !(m == unit->bl.m && dx == 0 && dy == 0)) { - int range = unit->range; - map_delblock (&unit->bl); + int range = unit->range; + map_delblock(&unit->bl); unit->bl.m = m; unit->bl.x += dx; unit->bl.y += dy; - map_addblock (&unit->bl); - clif_skill_setunit (unit); + map_addblock(&unit->bl); + clif_skill_setunit(unit); if (range > 0) { if (range < 7) range = 7; - map_foreachinarea (skill_unit_move_unit_group_sub, + map_foreachinarea(skill_unit_move_unit_group_sub, unit->bl.m, unit->bl.x - range, unit->bl.y - range, unit->bl.x + range, unit->bl.y + range, 0, &unit->bl, - gettick ()); + gettick()); } } } } else { - int i, j, *r_flag, *s_flag, *m_flag; + int i, j, *r_flag, *s_flag, *m_flag; struct skill_unit *unit1; struct skill_unit *unit2; - r_flag = (int *) malloc (sizeof (int) * group->unit_count); - s_flag = (int *) malloc (sizeof (int) * group->unit_count); - m_flag = (int *) malloc (sizeof (int) * group->unit_count); - memset (r_flag, 0, sizeof (int) * group->unit_count); // 継承フラグ - memset (s_flag, 0, sizeof (int) * group->unit_count); // 継承フラグ - memset (m_flag, 0, sizeof (int) * group->unit_count); // 継承フラグ + r_flag = (int *) malloc(sizeof(int) * group->unit_count); + s_flag = (int *) malloc(sizeof(int) * group->unit_count); + m_flag = (int *) malloc(sizeof(int) * group->unit_count); + memset(r_flag, 0, sizeof(int) * group->unit_count); // 継承フラグ + memset(s_flag, 0, sizeof(int) * group->unit_count); // 継承フラグ + memset(m_flag, 0, sizeof(int) * group->unit_count); // 継承フラグ //先にフラグを全部決める for (i = 0; i < group->unit_count; i++) { - int move_check = 0; // かぶりフラグ + int move_check = 0; // かぶりフラグ unit1 = &group->unit[i]; for (j = 0; j < group->unit_count; j++) { @@ -11658,24 +11637,24 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, if (!r_flag[i]) { // 残留フラグがoffなら //単純移動(rangeも継承の必要無し) - int range = unit1->range; - map_delblock (&unit1->bl); + int range = unit1->range; + map_delblock(&unit1->bl); unit1->bl.m = m; unit1->bl.x += dx; unit1->bl.y += dy; - map_addblock (&unit1->bl); - clif_skill_setunit (unit1); + map_addblock(&unit1->bl); + clif_skill_setunit(unit1); if (range > 0) { if (range < 7) range = 7; - map_foreachinarea (skill_unit_move_unit_group_sub, + map_foreachinarea(skill_unit_move_unit_group_sub, unit1->bl.m, unit1->bl.x - range, unit1->bl.y - range, unit1->bl.x + range, unit1->bl.y + range, 0, - &unit1->bl, gettick ()); + &unit1->bl, gettick()); } } else @@ -11687,25 +11666,24 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, if (s_flag[j] && !r_flag[j]) { // 継承移動(range継承付き) - int range = unit1->range; - map_delblock (&unit2->bl); + int range = unit1->range; + map_delblock(&unit2->bl); unit2->bl.m = m; unit2->bl.x = unit1->bl.x + dx; unit2->bl.y = unit1->bl.y + dy; unit2->range = unit1->range; - map_addblock (&unit2->bl); - clif_skill_setunit (unit2); + map_addblock(&unit2->bl); + clif_skill_setunit(unit2); if (range > 0) { if (range < 7) range = 7; - map_foreachinarea - (skill_unit_move_unit_group_sub, + map_foreachinarea(skill_unit_move_unit_group_sub, unit2->bl.m, unit2->bl.x - range, unit2->bl.y - range, unit2->bl.x + range, unit2->bl.y + range, 0, &unit2->bl, - gettick ()); + gettick()); } s_flag[j] = 0; // 継承完了したのでoff break; @@ -11714,9 +11692,9 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, } } } - free (r_flag); - free (s_flag); - free (m_flag); + free(r_flag); + free(s_flag); + free(m_flag); } } return 0; @@ -11731,25 +11709,25 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, * 初期化系 */ -static int scan_stat (char *statname) +static int scan_stat(char *statname) { - if (!strcasecmp (statname, "str")) + if (!strcasecmp(statname, "str")) return SP_STR; - if (!strcasecmp (statname, "dex")) + if (!strcasecmp(statname, "dex")) return SP_DEX; - if (!strcasecmp (statname, "agi")) + if (!strcasecmp(statname, "agi")) return SP_AGI; - if (!strcasecmp (statname, "vit")) + if (!strcasecmp(statname, "vit")) return SP_VIT; - if (!strcasecmp (statname, "int")) + if (!strcasecmp(statname, "int")) return SP_INT; - if (!strcasecmp (statname, "luk")) + if (!strcasecmp(statname, "luk")) return SP_LUK; - if (!strcasecmp (statname, "none")) + if (!strcasecmp(statname, "none")) return 0; else - fprintf (stderr, "Unknown stat `%s'\n", statname); + fprintf(stderr, "Unknown stat `%s'\n", statname); return 0; } @@ -11760,21 +11738,21 @@ static int scan_stat (char *statname) *------------------------------------------ */ static -int skill_readdb (void) +int skill_readdb(void) { - int i, j, k, l; + int i, j, k, l; FILE *fp; char line[1024], *p; /* The main skill database */ - memset (skill_db, 0, sizeof (skill_db)); - fp = fopen_ ("db/skill_db.txt", "r"); + memset(skill_db, 0, sizeof(skill_db)); + fp = fopen_("db/skill_db.txt", "r"); if (fp == NULL) { - printf ("can't read db/skill_db.txt\n"); + printf("can't read db/skill_db.txt\n"); return 1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { char *split[50], *split2[MAX_SKILL_LEVEL]; if (line[0] == '/' && line[1] == '/') @@ -11784,115 +11762,115 @@ int skill_readdb (void) while (*p == '\t' || *p == ' ') p++; split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } if (split[17] == NULL || j < 18) { - fprintf (stderr, "Incomplete skill db data online (%d entries)\n", + fprintf(stderr, "Incomplete skill db data online (%d entries)\n", j); continue; } - i = atoi (split[0]); + i = atoi(split[0]); if (i < 0 || i > MAX_SKILL_DB) continue; - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[1]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].range[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); - skill_db[i].hit = atoi (split[2]); - skill_db[i].inf = atoi (split[3]); - skill_db[i].pl = atoi (split[4]); - skill_db[i].nk = atoi (split[5]); - skill_db[i].max_raise = atoi (split[6]); - skill_db[i].max = atoi (split[7]); - - memset (split2, 0, sizeof (split2)); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); + skill_db[i].hit = atoi(split[2]); + skill_db[i].inf = atoi(split[3]); + skill_db[i].pl = atoi(split[4]); + skill_db[i].nk = atoi(split[5]); + skill_db[i].max_raise = atoi(split[6]); + skill_db[i].max = atoi(split[7]); + + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[8]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].num[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - if (strcasecmp (split[9], "yes") == 0) + if (strcasecmp(split[9], "yes") == 0) skill_db[i].castcancel = 1; else skill_db[i].castcancel = 0; - skill_db[i].cast_def_rate = atoi (split[9]); - skill_db[i].inf2 = atoi (split[10]); - skill_db[i].maxcount = atoi (split[11]); - if (strcasecmp (split[13], "weapon") == 0) + skill_db[i].cast_def_rate = atoi(split[9]); + skill_db[i].inf2 = atoi(split[10]); + skill_db[i].maxcount = atoi(split[11]); + if (strcasecmp(split[13], "weapon") == 0) skill_db[i].skill_type = BF_WEAPON; - else if (strcasecmp (split[12], "magic") == 0) + else if (strcasecmp(split[12], "magic") == 0) skill_db[i].skill_type = BF_MAGIC; - else if (strcasecmp (split[12], "misc") == 0) + else if (strcasecmp(split[12], "misc") == 0) skill_db[i].skill_type = BF_MISC; else skill_db[i].skill_type = 0; - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[14]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].blewcount[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - if (!strcasecmp (split[15], "passive")) + if (!strcasecmp(split[15], "passive")) { - skill_pool_register (i); + skill_pool_register(i); skill_db[i].poolflags = SKILL_POOL_FLAG; } - else if (!strcasecmp (split[15], "active")) + else if (!strcasecmp(split[15], "active")) { - skill_pool_register (i); + skill_pool_register(i); skill_db[i].poolflags = SKILL_POOL_FLAG | SKILL_POOL_ACTIVE; } else skill_db[i].poolflags = 0; - skill_db[i].stat = scan_stat (split[16]); + skill_db[i].stat = scan_stat(split[16]); - char *tmp = strdup (split[17]); + char *tmp = strdup(split[17]); skill_names[i].desc = tmp; { // replace "_" by " " char *s = tmp; - while ((s = strchr (s, '_'))) + while ((s = strchr(s, '_'))) *s = ' '; - if ((s = strchr (tmp, '\t')) - || (s = strchr (tmp, ' ')) - || (s = strchr (tmp, '\n'))) + if ((s = strchr(tmp, '\t')) + || (s = strchr(tmp, ' ')) + || (s = strchr(tmp, '\n'))) *s = '\000'; } } - fclose_ (fp); - printf ("read db/skill_db.txt done\n"); + fclose_(fp); + printf("read db/skill_db.txt done\n"); - fp = fopen_ ("db/skill_require_db.txt", "r"); + fp = fopen_("db/skill_require_db.txt", "r"); if (fp == NULL) { - printf ("can't read db/skill_require_db.txt\n"); + printf("can't read db/skill_require_db.txt\n"); return 1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { char *split[51], *split2[MAX_SKILL_LEVEL]; if (line[0] == '/' && line[1] == '/') @@ -11902,100 +11880,100 @@ int skill_readdb (void) while (*p == '\t' || *p == ' ') p++; split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } if (split[29] == NULL || j < 30) continue; - i = atoi (split[0]); + i = atoi(split[0]); if (i < 0 || i > MAX_SKILL_DB) continue; - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[1]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].hp[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[2]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].mhp[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[3]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].sp[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[4]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].hp_rate[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[5]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].sp_rate[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[6]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].zeny[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[7]; j < 32 && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < 32 && split2[k]; k++) { - l = atoi (split2[k]); + l = atoi(split2[k]); if (l == 99) { skill_db[i].weapon = 0xffffffff; @@ -12005,79 +11983,79 @@ int skill_readdb (void) skill_db[i].weapon |= 1 << l; } - if (strcasecmp (split[8], "hiding") == 0) + if (strcasecmp(split[8], "hiding") == 0) skill_db[i].state = ST_HIDING; - else if (strcasecmp (split[8], "cloaking") == 0) + else if (strcasecmp(split[8], "cloaking") == 0) skill_db[i].state = ST_CLOAKING; - else if (strcasecmp (split[8], "hidden") == 0) + else if (strcasecmp(split[8], "hidden") == 0) skill_db[i].state = ST_HIDDEN; - else if (strcasecmp (split[8], "riding") == 0) + else if (strcasecmp(split[8], "riding") == 0) skill_db[i].state = ST_RIDING; - else if (strcasecmp (split[8], "falcon") == 0) + else if (strcasecmp(split[8], "falcon") == 0) skill_db[i].state = ST_FALCON; - else if (strcasecmp (split[8], "cart") == 0) + else if (strcasecmp(split[8], "cart") == 0) skill_db[i].state = ST_CART; - else if (strcasecmp (split[8], "shield") == 0) + else if (strcasecmp(split[8], "shield") == 0) skill_db[i].state = ST_SHIELD; - else if (strcasecmp (split[8], "sight") == 0) + else if (strcasecmp(split[8], "sight") == 0) skill_db[i].state = ST_SIGHT; - else if (strcasecmp (split[8], "explosionspirits") == 0) + else if (strcasecmp(split[8], "explosionspirits") == 0) skill_db[i].state = ST_EXPLOSIONSPIRITS; - else if (strcasecmp (split[8], "recover_weight_rate") == 0) + else if (strcasecmp(split[8], "recover_weight_rate") == 0) skill_db[i].state = ST_RECOV_WEIGHT_RATE; - else if (strcasecmp (split[8], "move_enable") == 0) + else if (strcasecmp(split[8], "move_enable") == 0) skill_db[i].state = ST_MOVE_ENABLE; - else if (strcasecmp (split[8], "water") == 0) + else if (strcasecmp(split[8], "water") == 0) skill_db[i].state = ST_WATER; else skill_db[i].state = ST_NONE; - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[9]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].spiritball[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); - skill_db[i].itemid[0] = atoi (split[10]); - skill_db[i].amount[0] = atoi (split[11]); - skill_db[i].itemid[1] = atoi (split[12]); - skill_db[i].amount[1] = atoi (split[13]); - skill_db[i].itemid[2] = atoi (split[14]); - skill_db[i].amount[2] = atoi (split[15]); - skill_db[i].itemid[3] = atoi (split[16]); - skill_db[i].amount[3] = atoi (split[17]); - skill_db[i].itemid[4] = atoi (split[18]); - skill_db[i].amount[4] = atoi (split[19]); - skill_db[i].itemid[5] = atoi (split[20]); - skill_db[i].amount[5] = atoi (split[21]); - skill_db[i].itemid[6] = atoi (split[22]); - skill_db[i].amount[6] = atoi (split[23]); - skill_db[i].itemid[7] = atoi (split[24]); - skill_db[i].amount[7] = atoi (split[25]); - skill_db[i].itemid[8] = atoi (split[26]); - skill_db[i].amount[8] = atoi (split[27]); - skill_db[i].itemid[9] = atoi (split[28]); - skill_db[i].amount[9] = atoi (split[29]); - } - fclose_ (fp); - printf ("read db/skill_require_db.txt done\n"); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); + skill_db[i].itemid[0] = atoi(split[10]); + skill_db[i].amount[0] = atoi(split[11]); + skill_db[i].itemid[1] = atoi(split[12]); + skill_db[i].amount[1] = atoi(split[13]); + skill_db[i].itemid[2] = atoi(split[14]); + skill_db[i].amount[2] = atoi(split[15]); + skill_db[i].itemid[3] = atoi(split[16]); + skill_db[i].amount[3] = atoi(split[17]); + skill_db[i].itemid[4] = atoi(split[18]); + skill_db[i].amount[4] = atoi(split[19]); + skill_db[i].itemid[5] = atoi(split[20]); + skill_db[i].amount[5] = atoi(split[21]); + skill_db[i].itemid[6] = atoi(split[22]); + skill_db[i].amount[6] = atoi(split[23]); + skill_db[i].itemid[7] = atoi(split[24]); + skill_db[i].amount[7] = atoi(split[25]); + skill_db[i].itemid[8] = atoi(split[26]); + skill_db[i].amount[8] = atoi(split[27]); + skill_db[i].itemid[9] = atoi(split[28]); + skill_db[i].amount[9] = atoi(split[29]); + } + fclose_(fp); + printf("read db/skill_require_db.txt done\n"); /* ? */ - fp = fopen_ ("db/skill_cast_db.txt", "r"); + fp = fopen_("db/skill_cast_db.txt", "r"); if (fp == NULL) { - printf ("can't read db/skill_cast_db.txt\n"); + printf("can't read db/skill_cast_db.txt\n"); return 1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { char *split[50], *split2[MAX_SKILL_LEVEL]; - memset (split, 0, sizeof (split)); // [Valaris] thanks to fov + memset(split, 0, sizeof(split)); // [Valaris] thanks to fov if (line[0] == '/' && line[1] == '/') continue; for (j = 0, p = line; j < 5 && p; j++) @@ -12085,78 +12063,78 @@ int skill_readdb (void) while (*p == '\t' || *p == ' ') p++; split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } if (split[4] == NULL || j < 5) continue; - i = atoi (split[0]); + i = atoi(split[0]); if (i < 0 || i > MAX_SKILL_DB) continue; - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[1]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].cast[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[2]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].delay[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[3]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].upkeep_time[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[4]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].upkeep_time2[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); } - fclose_ (fp); - printf ("read db/skill_cast_db.txt done\n"); + fclose_(fp); + printf("read db/skill_cast_db.txt done\n"); - fp = fopen_ ("db/skill_castnodex_db.txt", "r"); + fp = fopen_("db/skill_castnodex_db.txt", "r"); if (fp == NULL) { - printf ("can't read db/skill_castnodex_db.txt\n"); + printf("can't read db/skill_castnodex_db.txt\n"); return 1; } - while (fgets (line, 1020, fp)) + while (fgets(line, 1020, fp)) { char *split[50], *split2[MAX_SKILL_LEVEL]; - memset (split, 0, sizeof (split)); + memset(split, 0, sizeof(split)); if (line[0] == '/' && line[1] == '/') continue; for (j = 0, p = line; j < 2 && p; j++) @@ -12164,34 +12142,34 @@ int skill_readdb (void) while (*p == '\t' || *p == ' ') p++; split[j] = p; - p = strchr (p, ','); + p = strchr(p, ','); if (p) *p++ = 0; } - i = atoi (split[0]); + i = atoi(split[0]); if (i < 0 || i > MAX_SKILL_DB) continue; - memset (split2, 0, sizeof (split2)); + memset(split2, 0, sizeof(split2)); for (j = 0, p = split[1]; j < MAX_SKILL_LEVEL && p; j++) { split2[j] = p; - p = strchr (p, ':'); + p = strchr(p, ':'); if (p) *p++ = 0; } for (k = 0; k < MAX_SKILL_LEVEL; k++) skill_db[i].castnodex[k] = - (split2[k]) ? atoi (split2[k]) : atoi (split2[0]); + (split2[k]) ? atoi(split2[k]) : atoi(split2[0]); } - fclose_ (fp); - printf ("read db/skill_castnodex_db.txt done\n"); + fclose_(fp); + printf("read db/skill_castnodex_db.txt done\n"); return 0; } -void skill_reload (void) +void skill_reload(void) { /* * @@ -12200,18 +12178,18 @@ void skill_reload (void) * */ - do_init_skill (); + do_init_skill(); } /*========================================== * スキル関係初期化処理 *------------------------------------------ */ -int do_init_skill (void) +int do_init_skill(void) { - skill_readdb (); + skill_readdb(); - add_timer_interval (gettick () + SKILLUNITTIMER_INVERVAL, + add_timer_interval(gettick() + SKILLUNITTIMER_INVERVAL, skill_unit_timer, 0, 0, SKILLUNITTIMER_INVERVAL); return 0; diff --git a/src/map/skill.hpp b/src/map/skill.hpp index 3dea4d3..38a0ed5 100644 --- a/src/map/skill.hpp +++ b/src/map/skill.hpp @@ -7,37 +7,37 @@ #include "map.hpp" #include "magic.hpp" -#define MAX_SKILL_DB 450 -#define MAX_SKILL_PRODUCE_DB 150 -#define MAX_SKILL_ARROW_DB 150 -#define MAX_SKILL_ABRA_DB 350 +#define MAX_SKILL_DB 450 +#define MAX_SKILL_PRODUCE_DB 150 +#define MAX_SKILL_ARROW_DB 150 +#define MAX_SKILL_ABRA_DB 350 -#define SKILL_POOL_FLAG 0x1 // is a pool skill -#define SKILL_POOL_ACTIVE 0x2 // is an active pool skill -#define SKILL_POOL_ACTIVATED 0x4 // pool skill has been activated (used for clif) +#define SKILL_POOL_FLAG 0x1 // is a pool skill +#define SKILL_POOL_ACTIVE 0x2 // is an active pool skill +#define SKILL_POOL_ACTIVATED 0x4 // pool skill has been activated (used for clif) // スキルデータベース struct skill_db { - int range[MAX_SKILL_LEVEL], hit, inf, pl, nk, max, stat, poolflags, max_raise; // `max' is the global max, `max_raise' is the maximum attainable via skill-ups - int num[MAX_SKILL_LEVEL]; - int cast[MAX_SKILL_LEVEL], delay[MAX_SKILL_LEVEL]; - int upkeep_time[MAX_SKILL_LEVEL], upkeep_time2[MAX_SKILL_LEVEL]; - int castcancel, cast_def_rate; - int inf2, maxcount, skill_type; - int blewcount[MAX_SKILL_LEVEL]; - int hp[MAX_SKILL_LEVEL], sp[MAX_SKILL_LEVEL], mhp[MAX_SKILL_LEVEL], + int range[MAX_SKILL_LEVEL], hit, inf, pl, nk, max, stat, poolflags, max_raise; // `max' is the global max, `max_raise' is the maximum attainable via skill-ups + int num[MAX_SKILL_LEVEL]; + int cast[MAX_SKILL_LEVEL], delay[MAX_SKILL_LEVEL]; + int upkeep_time[MAX_SKILL_LEVEL], upkeep_time2[MAX_SKILL_LEVEL]; + int castcancel, cast_def_rate; + int inf2, maxcount, skill_type; + int blewcount[MAX_SKILL_LEVEL]; + int hp[MAX_SKILL_LEVEL], sp[MAX_SKILL_LEVEL], mhp[MAX_SKILL_LEVEL], hp_rate[MAX_SKILL_LEVEL], sp_rate[MAX_SKILL_LEVEL], zeny[MAX_SKILL_LEVEL]; - int weapon, state, spiritball[MAX_SKILL_LEVEL]; - int itemid[10], amount[10]; - int castnodex[MAX_SKILL_LEVEL]; + int weapon, state, spiritball[MAX_SKILL_LEVEL]; + int itemid[10], amount[10]; + int castnodex[MAX_SKILL_LEVEL]; }; extern struct skill_db skill_db[MAX_SKILL_DB]; struct skill_name_db { - int id; // skill id + int id; // skill id const char *name; // search strings const char *desc; // description that shows up for search's }; @@ -48,133 +48,133 @@ struct map_session_data; struct skill_unit; struct skill_unit_group; -int do_init_skill (void); +int do_init_skill(void); // スキルデータベースへのアクセサ -int skill_get_hit (int id); -int skill_get_inf (int id); -int skill_get_pl (int id); -int skill_get_nk (int id); -int skill_get_max (int id); -int skill_get_max_raise (int id); -int skill_get_range (int id, int lv); -int skill_get_hp (int id, int lv); -int skill_get_mhp (int id, int lv); -int skill_get_sp (int id, int lv); -int skill_get_zeny (int id, int lv); -int skill_get_num (int id, int lv); -int skill_get_cast (int id, int lv); -int skill_get_delay (int id, int lv); -int skill_get_time (int id, int lv); -int skill_get_time2 (int id, int lv); -int skill_get_castdef (int id); -int skill_get_weapontype (int id); -int skill_get_unit_id (int id, int flag); -int skill_get_inf2 (int id); -int skill_get_maxcount (int id); -int skill_get_blewcount (int id, int lv); +int skill_get_hit(int id); +int skill_get_inf(int id); +int skill_get_pl(int id); +int skill_get_nk(int id); +int skill_get_max(int id); +int skill_get_max_raise(int id); +int skill_get_range(int id, int lv); +int skill_get_hp(int id, int lv); +int skill_get_mhp(int id, int lv); +int skill_get_sp(int id, int lv); +int skill_get_zeny(int id, int lv); +int skill_get_num(int id, int lv); +int skill_get_cast(int id, int lv); +int skill_get_delay(int id, int lv); +int skill_get_time(int id, int lv); +int skill_get_time2(int id, int lv); +int skill_get_castdef(int id); +int skill_get_weapontype(int id); +int skill_get_unit_id(int id, int flag); +int skill_get_inf2(int id); +int skill_get_maxcount(int id); +int skill_get_blewcount(int id, int lv); // スキルの使用 -int skill_use_id (struct map_session_data *sd, int target_id, +int skill_use_id(struct map_session_data *sd, int target_id, int skill_num, int skill_lv); -int skill_use_pos (struct map_session_data *sd, +int skill_use_pos(struct map_session_data *sd, int skill_x, int skill_y, int skill_num, int skill_lv); -int skill_castend_map (struct map_session_data *sd, int skill_num, +int skill_castend_map(struct map_session_data *sd, int skill_num, const char *map); -int skill_cleartimerskill (struct block_list *src); -int skill_addtimerskill (struct block_list *src, unsigned int tick, +int skill_cleartimerskill(struct block_list *src); +int skill_addtimerskill(struct block_list *src, unsigned int tick, int target, int x, int y, int skill_id, int skill_lv, int type, int flag); // 追加効果 -int skill_additional_effect (struct block_list *src, struct block_list *bl, +int skill_additional_effect(struct block_list *src, struct block_list *bl, int skillid, int skilllv, int attack_type, unsigned int tick); // ユニットスキル -struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, +struct skill_unit *skill_initunit(struct skill_unit_group *group, int idx, int x, int y); -int skill_delunit (struct skill_unit *unit); -struct skill_unit_group *skill_initunitgroup (struct block_list *src, +int skill_delunit(struct skill_unit *unit); +struct skill_unit_group *skill_initunitgroup(struct block_list *src, int count, int skillid, int skilllv, int unit_id); -int skill_delunitgroup (struct skill_unit_group *group); -struct skill_unit_group_tickset *skill_unitgrouptickset_search (struct +int skill_delunitgroup(struct skill_unit_group *group); +struct skill_unit_group_tickset *skill_unitgrouptickset_search(struct block_list *bl, int group_id); -int skill_unitgrouptickset_delete (struct block_list *bl, int group_id); -int skill_clear_unitgroup (struct block_list *src); +int skill_unitgrouptickset_delete(struct block_list *bl, int group_id); +int skill_clear_unitgroup(struct block_list *src); -int skill_unit_ondamaged (struct skill_unit *src, struct block_list *bl, +int skill_unit_ondamaged(struct skill_unit *src, struct block_list *bl, int damage, unsigned int tick); -int skill_castfix (struct block_list *bl, int time); -int skill_delayfix (struct block_list *bl, int time); -int skill_check_unit_range (int m, int x, int y, int range, int skillid); -int skill_check_unit_range2 (int m, int x, int y, int range); +int skill_castfix(struct block_list *bl, int time); +int skill_delayfix(struct block_list *bl, int time); +int skill_check_unit_range(int m, int x, int y, int range, int skillid); +int skill_check_unit_range2(int m, int x, int y, int range); // -- moonsoul (added skill_check_unit_cell) -int skill_check_unit_cell (int skillid, int m, int x, int y, int unit_id); -int skill_unit_out_all (struct block_list *bl, unsigned int tick, int range); -int skill_unit_move (struct block_list *bl, unsigned int tick, int range); -int skill_unit_move_unit_group (struct skill_unit_group *group, int m, +int skill_check_unit_cell(int skillid, int m, int x, int y, int unit_id); +int skill_unit_out_all(struct block_list *bl, unsigned int tick, int range); +int skill_unit_move(struct block_list *bl, unsigned int tick, int range); +int skill_unit_move_unit_group(struct skill_unit_group *group, int m, int dx, int dy); -struct skill_unit_group *skill_check_dancing (struct block_list *src); -void skill_stop_dancing (struct block_list *src, int flag); +struct skill_unit_group *skill_check_dancing(struct block_list *src); +void skill_stop_dancing(struct block_list *src, int flag); // 詠唱キャンセル -int skill_castcancel (struct block_list *bl, int type); - -int skill_gangsterparadise (struct map_session_data *sd, int type); -void skill_brandishspear_first (struct square *tc, int dir, int x, int y); -void skill_brandishspear_dir (struct square *tc, int dir, int are); -int skill_autospell (struct map_session_data *md, int skillid); -void skill_devotion (struct map_session_data *md, int target); -void skill_devotion2 (struct block_list *bl, int crusader); -int skill_devotion3 (struct block_list *bl, int target); -void skill_devotion_end (struct map_session_data *md, +int skill_castcancel(struct block_list *bl, int type); + +int skill_gangsterparadise(struct map_session_data *sd, int type); +void skill_brandishspear_first(struct square *tc, int dir, int x, int y); +void skill_brandishspear_dir(struct square *tc, int dir, int are); +int skill_autospell(struct map_session_data *md, int skillid); +void skill_devotion(struct map_session_data *md, int target); +void skill_devotion2(struct block_list *bl, int crusader); +int skill_devotion3(struct block_list *bl, int target); +void skill_devotion_end(struct map_session_data *md, struct map_session_data *sd, int target); #define skill_calc_heal(bl,skill_lv) (( battle_get_lv(bl)+battle_get_int(bl) )/8 *(4+ skill_lv*8)) // その他 -int skill_check_cloaking (struct block_list *bl); -int skill_is_danceskill (int id); +int skill_check_cloaking(struct block_list *bl); +int skill_is_danceskill(int id); // ステータス異常 -int skill_status_effect (struct block_list *bl, int type, int val1, int val2, +int skill_status_effect(struct block_list *bl, int type, int val1, int val2, int val3, int val4, int tick, int flag, int spell_invocation); -int skill_status_change_start (struct block_list *bl, int type, int val1, +int skill_status_change_start(struct block_list *bl, int type, int val1, int val2, int val3, int val4, int tick, int flag); -void skill_status_change_timer (timer_id, tick_t, custom_id_t, custom_data_t); -int skill_status_change_active (struct block_list *bl, int type); // [fate] -int skill_encchant_eremental_end (struct block_list *bl, int type); -int skill_status_change_end (struct block_list *bl, int type, int tid); -int skill_status_change_clear (struct block_list *bl, int type); +void skill_status_change_timer(timer_id, tick_t, custom_id_t, custom_data_t); +int skill_status_change_active(struct block_list *bl, int type); // [fate] +int skill_encchant_eremental_end(struct block_list *bl, int type); +int skill_status_change_end(struct block_list *bl, int type, int tid); +int skill_status_change_clear(struct block_list *bl, int type); // mobスキルのため -int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, +int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag); -int skill_castend_damage_id (struct block_list *src, struct block_list *bl, +int skill_castend_damage_id(struct block_list *src, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag); -int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, +int skill_castend_pos2(struct block_list *src, int x, int y, int skillid, int skilllv, unsigned int tick, int flag); // スキル攻撃一括処理 -int skill_attack (int attack_type, struct block_list *src, +int skill_attack(int attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag); -int skill_update_heal_animation (struct map_session_data *sd); // [Fate] Check whether the healing flag must be updated, do so if needed +int skill_update_heal_animation(struct map_session_data *sd); // [Fate] Check whether the healing flag must be updated, do so if needed -void skill_reload (void); +void skill_reload(void); enum { @@ -874,19 +874,19 @@ enum extern int skill_pool_skills[MAX_POOL_SKILLS]; // All pool skills extern int skill_pool_skills_size; // Number of entries in skill_pool_skills -int skill_pool (struct map_session_data *sd, int *skills); // Yields all active skills in the skill pool; no more than MAX_SKILL_POOL. Return is number of skills. -int skill_pool_size (struct map_session_data *sd); -int skill_pool_max (struct map_session_data *sd); // Max. number of pool skills -void skill_pool_empty (struct map_session_data *sd); // Deactivate all pool skills -int skill_pool_activate (struct map_session_data *sd, int skill); // Skill into skill pool. Return is zero iff okay. -int skill_pool_is_activated (struct map_session_data *sd, int skill); // Skill into skill pool. Return is zero when activated. -int skill_pool_deactivate (struct map_session_data *sd, int skill); // Skill out of skill pool. Return is zero iff okay. +int skill_pool(struct map_session_data *sd, int *skills); // Yields all active skills in the skill pool; no more than MAX_SKILL_POOL. Return is number of skills. +int skill_pool_size(struct map_session_data *sd); +int skill_pool_max(struct map_session_data *sd); // Max. number of pool skills +void skill_pool_empty(struct map_session_data *sd); // Deactivate all pool skills +int skill_pool_activate(struct map_session_data *sd, int skill); // Skill into skill pool. Return is zero iff okay. +int skill_pool_is_activated(struct map_session_data *sd, int skill); // Skill into skill pool. Return is zero when activated. +int skill_pool_deactivate(struct map_session_data *sd, int skill); // Skill out of skill pool. Return is zero iff okay. const char *skill_name(int skill); // Yield configurable skill name -int skill_stat (int skill); // Yields the stat associated with a skill. Returns zero if none, or SP_STR, SP_VIT, ... otherwise -int skill_power (struct map_session_data *sd, int skill); // Yields the power of a skill. This is zero if the skill is unknown or if it's a pool skill that is outside of the skill pool, +int skill_stat(int skill); // Yields the stat associated with a skill. Returns zero if none, or SP_STR, SP_VIT, ... otherwise +int skill_power(struct map_session_data *sd, int skill); // Yields the power of a skill. This is zero if the skill is unknown or if it's a pool skill that is outside of the skill pool, // otherwise a value from 0 to 255 (with 200 being the `normal maximum') -int skill_power_bl (struct block_list *bl, int skill); // Yields the power of a skill. This is zero if the skill is unknown or if it's a pool skill that is outside of the skill pool, +int skill_power_bl(struct block_list *bl, int skill); // Yields the power of a skill. This is zero if the skill is unknown or if it's a pool skill that is outside of the skill pool, // otherwise a value from 0 to 255 (with 200 being the `normal maximum') -void skill_pool_register (int id); // [Fate] Remember that a certain skill ID belongs to a pool skill +void skill_pool_register(int id); // [Fate] Remember that a certain skill ID belongs to a pool skill #endif diff --git a/src/map/storage.cpp b/src/map/storage.cpp index 2d45c69..6426cb1 100644 --- a/src/map/storage.cpp +++ b/src/map/storage.cpp @@ -23,7 +23,7 @@ static struct dbt *storage_db; * 倉庫内アイテムソート *------------------------------------------ */ -int storage_comp_item (const void *_i1, const void *_i2) +int storage_comp_item(const void *_i1, const void *_i2) { struct item *i1 = (struct item *) _i1; struct item *i2 = (struct item *) _i2; @@ -37,16 +37,16 @@ int storage_comp_item (const void *_i1, const void *_i2) return i1->nameid - i2->nameid; } -static void storage_db_final (db_key_t key, db_val_t data, va_list ap) +static void storage_db_final(db_key_t key, db_val_t data, va_list ap) { struct storage *stor = (struct storage *) data; - free (stor); + free(stor); } -void sortage_sortitem (struct storage *stor) +void sortage_sortitem(struct storage *stor) { - nullpo_retv (stor); - qsort (stor->storage_, MAX_STORAGE, sizeof (struct item), + nullpo_retv(stor); + qsort(stor->storage_, MAX_STORAGE, sizeof(struct item), storage_comp_item); } @@ -54,59 +54,59 @@ void sortage_sortitem (struct storage *stor) * 初期化とか *------------------------------------------ */ -int do_init_storage (void) // map.c::do_init()から呼ばれる +int do_init_storage(void) // map.c::do_init()から呼ばれる { - storage_db = numdb_init (); + storage_db = numdb_init(); return 1; } -void do_final_storage (void) // by [MC Cameri] +void do_final_storage(void) // by [MC Cameri] { if (storage_db) - numdb_final (storage_db, storage_db_final); + numdb_final(storage_db, storage_db_final); } -static void storage_reconnect_sub (db_key_t key, db_val_t data, va_list ap) +static void storage_reconnect_sub(db_key_t key, db_val_t data, va_list ap) { //Parses storage and saves 'dirty' ones upon reconnect. [Skotlex] struct storage *stor = (struct storage *) data; if (stor->dirty && stor->storage_status == 0) //Save closed storages. - storage_storage_save (stor->account_id, stor->dirty == 2 ? 1 : 0); + storage_storage_save(stor->account_id, stor->dirty == 2 ? 1 : 0); } //Function to be invoked upon server reconnection to char. To save all 'dirty' storages [Skotlex -void do_reconnect_storage (void) +void do_reconnect_storage(void) { - numdb_foreach (storage_db, storage_reconnect_sub); + numdb_foreach(storage_db, storage_reconnect_sub); } -struct storage *account2storage (int account_id) +struct storage *account2storage(int account_id) { struct storage *stor = - (struct storage *) numdb_search (storage_db, account_id); + (struct storage *) numdb_search(storage_db, account_id); if (stor == NULL) { - CREATE (stor, struct storage, 1); + CREATE(stor, struct storage, 1); stor->account_id = account_id; - numdb_insert (storage_db, stor->account_id, stor); + numdb_insert(storage_db, stor->account_id, stor); } return stor; } // Just to ask storage, without creation -struct storage *account2storage2 (int account_id) +struct storage *account2storage2(int account_id) { - return (struct storage *) numdb_search (storage_db, account_id); + return (struct storage *) numdb_search(storage_db, account_id); } -int storage_delete (int account_id) +int storage_delete(int account_id) { struct storage *stor = - (struct storage *) numdb_search (storage_db, account_id); + (struct storage *) numdb_search(storage_db, account_id); if (stor) { - numdb_erase (storage_db, account_id); - free (stor); + numdb_erase(storage_db, account_id); + free(stor); } return 0; } @@ -115,19 +115,19 @@ int storage_delete (int account_id) * カプラ倉庫を開く *------------------------------------------ */ -int storage_storageopen (struct map_session_data *sd) +int storage_storageopen(struct map_session_data *sd) { struct storage *stor; - nullpo_retr (0, sd); + nullpo_retr(0, sd); if (sd->state.storage_open) return 1; //Already open? if ((stor = - (struct storage *) numdb_search (storage_db, + (struct storage *) numdb_search(storage_db, sd->status.account_id)) == NULL) { //Request storage. - intif_request_storage (sd->status.account_id); + intif_request_storage(sd->status.account_id); return 1; } @@ -136,9 +136,9 @@ int storage_storageopen (struct map_session_data *sd) stor->storage_status = 1; sd->state.storage_open = 1; - clif_storageitemlist (sd, stor); - clif_storageequiplist (sd, stor); - clif_updatestorageamount (sd, stor); + clif_storageitemlist(sd, stor); + clif_storageequiplist(sd, stor); + clif_updatestorageamount(sd, stor); return 0; } @@ -146,27 +146,27 @@ int storage_storageopen (struct map_session_data *sd) * Internal add-item function. *------------------------------------------ */ -static int storage_additem (struct map_session_data *sd, struct storage *stor, +static int storage_additem(struct map_session_data *sd, struct storage *stor, struct item *item_data, int amount) { struct item_data *data; - int i; + int i; if (item_data->nameid <= 0 || amount <= 0) return 1; - data = itemdb_search (item_data->nameid); + data = itemdb_search(item_data->nameid); - if (!itemdb_isequip2 (data)) + if (!itemdb_isequip2(data)) { //Stackable for (i = 0; i < MAX_STORAGE; i++) { - if (compare_item (&stor->storage_[i], item_data)) + if (compare_item(&stor->storage_[i], item_data)) { if (amount > MAX_AMOUNT - stor->storage_[i].amount) return 1; stor->storage_[i].amount += amount; - clif_storageitemadded (sd, stor, i, amount); + clif_storageitemadded(sd, stor, i, amount); stor->dirty = 1; return 0; } @@ -178,11 +178,11 @@ static int storage_additem (struct map_session_data *sd, struct storage *stor, if (i >= MAX_STORAGE) return 1; - memcpy (&stor->storage_[i], item_data, sizeof (stor->storage_[0])); + memcpy(&stor->storage_[i], item_data, sizeof(stor->storage_[0])); stor->storage_[i].amount = amount; stor->storage_amount++; - clif_storageitemadded (sd, stor, i, amount); - clif_updatestorageamount (sd, stor); + clif_storageitemadded(sd, stor, i, amount); + clif_updatestorageamount(sd, stor); stor->dirty = 1; return 0; } @@ -191,7 +191,7 @@ static int storage_additem (struct map_session_data *sd, struct storage *stor, * Internal del-item function *------------------------------------------ */ -static int storage_delitem (struct map_session_data *sd, struct storage *stor, +static int storage_delitem(struct map_session_data *sd, struct storage *stor, int n, int amount) { @@ -201,11 +201,11 @@ static int storage_delitem (struct map_session_data *sd, struct storage *stor, stor->storage_[n].amount -= amount; if (stor->storage_[n].amount == 0) { - memset (&stor->storage_[n], 0, sizeof (stor->storage_[0])); + memset(&stor->storage_[n], 0, sizeof(stor->storage_[0])); stor->storage_amount--; - clif_updatestorageamount (sd, stor); + clif_updatestorageamount(sd, stor); } - clif_storageitemremoved (sd, n, amount); + clif_storageitemremoved(sd, n, amount); stor->dirty = 1; return 0; @@ -215,12 +215,12 @@ static int storage_delitem (struct map_session_data *sd, struct storage *stor, * Add an item to the storage from the inventory. *------------------------------------------ */ -int storage_storageadd (struct map_session_data *sd, int index, int amount) +int storage_storageadd(struct map_session_data *sd, int index, int amount) { struct storage *stor; - nullpo_retr (0, sd); - nullpo_retr (0, stor = account2storage2 (sd->status.account_id)); + nullpo_retr(0, sd); + nullpo_retr(0, stor = account2storage2(sd->status.account_id)); if ((stor->storage_amount > MAX_STORAGE) || !stor->storage_status) return 0; // storage full / storage closed @@ -235,11 +235,11 @@ int storage_storageadd (struct map_session_data *sd, int index, int amount) return 0; // log_tostorage(sd, index, 0); - if (storage_additem (sd, stor, &sd->status.inventory[index], amount) == 0) + if (storage_additem(sd, stor, &sd->status.inventory[index], amount) == 0) { // remove item from inventory - pc_unequipinvyitem (sd, index, 0); - pc_delitem (sd, index, amount, 0); + pc_unequipinvyitem(sd, index, 0); + pc_delitem(sd, index, amount, 0); } return 1; @@ -249,13 +249,13 @@ int storage_storageadd (struct map_session_data *sd, int index, int amount) * Retrieve an item from the storage. *------------------------------------------ */ -int storage_storageget (struct map_session_data *sd, int index, int amount) +int storage_storageget(struct map_session_data *sd, int index, int amount) { struct storage *stor; - int flag; + int flag; - nullpo_retr (0, sd); - nullpo_retr (0, stor = account2storage2 (sd->status.account_id)); + nullpo_retr(0, sd); + nullpo_retr(0, stor = account2storage2(sd->status.account_id)); if (index < 0 || index >= MAX_STORAGE) return 0; @@ -266,10 +266,10 @@ int storage_storageget (struct map_session_data *sd, int index, int amount) if (amount < 1 || amount > stor->storage_[index].amount) return 0; - if ((flag = pc_additem (sd, &stor->storage_[index], amount)) == 0) - storage_delitem (sd, stor, index, amount); + if ((flag = pc_additem(sd, &stor->storage_[index], amount)) == 0) + storage_delitem(sd, stor, index, amount); else - clif_additem (sd, 0, 0, flag); + clif_additem(sd, 0, 0, flag); // log_fromstorage(sd, index, 0); return 1; } @@ -278,13 +278,13 @@ int storage_storageget (struct map_session_data *sd, int index, int amount) * Move an item from cart to storage. *------------------------------------------ */ -int storage_storageaddfromcart (struct map_session_data *sd, int index, +int storage_storageaddfromcart(struct map_session_data *sd, int index, int amount) { struct storage *stor; - nullpo_retr (0, sd); - nullpo_retr (0, stor = account2storage2 (sd->status.account_id)); + nullpo_retr(0, sd); + nullpo_retr(0, stor = account2storage2(sd->status.account_id)); if (stor->storage_amount > MAX_STORAGE || !stor->storage_status) return 0; // storage full / storage closed @@ -298,8 +298,8 @@ int storage_storageaddfromcart (struct map_session_data *sd, int index, if (amount < 1 || amount > sd->status.cart[index].amount) return 0; - if (storage_additem (sd, stor, &sd->status.cart[index], amount) == 0) - pc_cart_delitem (sd, index, amount, 0); + if (storage_additem(sd, stor, &sd->status.cart[index], amount) == 0) + pc_cart_delitem(sd, index, amount, 0); return 1; } @@ -308,13 +308,13 @@ int storage_storageaddfromcart (struct map_session_data *sd, int index, * Get from Storage to the Cart *------------------------------------------ */ -int storage_storagegettocart (struct map_session_data *sd, int index, +int storage_storagegettocart(struct map_session_data *sd, int index, int amount) { struct storage *stor; - nullpo_retr (0, sd); - nullpo_retr (0, stor = account2storage2 (sd->status.account_id)); + nullpo_retr(0, sd); + nullpo_retr(0, stor = account2storage2(sd->status.account_id)); if (!stor->storage_status) return 0; @@ -328,8 +328,8 @@ int storage_storagegettocart (struct map_session_data *sd, int index, if (amount < 1 || amount > stor->storage_[index].amount) return 0; - if (pc_cart_additem (sd, &stor->storage_[index], amount) == 0) - storage_delitem (sd, stor, index, amount); + if (pc_cart_additem(sd, &stor->storage_[index], amount) == 0) + storage_delitem(sd, stor, index, amount); return 1; } @@ -338,20 +338,20 @@ int storage_storagegettocart (struct map_session_data *sd, int index, * Modified By Valaris to save upon closing [massdriller] *------------------------------------------ */ -int storage_storageclose (struct map_session_data *sd) +int storage_storageclose(struct map_session_data *sd) { struct storage *stor; - nullpo_retr (0, sd); - nullpo_retr (0, stor = account2storage2 (sd->status.account_id)); + nullpo_retr(0, sd); + nullpo_retr(0, stor = account2storage2(sd->status.account_id)); - clif_storageclose (sd); + clif_storageclose(sd); if (stor->storage_status) { if (save_settings & 4) - chrif_save (sd); //Invokes the storage saving as well. + chrif_save(sd); //Invokes the storage saving as well. else - storage_storage_save (sd->status.account_id, 0); + storage_storage_save(sd->status.account_id, 0); } stor->storage_status = 0; sd->state.storage_open = 0; @@ -359,7 +359,7 @@ int storage_storageclose (struct map_session_data *sd) if (sd->npc_flags.storage) { sd->npc_flags.storage = 0; - map_scriptcont (sd, sd->npc_id); + map_scriptcont(sd, sd->npc_id); } return 0; @@ -369,16 +369,16 @@ int storage_storageclose (struct map_session_data *sd) * When quitting the game. *------------------------------------------ */ -int storage_storage_quit (struct map_session_data *sd) +int storage_storage_quit(struct map_session_data *sd) { struct storage *stor; - nullpo_retr (0, sd); + nullpo_retr(0, sd); - stor = account2storage2 (sd->status.account_id); + stor = account2storage2(sd->status.account_id); if (stor) { - chrif_save (sd); //Invokes the storage saving as well. + chrif_save(sd); //Invokes the storage saving as well. stor->storage_status = 0; sd->state.storage_open = 0; } @@ -386,21 +386,21 @@ int storage_storage_quit (struct map_session_data *sd) return 0; } -void storage_storage_dirty (struct map_session_data *sd) +void storage_storage_dirty(struct map_session_data *sd) { struct storage *stor; - stor = account2storage2 (sd->status.account_id); + stor = account2storage2(sd->status.account_id); if (stor) stor->dirty = 1; } -int storage_storage_save (int account_id, int final) +int storage_storage_save(int account_id, int final) { struct storage *stor; - stor = account2storage2 (account_id); + stor = account2storage2(account_id); if (!stor) return 0; @@ -411,12 +411,12 @@ int storage_storage_save (int account_id, int final) stor->dirty = 2; stor->storage_status = 0; //To prevent further manipulation of it. } - intif_send_storage (stor); + intif_send_storage(stor); return 1; } if (final) { //Clear storage from memory. Nothing to save. - storage_delete (account_id); + storage_delete(account_id); return 1; } @@ -424,16 +424,16 @@ int storage_storage_save (int account_id, int final) } //Ack from Char-server indicating the storage was saved. [Skotlex] -int storage_storage_saved (int account_id) +int storage_storage_saved(int account_id) { struct storage *stor; - if ((stor = account2storage2 (account_id)) != NULL) + if ((stor = account2storage2(account_id)) != NULL) { //Only mark it clean if it's not in use. [Skotlex] if (stor->dirty && stor->storage_status == 0) { stor->dirty = 0; - sortage_sortitem (stor); + sortage_sortitem(stor); } return 1; } diff --git a/src/map/storage.hpp b/src/map/storage.hpp index 29702a6..171a21b 100644 --- a/src/map/storage.hpp +++ b/src/map/storage.hpp @@ -6,27 +6,27 @@ #include "../common/mmo.hpp" -int storage_storageopen (struct map_session_data *sd); -int storage_storageadd (struct map_session_data *sd, int index, int amount); -int storage_storageget (struct map_session_data *sd, int index, int amount); -int storage_storageaddfromcart (struct map_session_data *sd, int index, +int storage_storageopen(struct map_session_data *sd); +int storage_storageadd(struct map_session_data *sd, int index, int amount); +int storage_storageget(struct map_session_data *sd, int index, int amount); +int storage_storageaddfromcart(struct map_session_data *sd, int index, int amount); -int storage_storagegettocart (struct map_session_data *sd, int index, +int storage_storagegettocart(struct map_session_data *sd, int index, int amount); -int storage_storageclose (struct map_session_data *sd); -int do_init_storage (void); -void do_final_storage (void); -void do_reconnect_storage (void); -struct storage *account2storage (int account_id); -struct storage *account2storage2 (int account_id); -int storage_delete (int account_id); -int storage_storage_quit (struct map_session_data *sd); -int storage_storage_save (int account_id, int final); -int storage_storage_saved (int account_id); -void storage_storage_dirty (struct map_session_data *sd); +int storage_storageclose(struct map_session_data *sd); +int do_init_storage(void); +void do_final_storage(void); +void do_reconnect_storage(void); +struct storage *account2storage(int account_id); +struct storage *account2storage2(int account_id); +int storage_delete(int account_id); +int storage_storage_quit(struct map_session_data *sd); +int storage_storage_save(int account_id, int final); +int storage_storage_saved(int account_id); +void storage_storage_dirty(struct map_session_data *sd); -int storage_comp_item (const void *_i1, const void *_i2); +int storage_comp_item(const void *_i1, const void *_i2); //int storage_comp_item(const struct item* i1, const struct item* i2); -void sortage_sortitem (struct storage *stor); +void sortage_sortitem(struct storage *stor); #endif diff --git a/src/map/tmw.cpp b/src/map/tmw.cpp index 8c4f7fe..d648490 100644 --- a/src/map/tmw.cpp +++ b/src/map/tmw.cpp @@ -29,12 +29,12 @@ #include "storage.hpp" #include "trade.hpp" -int tmw_CheckChatSpam (struct map_session_data *sd, const char *message) +int tmw_CheckChatSpam(struct map_session_data *sd, const char *message) { - nullpo_retr (1, sd); - time_t now = time (NULL); + nullpo_retr(1, sd); + time_t now = time(NULL); - if (pc_isGM (sd)) + if (pc_isGM(sd)) return 0; if (now > sd->chat_reset_due) @@ -53,9 +53,8 @@ int tmw_CheckChatSpam (struct map_session_data *sd, const char *message) sd->chat_lines_in++; // Penalty for repeats. - if (strncmp - (sd->chat_lastmsg, message, - tmw_ShorterStrlen (sd->chat_lastmsg, message)) == 0) + if (strncmp(sd->chat_lastmsg, message, + tmw_ShorterStrlen(sd->chat_lastmsg, message)) == 0) { sd->chat_lines_in += battle_config.chat_lame_penalty; sd->chat_total_repeats++; @@ -66,17 +65,17 @@ int tmw_CheckChatSpam (struct map_session_data *sd, const char *message) } // Penalty for lame, it can stack on top of the repeat penalty. - if (tmw_CheckChatLameness (sd, message)) + if (tmw_CheckChatLameness(sd, message)) sd->chat_lines_in += battle_config.chat_lame_penalty; - strncpy ((char *) sd->chat_lastmsg, message, battle_config.chat_maxline); + strncpy((char *) sd->chat_lastmsg, message, battle_config.chat_maxline); if (sd->chat_lines_in >= battle_config.chat_spam_flood || sd->chat_total_repeats >= battle_config.chat_spam_flood) { sd->chat_lines_in = sd->chat_total_repeats = 0; - tmw_AutoBan (sd, "chat", battle_config.chat_spam_ban); + tmw_AutoBan(sd, "chat", battle_config.chat_spam_ban); return 1; } @@ -85,8 +84,8 @@ int tmw_CheckChatSpam (struct map_session_data *sd, const char *message) (sd->chat_lines_in >= battle_config.chat_spam_warn || sd->chat_total_repeats >= battle_config.chat_spam_warn)) { - clif_displaymessage (sd->fd, "WARNING: You are about to be automatically banned for spam!"); - clif_displaymessage (sd->fd, "WARNING: Please slow down, do not repeat, and do not SHOUT!"); + clif_displaymessage(sd->fd, "WARNING: You are about to be automatically banned for spam!"); + clif_displaymessage(sd->fd, "WARNING: Please slow down, do not repeat, and do not SHOUT!"); } return 0; @@ -101,36 +100,36 @@ void tmw_AutoBan(struct map_session_data *sd, const char *reason, int length) sd->auto_ban_info.in_progress = 1; - tmw_GmHackMsg ("%s has been autobanned for %s spam", + tmw_GmHackMsg("%s has been autobanned for %s spam", sd->status.name, reason); - gm_log ("%s(%d,%d) Server : @autoban %s %dh (%s spam)", + gm_log("%s (%d,%d) Server : @autoban %s %dh (%s spam)", map[sd->bl.m].name, sd->bl.x, sd->bl.y, sd->status.name, length, reason); - snprintf (anotherbuf, 511, "You have been banned for %s spamming. Please do not spam.", reason); + snprintf(anotherbuf, 511, "You have been banned for %s spamming. Please do not spam.", reason); - clif_displaymessage (sd->fd, anotherbuf); - /* type: 2 - ban (year, month, day, hour, minute, second) */ - chrif_char_ask_name (-1, sd->status.name, 2, 0, 0, 0, length, 0, 0); - clif_setwaitclose (sd->fd); + clif_displaymessage(sd->fd, anotherbuf); + /* type: 2 - ban(year, month, day, hour, minute, second) */ + chrif_char_ask_name(-1, sd->status.name, 2, 0, 0, 0, length, 0, 0); + clif_setwaitclose(sd->fd); } // Compares the length of two strings and returns that of the shorter -int tmw_ShorterStrlen (const char *s1, const char *s2) +int tmw_ShorterStrlen(const char *s1, const char *s2) { - int s1_len = strlen (s1); - int s2_len = strlen (s2); + int s1_len = strlen(s1); + int s2_len = strlen(s2); return (s2_len >= s1_len ? s1_len : s2_len); } // Returns true if more than 50% of input message is caps or punctuation -int tmw_CheckChatLameness (struct map_session_data *sd, const char *message) +int tmw_CheckChatLameness(struct map_session_data *sd, const char *message) { - int count, lame; + int count, lame; for (count = lame = 0; *message; message++, count++) - if (isupper (*message) || ispunct (*message)) + if (isupper(*message) || ispunct(*message)) lame++; if (count > 7 && lame > count / 2) @@ -140,26 +139,26 @@ int tmw_CheckChatLameness (struct map_session_data *sd, const char *message) } // Sends a whisper to all GMs -void tmw_GmHackMsg (const char *fmt, ...) +void tmw_GmHackMsg(const char *fmt, ...) { char buf[512]; va_list ap; - va_start (ap, fmt); - vsnprintf (buf, 511, fmt, ap); - va_end (ap); + va_start(ap, fmt); + vsnprintf(buf, 511, fmt, ap); + va_end(ap); char outbuf[512 + 5]; - strcpy (outbuf, "[GM] "); - strcat (outbuf, buf); + strcpy(outbuf, "[GM] "); + strcat(outbuf, buf); - intif_wis_message_to_gm (wisp_server_name, + intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, outbuf, - strlen (outbuf) + 1); + strlen(outbuf) + 1); } /* Remove leading and trailing spaces from a string, modifying in place. */ -void tmw_TrimStr (char *str) +void tmw_TrimStr(char *str) { char *l; char *a; @@ -168,16 +167,16 @@ void tmw_TrimStr (char *str) if (!*str) return; - e = str + strlen (str) - 1; + e = str + strlen(str) - 1; /* Skip all leading spaces. */ - for (l = str; *l && isspace (*l); ++l) + for (l = str; *l && isspace(*l); ++l) ; /* Find the end of the string, or the start of trailing spaces. */ - for (a = e; *a && a > l && isspace (*a); --a) + for (a = e; *a && a > l && isspace(*a); --a) ; - memmove (str, l, a - l + 1); + memmove(str, l, a - l + 1); str[a - l + 1] = '\0'; } diff --git a/src/map/tmw.hpp b/src/map/tmw.hpp index 71de462..bbdba89 100644 --- a/src/map/tmw.hpp +++ b/src/map/tmw.hpp @@ -4,12 +4,12 @@ #include "map.hpp" -int tmw_CheckChatSpam (struct map_session_data *sd, const char *message); -int tmw_ShorterStrlen (const char *s1, const char *s2); -int tmw_CheckChatLameness (struct map_session_data *sd, const char *message); +int tmw_CheckChatSpam(struct map_session_data *sd, const char *message); +int tmw_ShorterStrlen(const char *s1, const char *s2); +int tmw_CheckChatLameness(struct map_session_data *sd, const char *message); __attribute__((format(printf, 1, 2))) -void tmw_GmHackMsg (const char *fmt, ...); -void tmw_AutoBan (struct map_session_data *sd, const char *reason, int length); -void tmw_TrimStr (char *str); +void tmw_GmHackMsg(const char *fmt, ...); +void tmw_AutoBan(struct map_session_data *sd, const char *reason, int length); +void tmw_TrimStr(char *str); #endif /* TMW_H_ */ diff --git a/src/map/trade.cpp b/src/map/trade.cpp index 4d5a9cd..fc4c822 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -15,31 +15,31 @@ * 取引要請を相手に送る *------------------------------------------ */ -void trade_traderequest (struct map_session_data *sd, int target_id) +void trade_traderequest(struct map_session_data *sd, int target_id) { struct map_session_data *target_sd; - nullpo_retv (sd); + nullpo_retv(sd); - if ((target_sd = map_id2sd (target_id)) != NULL) + if ((target_sd = map_id2sd(target_id)) != NULL) { if (!battle_config.invite_request_check) { if (target_sd->party_invite > 0) { - clif_tradestart (sd, 2); // 相手はPT要請中かGuild要請中 + clif_tradestart(sd, 2); // 相手はPT要請中かGuild要請中 return; } } if (target_sd->npc_id) { //Trade fails if you are using an NPC. - clif_tradestart (sd, 2); + clif_tradestart(sd, 2); return; } if ((target_sd->trade_partner != 0) || (sd->trade_partner != 0)) { - trade_tradecancel (sd); //person is in another trade + trade_tradecancel(sd); //person is in another trade } else { @@ -49,19 +49,19 @@ void trade_traderequest (struct map_session_data *sd, int target_id) || (sd->bl.y - target_sd->bl.y <= -5 || sd->bl.y - target_sd->bl.y >= 5)) { - clif_tradestart (sd, 0); //too far + clif_tradestart(sd, 0); //too far } else if (sd != target_sd) { target_sd->trade_partner = sd->status.account_id; sd->trade_partner = target_sd->status.account_id; - clif_traderequest (target_sd, sd->status.name); + clif_traderequest(target_sd, sd->status.name); } } } else { - clif_tradestart (sd, 1); //character does not exist + clif_tradestart(sd, 1); //character does not exist } } @@ -69,15 +69,15 @@ void trade_traderequest (struct map_session_data *sd, int target_id) * 取引要請 *------------------------------------------ */ -void trade_tradeack (struct map_session_data *sd, int type) +void trade_tradeack(struct map_session_data *sd, int type) { struct map_session_data *target_sd; - nullpo_retv (sd); + nullpo_retv(sd); - if ((target_sd = map_id2sd (sd->trade_partner)) != NULL) + if ((target_sd = map_id2sd(sd->trade_partner)) != NULL) { - clif_tradestart (target_sd, type); - clif_tradestart (sd, type); + clif_tradestart(target_sd, type); + clif_tradestart(sd, type); if (type == 4) { // Cancel sd->deal_locked = 0; @@ -86,13 +86,13 @@ void trade_tradeack (struct map_session_data *sd, int type) target_sd->trade_partner = 0; } if (sd->npc_id != 0) - npc_event_dequeue (sd); + npc_event_dequeue(sd); if (target_sd->npc_id != 0) - npc_event_dequeue (target_sd); + npc_event_dequeue(target_sd); //close STORAGE window if it's open. It protects from spooffing packets [Lupus] if (sd->state.storage_open) - storage_storageclose (sd); + storage_storageclose(sd); } } @@ -100,19 +100,19 @@ void trade_tradeack (struct map_session_data *sd, int type) * アイテム追加 *------------------------------------------ */ -void trade_tradeadditem (struct map_session_data *sd, int index, int amount) +void trade_tradeadditem(struct map_session_data *sd, int index, int amount) { struct map_session_data *target_sd; struct item_data *id; - int trade_i; - int trade_weight = 0; - int free = 0; - int c; - int i; + int trade_i; + int trade_weight = 0; + int free = 0; + int c; + int i; - nullpo_retv (sd); + nullpo_retv(sd); - if (((target_sd = map_id2sd (sd->trade_partner)) != NULL) + if (((target_sd = map_id2sd(sd->trade_partner)) != NULL) && (sd->deal_locked < 1)) { if (index < 2 || index >= MAX_INVENTORY + 2) @@ -120,7 +120,7 @@ void trade_tradeadditem (struct map_session_data *sd, int index, int amount) if (index == 0 && amount > 0 && amount <= sd->status.zeny) { sd->deal_zeny = amount; - clif_tradeadditem (sd, target_sd, 0, amount); + clif_tradeadditem(sd, target_sd, 0, amount); } } else if (amount <= sd->status.inventory[index - 2].amount @@ -161,12 +161,12 @@ void trade_tradeadditem (struct map_session_data *sd, int index, int amount) if (target_sd->weight + trade_weight > target_sd->max_weight) { - clif_tradeitemok (sd, index, 0, 1); //fail to add item -- the player was over weighted. + clif_tradeitemok(sd, index, 0, 1); //fail to add item -- the player was over weighted. amount = 0; // [MouseJstr] } else if (free <= 0) { - clif_tradeitemok (sd, index, 0, 2); //fail to add item -- no free slots at receiver + clif_tradeitemok(sd, index, 0, 2); //fail to add item -- no free slots at receiver amount = 0; // peavey } else @@ -175,15 +175,15 @@ void trade_tradeadditem (struct map_session_data *sd, int index, int amount) { // re-deal exploit protection [Valaris] if (sd->deal_item_index[c] == index) { - trade_tradecancel (sd); + trade_tradecancel(sd); return; } } - pc_unequipinvyitem (sd, index - 2, 0); + pc_unequipinvyitem(sd, index - 2, 0); sd->deal_item_index[trade_i] = index; sd->deal_item_amount[trade_i] += amount; - clif_tradeitemok (sd, index, amount, 0); //success to add item - clif_tradeadditem (sd, target_sd, index, amount); + clif_tradeitemok(sd, index, amount, 0); //success to add item + clif_tradeadditem(sd, target_sd, index, amount); } break; } @@ -223,12 +223,12 @@ void trade_tradeadditem (struct map_session_data *sd, int index, int amount) * アイテム追加完了(ok押し) *------------------------------------------ */ -void trade_tradeok (struct map_session_data *sd) +void trade_tradeok(struct map_session_data *sd) { struct map_session_data *target_sd; - int trade_i; + int trade_i; - nullpo_retv (sd); + nullpo_retv(sd); for (trade_i = 0; trade_i < 10; trade_i++) { @@ -236,18 +236,18 @@ void trade_tradeok (struct map_session_data *sd) sd->status.inventory[sd->deal_item_index[trade_i] - 2].amount || sd->deal_item_amount[trade_i] < 0) { - trade_tradecancel (sd); + trade_tradecancel(sd); return; } } - if ((target_sd = map_id2sd (sd->trade_partner)) != NULL) + if ((target_sd = map_id2sd(sd->trade_partner)) != NULL) { sd->deal_locked = 1; - clif_tradeitemok (sd, 0, 0, 0); - clif_tradedeal_lock (sd, 0); - clif_tradedeal_lock (target_sd, 1); + clif_tradeitemok(sd, 0, 0, 0); + clif_tradedeal_lock(sd, 0); + clif_tradedeal_lock(target_sd, 1); } } @@ -255,27 +255,27 @@ void trade_tradeok (struct map_session_data *sd) * 取引キャンセル *------------------------------------------ */ -void trade_tradecancel (struct map_session_data *sd) +void trade_tradecancel(struct map_session_data *sd) { struct map_session_data *target_sd; - int trade_i; + int trade_i; - nullpo_retv (sd); + nullpo_retv(sd); - if ((target_sd = map_id2sd (sd->trade_partner)) != NULL) + if ((target_sd = map_id2sd(sd->trade_partner)) != NULL) { for (trade_i = 0; trade_i < 10; trade_i++) { //give items back (only virtual) if (sd->deal_item_amount[trade_i] != 0) { - clif_additem (sd, sd->deal_item_index[trade_i] - 2, + clif_additem(sd, sd->deal_item_index[trade_i] - 2, sd->deal_item_amount[trade_i], 0); sd->deal_item_index[trade_i] = 0; sd->deal_item_amount[trade_i] = 0; } if (target_sd->deal_item_amount[trade_i] != 0) { - clif_additem (target_sd, + clif_additem(target_sd, target_sd->deal_item_index[trade_i] - 2, target_sd->deal_item_amount[trade_i], 0); target_sd->deal_item_index[trade_i] = 0; @@ -285,19 +285,19 @@ void trade_tradecancel (struct map_session_data *sd) if (sd->deal_zeny) { sd->deal_zeny = 0; - clif_updatestatus (sd, SP_ZENY); + clif_updatestatus(sd, SP_ZENY); } if (target_sd->deal_zeny) { - clif_updatestatus (target_sd, SP_ZENY); + clif_updatestatus(target_sd, SP_ZENY); target_sd->deal_zeny = 0; } sd->deal_locked = 0; sd->trade_partner = 0; target_sd->deal_locked = 0; target_sd->trade_partner = 0; - clif_tradecancelled (sd); - clif_tradecancelled (target_sd); + clif_tradecancelled(sd); + clif_tradecancelled(target_sd); } } @@ -307,16 +307,16 @@ void trade_tradecancel (struct map_session_data *sd) * 取引許諾(trade押し) *------------------------------------------ */ -void trade_tradecommit (struct map_session_data *sd) +void trade_tradecommit(struct map_session_data *sd) { struct map_session_data *target_sd; - int trade_i; + int trade_i; - nullpo_retv (sd); + nullpo_retv(sd); - if ((target_sd = map_id2sd (sd->trade_partner)) != NULL) + if ((target_sd = map_id2sd(sd->trade_partner)) != NULL) { - MAP_LOG_PC (sd, " TRADECOMMIT WITH %d GIVE %d GET %d", + MAP_LOG_PC(sd, " TRADECOMMIT WITH %d GIVE %d GET %d", target_sd->status.char_id, sd->deal_zeny, target_sd->deal_zeny); if ((sd->deal_locked >= 1) && (target_sd->deal_locked >= 1)) @@ -330,15 +330,15 @@ void trade_tradecommit (struct map_session_data *sd) if (sd->deal_zeny > sd->status.zeny) { sd->deal_zeny = 0; - trade_tradecancel (sd); - MAP_LOG_PC (sd, " TRADECANCEL"); + trade_tradecancel(sd); + MAP_LOG_PC(sd, " TRADECANCEL"); return; } if (target_sd->deal_zeny > target_sd->status.zeny) { target_sd->deal_zeny = 0; - trade_tradecancel (sd); - MAP_LOG_PC (sd, " TRADECANCEL"); + trade_tradecancel(sd); + MAP_LOG_PC(sd, " TRADECANCEL"); return; } sd->trade_partner = 0; @@ -347,33 +347,33 @@ void trade_tradecommit (struct map_session_data *sd) { if (sd->deal_item_amount[trade_i] != 0) { - int n = sd->deal_item_index[trade_i] - 2; - int flag; + int n = sd->deal_item_index[trade_i] - 2; + int flag; flag = - pc_additem (target_sd, &sd->status.inventory[n], + pc_additem(target_sd, &sd->status.inventory[n], sd->deal_item_amount[trade_i]); if (flag == 0) - pc_delitem (sd, n, sd->deal_item_amount[trade_i], + pc_delitem(sd, n, sd->deal_item_amount[trade_i], 1); else - clif_additem (sd, n, + clif_additem(sd, n, sd->deal_item_amount[trade_i], 0); sd->deal_item_index[trade_i] = 0; sd->deal_item_amount[trade_i] = 0; } if (target_sd->deal_item_amount[trade_i] != 0) { - int n = target_sd->deal_item_index[trade_i] - 2; - int flag; + int n = target_sd->deal_item_index[trade_i] - 2; + int flag; flag = - pc_additem (sd, &target_sd->status.inventory[n], + pc_additem(sd, &target_sd->status.inventory[n], target_sd->deal_item_amount[trade_i]); if (flag == 0) - pc_delitem (target_sd, n, + pc_delitem(target_sd, n, target_sd->deal_item_amount[trade_i], 1); else - clif_additem (target_sd, n, + clif_additem(target_sd, n, target_sd->deal_item_amount [trade_i], 0); target_sd->deal_item_index[trade_i] = 0; @@ -382,27 +382,27 @@ void trade_tradecommit (struct map_session_data *sd) } if (sd->deal_zeny) { - int deal = sd->deal_zeny; + int deal = sd->deal_zeny; sd->deal_zeny = 0; sd->status.zeny -= deal; - clif_updatestatus (sd, SP_ZENY); + clif_updatestatus(sd, SP_ZENY); target_sd->status.zeny += deal; - clif_updatestatus (target_sd, SP_ZENY); + clif_updatestatus(target_sd, SP_ZENY); } if (target_sd->deal_zeny) { - int deal = target_sd->deal_zeny; + int deal = target_sd->deal_zeny; target_sd->deal_zeny = 0; target_sd->status.zeny -= deal; - clif_updatestatus (target_sd, SP_ZENY); + clif_updatestatus(target_sd, SP_ZENY); sd->status.zeny += deal; - clif_updatestatus (sd, SP_ZENY); + clif_updatestatus(sd, SP_ZENY); } sd->deal_locked = 0; target_sd->deal_locked = 0; - clif_tradecompleted (sd, 0); - clif_tradecompleted (target_sd, 0); - MAP_LOG_PC (sd, " TRADEOK"); + clif_tradecompleted(sd, 0); + clif_tradecompleted(target_sd, 0); + MAP_LOG_PC(sd, " TRADEOK"); } } } @@ -411,20 +411,20 @@ void trade_tradecommit (struct map_session_data *sd) // This is called when a char's zeny is changed // This helps prevent money duplication and other problems // [Jaxad0127] -void trade_verifyzeny (struct map_session_data *sd) +void trade_verifyzeny(struct map_session_data *sd) { struct map_session_data *target_sd; - nullpo_retv (sd); + nullpo_retv(sd); - if ((target_sd = map_id2sd (sd->trade_partner)) != NULL) + if ((target_sd = map_id2sd(sd->trade_partner)) != NULL) { if (sd->deal_zeny > sd->status.zeny) { if (sd->deal_locked < 1) - trade_tradeadditem (sd, 0, sd->status.zeny); // Fix money ammount + trade_tradeadditem(sd, 0, sd->status.zeny); // Fix money ammount else - trade_tradecancel (sd); // Or cancel the trade if we can't fix it + trade_tradecancel(sd); // Or cancel the trade if we can't fix it } } } diff --git a/src/map/trade.hpp b/src/map/trade.hpp index 1e885f4..3fc8f07 100644 --- a/src/map/trade.hpp +++ b/src/map/trade.hpp @@ -3,12 +3,12 @@ #define TRADE_HPP #include "map.hpp" -void trade_traderequest (struct map_session_data *sd, int target_id); -void trade_tradeack (struct map_session_data *sd, int type); -void trade_tradeadditem (struct map_session_data *sd, int index, int amount); -void trade_tradeok (struct map_session_data *sd); -void trade_tradecancel (struct map_session_data *sd); -void trade_tradecommit (struct map_session_data *sd); -void trade_verifyzeny (struct map_session_data *sd); +void trade_traderequest(struct map_session_data *sd, int target_id); +void trade_tradeack(struct map_session_data *sd, int type); +void trade_tradeadditem(struct map_session_data *sd, int index, int amount); +void trade_tradeok(struct map_session_data *sd); +void trade_tradecancel(struct map_session_data *sd); +void trade_tradecommit(struct map_session_data *sd); +void trade_verifyzeny(struct map_session_data *sd); #endif // TRADE_HPP |