Mercurial > mm7

comparison Player.h @ 1352:88f80476c99c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
author Grumpy7
date Sat, 13 Jul 2013 11:56:57 +0200
parents 3ed6dcf82912
children 05becb008006
comparison
equal deleted inserted replaced
1351:f1209ed77782 1352:88f80476c99c
411 CHARACTER_EXPRESSION_29 = 29, 411 CHARACTER_EXPRESSION_29 = 29,
412 CHARACTER_EXPRESSION_30 = 30, 412 CHARACTER_EXPRESSION_30 = 30,
413 CHARACTER_EXPRESSION_31 = 31, 413 CHARACTER_EXPRESSION_31 = 31,
414 CHARACTER_EXPRESSION_32 = 32, 414 CHARACTER_EXPRESSION_32 = 32,
415 CHARACTER_EXPRESSION_33 = 33, 415 CHARACTER_EXPRESSION_33 = 33,
416 CHARACTER_EXPRESSION_34 = 34, 416 CHARACTER_EXPRESSION_DMGRECVD_MINOR = 34,
417 CHARACTER_EXPRESSION_35 = 35, 417 CHARACTER_EXPRESSION_DMGRECVD_MODERATE = 35,
418 CHARACTER_EXPRESSION_36 = 36, 418 CHARACTER_EXPRESSION_DMGRECVD_MAJOR = 36,
419 CHARACTER_EXPRESSION_37 = 37, 419 CHARACTER_EXPRESSION_37 = 37,
420 CHARACTER_EXPRESSION_38 = 38, 420 CHARACTER_EXPRESSION_38 = 38,
421 CHARACTER_EXPRESSION_39 = 39, 421 CHARACTER_EXPRESSION_39 = 39,
422 422
423 // ? 423 // ?
426 426
427 CHARACTER_EXPRESSION_54 = 54, 427 CHARACTER_EXPRESSION_54 = 54,
428 CHARACTER_EXPRESSION_55 = 55, 428 CHARACTER_EXPRESSION_55 = 55,
429 CHARACTER_EXPRESSION_56 = 56, 429 CHARACTER_EXPRESSION_56 = 56,
430 CHARACTER_EXPRESSION_57 = 57, 430 CHARACTER_EXPRESSION_57 = 57,
431 CHARACTER_EXPRESSION_58 = 58, 431 CHARACTER_EXPRESSION_FALLING = 58,
432 432
433 // ? 433 // ?
434 434
435 CHARACTER_EXPRESSION_DEAD = 98, 435 CHARACTER_EXPRESSION_DEAD = 98,
436 CHARACTER_EXPRESSION_ERADICATED = 99, 436 CHARACTER_EXPRESSION_ERADICATED = 99,
618 inline void SetUnconcious(bool state) {pConditions[Condition_Unconcious] = state;} 618 inline void SetUnconcious(bool state) {pConditions[Condition_Unconcious] = state;}
619 inline void SetDead(bool state) {pConditions[Condition_Dead] = state;} 619 inline void SetDead(bool state) {pConditions[Condition_Dead] = state;}
620 inline void SetPertified(bool state) {pConditions[Condition_Pertified] = state;} 620 inline void SetPertified(bool state) {pConditions[Condition_Pertified] = state;}
621 inline void SetEradicated(bool state) {pConditions[Condition_Eradicated] = state;} 621 inline void SetEradicated(bool state) {pConditions[Condition_Eradicated] = state;}
622 inline void SetZombie(bool state) {pConditions[Condition_Zombie] = state;} 622 inline void SetZombie(bool state) {pConditions[Condition_Zombie] = state;}
623
624
625 __int64 pConditions[20]; 623 __int64 pConditions[20];
626 unsigned __int64 uExperience; 624 unsigned __int64 uExperience;
627 char pName[16]; 625 char pName[16];
628 PLAYER_SEX uSex; 626 PLAYER_SEX uSex;
629 PLAYER_CLASS_TYPE classType; 627 PLAYER_CLASS_TYPE classType;