Mercurial > might-and-magic-trilogy

changeset 63:427b6c3b4e0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player creation ui: arrows animation fix
author Nomad
date Fri, 26 Oct 2012 03:43:05 +0200
parents 1520e3385fed
children 476145dc3441 fdacbc653945
files mm7_4.cpp
diffstat 1 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_4.cpp	Fri Oct 26 03:34:54 2012 +0200
+++ b/mm7_4.cpp	Fri Oct 26 03:43:05 2012 +0200
@@ -5416,10 +5416,10 @@
   uPlayerCreationUI_SelectedCharacter = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) / 7;
   v2 = pFontCChar->AlignText_Center(640, pGlobalTXT_LocalizationStrings[51]);
   pGUIWindow_CurrentMenu->DrawText(pFontCChar, v2 + 1, 0, 0, uTitleText, 0, 0, 0);
-  pRenderer->DrawTextureTransparent(17u, 35u, pPlayerPortraits[(char)pParty->pPlayers[0].uFace]);
-  pRenderer->DrawTextureTransparent(176u, 35u, pPlayerPortraits[(char)pParty->pPlayers[1].uFace]);
-  pRenderer->DrawTextureTransparent(335u, 35u, pPlayerPortraits[(char)pParty->pPlayers[2].uFace]);
-  pRenderer->DrawTextureTransparent(494u, 35u, pPlayerPortraits[(char)pParty->pPlayers[3].uFace]);
+  pRenderer->DrawTextureTransparent(17u, 35u, pPlayerPortraits[pParty->pPlayers[0].uFace]);
+  pRenderer->DrawTextureTransparent(176u, 35u, pPlayerPortraits[pParty->pPlayers[1].uFace]);
+  pRenderer->DrawTextureTransparent(335u, 35u, pPlayerPortraits[pParty->pPlayers[2].uFace]);
+  pRenderer->DrawTextureTransparent(494u, 35u, pPlayerPortraits[pParty->pPlayers[3].uFace]);
   v3 = pIconsFrameTable->GetFrame(uIconID_CharacterFrame, pEventTimer->uStartTime);
   if ( uPlayerCreationUI_SelectedCharacter )
   {
@@ -5443,12 +5443,17 @@
   {
     v4 = 12;
   }
+
   pRenderer->DrawTextureTransparent(v4, 29, &pIcons_LOD->pTextures[v3->uTextureID]);
   uPosActiveItem = pGUIWindow_CurrentMenu->GetControl(pGUIWindow_CurrentMenu->pCurrentPosActiveItem);
-  pRenderer->DrawTextureTransparent(uPosActiveItem->uZ - 4, uPosActiveItem->uY, pTextures_arrowl[uPlayerCreationUI_ArrowAnim + 1]);
-  pRenderer->DrawTextureTransparent(uPosActiveItem->uX - 12, uPosActiveItem->uY, pTextures_arrowr[uPlayerCreationUI_ArrowAnim-- + 1]);
-  if ( uPlayerCreationUI_ArrowAnim < 0 )
-    uPlayerCreationUI_ArrowAnim = 18;
+
+  uPlayerCreationUI_ArrowAnim = 19 - (GetTickCount() % 500) / 25;
+  Log::Warning(L"%u",uPlayerCreationUI_ArrowAnim);
+  pRenderer->DrawTextureTransparent(uPosActiveItem->uZ - 4, uPosActiveItem->uY, pTextures_arrowl[uPlayerCreationUI_ArrowAnim]);
+  pRenderer->DrawTextureTransparent(uPosActiveItem->uX - 12, uPosActiveItem->uY, pTextures_arrowr[uPlayerCreationUI_ArrowAnim]);
+  //if (uPlayerCreationUI_ArrowAnim < 0)
+  //  uPlayerCreationUI_ArrowAnim = 18;
+
   v6 = LOBYTE(pFontCreate->uFontHeight) - 2;
   v128 = LOBYTE(pFontCreate->uFontHeight) - 2;
   strcpy(Str1, pGlobalTXT_LocalizationStrings[205]);// "Skills"