diff options
Diffstat (limited to 'src/map/npc.cpp')
-rw-r--r-- | src/map/npc.cpp | 1625 |
1 files changed, 599 insertions, 1026 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index c25f585..c08a0e7 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -1,30 +1,26 @@ -// $Id: npc.c,v 1.5 2004/09/25 05:32:18 MouseJstr Exp $ -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> -#include <string.h> -#include <math.h> -#include <time.h> +#include "npc.hpp" + +#include <cassert> +#include <cstdlib> +#include <cstring> +#include <ctime> +#include "../common/cxxstdio.hpp" +#include "../common/db.hpp" #include "../common/nullpo.hpp" +#include "../common/socket.hpp" #include "../common/timer.hpp" #include "battle.hpp" #include "clif.hpp" -#include "../common/db.hpp" -#include "intif.hpp" #include "itemdb.hpp" #include "map.hpp" #include "mob.hpp" -#include "npc.hpp" #include "pc.hpp" #include "script.hpp" #include "skill.hpp" -#include "../common/socket.hpp" -#ifdef MEMWATCH -#include "memwatch.hpp" -#endif +#include "../poison.hpp" struct npc_src_list { @@ -33,24 +29,30 @@ struct npc_src_list char name[4]; }; -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; +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++; } -static struct dbt *ev_db; -static struct dbt *npcname_db; - struct event_data { struct npc_data *nd; - int pos; + int pos; }; -static struct tm ev_tm_b; // 時計イベント用 +static +Map<std::string, struct event_data> ev_db; +static +DMap<std::string, struct npc_data *> npcname_db; + +static +struct tm ev_tm_b; // 時計イベント用 /*========================================== * NPCの無効化/有効化 @@ -59,63 +61,48 @@ static struct tm ev_tm_b; // 時計イベント用 *------------------------------------------ */ static -int npc_enable_sub (struct block_list *bl, va_list ap) +void npc_enable_sub(struct block_list *bl, struct npc_data *nd) { 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_retr (0, bl); - nullpo_retr (0, ap); - nullpo_retr (0, nd = va_arg (ap, struct npc_data *)); - if (bl->type == BL_PC && (sd = (struct map_session_data *) bl)) + if (bl->type == BL::PC && (sd = (struct map_session_data *) bl)) { if (nd->flag & 1) // 無効化されている - return 1; + return; - memcpy (name, nd->name, sizeof(nd->name)); + memcpy(name, nd->name, sizeof(nd->name)); if (sd->areanpc_id == nd->bl.id) - return 1; + return; // TODO fix leak of 'name' sd->areanpc_id = nd->bl.id; - npc_event (sd, strcat (name, "::OnTouch"), 0); + npc_event(sd, strcat(name, "::OnTouch"), 0); } - free (name); - return 0; + free(name); } -int npc_enable (const char *name, int flag) +int npc_enable(const char *name, bool flag) { - struct npc_data *nd = (struct npc_data *)strdb_search (npcname_db, name); + struct npc_data *nd = npcname_db.get(name); if (nd == NULL) return 0; - if (flag & 1) + if (flag) { // 有効化 nd->flag &= ~1; - clif_spawnnpc (nd); - } - else if (flag & 2) - { - nd->flag &= ~1; - nd->option = 0x0000; - clif_changeoption (&nd->bl); - } - else if (flag & 4) - { - nd->flag |= 1; - nd->option = 0x0002; - clif_changeoption (&nd->bl); + clif_spawnnpc(nd); } else { // 無効化 nd->flag |= 1; - clif_clearchar (&nd->bl, 0); + clif_clearchar(&nd->bl, BeingRemoveWhy::GONE); } - 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, - nd->bl.y - nd->u.scr.ys, nd->bl.x + nd->u.scr.xs, - nd->bl.y + nd->u.scr.ys, BL_PC, nd); + if (flag && (nd->u.scr.xs > 0 || nd->u.scr.ys > 0)) + map_foreachinarea(std::bind(npc_enable_sub, ph::_1, nd), + 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); return 0; } @@ -124,32 +111,32 @@ 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 npcname_db.get(name); } /*========================================== * イベントキューのイベント処理 *------------------------------------------ */ -int npc_event_dequeue (struct map_session_data *sd) +int npc_event_dequeue(struct map_session_data *sd) { - nullpo_retr (0, sd); + nullpo_ret(sd); sd->npc_id = 0; if (sd->eventqueue[0][0]) // キューのイベント処理 { - if (!pc_addeventtimer(sd, 100, sd->eventqueue[0])) + if (!pc_addeventtimer(sd, std::chrono::milliseconds(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; } @@ -157,213 +144,94 @@ 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(&nd->bl, BeingRemoveWhy::DEAD); + map_delblock(&nd->bl); return 0; } -/*========================================== - * イベントの遅延実行 - *------------------------------------------ - */ -void npc_event_timer (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) +int npc_timer_event(const char *eventname) // Added by RoVeRT { - struct map_session_data *sd = map_id2sd (id); - if (sd == NULL) - return; - - npc_event (sd, (const char *) data, 0); - free ((void *) data); -} - -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 = ev_db.search(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 -{ - 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 -{ - struct npc_data *nd=(struct npc_data*)data; - - if(nd->timer == -1) - return 0; - - strdb_foreach(ev_db,npc_timer_sub_sub,&nd->bl.id); - - return 0; -} - -int npc_timer(int tid,unsigned int tick,int id,int data) // Added by RoVeRT -{ - strdb_foreach(npcname_db,npc_timer_sub); - - free((void*)data); - return 0; -}*/ -/*========================================== - * イベント用ラベルのエクスポート - * npc_parse_script->strdb_foreachから呼ばれる - *------------------------------------------ - */ -static -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 *); - - if ((lname[0] == 'O' || lname[0] == 'o') - && (lname[1] == 'N' || lname[1] == 'n')) - { - struct event_data *ev; - char *buf; - char *p = strchr (lname, ':'); - // エクスポートされる - 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); - } - else - { - ev->nd = nd; - ev->pos = pos; - *p = '\0'; - sprintf (buf, "%s::%s", nd->exname, lname); - *p = ':'; - strdb_insert (ev_db, buf, ev); -// if (battle_config.etc_log) -// printf("npc_event_export: export [%s]\n",buf); - } - } - return 0; -} - /*========================================== * 全てのNPCのOn*イベント実行 *------------------------------------------ */ static -void npc_event_doall_sub (db_key_t key, db_val_t data, va_list ap) +void npc_event_doall_sub(const std::string& key, struct event_data *ev, + int *c, const char *name, int rid, int argc, argrec_t *argv) { - const char *p = key.s; - int rid, argc; - argrec_t *argv; - struct event_data *ev; - int *c; - const char *name; + const char *p = key.c_str(); - nullpo_retv (ev = (struct event_data *) data); - nullpo_retv (ap); - nullpo_retv (c = va_arg (ap, int *)); + nullpo_retv(ev); - 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); + for (auto& pair : ev_db) + npc_event_doall_sub(pair.first, &pair.second, &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(const std::string& key, struct event_data *ev, + int *c, const char *name, int rid, int argc, argrec_t *argv) { - const char *p = key.s; - struct event_data *ev; - int *c; - const char *name; - int rid, argc; - argrec_t *argv; - - nullpo_retv (ev = (struct event_data *) data); - nullpo_retv (ap); - nullpo_retv (c = va_arg (ap, int *)); + const char *p = key.c_str(); - name = va_arg (ap, const char *); - rid = va_arg (ap, int); - argc = va_arg (ap, int); - argv = va_arg (ap, argrec_t *); + nullpo_retv(ev); - 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); + for (auto& pair : ev_db) + npc_event_do_sub(pair.first, &pair.second, &c, name, rid, argc, args); return c; } @@ -372,180 +240,47 @@ 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(TimerData *, tick_t) { - time_t timer; - struct tm *t; - char buf[64]; - int c = 0; - - time (&timer); - t = gmtime (&timer); + struct tm t = TimeT::now(); - if (t->tm_min != ev_tm_b.tm_min) + 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); + std::string buf; + buf = STRPRINTF("OnMinute%02d", t.tm_min); + npc_event_doall(buf.c_str()); + buf = STRPRINTF("OnClock%02d%02d", t.tm_hour, t.tm_min); + npc_event_doall(buf.c_str()); } - if (t->tm_hour != ev_tm_b.tm_hour) + if (t.tm_hour != ev_tm_b.tm_hour) { - sprintf (buf, "OnHour%02d", t->tm_hour); - c += npc_event_doall (buf); + std::string buf; + buf = STRPRINTF("OnHour%02d", t.tm_hour); + npc_event_doall(buf.c_str()); } - if (t->tm_mday != ev_tm_b.tm_mday) + 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); + std::string buf; + buf = STRPRINTF("OnDay%02d%02d", t.tm_mon + 1, t.tm_mday); + npc_event_doall(buf.c_str()); } - memcpy (&ev_tm_b, t, sizeof (ev_tm_b)); + ev_tm_b = t; } /*========================================== * OnInitイベント実行(&時計イベント開始) *------------------------------------------ */ -int npc_event_do_oninit (void) -{ - 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); - - return 0; -} - -/*========================================== - * OnTimer NPC event - by RoVeRT - *------------------------------------------ - */ -static -int npc_addeventtimer (struct npc_data *nd, int tick, const char *name) -{ - 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, - npc_event_timer, nd->bl.id, - (int) evname); - } - else - printf ("npc_addtimer: event timer is full !\n"); - - return 0; -} - -static -int npc_deleventtimer (struct npc_data *nd, const char *name) -{ - int i; - for (i = 0; i < MAX_EVENTTIMER; i++) - if (nd->eventtimer[i] != -1 && strcmp ((char - *) (get_timer (nd->eventtimer - [i])->data), - name) == 0) - { - delete_timer (nd->eventtimer[i], npc_event_timer); - nd->eventtimer[i] = -1; - break; - } - - return 0; -} - -static -int npc_cleareventtimer (struct npc_data *nd) -{ - int i; - for (i = 0; i < MAX_EVENTTIMER; i++) - if (nd->eventtimer[i] != -1) - { - delete_timer (nd->eventtimer[i], npc_event_timer); - nd->eventtimer[i] = -1; - } - - return 0; -} - -static -void npc_do_ontimer_sub (db_key_t key, db_val_t data, va_list ap) +int npc_event_do_oninit(void) { - const char *p = key.s; - struct event_data *ev = (struct event_data *) data; - 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; - char temp[10]; - char event[50]; + int c = npc_event_doall("OnInit"); + PRINTF("npc: OnInit Event done. (%d npc)\n", c); - 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 (option != 0) - { - npc_addeventtimer (ev->nd, tick, event); - } - else - { - npc_deleventtimer (ev->nd, event); - } - } -} - -int npc_do_ontimer (int id, struct map_session_data *sd, int option) -{ - strdb_foreach (ev_db, npc_do_ontimer_sub, &id, sd, option); - return 0; -} + Timer(gettick() + std::chrono::milliseconds(100), + npc_event_do_clock, + std::chrono::seconds(1) + ).detach(); -/*========================================== - * タイマーイベント用ラベルの取り込み - * npc_parse_script->strdb_foreachから呼ばれる - *------------------------------------------ - */ -static -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; - - if (sscanf (lname, "OnTimer%d%n", &t, &i) == 1 && lname[i] == ':') - { - // タイマーイベント - struct npc_timerevent_list *te = nd->u.scr.timer_event; - int j; - i = nd->u.scr.timeramount; - 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)); - break; - } - } - te[j].timer = t; - te[j].pos = pos; - nd->u.scr.timer_event = te; - nd->u.scr.timeramount = i + 1; - } return 0; } @@ -554,40 +289,39 @@ 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(TimerData *, tick_t tick, int id, interval_t data) { - int next, t; - struct npc_data *nd = (struct npc_data *) map_id2bl (id); + 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"); - return; - } + assert (nd != NULL); + assert (nd->u.scr.nexttimer >= 0); + nd->u.scr.timertick = tick; te = nd->u.scr.timer_event + nd->u.scr.nexttimer; - nd->u.scr.timerid = -1; + // nd->u.scr.timerid = nullptr; - t = nd->u.scr.timer += data; + interval_t t = nd->u.scr.timer += data; nd->u.scr.nexttimer++; 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); + interval_t next = nd->u.scr.timer_event[nd->u.scr.nexttimer].timer - t; + nd->u.scr.timerid = Timer(tick + next, + std::bind(npc_timerevent, ph::_1, ph::_2, + 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; - nullpo_retr (0, nd); + nullpo_ret(nd); n = nd->u.scr.timeramount; if (nd->u.scr.nexttimer >= 0 || n == 0) @@ -599,14 +333,15 @@ 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); + interval_t next = nd->u.scr.timer_event[j].timer - nd->u.scr.timer; + nd->u.scr.timerid = Timer(gettick() + next, + std::bind(npc_timerevent, ph::_1, ph::_2, + nd->bl.id, next)); return 0; } @@ -614,17 +349,15 @@ 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_ret(nd); if (nd->u.scr.nexttimer >= 0) { nd->u.scr.nexttimer = -1; - nd->u.scr.timer += (int) (gettick () - nd->u.scr.timertick); - if (nd->u.scr.timerid != -1) - delete_timer (nd->u.scr.timerid, npc_timerevent); - nd->u.scr.timerid = -1; + nd->u.scr.timer += gettick() - nd->u.scr.timertick; + nd->u.scr.timerid.cancel(); } return 0; } @@ -633,16 +366,14 @@ int npc_timerevent_stop (struct npc_data *nd) * タイマー値の所得 *------------------------------------------ */ -int npc_gettimerevent_tick (struct npc_data *nd) +interval_t npc_gettimerevent_tick(struct npc_data *nd) { - int tick; - - nullpo_retr (0, nd); + nullpo_retr(interval_t::zero(), nd); - tick = nd->u.scr.timer; + interval_t tick = nd->u.scr.timer; if (nd->u.scr.nexttimer >= 0) - tick += (int) (gettick () - nd->u.scr.timertick); + tick += gettick() - nd->u.scr.timertick; return tick; } @@ -650,18 +381,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, interval_t newtimer) { - int flag; + int flag; - nullpo_retr (0, nd); + nullpo_ret(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; } @@ -669,41 +400,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 = ev_db.search(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 = ev_db.search(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,59 +456,57 @@ int npc_event (struct map_session_data *sd, const char *eventname, if (sd->npc_id != 0) { // if (battle_config.error_log) -// printf("npc_event: npc_id != 0\n"); - int i; +// PRINTF("npc_event: npc_id != 0\n"); + 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); +// PRINTF("npc_event: enqueue\n"); + 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(const std::string& key, struct event_data *ev, const char *npcname, const char *command) { - 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 *); + const char *p = key.c_str(); 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 *, const char *npcname, const char *command) { - strdb_foreach (ev_db, npc_command_sub, npcname, command); + for (auto& pair : ev_db) + npc_command_sub(pair.first, &pair.second, npcname, command); return 0; } @@ -786,12 +515,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; @@ -806,12 +535,12 @@ int npc_touch_areanpc (struct map_session_data *sd, int m, int x, int y) switch (map[m].npc[i]->bl.subtype) { - case WARP: + case NpcSubtype::WARP: xs = map[m].npc[i]->u.warp.xs; ys = map[m].npc[i]->u.warp.ys; break; - case MESSAGE: - case SCRIPT: + case NpcSubtype::MESSAGE: + case NpcSubtype::SCRIPT: xs = map[m].npc[i]->u.scr.xs; ys = map[m].npc[i]->u.scr.ys; break; @@ -829,29 +558,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, - map[m].npc[i]->u.warp.x, map[m].npc[i]->u.warp.y, 0); + case NpcSubtype::WARP: + 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, BeingRemoveWhy::GONE); break; - case MESSAGE: - case SCRIPT: + case NpcSubtype::MESSAGE: + case NpcSubtype::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; + return 1; // TODO fix leak of 'name' 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; } } @@ -862,17 +591,18 @@ 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) +static +int npc_checknear(struct map_session_data *sd, int id) { struct npc_data *nd; - nullpo_retr (0, sd); + nullpo_ret(sd); - nd = (struct npc_data *) map_id2bl (id); - if (nd == NULL || nd->bl.type != BL_NPC) + 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; } @@ -894,25 +624,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,18 +650,18 @@ int npc_click (struct map_session_data *sd, int id) sd->npc_id = id; switch (nd->bl.subtype) { - case SHOP: - clif_npcbuysell (sd, id); - npc_event_dequeue (sd); + case NpcSubtype::SHOP: + 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); + case NpcSubtype::SCRIPT: + sd->npc_pos = run_script(nd->u.scr.script, 0, sd->bl.id, id); break; - case MESSAGE: + case NpcSubtype::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; } @@ -943,29 +673,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) + if (!nd /* NPC was disposed? */ || nd->bl.subtype == NpcSubtype::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; } @@ -974,20 +704,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); - if (nd->bl.subtype != SHOP) + nd = (struct npc_data *) map_id2bl(id); + if (nd->bl.subtype != NpcSubtype::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; } @@ -997,11 +727,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; } @@ -1010,21 +740,22 @@ int npc_buysellsel (struct map_session_data *sd, int id, int type) * *------------------------------------------ */ -int npc_buylist (struct map_session_data *sd, int n, - unsigned short *item_list) +// TODO enumify return type +int npc_buylist(struct map_session_data *sd, int n, + const uint16_t *item_list) { struct npc_data *nd; double z; - int i, j, w, skill, itemamount = 0, new_stacks = 0; + int i, j, w, 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); - if (nd->bl.subtype != SHOP) + nd = (struct npc_data *) map_id2bl(sd->npc_shopid); + if (nd->bl.subtype != NpcSubtype::SHOP) return 3; for (i = 0, w = 0, z = 0; i < n; i++) @@ -1037,88 +768,67 @@ 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)) - z += (double) nd->u.shop_item[j].value * item_list[i * 2]; - else - z += (double) pc_modifybuyvalue (sd, - nd->u.shop_item[j].value) * - item_list[i * 2]; + z += (double) 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: + case ADDITEM::EXIST: break; - case ADDITEM_NEW: - if (itemdb_isequip (item_list[i * 2 + 1])) + case ADDITEM::NEW: + if (itemdb_isequip(item_list[i * 2 + 1])) new_stacks += item_list[i * 2]; else new_stacks++; break; - case ADDITEM_OVERAMOUNT: + case ADDITEM::OVERAMOUNT: 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販売アイテムは鑑定済み if (amount > 1 - && (item_data->type == 4 || item_data->type == 5 - || item_data->type == 7 || item_data->type == 8)) + && (item_data->type == ItemType::WEAPON + || item_data->type == ItemType::ARMOR + || item_data->type == ItemType::_7 + || item_data->type == ItemType::_8)) { 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 (battle_config.shop_exp > 0 && z > 0 - && (skill = pc_checkskill (sd, MC_DISCOUNT)) > 0) - { - if (skill > 0) - { - z = (log (z * (double) skill) * (double) battle_config.shop_exp / - 100.); - if (z < 1) - z = 1; - pc_gainexp (sd, 0, (int) z); - } - } - return 0; } @@ -1126,20 +836,20 @@ int npc_buylist (struct map_session_data *sd, int n, * *------------------------------------------ */ -int npc_selllist (struct map_session_data *sd, int n, - unsigned short *item_list) +int npc_selllist(struct map_session_data *sd, int n, + const uint16_t *item_list) { double z; - int i, skill, itemamount = 0; + int i, 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; @@ -1149,40 +859,17 @@ 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]; - else - z += (double) pc_modifysellvalue (sd, - itemdb_value_sell (nameid)) * - item_list[i * 2 + 1]; + z += (double) 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); - } - - //商人経験値 -/* 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) - { - if (skill > 0) - { - z = (log (z * (double) skill) * (double) battle_config.shop_exp / - 100.); - if (z < 1) - z = 1; - pc_gainexp (sd, 0, (int) z); - } + int item_id = item_list[i * 2] - 2; + pc_delitem(sd, item_id, item_list[i * 2 + 1], 0); } return 0; @@ -1198,7 +885,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; @@ -1206,7 +893,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; @@ -1216,21 +903,21 @@ void npc_clearsrcfile (void) * 読み込むnpcファイルの追加 *------------------------------------------ */ -void npc_addsrcfile (char *name) +void npc_addsrcfile(const 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) @@ -1243,24 +930,24 @@ void npc_addsrcfile (char *name) * 読み込むnpcファイルの削除 *------------------------------------------ */ -void npc_delsrcfile (char *name) +void npc_delsrcfile(const 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; } } @@ -1270,48 +957,48 @@ 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 *, 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; nd->bl.x = x; nd->bl.y = y; - nd->dir = 0; + nd->dir = DIR::S; 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) nd->npc_class = WARP_CLASS; else nd->npc_class = WARP_DEBUG_CLASS; - nd->speed = 200; - nd->option = 0; - nd->opt1 = 0; - nd->opt2 = 0; - nd->opt3 = 0; - memcpy (nd->u.warp.name, to_mapname, 16); + nd->speed = std::chrono::milliseconds(200); + nd->option = Option::ZERO; + nd->opt1 = Opt1::ZERO; + nd->opt2 = Opt2::ZERO; + nd->opt3 = Opt3::ZERO; + memcpy(nd->u.warp.name, to_mapname, 16); xs += 2; ys += 2; nd->u.warp.x = to_x; @@ -1323,21 +1010,24 @@ 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); - if (t == 1 || t == 5) + int x_lo = x - xs / 2; + int y_lo = y - ys / 2; + int xc = x_lo + j; + int yc = y_lo + i; + MapCell t = map_getcell(m, xc, yc); + if (bool(t & MapCell::UNWALKABLE)) continue; - map_setcell (m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80); + map_setcell(m, xc, yc, t | MapCell::NPC_NEAR); } } -// printf("warp npc %s %d read done\n",mapname,nd->bl.id); +// PRINTF("warp npc %s %d read done\n",mapname,nd->bl.id); 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); + nd->bl.type = BL::NPC; + nd->bl.subtype = NpcSubtype::WARP; + map_addblock(&nd->bl); + clif_spawnnpc(nd); + npcname_db.put(nd->name, nd); return 0; } @@ -1346,40 +1036,46 @@ 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 *, char *w3, char *w4) { char *p; - int x, y, dir, m; - int max = 100, pos = 0; + int x, y; + DIR dir; + int 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) + int dir_; // TODO use SSCANF or extract + if (sscanf(w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir_) != 4 + || dir_ < 0 || dir_ >= 8 + || strchr(w4, ',') == NULL) { - printf ("bad shop line : %s\n", w3); + PRINTF("bad shop line : %s\n", w3); return 1; } - m = map_mapname2mapid (mapname); + dir = static_cast<DIR>(dir_); + 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 @@ -1394,18 +1090,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; @@ -1414,29 +1110,29 @@ 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); - nd->speed = 200; + memcpy(nd->name, w3, 24); + nd->npc_class = atoi(w4); + nd->speed = std::chrono::milliseconds(200); nd->chat_id = 0; - nd->option = 0; - nd->opt1 = 0; - nd->opt2 = 0; - nd->opt3 = 0; + nd->option = Option::ZERO; + nd->opt1 = Opt1::ZERO; + nd->opt2 = Opt2::ZERO; + nd->opt3 = Opt3::ZERO; 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); + //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->bl.type = BL::NPC; + nd->bl.subtype = NpcSubtype::SHOP; + nd->n = map_addnpc(m, nd); + map_addblock(&nd->bl); + clif_spawnnpc(nd); + npcname_db.put(nd->name, nd); return 0; } @@ -1446,36 +1142,26 @@ 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(const std::string& lname, int pos, struct npc_data *nd) { - const char *lname = key.s; - int pos = (int) data; - struct npc_data *nd; struct npc_label_list *lst; - int num; - // this exists for evil purposes - char *p = const_cast<char *>(strchr (lname, ':')); + int num; - nullpo_retv (ap); - nullpo_retv (nd = va_arg (ap, struct npc_data *)); + nullpo_retv(nd); 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); - lst[num].name[sizeof(lst[num].name)-1] = '\0'; - *p = ':'; + strzcpy(lst[num].name, lname.c_str(), sizeof(lst[num].name)); lst[num].pos = pos; nd->u.scr.label_list = lst; nd->u.scr.label_list_num = num + 1; @@ -1486,25 +1172,26 @@ 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 dir = DIR::S; + int 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; - struct dbt *label_db; + int evflag = 0; 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; @@ -1513,22 +1200,25 @@ 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)) + int dir_; // TODO use SSCANF or extract + if (sscanf(w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir_) != 4 + || dir_ < 0 || dir_ >= 8 + || (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); + dir = static_cast<DIR>(dir_); + 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 @@ -1536,36 +1226,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; } @@ -1576,14 +1266,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; @@ -1593,17 +1283,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; @@ -1617,11 +1307,14 @@ 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); - if (t == 1 || t == 5) + int x_lo = x - xs / 2; + int y_lo = y - ys / 2; + int xc = x_lo + j; + int yc = y_lo + i; + MapCell t = map_getcell(m, xc, yc); + if (bool(t & MapCell::UNWALKABLE)) continue; - map_setcell (m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80); + map_setcell(m, xc, yc, t | MapCell::NPC_NEAR); } } } @@ -1631,7 +1324,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; } @@ -1641,7 +1334,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; @@ -1649,53 +1342,52 @@ 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; - nd->speed = 200; + nd->speed = std::chrono::milliseconds(200); nd->u.scr.script = script; nd->u.scr.src_id = src_id; nd->chat_id = 0; - nd->option = 0; - nd->opt1 = 0; - nd->opt2 = 0; - nd->opt3 = 0; + nd->option = Option::ZERO; + nd->opt1 = Opt1::ZERO; + nd->opt2 = Opt2::ZERO; + nd->opt3 = Opt3::ZERO; - //printf("script npc %s %d %d read done\n",mapname,nd->bl.id,nd->class); + //PRINTF("script npc %s %d %d read done\n",mapname,nd->bl.id,nd->class); npc_script++; - nd->bl.type = BL_NPC; - nd->bl.subtype = SCRIPT; + nd->bl.type = BL::NPC; + nd->bl.subtype = NpcSubtype::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)); - ev->nd = nd; - ev->pos = 0; - strdb_insert (ev_db, nd->exname, ev); + struct event_data ev {}; + ev.nd = nd; + ev.pos = 0; + ev_db.insert(nd->exname, ev); } else - clif_spawnnpc (nd); + clif_spawnnpc(nd); } - strdb_insert (npcname_db, nd->exname, nd); + npcname_db.put(nd->exname, nd); //----------------------------------------- // ラベルデータの準備 @@ -1704,11 +1396,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); + for (auto& pair : scriptlabel_db) + npc_convertlabel_db(pair.first, pair.second, nd); // もう使わないのでバッファ解放 - free (srcbuf); + free(srcbuf); } else @@ -1727,29 +1419,21 @@ 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')) { - 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) + if (strlen(lname) > 24) { - 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); + PRINTF("npc_parse_script: label name error !\n"); + exit(1); } + struct event_data ev {}; + ev.nd = nd; + ev.pos = pos; + std::string buf = STRPRINTF("%s::%s", nd->exname, lname); + ev_db.insert(buf, ev); } } @@ -1757,29 +1441,30 @@ 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') { + interval_t t = static_cast<interval_t>(t_); // タイマーイベント 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; } } @@ -1790,7 +1475,7 @@ int npc_parse_script (char *w1, char *w2, char *w3, char *w4, } } nd->u.scr.nexttimer = -1; - nd->u.scr.timerid = -1; + // nd->u.scr.timerid = nullptr; return 0; } @@ -1799,73 +1484,66 @@ 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 *, char *, char *w3, char *, 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; -// struct dbt *label_db; - char *p; + int i; // スクリプトの解析 - 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)); - - strncpy (p, w3, 49); - strdb_insert (script_get_userfunc_db (), p, script); - -// label_db=script_get_label_db(); + std::string p = w3; + userfunc_db.put(p, script); // もう使わないのでバッファ解放 - free (srcbuf); - -// printf("function %s => %p\n",p,script); + free(srcbuf); return 0; } @@ -1874,26 +1552,29 @@ 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) +static +int npc_parse_mob(const char *w1, const char *, 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; + int i; char mapname[24]; char eventname[24] = ""; struct mob_data *md; xs = ys = 0; - delay1 = delay2 = 0; + int delay1_ = 0, 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; } + interval_t delay1 = std::chrono::milliseconds(delay1_); + interval_t delay2 = std::chrono::milliseconds(delay2_); - m = map_mapname2mapid (mapname); + m = map_mapname2mapid(mapname); if (num > 1 && battle_config.mob_count_rate != 100) { @@ -1903,23 +1584,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->mob_class = mob_class; + md->bl.id = npc_get_new_npc_id(); md->m = m; md->x0 = x; md->y0 = y; @@ -1928,31 +1609,31 @@ 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)); - md->timer = -1; + memset(&md->state, 0, sizeof(md->state)); + // md->timer = nullptr; md->target_id = 0; md->attacked_id = 0; - if (mob_db[mob_class].mode & 0x02) + if (bool(mob_db[mob_class].mode & MobMode::LOOTER)) 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); + md->bl.type = BL::MOB; + map_addiddb(&md->bl); + mob_spawn(md->bl.id); npc_mob++; } - //printf("warp npc %s %d read done\n",mapname,nd->bl.id); + //PRINTF("warp npc %s %d read done\n",mapname,nd->bl.id); return 0; } @@ -1961,175 +1642,125 @@ 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 *, char *w3, char *w4) { - int m; + int m; char mapname[24], savemap[16]; - int savex, savey; - char drop_arg1[16], drop_arg2[16]; - int drop_id = 0, drop_type = 0, drop_per = 0; + int savex, savey; // 引数の個数チェック // 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_noguild") == 0) - { - map[m].flag.pvp_noguild = 1; - } - else if (strcasecmp (w3, "pvp_nightmaredrop") == 0) - { - if (sscanf (w4, "%[^,],%[^,],%d", drop_arg1, drop_arg2, &drop_per) == - 3) - { - int i; - if (strcmp (drop_arg1, "random") == 0) - drop_id = -1; - else if (itemdb_exists ((drop_id = atoi (drop_arg1))) == NULL) - drop_id = 0; - if (strcmp (drop_arg2, "inventory") == 0) - drop_type = 1; - else if (strcmp (drop_arg2, "equip") == 0) - drop_type = 2; - else if (strcmp (drop_arg2, "all") == 0) - drop_type = 3; - - if (drop_id != 0) - { - for (i = 0; i < MAX_DROP_PER_MAP; i++) - { - if (map[m].drop_list[i].drop_id == 0) - { - map[m].drop_list[i].drop_id = drop_id; - map[m].drop_list[i].drop_type = drop_type; - map[m].drop_list[i].drop_per = drop_per; - break; - } - } - map[m].flag.pvp_nightmaredrop = 1; - } - } - } - else if (strcasecmp (w3, "pvp_nocalcrank") == 0) + else if (strcasecmp(w3, "pvp_nocalcrank") == 0) { map[m].flag.pvp_nocalcrank = 1; } - else if (strcasecmp (w3, "gvg") == 0) - { - map[m].flag.gvg = 1; - } - else if (strcasecmp (w3, "gvg_noparty") == 0) - { - map[m].flag.gvg_noparty = 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) - { - 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; } @@ -2137,177 +1768,119 @@ 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) -{ - 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; + retval->bl.type = BL::NPC; + retval->bl.subtype = NpcSubtype::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; + retval->speed = std::chrono::milliseconds(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); + npcname_db.put(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->bl.subtype == NpcSubtype::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) + else if (nd->bl.subtype == NpcSubtype::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) -{ - 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_propagate_update(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); + map_foreachinarea(std::bind(npc_enable_sub, ph::_1, nd), + 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); } -/*========================================== - * 終了 - *------------------------------------------ - */ -int do_final_npc (void) +void npc_free(struct npc_data *nd) { - int i; - struct block_list *bl; - struct npc_data *nd; - struct mob_data *md; - - if (ev_db) - strdb_final (ev_db, ev_db_final); - if (npcname_db) - strdb_final (npcname_db, NULL); - - for (i = START_NPC_NUM; i < npc_id; i++) - { - if ((bl = map_id2bl (i))) - { - if (bl->type == BL_NPC && (nd = (struct npc_data *) bl)) - npc_free_internal (nd); - else if (bl->type == BL_MOB && (md = (struct mob_data *) bl)) - { - if (md->lootitem) - { - free (md->lootitem); - md->lootitem = NULL; - } - free (md); - md = NULL; - } - } - } - - return 0; -} - -static -void ev_release (db_key_t key, db_val_t val) -{ - free ((char*)key.s); - free (val); + clif_clearchar(&nd->bl, BeingRemoveWhy::GONE); + npc_propagate_update(nd); + map_deliddb(&nd->bl); + map_delblock(&nd->bl); + npc_free_internal(nd); } /*========================================== * npc初期化 *------------------------------------------ */ -int do_init_npc (void) +int do_init_npc(void) { struct npc_src_list *nsl; FILE *fp; char line[1024]; - int m, lines; - - ev_db = strdb_init (24); - npcname_db = strdb_init (24); - - ev_db->release = ev_release; + int m, lines; - 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] == '/') @@ -2319,7 +1892,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++] = ' '; } @@ -2333,67 +1906,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; |