summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlordttseven <lordttseven@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-16 18:48:05 +0000
committerlordttseven <lordttseven@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-16 18:48:05 +0000
commita07d917ebf909df258edb5a01d58f161f782228c (patch)
tree20a613d141739be10f572fd661bc5d9c8536742f
parent334ee0d80c09c6a840db235b5ac3d2d1709ac2f3 (diff)
downloadhercules-a07d917ebf909df258edb5a01d58f161f782228c.tar.gz
hercules-a07d917ebf909df258edb5a01d58f161f782228c.tar.bz2
hercules-a07d917ebf909df258edb5a01d58f161f782228c.tar.xz
hercules-a07d917ebf909df258edb5a01d58f161f782228c.zip
* forgot to also actually store the skill ids as numbers (follow-up to r15692, semi-revert of r15634)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15693 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/skill.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 918e15b2f..ebf01a8ca 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -15265,7 +15265,7 @@ void skill_cooldown_load(struct map_session_data * sd)
static bool skill_parse_row_skilldb(char* split[], int columns, int current)
{// id,range,hit,inf,element,nk,splash,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,name,description
int id = atoi(split[0]);
- int i, *idp;
+ int i;
if( (id >= GD_SKILLRANGEMIN && id <= GD_SKILLRANGEMAX)
|| (id >= HM_SKILLRANGEMIN && id <= HM_SKILLRANGEMAX)
|| (id >= MC_SKILLRANGEMIN && id <= MC_SKILLRANGEMAX) )
@@ -15305,9 +15305,7 @@ static bool skill_parse_row_skilldb(char* split[], int columns, int current)
skill_split_atoi(split[14],skill_db[i].blewcount);
safestrncpy(skill_db[i].name, trim(split[15]), sizeof(skill_db[i].name));
safestrncpy(skill_db[i].desc, trim(split[16]), sizeof(skill_db[i].desc));
- CREATE(idp, int, 1);
- *idp = id;
- strdb_put(skilldb_name2id, skill_db[i].name, idp);
+ strdb_iput(skilldb_name2id, skill_db[i].name, id);
return true;
}