Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Player.h	Sat Jul 13 04:16:30 2013 +0200
+++ b/Player.h	Sat Jul 13 11:56:57 2013 +0200
@@ -413,9 +413,9 @@
   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_DMGRECVD_MINOR = 34,
+  CHARACTER_EXPRESSION_DMGRECVD_MODERATE = 35,
+  CHARACTER_EXPRESSION_DMGRECVD_MAJOR = 36,
   CHARACTER_EXPRESSION_37 = 37,
   CHARACTER_EXPRESSION_38 = 38,
   CHARACTER_EXPRESSION_39 = 39,
@@ -428,7 +428,7 @@
   CHARACTER_EXPRESSION_55 = 55,
   CHARACTER_EXPRESSION_56 = 56,
   CHARACTER_EXPRESSION_57 = 57,
-  CHARACTER_EXPRESSION_58 = 58,
+  CHARACTER_EXPRESSION_FALLING = 58,
 
   // ?
 
@@ -620,8 +620,6 @@
   inline void SetPertified(bool state)   {pConditions[Condition_Pertified] = state;}
   inline void SetEradicated(bool state)  {pConditions[Condition_Eradicated] = state;}
   inline void SetZombie(bool state)      {pConditions[Condition_Zombie] = state;}
-
-
   __int64 pConditions[20];
   unsigned __int64 uExperience;
   char pName[16];