Mercurial > mm7

changeset 162:3a8e7802f241

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 13 Feb 2013 09:52:42 +0600
parents 49e74dee4eab (diff) f4ebd13c2a8e (current diff)
children a0e7ad5425d4
files mm7_2.cpp
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Outdoor.cpp	Wed Feb 13 01:26:49 2013 +0600
+++ b/Outdoor.cpp	Wed Feb 13 09:52:42 2013 +0600
@@ -141,7 +141,7 @@
     pRenderer->PrepareDecorationsRenderList_ODM();
 
   pRenderer->DrawLayingItems_Shooting_Magic_ODM();
-  pRenderer->TransformBillboardsAndSetPalettesODM();//Ritor1: do comment to test
+  pRenderer->TransformBillboardsAndSetPalettesODM();
   sub_485F53((Vec2_int_ *)unnamed_6BE060);
 }
 
--- a/Render.cpp	Wed Feb 13 01:26:49 2013 +0600
+++ b/Render.cpp	Wed Feb 13 09:52:42 2013 +0600
@@ -7172,7 +7172,7 @@
   if (pRenderD3D)
   {
     pGame->draw_debug_outlines();
-    DoRenderBillboards_D3D(); //Ritor1: it's temporarily
+    DoRenderBillboards_D3D();
     pGame->pStru6Instance->RenderSpecialEffects();
     pRenderD3D->pDevice->EndScene();
   }
--- a/mm7_2.cpp	Wed Feb 13 01:26:49 2013 +0600
+++ b/mm7_2.cpp	Wed Feb 13 09:52:42 2013 +0600
@@ -16344,7 +16344,7 @@
       UI_CreateTravelDialogue();
     }
   }
-  UpdateActors_ODM();//Ritor1: it's temporarily
+  UpdateActors_ODM();
   _46CC4B_check_event_triggers();
 }