Mercurial > mm7

changeset 2535:3a36de426f5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For draw uPlayerCreationUI_ArrowAnim
author Ritor1
date Sun, 15 Feb 2015 23:39:07 +0600
parents 1bcadc6dd203
children 400edd7b0407
files Build/init_win.bat Engine/Graphics/Render.cpp GUI/UI/UIPartyCreation.cpp
diffstat 3 files changed, 16 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/Build/init_win.bat	Mon Feb 09 19:17:12 2015 +0600
+++ b/Build/init_win.bat	Sun Feb 15 23:39:07 2015 +0600
@@ -1,5 +1,5 @@
 @echo off
-set _mm7_install_dir=D:\g\mm collection\MM_VII
+set _mm7_install_dir=D:\Buka\MMCollection\MM_VII
 
 
 
--- a/Engine/Graphics/Render.cpp	Mon Feb 09 19:17:12 2015 +0600
+++ b/Engine/Graphics/Render.cpp	Sun Feb 15 23:39:07 2015 +0600
@@ -8682,7 +8682,7 @@
     pSkyPolygon.sTextureDeltaU = 224 * pMiscTimer->uTotalGameTimeElapsed;//7168
     pSkyPolygon.sTextureDeltaV = 224 * pMiscTimer->uTotalGameTimeElapsed;//7168
 
-    pSkyPolygon.field_24 = 0x2000000u;//maybe attributes
+    pSkyPolygon.field_24 = 0x2000000;//maybe attributes
     v33 = 65536 / (signed int)(signed __int64)(((double)(pViewport->uViewportBR_X - pViewport->uViewportTL_X) / 2) / tan(0.6457717418670654) + 0.5);
     for ( uint i = 0; i < pSkyPolygon.uNumVertices; ++i )
     {
@@ -8859,8 +8859,11 @@
         if ( pBillboardRenderList[v3].sZValue <= (unsigned int)(pDepth << 16) )
         {
           v6 = PID_ID(v5);
-          if ( pActors[v6].uAIState != Dead && pActors[v6].uAIState != Dying && pActors[v6].uAIState != Removed
-            && pActors[v6].uAIState != Disabled && pActors[v6].uAIState != Summoned )
+          if ( pActors[v6].uAIState != Dead 
+		    && pActors[v6].uAIState != Dying
+			&& pActors[v6].uAIState != Removed
+            && pActors[v6].uAIState != Disabled
+			&& pActors[v6].uAIState != Summoned )
           {
             if ( pGame->pVisInstance->DoesRayIntersectBillboard((double)pDepth, a1a) )
             {
@@ -8945,12 +8948,7 @@
 void Render::do_draw_debug_line_d3d(const RenderVertexD3D3 *pLineBegin, signed int sDiffuseBegin, const RenderVertexD3D3 *pLineEnd, signed int sDiffuseEnd, float z_stuff)
 {
   double v6; // st7@2
-  //IDirect3DDevice3 *v7; // eax@2
-//  HRESULT v8; // eax@2
   std::string v9; // [sp-18h] [bp-60h]@3
-//  const char *v10; // [sp-Ch] [bp-54h]@2
-//  const char *v11; // [sp-8h] [bp-50h]@2
-//  int v12; // [sp-4h] [bp-4Ch]@2
   RenderVertexD3D3 v13[2]; // [sp+8h] [bp-40h]@2
 
   //if ( pRenderer->pRenderD3D )
@@ -8963,11 +8961,7 @@
     v13[0].diffuse = sDiffuseBegin;
     v13[1].diffuse = sDiffuseEnd;
     ErrD3D(pRenderD3D->pDevice->SetTexture(0, nullptr));
-    ErrD3D(pRenderD3D->pDevice->DrawPrimitive(D3DPT_LINELIST,
-           452,
-           v13,
-           2,
-           16));
+    ErrD3D(pRenderD3D->pDevice->DrawPrimitive(D3DPT_LINELIST, 452, v13, 2, 16));
   }
 }
 
@@ -9164,30 +9158,14 @@
 //----- (0047C4FC) --------------------------------------------------------
 int __fastcall GetActorTintColor(int max_dimm, int min_dimm, float distance, int a4, RenderBillboard *a5)
 {
-	//int v5; // esi@1
 	signed int v6; // edx@1
-	//signed int result; // eax@2
 	int v8; // eax@3
 	double v9; // st7@12
-	//double v10; // ST0C_8@18
 	int v11; // ecx@28
-	//signed int v12; // edi@28
-	//double v13; // ST0C_8@33
-	//double v14; // ST0C_8@34
 	double v15; // st7@44
-	//double v16; // ST0C_8@44
-	//double v17; // ST0C_8@44
 	int v18; // ST14_4@44
-	//double v19; // ST0C_8@44
 	signed int v20; // [sp+10h] [bp-4h]@10
-	//  float a3a; // [sp+1Ch] [bp+8h]@33
-	//float a3b; // [sp+1Ch] [bp+8h]@34
 	float a3c; // [sp+1Ch] [bp+8h]@44
-	//float a3d; // [sp+1Ch] [bp+8h]@44
-	//float a4b; // [sp+20h] [bp+Ch]@18
-	//int a4a; // [sp+20h] [bp+Ch]@33
-	//float a4c; // [sp+20h] [bp+Ch]@44
-	//float a4d; // [sp+20h] [bp+Ch]@44
 	int a5a; // [sp+24h] [bp+10h]@44
 
 	//v5 = a2;
@@ -9327,7 +9305,6 @@
 //----- (0043F5C8) --------------------------------------------------------
 int __fastcall _43F5C8_get_point_light_level_with_respect_to_lights(unsigned int uBaseLightLevel, int uSectorID, float x, float y, float z)
 {
-	//  int v5; // esi@1
 	signed int v6; // edi@1
 	int v8; // eax@6
 	int v9; // ebx@6
@@ -9337,23 +9314,9 @@
 	signed int v13; // ecx@12
 	BLVLightMM7 *v16; // esi@20
 	int v17; // ebx@21
-	//  int v18; // eax@24
-	//  int v19; // ebx@24
-	//  unsigned int v20; // ecx@24
-	//  int v21; // edx@25
-	//  unsigned int v22; // edx@27
-	//  unsigned int v23; // edx@29
 	signed int v24; // ecx@30
 	int v26; // ebx@35
-	//  int v27; // eax@38
-	//  int v28; // ebx@38
-	//  unsigned int v29; // ecx@38
-	//  int v30; // edx@39
-	//  unsigned int v31; // edx@41
-	//  unsigned int v32; // edx@43
-	//signed int v33; // ecx@44
 	int v37; // [sp+Ch] [bp-18h]@37
-	//  int v38; // [sp+10h] [bp-14h]@5
 	int v39; // [sp+10h] [bp-14h]@23
 	int v40; // [sp+10h] [bp-14h]@36
 	int v42; // [sp+14h] [bp-10h]@22
@@ -9982,8 +9945,8 @@
 	int a3; // [sp+Ch] [bp-8h]@13
 	int v12; // [sp+10h] [bp-4h]@15
 
-	v1 = 0xFFFFFFu;
-	v10 = 0xFFFFFFu;
+	v1 = 0xFFFFFF;
+	v10 = 0xFFFFFF;
 	for (uint i = 0; i < pIndoor->pSectors[stru_721530.uSectorID].uNumPortals; ++i)
 	{
 		if (pIndoor->pSectors[stru_721530.uSectorID].pPortals[i] != stru_721530.field_80)
@@ -10018,7 +9981,7 @@
 			stru_721530.uSectorID = pIndoor->pFaces[v12].uBackSectorID;
 		else
 			stru_721530.uSectorID = pIndoor->pFaces[v12].uSectorID;
-		stru_721530.field_7C = 268435455;
+		stru_721530.field_7C = 268435455;//0xFFFFFFF
 		result = 0;
 	}
 	else
--- a/GUI/UI/UIPartyCreation.cpp	Mon Feb 09 19:17:12 2015 +0600
+++ b/GUI/UI/UIPartyCreation.cpp	Sun Feb 15 23:39:07 2015 +0600
@@ -134,9 +134,11 @@
 
   pRenderer->DrawTextureIndexedAlpha(pX, 29, &pIcons_LOD->pTextures[pFrame->uTextureID]);
   uPosActiveItem = pGUIWindow_CurrentMenu->GetControl(pGUIWindow_CurrentMenu->pCurrentPosActiveItem);
-  uPlayerCreationUI_ArrowAnim = 19 - (GetTickCount() % 500) / 25;
-  pRenderer->DrawTextureIndexedAlpha(uPosActiveItem->uZ - 4, uPosActiveItem->uY, pTextures_arrowl[uPlayerCreationUI_ArrowAnim]);
-  pRenderer->DrawTextureIndexedAlpha(uPosActiveItem->uX - 12, uPosActiveItem->uY, pTextures_arrowr[uPlayerCreationUI_ArrowAnim]);
+  uPlayerCreationUI_ArrowAnim = 18 - (GetTickCount() % 450) / 25;
+  if (uPlayerCreationUI_ArrowAnim < 0)
+	  uPlayerCreationUI_ArrowAnim = 18;
+  pRenderer->DrawTextureIndexedAlpha(uPosActiveItem->uZ - 4, uPosActiveItem->uY, pTextures_arrowl[uPlayerCreationUI_ArrowAnim + 1]);
+  pRenderer->DrawTextureIndexedAlpha(uPosActiveItem->uX - 12, uPosActiveItem->uY, pTextures_arrowr[uPlayerCreationUI_ArrowAnim + 1]);
 
   memset(pText, 0, 200);
   strcpy(pText, pGlobalTXT_LocalizationStrings[205]);// "Skills"