From a9740f772101b5ce448c8c04d4bb003fa7920db3 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sat, 2 Sep 2006 01:43:23 +0000 Subject: - Corrected script_commands description of getequipid, it returns -1, not 0 on fail. - Fixed the mob-id check during pet_db loading, it will also now print when a pet is not loaded due to having an invalid mob class specified. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8587 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pet.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/map/pet.c') diff --git a/src/map/pet.c b/src/map/pet.c index cf5266047..9b5f6a3a3 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -1308,10 +1308,14 @@ int read_petdb() } nameid=atoi(str[0]); - if(nameid<=0 || nameid>2000) + if(nameid<=0) continue; - - //MobID,Name,JName,ItemID,EggID,AcceID,FoodID,"Fullness (1回の餌での満腹度増加率%)","HungryDeray (/min)","R_Hungry (空腹時餌やり親密度増加率%)","R_Full (とても満腹時餌やり親密度減少率%)","Intimate (捕獲時親密度%)","Die (死亡時親密度減少率%)","Capture (捕獲率%)",(Name) + + if (!mobdb_checkid(nameid)) { + ShowWarning("pet_db reading: Invalid mob-class %d, pet not read.\n", nameid); + continue; + } + pet_db[j].class_ = nameid; memcpy(pet_db[j].name,str[1],NAME_LENGTH-1); memcpy(pet_db[j].jname,str[2],NAME_LENGTH-1); -- cgit v1.2.3-70-g09d2