diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-31 00:42:56 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-31 00:42:56 +0000 |
| commit | 01125519eed1ab1d2293e96e859e6711365b3d12 (patch) | |
| tree | a576886c0d27b08c6e6445bbe942b2d12e435fd7 /src/map/status.c | |
| parent | 55d99ca77ba52ce480be9e2ec6ff9c35ddd575ed (diff) | |
| download | hercules-01125519eed1ab1d2293e96e859e6711365b3d12.tar.gz hercules-01125519eed1ab1d2293e96e859e6711365b3d12.tar.bz2 hercules-01125519eed1ab1d2293e96e859e6711365b3d12.tar.xz hercules-01125519eed1ab1d2293e96e859e6711365b3d12.zip | |
- Fixed the pc_additem weight check breaking when your current weight is above your max.
- Some minor cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11621 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 3b6d0460a..ddc3ce745 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3366,6 +3366,7 @@ static unsigned short status_calc_batk(struct block_list *bl, struct status_chan { if(!sc || !sc->count) return cap_value(batk,0,USHRT_MAX); + if(sc->data[SC_INCBASEATK].timer!=-1) batk += sc->data[SC_INCBASEATK].val1; if(sc->data[SC_ATKPOTION].timer!=-1) @@ -3464,6 +3465,7 @@ static signed short status_calc_critical(struct block_list *bl, struct status_ch { if(!sc || !sc->count) return cap_value(critical,10,SHRT_MAX); + if (sc->data[SC_INCCRI].timer!=-1) critical += sc->data[SC_INCCRI].val2; if (sc->data[SC_EXPLOSIONSPIRITS].timer!=-1) |