# HG changeset patch
# User Ritor1
# Date 1358795492 -21600
# Node ID b9d70af644f3c38cf64ba6bb4bd860ab13abbaa6
# Parent  285e144d0b8b01aae451d4b0adc964f2a437be4c
Обращённый набор изменений слияния: 285e144d0b8b

Обращены изменения ревизии слияния, к её первому родителю (764abc86ce90)

diff -r 285e144d0b8b -r b9d70af644f3 LightmapBuilder.cpp
--- a/LightmapBuilder.cpp	Tue Jan 22 00:59:20 2013 +0600
+++ b/LightmapBuilder.cpp	Tue Jan 22 01:11:32 2013 +0600
@@ -964,7 +964,7 @@
   RenderD3D *v13; // ecx@11
   char v14; // dl@11
 
-//  __debugbreak();
+  __debugbreak();
 
   v6 = pLight->uRadius;
   if ( v6 > 0
diff -r 285e144d0b8b -r b9d70af644f3 Outdoor.cpp
--- a/Outdoor.cpp	Tue Jan 22 00:59:20 2013 +0600
+++ b/Outdoor.cpp	Tue Jan 22 01:11:32 2013 +0600
@@ -138,7 +138,7 @@
   if ( !pOutdoorCamera->bDoNotRenderDecorations )
     pRenderer->DrawDecorations();
   pRenderer->DrawLayingItems_Shooting_Magic_ODM();
-  //pRenderer->TransformBillboardsAndSetPalettesODM();
+  pRenderer->TransformBillboardsAndSetPalettesODM();
   sub_485F53((Vec2_int_ *)unnamed_6BE060);
 }
 
diff -r 285e144d0b8b -r b9d70af644f3 ParticleEngine.cpp
--- a/ParticleEngine.cpp	Tue Jan 22 00:59:20 2013 +0600
+++ b/ParticleEngine.cpp	Tue Jan 22 01:11:32 2013 +0600
@@ -93,10 +93,10 @@
   uTimeElapsed += pEventTimer->uTimeElapsed;
   pLines.uNumLines = 0;
 
-  //if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
-    //DrawParticles_BLV();
-  //else
-    //DrawParticles_ODM();
+  if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
+    DrawParticles_BLV();
+  else
+    DrawParticles_ODM();
 
   if (pRenderer->pRenderD3D)
   {
diff -r 285e144d0b8b -r b9d70af644f3 Render.cpp
--- a/Render.cpp	Tue Jan 22 00:59:20 2013 +0600
+++ b/Render.cpp	Tue Jan 22 01:11:32 2013 +0600
@@ -1621,10 +1621,10 @@
       }
 	  v103 = abs((int)pIndoorCamera->uMapGridCellZ - terrain_76D9C8[v70]);
       v104 = abs((int)pIndoorCamera->uMapGridCellX - terrain_76DBC8[v70]);
-	 // if ( pRenderer->pRenderD3D )
-        //Render::DrawTerrainD3D(v111, 0, (int)&v102);
-    //  else
-        //Render::DrawTerrainSW(v111, 0, (int)&v102);
+	  if ( pRenderer->pRenderD3D )
+        Render::DrawTerrainD3D(v111, 0, (int)&v102);
+      else
+        Render::DrawTerrainSW(v111, 0, (int)&v102);
     }
   }
   else
diff -r 285e144d0b8b -r b9d70af644f3 Vis.cpp
--- a/Vis.cpp	Tue Jan 22 00:59:20 2013 +0600
+++ b/Vis.cpp	Tue Jan 22 01:11:32 2013 +0600
@@ -1605,7 +1605,7 @@
 
   stru1.uNumPointers = 0;
   CastPickRay(pMouseRay, fMouseX, fMouseY, fDepth);
-  //PickBillboards(fDepth, fMouseX, fMouseY, &stru1, a5);
+  PickBillboards(fDepth, fMouseX, fMouseY, &stru1, a5);
   if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
     PickIndoor(fDepth, pMouseRay, &stru1, a6);
   else