diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-14 15:35:25 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-14 15:35:25 +0000 |
| commit | 987aa586c48f83830f8c457d5cfe49361acb028a (patch) | |
| tree | dfaffb829dadf841dcb21443915c49f208e14d95 /src/map/status.c | |
| parent | 50df12f5c8f485b12944182a53c43df975edd4cb (diff) | |
| download | hercules-987aa586c48f83830f8c457d5cfe49361acb028a.tar.gz hercules-987aa586c48f83830f8c457d5cfe49361acb028a.tar.bz2 hercules-987aa586c48f83830f8c457d5cfe49361acb028a.tar.xz hercules-987aa586c48f83830f8c457d5cfe49361acb028a.zip | |
- blocked again skill usage during marionette.
- Some minor code cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7162 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c index 87457f2dd..7872771b9 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -896,7 +896,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int (src->type != BL_PC || ((TBL_PC*)src)->skillitem != skill_num) ) { //Skills blocked through status changes... if (!flag && ( //Blocked only from using the skill (stuff like autospell may still go through -// (sc->data[SC_MARIONETTE].timer != -1 && skill_num != CG_MARIONETTE) || + (sc->data[SC_MARIONETTE].timer != -1 && skill_num != CG_MARIONETTE) || (sc->data[SC_MARIONETTE2].timer != -1 && skill_num == CG_MARIONETTE) || sc->data[SC_SILENCE].timer != -1 || sc->data[SC_STEELBODY].timer != -1 || @@ -3817,7 +3817,7 @@ struct status_change *status_get_sc(struct block_list *bl) case BL_NPC: return &((TBL_NPC*)bl)->sc; case BL_HOMUNCULUS: //[blackhole89] - return &((struct homun_data*)bl)->sc; + return &((TBL_HOMUNCULUS*)bl)->sc; } return NULL; } @@ -3890,7 +3890,7 @@ int status_get_sc_def(struct block_list *bl, int type) break; case SC_CURSE: if (status->luk > status_get_lv(bl)) - sc_def = 10000; //Special property: inmunity when luk is greater than level + return 10000; //Special property: inmunity when luk is greater than level else sc_def = 300 +100*status->luk; break; |