diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-23 21:23:36 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-23 21:23:36 +0000 |
commit | f6bcd12cd633717e9e503bb453c85955e29cd519 (patch) | |
tree | 49225d619843accadf26532263f615392da5b8a2 /src/map/pet.c | |
parent | 9b9305b6b1a1a004c2ef909404daa705e956a5de (diff) | |
download | hercules-f6bcd12cd633717e9e503bb453c85955e29cd519.tar.gz hercules-f6bcd12cd633717e9e503bb453c85955e29cd519.tar.bz2 hercules-f6bcd12cd633717e9e503bb453c85955e29cd519.tar.xz hercules-f6bcd12cd633717e9e503bb453c85955e29cd519.zip |
- Added new flag to skill_castnodex.txt, to allow per-skill tweaking of cast time and delay reducibility by item scripts (cards and such)
- Fixed Martyr's Reckoning never triggering for gms with all skills
- Added MO_TRIPLEATTACK and RG_SNATCHER to @skillall's skill filter
- Made gm_skill_unconditional bypass skill blocking (guild timer, etc)
- Reverted the weird delay_dependon_agi thing (r8923, r9055, r9059)
- Changed a few memsets to strncpy (reading past buffer is a bad idea)
- Sped up some memset operations (multiples of 4 are faster)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10613 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
-rw-r--r-- | src/map/pet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index 02ae3b5e2..82168ac48 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -709,7 +709,7 @@ int pet_change_name_ack(struct map_session_data *sd, char* name, int flag) clif_send_petstatus(sd); //Send status so client knows oet name change got rejected. return 0; } - memcpy(pd->pet.name, name, NAME_LENGTH-1); + memcpy(pd->pet.name, name, NAME_LENGTH); clif_charnameack (0,&pd->bl); pd->pet.rename_flag = 1; clif_pet_equip(pd); @@ -1327,8 +1327,8 @@ int read_petdb() } 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); + strncpy(pet_db[j].name,str[1],NAME_LENGTH); + strncpy(pet_db[j].jname,str[2],NAME_LENGTH); pet_db[j].itemID=atoi(str[3]); pet_db[j].EggID=atoi(str[4]); pet_db[j].AcceID=atoi(str[5]); |