Mercurial > mm7
comparison Render.cpp @ 60:b9d70af644f3
Обращённый набор изменений слияния: 285e144d0b8b
Обращены изменения ревизии слияния, к её первому родителю (764abc86ce90)
| author | Ritor1 |
|---|---|
| date | Tue, 22 Jan 2013 01:11:32 +0600 |
| parents | 285e144d0b8b |
| children | 6c2cefdaea3e |
comparison
equal
deleted
inserted
replaced
| 59:285e144d0b8b | 60:b9d70af644f3 |
|---|---|
| 1619 } | 1619 } |
| 1620 while ( v116 < v107 ); | 1620 while ( v116 < v107 ); |
| 1621 } | 1621 } |
| 1622 v103 = abs((int)pIndoorCamera->uMapGridCellZ - terrain_76D9C8[v70]); | 1622 v103 = abs((int)pIndoorCamera->uMapGridCellZ - terrain_76D9C8[v70]); |
| 1623 v104 = abs((int)pIndoorCamera->uMapGridCellX - terrain_76DBC8[v70]); | 1623 v104 = abs((int)pIndoorCamera->uMapGridCellX - terrain_76DBC8[v70]); |
| 1624 // if ( pRenderer->pRenderD3D ) | 1624 if ( pRenderer->pRenderD3D ) |
| 1625 //Render::DrawTerrainD3D(v111, 0, (int)&v102); | 1625 Render::DrawTerrainD3D(v111, 0, (int)&v102); |
| 1626 // else | 1626 else |
| 1627 //Render::DrawTerrainSW(v111, 0, (int)&v102); | 1627 Render::DrawTerrainSW(v111, 0, (int)&v102); |
| 1628 } | 1628 } |
| 1629 } | 1629 } |
| 1630 else | 1630 else |
| 1631 { | 1631 { |
| 1632 for ( i = v69; i >= 1; --i ) | 1632 for ( i = v69; i >= 1; --i ) |