Mercurial > mm7
comparison Outdoor.cpp @ 80:48f69ae3bc8d
previous fix, forgot
author | zipi |
---|---|
date | Sat, 02 Feb 2013 16:56:01 +0000 |
parents | 6ad816231528 |
children | 1faa29fd4c2d |
comparison
equal
deleted
inserted
replaced
79:6ad816231528 | 80:48f69ae3bc8d |
---|---|
1770 //uSourceLen = (char *)v44 + (int)pFilename; | 1770 //uSourceLen = (char *)v44 + (int)pFilename; |
1771 //v151 = 0; | 1771 //v151 = 0; |
1772 for (uint i = 0; i < uNumBModels; ++i) | 1772 for (uint i = 0; i < uNumBModels; ++i) |
1773 { | 1773 { |
1774 //v48 = 0; | 1774 //v48 = 0; |
1775 BSPModel *model = (BSPModel *)pBModels+i; | 1775 auto model = &pBModels[i]; |
1776 | 1776 |
1777 model->pVertices.pVertices = nullptr; | 1777 model->pVertices.pVertices = nullptr; |
1778 model->pFaces = nullptr; | 1778 model->pFaces = nullptr; |
1779 model->pFacesOrdering = nullptr; | 1779 model->pFacesOrdering = nullptr; |
1780 model->pNodes = nullptr; | 1780 model->pNodes = nullptr; |
1854 { | 1854 { |
1855 auto texFilename = textureFilenames + j * 10; | 1855 auto texFilename = textureFilenames + j * 10; |
1856 //v149 = 0; | 1856 //v149 = 0; |
1857 //Str2 = (char *)ptr; | 1857 //Str2 = (char *)ptr; |
1858 | 1858 |
1859 ODMFace *face = (ODMFace *)model->pFaces+j; | 1859 auto *face = &model->pFaces[j]; |
1860 //pFilename = (char *)v149 + (unsigned int)v60[v48].pFaces; | 1860 //pFilename = (char *)v149 + (unsigned int)v60[v48].pFaces; |
1861 if (~face->uAttributes & 0x40) | 1861 if (~face->uAttributes & 0x40) |
1862 { | 1862 { |
1863 v62 = pBitmaps_LOD->LoadTexture(texFilename); | 1863 v62 = pBitmaps_LOD->LoadTexture(texFilename); |
1864 // v63 = (ODMFace *)pFilename; | 1864 // v63 = (ODMFace *)pFilename; |
2040 } | 2040 } |
2041 //v76 = uNumBModels; | 2041 //v76 = uNumBModels; |
2042 //v77 = actualNumFacesInLevel = 0; | 2042 //v77 = actualNumFacesInLevel = 0; |
2043 uint actualNumFacesInLevel = 0; | 2043 uint actualNumFacesInLevel = 0; |
2044 for (uint i = 0; i < uNumBModels; ++i) | 2044 for (uint i = 0; i < uNumBModels; ++i) |
2045 actualNumFacesInLevel += ((BSPModel *)pBModels+i)->uNumFaces; | 2045 actualNumFacesInLevel += pBModels[i].uNumFaces; |
2046 | 2046 |
2047 //v79 = ddm.uNumFacesInBModels; | 2047 //v79 = ddm.uNumFacesInBModels; |
2048 if (ddm.uNumFacesInBModels) | 2048 if (ddm.uNumFacesInBModels) |
2049 { | 2049 { |
2050 if ( ddm.uNumBModels ) | 2050 if ( ddm.uNumBModels ) |