summaryrefslogtreecommitdiff
path: root/src/common/mmo.h
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:43:26 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:43:26 -0700
commit8f4e4e9a92f6af89820a358ab99b990697117502 (patch)
treecb312b5367c71dfe89543a5463be9555177c6445 /src/common/mmo.h
parentf841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (diff)
parent2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a (diff)
downloadtmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.gz
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.bz2
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.xz
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.zip
Merge commit '2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a'
Diffstat (limited to 'src/common/mmo.h')
-rw-r--r--src/common/mmo.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 906f5c1..64e0523 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -5,12 +5,6 @@
# include <time.h>
# include "utils.h" // LCCWIN32
-# ifdef CYGWIN
-# define RETCODE "\r\n"
-# else
-# define RETCODE "\n"
-# endif
-
# define FIFOSIZE_SERVERLINK 256*1024
// set to 0 to not check IP of player between each server.
@@ -101,7 +95,7 @@ struct mmo_charstatus
int base_exp, job_exp, zeny;
- short class;
+ short pc_class;
short status_point, skill_point;
int hp, max_hp, sp, max_sp;
short option, karma, manner;
@@ -176,7 +170,7 @@ struct party
struct guild_member
{
int account_id, char_id;
- short hair, hair_color, gender, class, lv;
+ short hair, hair_color, gender, pc_class, lv;
int exp, exp_payper;
short online, position;
int rsv1, rsv2;