Mercurial > mm7
comparison Outdoor.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 |
|---|---|
| 136 uNumBillboardsToDraw = 0; | 136 uNumBillboardsToDraw = 0; |
| 137 DrawActors(); | 137 DrawActors(); |
| 138 if ( !pOutdoorCamera->bDoNotRenderDecorations ) | 138 if ( !pOutdoorCamera->bDoNotRenderDecorations ) |
| 139 pRenderer->DrawDecorations(); | 139 pRenderer->DrawDecorations(); |
| 140 pRenderer->DrawLayingItems_Shooting_Magic_ODM(); | 140 pRenderer->DrawLayingItems_Shooting_Magic_ODM(); |
| 141 //pRenderer->TransformBillboardsAndSetPalettesODM(); | 141 pRenderer->TransformBillboardsAndSetPalettesODM(); |
| 142 sub_485F53((Vec2_int_ *)unnamed_6BE060); | 142 sub_485F53((Vec2_int_ *)unnamed_6BE060); |
| 143 } | 143 } |
| 144 | 144 |
| 145 | 145 |
| 146 | 146 |