summaryrefslogtreecommitdiff
path: root/src/char/int_homun.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 23:30:48 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 23:30:48 +0000
commited23cac0a89a552f82225dc5c8c702850892a46d (patch)
tree4b2037ab946350d4e5b803c307b8e6f39693e1a6 /src/char/int_homun.c
parentb6b59bf78e91dbbef2c52682bef631be019964e3 (diff)
downloadhercules-ed23cac0a89a552f82225dc5c8c702850892a46d.tar.gz
hercules-ed23cac0a89a552f82225dc5c8c702850892a46d.tar.bz2
hercules-ed23cac0a89a552f82225dc5c8c702850892a46d.tar.xz
hercules-ed23cac0a89a552f82225dc5c8c702850892a46d.zip
- Applied multiple fixes which should take care of making homun save/load work on TXT now.
- Added Gatling Fever's batk bonus. - Some cleaning in status_damage which should prevent trying to free already free'd pointers when unit_remove_map invokes unit_free (when status_damage was going to invoke unit_free anyway) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8308 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char/int_homun.c')
-rw-r--r--src/char/int_homun.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 35b54c2fe..d9153a9fe 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -92,13 +92,13 @@ int inter_homun_fromstr(char *str,struct s_homunculus *p)
p->luk = tmp_int[17];
//Read skills.
- while(str[next]) {
+ while(str[next] && str[next] != '\n') {
if (sscanf(str+next, "%d,%d,%n", &tmp_int[0], &tmp_int[1], &len) != 2)
return 2;
- if (tmp_int[0] >= HM_SKILLBASE && tmp_int[0] < HM_SKILLBASE+MAX_HOMUNSKILL)
+ if (tmp_int[0] > HM_SKILLBASE && tmp_int[0] <= HM_SKILLBASE+MAX_HOMUNSKILL)
{
- i = tmp_int[0] - HM_SKILLBASE;
+ i = tmp_int[0] - HM_SKILLBASE -1;
p->hskill[i].id = tmp_int[0];
p->hskill[i].lv = tmp_int[1];
} else
@@ -327,7 +327,7 @@ int mapif_save_homun(int fd,int account_id,struct s_homunculus *data)
hom_id = data->hom_id;
p= idb_ensure(homun_db,hom_id,create_homun);
memcpy(p,data,sizeof(struct s_homunculus));
- mapif_save_homun_ack(fd,account_id,0);
+ mapif_save_homun_ack(fd,account_id,1);
return 0;
}
@@ -382,11 +382,11 @@ int inter_homun_parse_frommap(int fd)
{
RFIFOHEAD(fd);
switch(RFIFOW(fd,0)){
- case 0x3080: mapif_create_homun(fd); break;
- case 0x3081: mapif_load_homun(fd); break;
- case 0x3082: mapif_parse_SaveHomun(fd); break;
- case 0x3083: mapif_parse_DeleteHomun(fd); break;
- case 0x3084: mapif_parse_RenameHomun(fd); break;
+ case 0x3090: mapif_create_homun(fd); break;
+ case 0x3091: mapif_load_homun(fd); break;
+ case 0x3092: mapif_parse_SaveHomun(fd); break;
+ case 0x3093: mapif_parse_DeleteHomun(fd); break;
+ case 0x3094: mapif_parse_RenameHomun(fd); break;
default:
return 0;
}