mm7: mm7_4.cpp comparison

comparison mm7_4.cpp @ 830:08d90b633131

some BLV floor collisions

author	Nomad
date	Wed, 27 Mar 2013 11:59:37 +0200
parents	085eb19b7ffd
children	dfd683c4f538

comparison

equal deleted inserted replaced

-:d5b1870df3ab
+:08d90b633131
 int v21; // eax@27
 //int v22; // ecx@29
 signed int v28; // eax@45
 int v29; // ebx@47
 int v30; // edx@49
-int v31; // ST10_4@49
+//int v31; // ST10_4@49
-signed int v32; // edx@49
+//signed int v32; // edx@49
 signed __int64 v33; // qtt@49
-signed int v34; // eax@54
+//signed int v34; // eax@54
-signed int v35; // esi@56
+//signed int v35; // esi@56
-int result; // eax@57
+//int result; // eax@57
 int v38; // edx@62
 //int v44; // [sp+20h] [bp-20h]@10
 bool v47; // [sp+24h] [bp-1Ch]@43
 bool v48; // [sp+28h] [bp-18h]@10
 bool v49; // [sp+28h] [bp-18h]@41
 {
 auto portal = &pIndoor->pFaces[pSector->pPortals[i]];
 if (portal->uPolygonType != POLYGON_Floor)
 continue;
+if (!portal->uNumVertices)
+continue;
 if (x <= portal->pBounding.x2 && x >= portal->pBounding.x1 &&
 y <= portal->pBounding.y2 && y >= portal->pBounding.y1 )
 {
 for (uint j = 0; j < portal->uNumVertices; ++j)
 {
 word_721390_ys[2 * j + 1] = portal->pYInterceptDisplacements[j + 1] + pIndoor->pVertices[portal->pVertexIDs[j + 1]].y;
 }
 word_721460_xs[2 * portal->uNumVertices] = word_721460_xs[0];
 word_721390_ys[2 * portal->uNumVertices] = word_721390_ys[0];
 v54 = 0;
-v49 = word_721390_ys[0] >= y;
+v47 = word_721390_ys[0] >= y;
-if ( portal->uNumVertices > 0 )
-{
+for (uint j = 0; j < 2 * portal->uNumVertices; ++j)
-for ( int i = 0; i < 2 * portal->uNumVertices; ++i )
 {
+v49 = v47;
 if ( v54 >= 2 )
 break;
-v47 = word_721390_ys[i + 1] >= y;
+v47 = word_721390_ys[j + 1] >= y;
 if ( v49 != v47 )
 {
-v28 = word_721460_xs[i + 1] >= x ? 0 : 2;
+v28 = word_721460_xs[j + 1] >= x ? 0 : 2;
-v29 = v28 | word_721460_xs[i] < x;
+v29 = v28 | (word_721460_xs[j] < x);
 if ( v29 != 3 )
 {
 if ( !v29 )
 ++v54;
 else
 {
-//v30 = word_721390_ys[v27];
+auto a_div_b = fixpoint_div(y - word_721390_ys[j], word_721390_ys[j + 1] - word_721390_ys[j]);
-v31 = word_721390_ys[i + 1] - word_721390_ys[i];
+auto res = fixpoint_mul(word_721460_xs[j + 1] - word_721460_xs[j], a_div_b);
-v32 = y - word_721390_ys[i];
+if (res + word_721460_xs[j] >= x)
-LODWORD(v33) = v32 << 16;
-HIDWORD(v33) = v32 >> 16;
-if ((signed int)(((unsigned __int64)(((signed int)word_721460_xs[i + 1] - (signed int)word_721460_xs[i]) * v33 / v31) >> 16) + word_721460_xs[i]) >= x)
 ++v54;
 }
 }
 }
-v49 = v47;
 }
 if ( v54 == 1 )
 {
 if ( v55 >= 50 )
 break;
-v34 = v55++;
+blv_floor_level[v55] = -29000;
-blv_floor_level[v34] = -29000;
+blv_floor_id[v55] = pSector->pPortals[i];
-blv_floor_id[v34] = pSector->pPortals[i];
+v55++;
 }
-}
 }
 }
 }
 if ( v55 == 1 )
 {
 }
 if ( !v55 )
 return -30000;
 *pFaceID = blv_floor_id[0];
 //result = blv_floor_level[0];
-if ( v55 > 1 )
-{
+/*for ( v35 = 1; v35 < v55; ++v35 )
-for ( v35 = 1; v35 < v55; ++v35 )
 {
 if ( blv_floor_level[0] <= z + 5 )
 {
 if ( blv_floor_level[v35] >= blv_floor_level[0] || blv_floor_level[v35] > z + 5 )
 continue;
 if ( blv_floor_level[v35] < blv_floor_level[0] )
 {
 blv_floor_level[0] = blv_floor_level[v35];
 *pFaceID = blv_floor_id[v35];
 }
-}
+}*/
-}
-return blv_floor_level[0];
+int result = blv_floor_level[0];
+for (uint i = 1; i < v55; ++i)
+{
+v38 = blv_floor_level[i];
+if ( result <= z + 5 )
+{
+if ( v38 > result && v38 <= z + 5 )
+{
+result = blv_floor_level[i];
+*pFaceID = blv_floor_id[i];
+}
+}
+else if ( v38 < result )
+{
+result = blv_floor_level[i];
+*pFaceID = blv_floor_id[i];
+}
+}
+return result;
 }
 //----- (0046D49E) --------------------------------------------------------
 int __fastcall ODM_GetFloorLevel(int X, signed int Y, int Z, int __unused, int *pIsOnWater, int *a6, int bWaterWalk)
 {

Mercurial > mm7

comparison mm7_4.cpp @ 830:08d90b633131