Mercurial > mm7
comparison Player.h @ 304:f16ac5e65438
Merge
author | Nomad |
---|---|
date | Tue, 19 Feb 2013 15:40:11 +0200 |
parents | 3dcc9d945eeb ada52edca264 |
children | f0f66f690777 |
comparison
equal
deleted
inserted
replaced
303:3dcc9d945eeb | 304:f16ac5e65438 |
---|---|
512 void Reset(PLAYER_CLASS_TYPE classType); | 512 void Reset(PLAYER_CLASS_TYPE classType); |
513 enum PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order); | 513 enum PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order); |
514 void DecreaseAttribute(int eAttribute); | 514 void DecreaseAttribute(int eAttribute); |
515 int IncreaseAttribute(int eAttribute); | 515 int IncreaseAttribute(int eAttribute); |
516 void Player::Zero(); | 516 void Player::Zero(); |
517 __int16 GetStatColor(unsigned int uStat); | 517 unsigned int GetStatColor(int uStat); |
518 bool DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime); | 518 bool DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime); |
519 int _490EEE(ItemGen *pItem, int a3, int a4, int a5); | 519 int _490EEE(ItemGen *pItem, int a3, int a4, int a5); |
520 int GetBodybuilding(); | 520 int GetBodybuilding(); |
521 int GetMediatation(); | 521 int GetMediatation(); |
522 int CanIdentify(ItemGen *pItem); | 522 int CanIdentify(ItemGen *pItem); |