diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-15 19:44:22 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-15 19:44:22 +0000 |
| commit | 7b19af9f7c8ea99216f1a7f5c92a8122010b0631 (patch) | |
| tree | 9db73bc3461b78773c5af99bb986c1eb02b2c756 /src/map | |
| parent | 8a215272209c0d486fa6eb400825bec43287b9b6 (diff) | |
| download | hercules-7b19af9f7c8ea99216f1a7f5c92a8122010b0631.tar.gz hercules-7b19af9f7c8ea99216f1a7f5c92a8122010b0631.tar.bz2 hercules-7b19af9f7c8ea99216f1a7f5c92a8122010b0631.tar.xz hercules-7b19af9f7c8ea99216f1a7f5c92a8122010b0631.zip | |
- Some cleanup of int_homun.c
- Added homun saving/loading support to char-TXT. Note that this is completely untested, so it may be as good as broken.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8299 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/intif.c | 6 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index c3ea6c013..ef0833b71 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -36,7 +36,7 @@ static const int packet_len_table[]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
11,-1, 7, 3, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3880
- 16,-1, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x3890 Homunculus [albator]
+ 16,-1, 7, 3, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3890 Homunculus [albator]
};
extern int char_fd; // inter serverのfdはchar_fdを使う
@@ -1489,9 +1489,9 @@ int intif_parse_RecvHomunculusData(int fd) int intif_parse_SaveHomunculusOk(int fd)
{
RFIFOHEAD(fd);
- if(RFIFOB(fd,2) != 1) {
+ if(RFIFOB(fd,6) != 1) {
if(battle_config.error_log)
- ShowError("homunculus data save failure\n");
+ ShowError("homunculus data save failure for account %d\n", RFIFOL(fd,2));
}
return 0;
}
diff --git a/src/map/skill.c b/src/map/skill.c index 42762183d..5b3be336f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1867,12 +1867,11 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds if (attack_type&BF_MAGIC) { if(sc && sc->data[SC_KAITE].timer != -1 && (dmg.damage || dmg.damage2) - && !(sstatus->mode&MD_BOSS) && (src->type == BL_PC || status_get_lv(src) <= 80) ) + && !(sstatus->mode&MD_BOSS) && (sd || status_get_lv(src) <= 80) ) { //Works on players or mobs with level under 80. clif_specialeffect(bl, 438, AREA); if (--sc->data[SC_KAITE].val2 <= 0) status_change_end(bl, SC_KAITE, -1); - clif_skill_nodamage(bl,src,skillid,skilllv,1); bl = src; //Just make the skill attack yourself @.@ sc = status_get_sc(bl); tsd = (bl->type == BL_PC)?(TBL_PC*)bl:NULL; |