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/char/int_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/char/int_pet.c')
| -rw-r--r-- | src/char/int_pet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/char/int_pet.c b/src/char/int_pet.c index c49150a9c..4eb3f5b49 100644 --- a/src/char/int_pet.c +++ b/src/char/int_pet.c @@ -58,7 +58,7 @@ int inter_pet_fromstr(char *str,struct s_pet *p) p->pet_id = tmp_int[0]; p->class_ = tmp_int[1]; - memcpy(p->name,tmp_str,NAME_LENGTH-1); + memcpy(p->name,tmp_str,NAME_LENGTH); p->account_id = tmp_int[2]; p->char_id = tmp_int[3]; p->level = tmp_int[4]; @@ -234,7 +234,7 @@ int mapif_create_pet(int fd,int account_id,int char_id,short pet_class,short pet } // memset(p,0,sizeof(struct s_pet)); unnecessary after aCalloc [Skotlex] p->pet_id = pet_newid++; - memcpy(p->name,pet_name,NAME_LENGTH-1); + memcpy(p->name,pet_name,NAME_LENGTH); if(incuvate == 1) p->account_id = p->char_id = 0; else { |