diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-25 13:49:29 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-25 13:49:29 +0000 |
| commit | 7506179f2d94e1ac9ae7491946d1cb4fe82c0ba7 (patch) | |
| tree | 639efd75a43d9d09e3ee7541da0ca174700ab891 /src/map/status.c | |
| parent | c24f4cb1c14a32b78641fe48e1694bbbdb58cbed (diff) | |
| download | hercules-7506179f2d94e1ac9ae7491946d1cb4fe82c0ba7.tar.gz hercules-7506179f2d94e1ac9ae7491946d1cb4fe82c0ba7.tar.bz2 hercules-7506179f2d94e1ac9ae7491946d1cb4fe82c0ba7.tar.xz hercules-7506179f2d94e1ac9ae7491946d1cb4fe82c0ba7.zip | |
- Changed the order of packets in TK_HIGHJUMP, may fix the reports of getting stuck when jumping into a warp.
- Changed a bit the code of marionette control, where a redefined local variable may be the cause of mob-targetted Marionette Control stacking stats up.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8857 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/map/status.c b/src/map/status.c index aeacf4929..8579dc9e3 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5262,38 +5262,38 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val stat =max-sd->status.luk;
val4 |= stat;
} else {
- struct status_data *status = status_get_base_status(bl);
- if (!status) return 0;
+ struct status_data *b_status = status_get_base_status(bl);
+ if (!b_status) return 0;
max = 0xFF; //Assume a 256 max parameter
//Str
stat = (psc->data[SC_MARIONETTE].val3>>16)&0xFF;
- if (status->str+stat > max)
- stat = max - status->str;
+ if (b_status->str+stat > max)
+ stat = max - b_status->str;
val3 |= stat<<16;
//Agi
stat = (psc->data[SC_MARIONETTE].val3>>8)&0xFF;
- if (status->agi+stat > max)
- stat = max - status->agi;
+ if (b_status->agi+stat > max)
+ stat = max - b_status->agi;
val3 |= stat<<8;
//Vit
stat = psc->data[SC_MARIONETTE].val3&0xFF;
- if (status->vit+stat > max)
- stat = max - status->vit;
+ if (b_status->vit+stat > max)
+ stat = max - b_status->vit;
val3 |= stat;
//Int
stat = (psc->data[SC_MARIONETTE].val4>>16)&0xFF;
- if (status->int_+stat > max)
- stat = max - status->int_;
+ if (b_status->int_+stat > max)
+ stat = max - b_status->int_;
val4 |= stat<<16;
//Dex
stat = (psc->data[SC_MARIONETTE].val4>>8)&0xFF;
- if (status->dex+stat > max)
- stat = max - status->dex;
+ if (b_status->dex+stat > max)
+ stat = max - b_status->dex;
val4 |= stat<<8;
//Luk
stat = psc->data[SC_MARIONETTE].val4&0xFF;
- if (status->luk+stat > max)
- stat = max - status->luk;
+ if (b_status->luk+stat > max)
+ stat = max - b_status->luk;
val4 |= stat;
}
tick = 1000;
@@ -5488,7 +5488,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val val2 = (status_get_lv(bl) + status->dex + status->luk)/2; //def increase
break;
case SC_MOON_COMFORT:
- val2 = (status_get_lv(bl) + status->dex + status->luk)/10; //luk increase
+ val2 = (status_get_lv(bl) + status->dex + status->luk)/10; //flee increase
break;
case SC_STAR_COMFORT:
val2 = (status_get_lv(bl) + status->dex + status->luk); //Aspd increase
|