Mercurial > mm7
diff Player.h @ 130:1c471f3629fb
Party expressions update
author | Nomad |
---|---|
date | Mon, 11 Feb 2013 19:40:49 +0200 |
parents | 9c0607679772 |
children | 9b0d651821f1 |
line wrap: on
line diff
--- a/Player.h Mon Feb 11 18:22:21 2013 +0200 +++ b/Player.h Mon Feb 11 19:40:49 2013 +0200 @@ -25,6 +25,8 @@ CHARACTER_LUCK = 0x6, }; + + /* 332 */ enum CHARACTER_ATTRIBUTE_TYPE { @@ -201,6 +203,65 @@ +enum CHARACTER_EXPRESSION_ID: unsigned __int16 +{ + CHARACTER_EXPRESSION_INVALID = 0, + CHARACTER_EXPRESSION_1 = 1, + CHARACTER_EXPRESSION_CURSED = 2, + CHARACTER_EXPRESSION_WEAK = 3, + CHARACTER_EXPRESSION_SLEEP = 4, + CHARACTER_EXPRESSION_FEAR = 5, + CHARACTER_EXPRESSION_DRUNK = 6, + CHARACTER_EXPRESSION_INSANE = 7, + CHARACTER_EXPRESSION_POISONED = 8, + CHARACTER_EXPRESSION_DISEASED = 9, + CHARACTER_EXPRESSION_PARALYZED = 10, + CHARACTER_EXPRESSION_UNCONCIOUS = 11, + CHARACTER_EXPRESSION_PERTIFIED = 12, + CHARACTER_EXPRESSION_13 = 13, + CHARACTER_EXPRESSION_14 = 14, + CHARACTER_EXPRESSION_15 = 15, + CHARACTER_EXPRESSION_16 = 16, + CHARACTER_EXPRESSION_17 = 17, + CHARACTER_EXPRESSION_18 = 18, + CHARACTER_EXPRESSION_19 = 19, + CHARACTER_EXPRESSION_20 = 20, + CHARACTER_EXPRESSION_21 = 21, + CHARACTER_EXPRESSION_22 = 22, + CHARACTER_EXPRESSION_23 = 23, + CHARACTER_EXPRESSION_24 = 24, + CHARACTER_EXPRESSION_25 = 25, + CHARACTER_EXPRESSION_26 = 26, + CHARACTER_EXPRESSION_27 = 27, + CHARACTER_EXPRESSION_28 = 28, + CHARACTER_EXPRESSION_29 = 29, + CHARACTER_EXPRESSION_30 = 30, + CHARACTER_EXPRESSION_31 = 31, + CHARACTER_EXPRESSION_32 = 32, + CHARACTER_EXPRESSION_33 = 33, + CHARACTER_EXPRESSION_34 = 34, + CHARACTER_EXPRESSION_35 = 35, + CHARACTER_EXPRESSION_36 = 36, + CHARACTER_EXPRESSION_37 = 37, + CHARACTER_EXPRESSION_38 = 38, + CHARACTER_EXPRESSION_39 = 39, + + // ? + + CHARACTER_EXPRESSION_46 = 46, + + CHARACTER_EXPRESSION_54 = 54, + CHARACTER_EXPRESSION_55 = 55, + CHARACTER_EXPRESSION_56 = 56, + CHARACTER_EXPRESSION_57 = 57, + + // ? + + CHARACTER_EXPRESSION_DEAD = 98, + CHARACTER_EXPRESSION_ERADICATED = 99, +}; + + enum PLAYER_SEX: unsigned __int8 { SEX_MALE = 0, @@ -220,7 +281,7 @@ Condition_Insane = 5, Condition_Poison1 = 6, Condition_Disease1 = 7, - Condition_Posion2 = 8, + Condition_Poison2 = 8, Condition_Disease2 = 9, Condition_Poison3 = 10, Condition_Disease3 = 11, @@ -336,7 +397,7 @@ int SetCondition(unsigned int uConditionIdx, int a3); int _49327B(unsigned int uClass, int a3); __int16 PlaySound(int a2, int a3); - __int16 PlayEmotion(int a2, int a3); + __int16 PlayEmotion(CHARACTER_EXPRESSION_ID expression, int a3); char _4160CA(int a2); unsigned int GetItemIDAtInventoryIndex(int *a2); int _4B6FF9(); @@ -499,7 +560,7 @@ char _health_related; char uFullManaBonus; char _mana_related; - unsigned __int16 uExpressionID; + CHARACTER_EXPRESSION_ID expression; unsigned __int16 uExpressionTimePassed; unsigned __int16 uExpressionTimeLength; __int16 field_1AA2;