diff options
| author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-19 23:35:42 +0000 |
|---|---|---|
| committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-19 23:35:42 +0000 |
| commit | e697781ab5e618988b37951ab4e16a3e23e18655 (patch) | |
| tree | c216021804a03f648bda52bb4e2a76664af118d6 /src/map/npc.c | |
| parent | 53ea174bd7c6f584ba78ab5b7201eec5ce5e5967 (diff) | |
| download | hercules-e697781ab5e618988b37951ab4e16a3e23e18655.tar.gz hercules-e697781ab5e618988b37951ab4e16a3e23e18655.tar.bz2 hercules-e697781ab5e618988b37951ab4e16a3e23e18655.tar.xz hercules-e697781ab5e618988b37951ab4e16a3e23e18655.zip | |
- Script label db now utilizes `DBMap`'s ability to store integer-type data (follow-up to r15682).
- Some minor code cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15734 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index fb806cdd2..6479bd9e1 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2148,7 +2148,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 = (int)db_data2ptr(data); + int lpos = db_data2i(data); struct npc_label_list** label_list; int* label_list_num; const char* filepath; @@ -2299,7 +2299,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons { DBMap* label_db = script_get_label_db(); label_db->foreach(label_db, npc_convertlabel_db, &label_list, &label_list_num, filepath); - label_db->clear(label_db, NULL); // not needed anymore, so clear the db + db_clear(label_db); // not needed anymore, so clear the db } CREATE(nd, struct npc_data, 1); |