Mercurial > mm7

changeset 61:6c2cefdaea3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 22 Jan 2013 18:41:17 +0600
parents b9d70af644f3 (diff) 63cfe63ac4c5 (current diff)
children 80484cf3a683
files GUIWindow.cpp LightmapBuilder.cpp Outdoor.cpp ParticleEngine.cpp Render.cpp mm7_2.cpp mm7_5.cpp
diffstat 4 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/GUIWindow.cpp	Tue Jan 22 17:50:36 2013 +0600
+++ b/GUIWindow.cpp	Tue Jan 22 18:41:17 2013 +0600
@@ -1830,7 +1830,6 @@
       break;
   }
 
-
   auto pWindow = &pWindowList[uNextFreeWindowID];
   pWindow->uFrameWidth = uWidth;
   pWindow->uFrameZ = uX + uWidth - 1;
--- a/LightmapBuilder.cpp	Tue Jan 22 17:50:36 2013 +0600
+++ b/LightmapBuilder.cpp	Tue Jan 22 18:41:17 2013 +0600
@@ -964,7 +964,7 @@
   RenderD3D *v13; // ecx@11
   char v14; // dl@11
 
-//  __debugbreak();
+  __debugbreak();
 
   v6 = pLight->uRadius;
   if ( v6 > 0
--- a/Outdoor.cpp	Tue Jan 22 17:50:36 2013 +0600
+++ b/Outdoor.cpp	Tue Jan 22 18:41:17 2013 +0600
@@ -102,7 +102,7 @@
 //LABEL_14:
     pRenderer->DrawSkyD3D();
     pRenderer->DrawBuildingsD3D();
-    //pRenderer->DrawBezierTerrain();
+    pRenderer->DrawBezierTerrain();// Ritor1: sometimes crash
     goto LABEL_16;
   }
   pRenderer->DrawBuildingsSW();
--- a/mm7_4.cpp	Tue Jan 22 17:50:36 2013 +0600
+++ b/mm7_4.cpp	Tue Jan 22 18:41:17 2013 +0600
@@ -3245,7 +3245,7 @@
     if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || v22 )
     {
       pPlayer->field_1AA2 = pFrame->uTextureID - 1;
-      pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];
+      pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID];
       pPortrait = pFace;
       v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i];
       if ( pParty->pPartyBuffs[11].uExpireTime )