# HG changeset patch # User zipi # Date 1358794676 0 # Node ID ca142e247b736f5b2a9fd373a696c098c6c9e1ba # Parent 5629105aa1781d02a1b6e85140abb8abd5fe7c26 temporary commit, remove crashes diff -r 5629105aa178 -r ca142e247b73 LightmapBuilder.cpp --- a/LightmapBuilder.cpp Mon Jan 21 14:37:14 2013 +0600 +++ b/LightmapBuilder.cpp Mon Jan 21 18:57:56 2013 +0000 @@ -964,7 +964,7 @@ RenderD3D *v13; // ecx@11 char v14; // dl@11 - __debugbreak(); +// __debugbreak(); v6 = pLight->uRadius; if ( v6 > 0 diff -r 5629105aa178 -r ca142e247b73 Outdoor.cpp --- a/Outdoor.cpp Mon Jan 21 14:37:14 2013 +0600 +++ b/Outdoor.cpp Mon Jan 21 18:57:56 2013 +0000 @@ -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 5629105aa178 -r ca142e247b73 ParticleEngine.cpp --- a/ParticleEngine.cpp Mon Jan 21 14:37:14 2013 +0600 +++ b/ParticleEngine.cpp Mon Jan 21 18:57:56 2013 +0000 @@ -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 5629105aa178 -r ca142e247b73 Render.cpp --- a/Render.cpp Mon Jan 21 14:37:14 2013 +0600 +++ b/Render.cpp Mon Jan 21 18:57:56 2013 +0000 @@ -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 5629105aa178 -r ca142e247b73 Vis.cpp --- a/Vis.cpp Mon Jan 21 14:37:14 2013 +0600 +++ b/Vis.cpp Mon Jan 21 18:57:56 2013 +0000 @@ -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