summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-22 05:21:24 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-22 05:21:24 +0000
commit201a9b5d634573e92df148deb58793441a3ece1b (patch)
tree07e3ccf6e7462cee634957f90db30ab7d49361ab /src/common
parent6902547b621eb77e90c0a77516b64947270919e1 (diff)
downloadhercules-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/common')
-rw-r--r--src/common/mmo.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 99fb76c40..2b940de6b 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -183,7 +183,8 @@ struct mmo_charstatus {
short class_;
unsigned short status_point,skill_point;
int hp,max_hp,sp,max_sp;
- short option,manner;
+ unsigned short option;
+ short manner;
unsigned char karma;
short hair,hair_color,clothes_color;
int party_id,guild_id,pet_id;