# HG changeset patch # User Gloval # Date 1361098078 -14400 # Node ID e3fd201a58f07f9886591362b79cdadd363eda21 # Parent 9917d3b4925e8b79afb81336eac4d5696644e57c# Parent c122d90a620a781433d969c5823d10b43a3d1808 Merge diff -r 9917d3b4925e -r e3fd201a58f0 AudioPlayer.cpp --- a/AudioPlayer.cpp Sun Feb 17 14:46:05 2013 +0400 +++ b/AudioPlayer.cpp Sun Feb 17 14:47:58 2013 +0400 @@ -737,7 +737,6 @@ int v102; // [sp+90h] [bp+1Ch]@60 int v103; // [sp+90h] [bp+1Ch]@68 - uVolume = 120; //Ritor1:It's temporary pAudioPlayer = this; v35 = this->bPlayerReady == 0; //pAudioPlayer = this; diff -r 9917d3b4925e -r e3fd201a58f0 GUIWindow.cpp --- a/GUIWindow.cpp Sun Feb 17 14:46:05 2013 +0400 +++ b/GUIWindow.cpp Sun Feb 17 14:47:58 2013 +0400 @@ -1766,7 +1766,6 @@ DrawText(a2, v4, a4, 0, "_", 0, 0, 0); } - //----- (0041C432) -------------------------------------------------------- GUIWindow *GUIWindow::Create(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight, WindowType eWindowType, int pButton, int a5) { diff -r 9917d3b4925e -r e3fd201a58f0 Indoor.cpp --- a/Indoor.cpp Sun Feb 17 14:46:05 2013 +0400 +++ b/Indoor.cpp Sun Feb 17 14:47:58 2013 +0400 @@ -1257,8 +1257,6 @@ return result; } - - //----- (004B0EA8) -------------------------------------------------------- void BspRenderer::PrepareFaceRenderList_d3d(int a2, unsigned int uFaceID) { diff -r 9917d3b4925e -r e3fd201a58f0 LayingItem.cpp --- a/LayingItem.cpp Sun Feb 17 14:46:05 2013 +0400 +++ b/LayingItem.cpp Sun Feb 17 14:47:58 2013 +0400 @@ -113,7 +113,7 @@ unsigned __int16 *pAttributes; // ecx@2 unsigned __int16 v3; // ax@2 - __debugbreak(); // find out what's going on + //__debugbreak(); // find out what's going on v1 = uLayingItemID; pLayingItems[v1].uObjectDescID = 0; @@ -123,7 +123,7 @@ v3 = *pAttributes; if ( *pAttributes & 4 ) { - LOBYTE(v3) = v3 & 0xFB; + v3 = v3 & 0xFB; --pTurnEngine->field_1C; *pAttributes = v3; } diff -r 9917d3b4925e -r e3fd201a58f0 MM7.vcxproj.filters --- a/MM7.vcxproj.filters Sun Feb 17 14:46:05 2013 +0400 +++ b/MM7.vcxproj.filters Sun Feb 17 14:47:58 2013 +0400 @@ -199,6 +199,9 @@ + + + @@ -314,5 +317,9 @@ + + + + \ No newline at end of file diff -r 9917d3b4925e -r e3fd201a58f0 Outdoor.cpp --- a/Outdoor.cpp Sun Feb 17 14:46:05 2013 +0400 +++ b/Outdoor.cpp Sun Feb 17 14:47:58 2013 +0400 @@ -2407,20 +2407,6 @@ int v3; // esi@5 unsigned int result; // eax@9 - -/* v3 = *(&this->pTerrain.pTilemap[128 * uZ] + uX); - if ( v3 < 198 ) - { - if ( v3 >= 90 ) - v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90; - } - else - { - v3 = v3 + this->pTileTypes[3].uTileID - 198; - } - result = pTileTable->pTiles[v3].uBitmapID; - } - return result;*/ if ( uX < 0 || uX > 127 || uY < 0 || uY > 127) return 0; @@ -2452,20 +2438,7 @@ int OutdoorLocation::ActuallyGetSomeOtherTileInfo(unsigned int uX, unsigned int uY) { int v3; // esi@5 - //int result; // eax@7 -/* if ( (uX & 0x80000000u) != 0 || (signed int)uX > 127 || (uY & 0x80000000u) != 0 || (signed int)uY > 127 ) - { - result = 0; - } - else - { - v3 = *(&this->pTerrain.pTilemap[128 * uY] + uX); - if ( v3 >= 90 ) - v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90; - result = pTileTable->pTiles[v3].uAttributes; - } - return result;*/ if (uX < 0 || uX > 127 || uY < 0 || uY > 127) return 0; else diff -r 9917d3b4925e -r e3fd201a58f0 Spells.cpp diff -r 9917d3b4925e -r e3fd201a58f0 Vis.cpp diff -r 9917d3b4925e -r e3fd201a58f0 mm7_3.cpp --- a/mm7_3.cpp Sun Feb 17 14:46:05 2013 +0400 +++ b/mm7_3.cpp Sun Feb 17 14:47:58 2013 +0400 @@ -14668,7 +14668,7 @@ v77 = (unsigned __int16 *)v36; do { - *(short *)v32 = v78[*((char *)v77 + v37)]; + *(short *)v32 = v78[*((char *)v77 + v37)];//crash v32 += 2; v97 = (char *)v97 + v87; v37 = (signed int)v97 >> 16; @@ -14734,7 +14734,7 @@ v7 = (uint *)pIndoor->pMapOutlines; uNumBlueFacesInBLVMinimap = 0; v8 = pIndoor->pMapOutlines->uNumOutlines == 0; - v9 = (pIndoor->pMapOutlines->uNumOutlines & 0x80000000u) != 0; + v9 = pIndoor->pMapOutlines->uNumOutlines < 0; v94 = 0; if ( !(v9 | v8) ) { diff -r 9917d3b4925e -r e3fd201a58f0 mm7_data.cpp --- a/mm7_data.cpp Sun Feb 17 14:46:05 2013 +0400 +++ b/mm7_data.cpp Sun Feb 17 14:47:58 2013 +0400 @@ -1100,11 +1100,54 @@ unsigned char byte_4ECF08[48][25] = // 4ECF08 { - {2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1}, - {2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2}, // IMCOMPLETE - {2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}, - {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2}, - {2, 2, 2, 2, 2, 1, 2, 2} + {2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1},//1 + {2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2},//2 + {2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//3 + {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//4 + {2, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//5 + {2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//6 + {2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//7 + {2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1},//8 + {2, 1, 2, 2, 2, 2, 1, 2, 1, 2, 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, 2, 2, 2},//9 + {2, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//10 + {2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 1, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2},//11 + {1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 2},//12 + {2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//13 + {1, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 2},//14 + {2, 1, 1, 2, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2},//15 + {1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1},//16 + {1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//17 + {1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 2, 1, 2, 1, 1},//18 + {1, 1, 1, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//19 + {1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//20 + {1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//21 + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//22 + {2, 2, 2, 1, 2, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1},//23 + {2, 2, 2, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2},//24 + {1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 2, 2, 2, 1, 2, 1, 1},//25 + {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},//26 + {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2},//27 + {1, 2, 2, 1, 2, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//28 + {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 2, 1, 2, 2, 1, 2, 1, 1},//29 + {1, 2, 2, 1, 2, 1, 2, 2, 1, 2, 2, 1, 1, 1, 2, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1},//30 + {1, 1, 2, 1, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 1},//31 + {1, 1, 2, 1, 1, 2, 2, 2, 2, 1, 2, 2, 1, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2},//32 + {1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1},//33 + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1},//34 + {1, 1, 1, 2, 1, 2, 2, 1, 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2},//35 + {1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2},//36 + {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2},//37 + {2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 2, 1, 1},//38 + {1, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1},//39 + {1, 2, 2, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//40 + {2, 1, 2, 1, 2, 1, 2, 2, 2, 1, 1, 2, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1},//41 + {1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 1},//42 + {1, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},//43 + {1, 2, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 2, 1, 1, 2, 1, 2, 2},//44 + {2, 1, 1, 1, 2, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 2, 2, 1, 2, 1, 2, 2},//45 + {1, 1, 1, 2, 2, 2, 1, 1, 2, 1, 2, 1, 2, 2, 2, 2, 2, 1, 1, 2, 1, 2, 1, 2, 2},//46 + {1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1},//47 + {1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1},//48 }; unsigned char SoundSetAction[110][8] = // 4ED3D8 {