diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-20 18:30:05 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-20 18:30:05 +0000 |
| commit | 54a7f124543239c98d696da37c91eb5e2e99b25d (patch) | |
| tree | 03c1c0d7148de31a112f2c3d82c7eabf910dd351 /src/map/script.c | |
| parent | 1893d0bc7b07a362ac6efcd8de4af056544bad3a (diff) | |
| download | hercules-54a7f124543239c98d696da37c91eb5e2e99b25d.tar.gz hercules-54a7f124543239c98d696da37c91eb5e2e99b25d.tar.bz2 hercules-54a7f124543239c98d696da37c91eb5e2e99b25d.tar.xz hercules-54a7f124543239c98d696da37c91eb5e2e99b25d.zip | |
- Fixed Charge Atk being able to go through chasm/pits.
- Moved the homunculus DB information from the player structure to the homun structure. Modified the homunculus creation packets to hold this information during creation, also, all initial values are handled by the map-server, the char server only assigns it a homun ID.
- Removed target_id/attacked_id from homun_data as it wasn't really used.
- Codes cleanup (removing of commented code mostly)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9031 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/script.c b/src/map/script.c index a8fbf454c..eef5cac23 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7765,7 +7765,7 @@ int buildin_homunculus_evolution(struct script_state *st) { struct map_session_data *sd; sd=script_rid2sd(st); - if ( sd->hd && sd->hd->homunculusDB->evo_class && sd->homunculus.intimacy > 91000 ) { + if ( sd->hd && sd->hd->homunculusDB->evo_class && sd->hd->homunculus.intimacy > 91000 ) { return merc_hom_evolution(sd->hd) ; } clif_emotion(&sd->hd->bl, 4) ; //swt @@ -11737,19 +11737,19 @@ int buildin_rid2name(struct script_state *st){ if((bl = map_id2bl(rid))){ switch(bl->type){ case BL_MOB: - push_str(st->stack,C_CONSTSTR,((struct mob_data *)bl)->name); + push_str(st->stack,C_CONSTSTR,((TBL_MOB*)bl)->name); break; case BL_PC: - push_str(st->stack,C_CONSTSTR,((struct map_session_data *)bl)->status.name); + push_str(st->stack,C_CONSTSTR,((TBL_PC*)bl)->status.name); break; case BL_NPC: - push_str(st->stack,C_CONSTSTR,((struct npc_data *)bl)->exname); + push_str(st->stack,C_CONSTSTR,((TBL_NPC*)bl)->exname); break; case BL_PET: - push_str(st->stack,C_CONSTSTR,((struct pet_data *)bl)->pet.name); + push_str(st->stack,C_CONSTSTR,((TBL_PET*)bl)->pet.name); break; case BL_HOM: - push_str(st->stack,C_CONSTSTR,((struct homun_data *)bl)->master->homunculus.name); + push_str(st->stack,C_CONSTSTR,((TBL_HOM*)bl)->homunculus.name); break; default: ShowError("buildin_rid2name: BL type unknown.\n"); |