diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-22 05:21:24 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-22 05:21:24 +0000 |
| commit | 201a9b5d634573e92df148deb58793441a3ece1b (patch) | |
| tree | 07e3ccf6e7462cee634957f90db30ab7d49361ab /src/map/status.c | |
| parent | 6902547b621eb77e90c0a77516b64947270919e1 (diff) | |
| download | hercules-201a9b5d634573e92df148deb58793441a3ece1b.tar.gz hercules-201a9b5d634573e92df148deb58793441a3ece1b.tar.bz2 hercules-201a9b5d634573e92df148deb58793441a3ece1b.tar.xz hercules-201a9b5d634573e92df148deb58793441a3ece1b.zip | |
- Added SC_KEEPING/SC_BARRIER to calc_flag in status_change_end
- Added Option constants for Carts, fixed OPTION_FLYING (it conflicts with OPTION_XMAS?)
- Updated clif.c to check for OPTION_WEDDING|OPTION_XMAS instead of view class to block attacks and skill usage.
- Removed struct pc_base_job and functions pc_calc_base_job/pc_calc_base_job2 which are no longer used anywhere (were long ago deprecated infavor of the new jobid system)
- Cleaned up change-cart code.
- Modified SC_XMAS to not change your view anymore and only set the proper option value (OPTION_XMAS)
- Cleaned up the code regarding char_gm reading.
- Changed the option field to unsigned short to make room for the higher values.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6229 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index a4e47a97f..bdb12deb9 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4088,7 +4088,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val val2 = 5*(2+type-SC_ASPDPOTION0);
break;
- case SC_XMAS: // Xmas Suit [Valaris]
case SC_WEDDING: //結婚用(結婚衣裳になって?くのが?いとか)
{
struct view_data *vd = status_get_viewdata(bl);
@@ -4746,6 +4745,9 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_SIGHTTRASHER:
sc->option |= OPTION_SIGHTTRASHER;
break;
+ case SC_XMAS: // Xmas Suit [Valaris]
+ sc->option |= OPTION_XMAS;
+ break;
case SC_FUSION:
sc->option |= OPTION_FLYING;
break;
@@ -4957,10 +4959,11 @@ int status_change_end( struct block_list* bl , int type,int tid ) case SC_SWOO: // [marquis007]
case SC_SKA: // [marquis007]
case SC_KNOWLEDGE:
+ case SC_KEEPING:
+ case SC_BARRIER:
calc_flag = 1;
break;
- case SC_XMAS: // Xmas Suit [Valaris]
case SC_WEDDING: //結婚用(結婚衣裳になって?くのが?いとか)
{
struct view_data *vd = status_get_viewdata(bl);
@@ -5256,6 +5259,10 @@ int status_change_end( struct block_list* bl , int type,int tid ) sc->option &= ~OPTION_SIGHTTRASHER;
opt_flag = 1;
break;
+ case SC_XMAS: // Xmas Suit [Valaris]
+ sc->option &= ~OPTION_XMAS;
+ opt_flag = 1;
+ break;
case SC_FUSION:
sc->option &= ~OPTION_FLYING;
opt_flag = 1;
|