--- a/GUIWindow.cpp	Mon Feb 11 22:56:05 2013 +0600
+++ b/GUIWindow.cpp	Mon Feb 11 22:56:43 2013 +0600
@@ -198,10 +198,10 @@
     v13 = pTexture_PlayerFaceDead;
   else
   {
-      uFramesetID = pPlayerFrameTable->GetFrameIdBy_field0(pPlayer->uExpressionID);
+      uFramesetID = pPlayerFrameTable->GetFrameIdByExpression(pPlayer->expression);
       if ( !uFramesetID )
         uFramesetID = 1;
-      if ( pPlayer->uExpressionID == 21 )
+      if ( pPlayer->expression == CHARACTER_EXPRESSION_21)
       {
         v15 = pPlayerFrameTable->GetFrameBy_y(
                 &pPlayer->field_1AA8,
@@ -1884,7 +1884,7 @@
                     pWindow->CreateButton(0x1E0u, a4a++ * v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x13u, 0, "", 0);
                 }
               }
-              v15 = (void *)v12->evtb;
+              v15 = (void *)v12->_anim_current_time;
               if ( v15 )
               {
                 if ( a4a < 4 )
@@ -1894,7 +1894,7 @@
                     pWindow->CreateButton(0x1E0u, a4a++ * v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x14u, 0, "", 0);
                 }
               }
-              v17 = (void *)v12->evtc;
+              v17 = (void *)v12->_anim_end_time;
               if ( v17 )
               {
                 if ( a4a < 4 )