diff options
| author | shennetsind <ind@henn.et> | 2013-06-08 17:31:28 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-08 17:31:28 -0300 |
| commit | 4c31ec091c3dcef916c90b6416976ea701671e90 (patch) | |
| tree | 421552306c5f014103c6f8efc261e947bbb448c5 /src/map/npc.c | |
| parent | 60eb0c9e0527e80b7793e48d2cea47e3204b777c (diff) | |
| download | hercules-4c31ec091c3dcef916c90b6416976ea701671e90.tar.gz hercules-4c31ec091c3dcef916c90b6416976ea701671e90.tar.bz2 hercules-4c31ec091c3dcef916c90b6416976ea701671e90.tar.xz hercules-4c31ec091c3dcef916c90b6416976ea701671e90.zip | |
Follow up d73783f22b2bb881aab74524d153d89a5932a199
Adjusting db.c interface name to adhere with the rest (pretty much we try to make it as short as we can, and being there were no conflicts we saw no reason to maintain the 'i')
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index e842a6c05..5e03191e7 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -350,7 +350,7 @@ int npc_event_doall_sub(DBKey key, DBData *data, va_list ap) const char* name; int rid; - nullpo_ret(ev = iDB->data2ptr(data)); + nullpo_ret(ev = DB->data2ptr(data)); nullpo_ret(c = va_arg(ap, int *)); nullpo_ret(name = va_arg(ap, const char *)); rid = va_arg(ap, int); @@ -378,7 +378,7 @@ static int npc_event_do_sub(DBKey key, DBData *data, va_list ap) int* c; const char* name; - nullpo_ret(ev = iDB->data2ptr(data)); + nullpo_ret(ev = DB->data2ptr(data)); nullpo_ret(c = va_arg(ap, int *)); nullpo_ret(name = va_arg(ap, const char *)); @@ -1773,7 +1773,7 @@ int npc_remove_map(struct npc_data* nd) { */ static int npc_unload_ev(DBKey key, DBData *data, va_list ap) { - struct event_data* ev = iDB->data2ptr(data); + struct event_data* ev = DB->data2ptr(data); char* npcname = va_arg(ap, char *); if(strcmp(ev->nd->exname,npcname)==0){ @@ -2289,7 +2289,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const int npc_convertlabel_db(DBKey key, DBData *data, va_list ap) { const char* lname = (const char*)key.str; - int lpos = iDB->data2i(data); + int lpos = DB->data2i(data); struct npc_label_list** label_list; int* label_list_num; const char* filepath; @@ -2933,9 +2933,9 @@ static const char* npc_parse_function(char* w1, char* w2, char* w3, char* w4, co return end; func_db = script_get_userfunc_db(); - if (func_db->put(func_db, iDB->str2key(w3), iDB->ptr2data(script), &old_data)) + if (func_db->put(func_db, DB->str2key(w3), DB->ptr2data(script), &old_data)) { - struct script_code *oldscript = (struct script_code*)iDB->data2ptr(&old_data); + struct script_code *oldscript = (struct script_code*)DB->data2ptr(&old_data); ShowInfo("npc_parse_function: Overwriting user function [%s] (%s:%d)\n", w3, filepath, strline(buffer,start-buffer)); script_free_vars(oldscript->script_vars); aFree(oldscript->script_buf); @@ -3729,7 +3729,7 @@ void npc_read_event_script(void) for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) ) { const char* p = key.str; - struct event_data* ed = iDB->data2ptr(data); + struct event_data* ed = DB->data2ptr(data); unsigned char count = script_event[i].event_count; if( count >= ARRAYLENGTH(script_event[i].event) ) |