From 3d6011c46f2f556aa0b9ad41c9e6139ba687e90d Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 9 Mar 2006 16:54:36 +0000 Subject: - Moved a bunch of sc_effects that should be cancelled on hit from mob_damage/pc_damage to battle_damage. - Changed ITEM_NAME_LENGTH to 50. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5533 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/itemdb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/map/itemdb.c') diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 0e7241ea8..814a5239e 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -238,8 +238,8 @@ static void create_dummy_data(void) { dummy_item->nameid=500; dummy_item->weight=1; dummy_item->type=3; //Etc item - strncpy(dummy_item->name,"UNKNOWN_ITEM",ITEM_NAME_LENGTH); - strncpy(dummy_item->jname,"UNKNOWN_ITEM",ITEM_NAME_LENGTH); + strncpy(dummy_item->name,"UNKNOWN_ITEM",ITEM_NAME_LENGTH-1); + strncpy(dummy_item->jname,"UNKNOWN_ITEM",ITEM_NAME_LENGTH-1); dummy_item->view_id = 512; //Use apple sprite. } @@ -575,7 +575,7 @@ static int itemdb_read_itemnametable(void) } #endif - memcpy(itemdb_search(nameid)->jname,buf2,ITEM_NAME_LENGTH-1); + strncpy(itemdb_search(nameid)->jname,buf2,ITEM_NAME_LENGTH-1); } p=strchr(p,10); @@ -848,8 +848,8 @@ static int itemdb_read_sqldb(void) // ---------- id = itemdb_load(nameid); - memcpy(id->name, sql_row[1], ITEM_NAME_LENGTH); - memcpy(id->jname, sql_row[2], ITEM_NAME_LENGTH); + strncpy(id->name, sql_row[1], ITEM_NAME_LENGTH-1); + strncpy(id->jname, sql_row[2], ITEM_NAME_LENGTH-1); id->type = atoi(sql_row[3]); if (id->type == 11) @@ -991,8 +991,8 @@ static int itemdb_readdb(void) //ID,Name,Jname,Type,Price,Sell,Weight,ATK,DEF,Range,Slot,Job,Job Upper,Gender,Loc,wLV,eLV,refineable,View id=itemdb_load(nameid); - memcpy(id->name, str[1], ITEM_NAME_LENGTH); - memcpy(id->jname, str[2], ITEM_NAME_LENGTH); + strncpy(id->name, str[1], ITEM_NAME_LENGTH-1); + strncpy(id->jname, str[2], ITEM_NAME_LENGTH-1); id->type=atoi(str[3]); if (id->type == 11) { //Items that are consumed upon target confirmation -- cgit v1.2.3-70-g09d2