# HG changeset patch # User Ritor1 # Date 1353755547 -21600 # Node ID 5eb242640b6fe5d364f6da5af61b0b668a8cbf17 # Parent 4e1e3fe8502f38d3b39705ebb4f4139be853d044 24.11.12 diff -r 4e1e3fe8502f -r 5eb242640b6f LOD.cpp --- a/LOD.cpp Sat Nov 17 17:32:20 2012 +0600 +++ b/LOD.cpp Sat Nov 24 17:12:27 2012 +0600 @@ -1646,13 +1646,13 @@ //----- (00461B48) -------------------------------------------------------- unsigned int LODWriteableFile::Write(const LOD::Directory *pDir, const void *pDirData, int a4) { - //LODWriteableFile *v4; // ebx@1 + LODWriteableFile *v4; // ebx@1 int v5; // esi@1 - //unsigned __int8 v7; // zf@7 - //unsigned __int8 v8; // sf@7 + unsigned __int8 v7; // zf@7 + unsigned __int8 v8; // sf@7 const LOD::Directory *v9; // edi@9 int v10; // eax@9 - //unsigned __int8 v11; // of@15 + unsigned __int8 v11; // of@15 unsigned __int16 v12; // dx@17 LOD::Directory *v13; // eax@17 unsigned __int16 v14; // cx@17 @@ -1674,7 +1674,7 @@ char NewFilename[256]; // [sp+10Ch] [bp-130h]@51 //LOD::Directory Str; // [sp+20Ch] [bp-30h]@27 size_t v33; // [sp+22Ch] [bp-10h]@27 - //int v34; // [sp+230h] [bp-Ch]@7 + int v34; // [sp+230h] [bp-Ch]@7 __int32 v35; // [sp+234h] [bp-8h]@8 int v36; // [sp+238h] [bp-4h]@7 size_t Count; // [sp+244h] [bp+8h]@40 @@ -1682,81 +1682,63 @@ size_t Countb; // [sp+244h] [bp+8h]@47 FILE *pFile; // [sp+24Ch] [bp+10h]@22 - //v4 = this; - //v5 = 0; - - if (!isFileOpened) + v4 = this; + v5 = 0; + if ( !this->isFileOpened ) return 1; - if (!pSubIndices) + if ( !this->pSubIndices ) return 2; - if (!pIOBuffer || !uIOBufferSize) + if ( !this->pIOBuffer || !this->uIOBufferSize ) return 3; - - //v7 = this->uNumSubIndices == 0; - //v8 = (this->uNumSubIndices & 0x80000000u) != 0; - v35 = 0; + v7 = this->uNumSubIndices == 0; + v8 = (this->uNumSubIndices & 0x80000000u) != 0; v36 = 0; - //v34 = 0; - for (v5 = 0; v5 < uNumSubIndices; ++v5) - /*if ( v8 | v7 ) + v34 = 0; + if ( v8 | v7 ) { v9 = pDir; goto LABEL_22; } - while ( 1 )*/ + v35 = 0; + while ( 1 ) { v9 = pDir; - v10 = _strcmpi(pSubIndices[v5].pFilename, pDir->pFilename); - if (v10 > 0) - break; - else if (v10 < 0) - continue; - /*if ( v10 ) + v10 = _strcmpi((const char *)v4->pSubIndices + v35, (const char *)pDir); + if ( v10 ) { if ( v10 > 0 ) goto LABEL_22; goto LABEL_15; - }*/ + } if ( !a4 ) - { - v36 = 1; - break; - } + goto LABEL_20; if ( a4 == 1 ) - { - v12 = pDir->uNumSubIndices; - v13 = &pSubIndices[v5]; - v14 = v13->uNumSubIndices; - if ( v14 >= v12 && (v14 != v12 || (unsigned __int16)v13->word_00001E >= pDir->word_00001E) ) - return 4; - v36 = 1; break; - } if ( a4 == 2 ) return 4; -//LABEL_15: - //v35 += 32; - //++v5; - //v11 = __OFSUB__(v5, v4->uNumSubIndices); - //v8 = ((v5 - v4->uNumSubIndices) & 0x80000000u) != 0; - //v34 = v5; - //if ( !(v8 ^ v11) ) - //goto LABEL_22; +LABEL_15: + v35 += 32; + ++v5; + v11 = v5 >= v4->uNumSubIndices; + v8 = ((v5 - v4->uNumSubIndices) & 0x80000000u) != 0; + v34 = v5; + if ( !(v8 ^ v11) ) + goto LABEL_22; } -/* v12 = pDir->uNumSubIndices; + v12 = pDir->uNumSubIndices; v13 = &v4->pSubIndices[v5]; v14 = v13->uNumSubIndices; if ( v14 >= v12 && (v14 != v12 || (unsigned __int16)v13->word_00001E >= pDir->word_00001E) ) return 4; LABEL_20: v36 = 1; -LABEL_22:*/ +LABEL_22: strcpy(pFilename, "lod.tmp"); pFile = fopen(pFilename, "wb+"); if ( !pFile ) return 5; if ( v36 ) - v35 = pSubIndices[v5].uDataSize; + v35 = v4->pSubIndices[v5].uDataSize; else v35 = 0; v33 = v9->uDataSize; @@ -1765,9 +1747,9 @@ LOD::Directory Str; // [sp+20Ch] [bp-30h]@27 //LOD::Directory::LOD::Directory(&Str); - strcpy(Str.pFilename, "chapter"); - v16 = uLODDataSize; - Str.uNumSubIndices = uNumSubIndices; + strcpy((char *)&Str, "chapter"); + v16 = v4->uLODDataSize; + Str.uNumSubIndices = LOWORD(v4->uNumSubIndices); Str.dword_000018 = 0; Str.word_00001E = 0; if ( !v36 ) @@ -1775,76 +1757,84 @@ ++Str.uNumSubIndices; v15 += 32; } - //v7 = v36 == 0; + v7 = v36 == 0; Str.uDataSize = v15 + v16; Str.uOfsetFromSubindicesStart = 288; v17 = (signed __int16)Str.uNumSubIndices; - uNumSubIndices = (signed __int16)Str.uNumSubIndices; - if ( !v36 && v17 > v5 ) + v4->uNumSubIndices = (signed __int16)Str.uNumSubIndices; + if ( v7 && v17 > v5 ) { v18 = v17; v19 = v17 - v5; do { - v20 = &pSubIndices[v18]; + v20 = &v4->pSubIndices[v18]; --v18; --v19; memcpy(v20, (char *)v20 - 32, 0x20u); } while ( v19 ); - //v5 = v34; + v5 = v34; } - //v34 = 32 * v5; - memcpy(&pSubIndices[v5], pDir, sizeof(LOD::Directory)); - v23 = 32 * uNumSubIndices; - if ( (signed int)uNumSubIndices > 0 ) + v21 = v4->pSubIndices; + v34 = 32 * v5; + memcpy(&v21[v5], pDir, sizeof(v21[v5])); + v22 = 0; + v23 = 32 * v4->uNumSubIndices; + if ( (signed int)v4->uNumSubIndices > 0 ) { - for (int i = 0; i < (signed int)uNumSubIndices; ++i) + v24 = v4->pSubIndices; + v25 = 0; + do { - pSubIndices[i].uOfsetFromSubindicesStart = v23; - v23 += pSubIndices[i].uDataSize; + v24[v25].uOfsetFromSubindicesStart = v23; + v24 = v4->pSubIndices; + v23 += v24[v25].uDataSize; + ++v22; + ++v25; } + while ( v22 < (signed int)v4->uNumSubIndices ); } - fwrite(&header, 0x100, 1, pFile); - fwrite(&Str, 0x20, 1, pFile); - fseek(pFile, Str.uOfsetFromSubindicesStart, 0); - fwrite(pSubIndices, 0x20u, uNumSubIndices, pFile); - v26 = 32 * uNumSubIndices; + fwrite(&v4->header, 0x100u, 1u, pFile); + fwrite(&Str, 0x20u, 1u, pFile); + fseek(v4->pFile, Str.uOfsetFromSubindicesStart, 0); + fwrite(v4->pSubIndices, 0x20u, v4->uNumSubIndices, pFile); + v26 = 32 * v4->uNumSubIndices; if ( !v36 ) v26 -= 32; - fseek(pFile, v26, 1); - for ( i = pSubIndices[v5].uOfsetFromSubindicesStart - - pSubIndices->uOfsetFromSubindicesStart; i > 0; i -= Count ) + fseek(v4->pFile, v26, 1); + for ( i = *(unsigned int *)((char *)&v4->pSubIndices->uOfsetFromSubindicesStart + v34) + - v4->pSubIndices->uOfsetFromSubindicesStart; i > 0; i -= Count ) { - Count = uIOBufferSize; - if ( i <= (signed int)uIOBufferSize ) + Count = v4->uIOBufferSize; + if ( i <= (signed int)v4->uIOBufferSize ) Count = i; - fread(pIOBuffer, 1u, Count, pFile); - fwrite(pIOBuffer, 1u, Count, pFile); + fread(v4->pIOBuffer, 1u, Count, v4->pFile); + fwrite(v4->pIOBuffer, 1u, Count, pFile); } fwrite(pDirData, 1u, v33, pFile); if ( v36 ) - fseek(pFile, v35, 1); - Countc = ftell(pFile); - fseek(pFile, 0, 2); - v28 = ftell(pFile) - Countc; - fseek(pFile, Countc, 0); + fseek(v4->pFile, v35, 1); + Countc = ftell(v4->pFile); + fseek(v4->pFile, 0, 2); + v28 = ftell(v4->pFile) - Countc; + fseek(v4->pFile, Countc, 0); while ( v28 > 0 ) { - Countb = uIOBufferSize; - if ( v28 <= (signed int)uIOBufferSize ) + Countb = v4->uIOBufferSize; + if ( v28 <= (signed int)v4->uIOBufferSize ) Countb = v28; - fread(pIOBuffer, 1u, Countb, pFile); - fwrite(pIOBuffer, 1u, Countb, pFile); + fread(v4->pIOBuffer, 1u, Countb, v4->pFile); + fwrite(v4->pIOBuffer, 1u, Countb, pFile); v28 -= Countb; } - strcpy(NewFilename, (const char *)pLODName); + strcpy(NewFilename, (const char *)v4->pLODName); fclose(pFile); - CloseWriteFile(); + v4->CloseWriteFile(); remove(NewFilename); rename(pFilename, NewFilename); - CloseWriteFile(); - LoadFile(pLODName, 0); + v4->CloseWriteFile(); + v4->LoadFile(v4->pLODName, 0); return 0; } diff -r 4e1e3fe8502f -r 5eb242640b6f Render.cpp --- a/Render.cpp Sat Nov 17 17:32:20 2012 +0600 +++ b/Render.cpp Sat Nov 24 17:12:27 2012 +0600 @@ -1839,27 +1839,28 @@ v6 = abs(v83); --X; v93 = &stru_76E5C8[(v5 << 7) + v6]; - if ( !v93->field_0 || ((v7 = 48 * v4, v8 = &pVerticesSR_806210[v4], a2 = v8, !v82) ? (v9 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7), - v10 = &pVerticesSR_806210[1] + v7) : (v9 = &pVerticesSR_806210[1] + v7, v10 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7)), - ((a8 = v9, - pVertices = &pVerticesSR_801A10[1] + v7, - v11 = v8->vWorldPosition.x, - v101 = v10, - v12 = v11 + 6.755399441055744e15, - sX = LODWORD(v12), - v13 = v8->vWorldPosition.y + 6.755399441055744e15, - sY = LODWORD(v13), - thisd = (v10->vWorldPosition.x + v8->vWorldPosition.x) * 0.5, - v14 = WorldPosToGridCellX(COERCE_UNSIGNED_INT64(thisd + 6.755399441055744e15)), - v15 = v9->vWorldPosition.y + v8->vWorldPosition.y, - v89 = v14, - thise = v15 * 0.5, - _this = (LightmapBuilder *)WorldPosToGridCellZ(COERCE_UNSIGNED_INT64(thise + 6.755399441055744e15)), - WorldPosToGridCellX(sX), - WorldPosToGridCellZ(sY), - !byte_4D864C) - || !(pGame->uFlags & 0x80)) - && !sub_481EFA(v8, v9, v101, pVertices, 1)) ) + v7 = 48 * v4; + v8 = &pVerticesSR_806210[v4]; + a2 = v8; + if (( !v82 ) ? (v9 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7), v10 = &pVerticesSR_806210[1] + v7) + : (v9 = &pVerticesSR_806210[1] + v7, v10 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7))) + a8 = v9; + pVertices = &pVerticesSR_801A10[1] + v7; + v11 = v8->vWorldPosition.x; + v101 = v10; + v12 = v11 + 6.755399441055744e15; + sX = LODWORD(v12); + v13 = v8->vWorldPosition.y + 6.755399441055744e15; + sY = LODWORD(v13); + thisd = (v10->vWorldPosition.x + v8->vWorldPosition.x) * 0.5; + v14 = WorldPosToGridCellX((int)(thisd + 6.755399441055744e15)); + v15 = v9->vWorldPosition.y + v8->vWorldPosition.y; + v89 = v14; + thise = v15 * 0.5; + _this = (LightmapBuilder *)WorldPosToGridCellZ(COERCE_UNSIGNED_INT64(thise + 6.755399441055744e15)); + WorldPosToGridCellX(sX); + WorldPosToGridCellZ(sY); + if ( !v93->field_0 || !byte_4D864C || !(pGame->uFlags & 0x80) && !sub_481EFA(v8, v9, v101, pVertices, 1)) goto LABEL_162; if ( v8->vWorldPosition.z != v9->vWorldPosition.z || v9->vWorldPosition.z != pVertices->vWorldPosition.z || pVertices->vWorldPosition.z != v101->vWorldPosition.z ) break;