Mercurial > mm7
changeset 157:8e0e2991f9d1
Слияние
author | Ritor1 |
---|---|
date | Tue, 12 Feb 2013 18:16:34 +0600 |
parents | 2cb13d295f4b (diff) 86a2637ba125 (current diff) |
children | f4ebd13c2a8e |
files | mm7_3.cpp |
diffstat | 2 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Vis.cpp Tue Feb 12 16:54:25 2013 +0600 +++ b/Vis.cpp Tue Feb 12 18:16:34 2013 +0600 @@ -1410,8 +1410,9 @@ memcpy(&v12, &v5[v8], sizeof(v12)); memcpy(&v5[v8], v15, sizeof(v5[v8])); memcpy(v15, &v12, 0x20u); - SortVerticesByX(v5, uStart, v8 - 1); - SortVerticesByX(a2, v8 + 1, uEnd); + __debugbreak(); + //SortVerticesByX(v5, uStart, v8 - 1); + //SortVerticesByX(a2, v8 + 1, uEnd); } return true; }
--- a/mm7_3.cpp Tue Feb 12 16:54:25 2013 +0600 +++ b/mm7_3.cpp Tue Feb 12 18:16:34 2013 +0600 @@ -4138,10 +4138,6 @@ } } - - - - //----- (0047531C) -------------------------------------------------------- bool __fastcall sub_47531C(int a1, int *a2, int a3, int a4, int a5, int a6, int a7, int a8, BLVFace *a9, int a10) {