# HG changeset patch
# User Ritor1
# Date 1373024250 -21600
# Node ID 8bfdc44cebfd51eee274794064c9b6ae4f8bc3d5
# Parent  9749edd941c64c4372b7007c315b2118cbb2f0da# Parent  d14bc530cddba0fac02af49e2b41c821a769d782
Слияние

diff -r d14bc530cddb -r 8bfdc44cebfd Actor.cpp
--- a/Actor.cpp	Fri Jul 05 08:51:37 2013 +0400
+++ b/Actor.cpp	Fri Jul 05 17:37:30 2013 +0600
@@ -1618,243 +1618,198 @@
 AIDirection *__fastcall Actor::GetDirectionInfo(unsigned int uObj1ID, unsigned int uObj2ID, AIDirection *pOut, int a4)
 {
   signed int v4; // eax@1
-  unsigned int v5; // ecx@1
-  unsigned int v6; // ebx@1
+  signed int v5; // ecx@1
+  //unsigned int v6; // ebx@1
   int v7; // ecx@2
   int v8; // ecx@3
   int v9; // ecx@4
-  BLVFace *v10; // eax@8
-  unsigned int v11; // ecx@8
-  signed int v12; // eax@9
-  int v13; // ecx@9
-  int v14; // eax@9
+  //BLVFace *v10; // eax@8
+  //unsigned int v11; // ecx@8
+  //signed int v12; // eax@9
+  //int v13; // ecx@9
+  //int v14; // eax@9
   int v15; // eax@11
   int v16; // eax@12
   int v17; // eax@13
   int v18; // edx@15
-  signed int v19; // eax@25
-  signed int v20; // eax@28
-  int v21; // ebx@28
-  signed int v22; // eax@28
-  BLVFace *v23; // eax@35
-  int v24; // edx@35
-  unsigned int v25; // ecx@35
-  signed int v26; // eax@36
-  int v27; // ecx@36
-  int v28; // eax@36
-  int v29; // eax@37
-  signed int v30; // eax@42
+  //signed int v19; // eax@25
+  //signed int v20; // eax@28
+  //int v21; // ebx@28
+  //signed int v22; // eax@28
+  //BLVFace *v23; // eax@35
+  //int v24; // edx@35
+  //unsigned int v25; // ecx@35
+  //signed int v26; // eax@36
+  //int v27; // ecx@36
+  //int v28; // eax@36
+  //int v29; // eax@37
+  //signed int v30; // eax@42
   double v31; // st7@45
   double v32; // st6@45
   double v33; // st7@45
   AIDirection *result; // eax@48
-  int v35; // [sp-18h] [bp-64h]@17
-  int v36; // [sp-14h] [bp-60h]@17
+  //int v35; // [sp-18h] [bp-64h]@17
+  //int v36; // [sp-14h] [bp-60h]@17
   Vec3_int_ v37; // [sp-10h] [bp-5Ch]@15
-  int *v38; // [sp-4h] [bp-50h]@15
-  int *v39; // [sp+0h] [bp-4Ch]@15
-  int *v40; // [sp+4h] [bp-48h]@15
+  //int *v38; // [sp-4h] [bp-50h]@15
+  //int *v39; // [sp+0h] [bp-4Ch]@15
+  //int *v40; // [sp+4h] [bp-48h]@15
   AIDirection v41; // [sp+14h] [bp-38h]@46
   float v42; // [sp+30h] [bp-1Ch]@23
   float v43; // [sp+34h] [bp-18h]@45
-  float v44; // [sp+38h] [bp-14h]@33
-  float v45; // [sp+3Ch] [bp-10h]@33
+  float outy2; // [sp+38h] [bp-14h]@33
+  float outx2; // [sp+3Ch] [bp-10h]@33
   int outz; // [sp+40h] [bp-Ch]@6
   int outy; // [sp+44h] [bp-8h]@6
   int outx; // [sp+48h] [bp-4h]@6
   float a4a; // [sp+58h] [bp+Ch]@45
 
   v4 = PID_ID(uObj1ID);
-  v5 = PID_TYPE(uObj1ID);
-  v6 = uObj2ID;
-  switch(v5)
+  //v6 = uObj2ID;
+  v5 = PID_ID(uObj2ID);
+  switch( PID_TYPE(uObj1ID) )
   {
-	case OBJECT_Item:
-		{
-		v19 = v4;
-		outx = pSpriteObjects[v19].vPosition.x;
-		v13 = pSpriteObjects[v19].vPosition.y;
-		v14 = pSpriteObjects[v19].vPosition.z;
-		outy = v13;
-		outz = v14;
-		break;
-	    }
-	case OBJECT_Actor:
-		{
-		outx = pActors[v4].vPosition.x;
-		outy = pActors[v4].vPosition.y;
-		LODWORD(v42) = pActors[v4].uActorHeight;
-		v11 = pActors[v4].vPosition.z - (unsigned int)(signed __int64)((double)SLODWORD(v42) * -0.75);
-		outz = v11;
-		break;
-		}
-	case OBJECT_Player:
-		{
-		if ( !v4 )
-		{
-			outx = pParty->vPosition.x;
-			outy = pParty->vPosition.y;
-			v14 = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
-			outz = v14;
-			break;;
-		}
-		if ( v4 == 4 )
-		{
-			v40 = &outz;
-			v39 = &outy;
-			v38 = &outx;
-			v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
-			v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
-			*(_QWORD *)&v37 = *(_QWORD *)&pParty->vPosition.x;
-			v36 = 0;
-			v35 = 24;
-			Vec3_int_::Rotate(v35, v18, v36, v37, v38, v39, v40);
-			break;
-		}
-		if ( v4 == 3 )
-		{
-			v40 = &outz;
-			v39 = &outy;
-			v38 = &outx;
-			v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
-			v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
-			*(_QWORD *)&v37.x = *(_QWORD *)&pParty->vPosition.x;
-			v36 = 0;
-			v35 = 8;
-			Vec3_int_::Rotate(v35, v18, v36, v37, v38, v39, v40);
-			break;
-		}
-		if ( v4 == 2 )
-		{
-			v40 = &outz;
-			v39 = &outy;
-			v38 = &outx;
-			v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
-			v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
-			*(_QWORD *)&v37.x = *(_QWORD *)&pParty->vPosition.x;
-			v36 = 0;
-			v35 = 8;
-			Vec3_int_::Rotate(v35, v18, v36, v37, v38, v39, v40);
-			break;
-		}
-		if ( v4 == 1 )
-		{
-			v40 = &outz;
-			v39 = &outy;
-			v38 = &outx;
-			v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
-			v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
-			*(_QWORD *)&v37 = *(_QWORD *)&pParty->vPosition.x;
-			v36 = 0;
-			v35 = 24;
-			Vec3_int_::Rotate(v35, v18, v36, v37, v38, v39, v40);
-			break;
-		}
-		}
-	case OBJECT_Decoration:
-		{
-		v12 = v4;
-		outx = pLevelDecorations[v12].vPosition.x;
-		v13 = pLevelDecorations[v12].vPosition.y;
-		v14 = pLevelDecorations[v12].vPosition.z;
-		outy = v13;
-		outz = v14;
-		break;
-		}
-	default:
-		{
-		outz = 0;
-		outy = 0;
-		outx = 0;
-		break;
-		}
-	case OBJECT_BModel:
-		{
-		if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
-		{
-			v10 = &pIndoor->pFaces[v4];
-			outx = (v10->pBounding.x1 + v10->pBounding.x2) >> 1;
-			outy = (v10->pBounding.y1 + v10->pBounding.y2) >> 1;
-			v11 = (v10->pBounding.z1 + v10->pBounding.z2) >> 1;
-			outz = v11;
-		}
-		break;
-		}
+    case OBJECT_Item:
+    {
+      outx = pSpriteObjects[v4].vPosition.x;
+      outy = pSpriteObjects[v4].vPosition.y;
+      outz = pSpriteObjects[v4].vPosition.z;
+      break;
+    }
+    case OBJECT_Actor:
+    {
+      outx = pActors[v4].vPosition.x;
+      outy = pActors[v4].vPosition.y;
+      outz = pActors[v4].vPosition.z - (unsigned int)(signed __int64)((double)pActors[v4].uActorHeight * -0.75);
+      break;
+    }
+    case OBJECT_Player:
+    {
+      if ( !v4 )
+      {
+        outx = pParty->vPosition.x;
+        outy = pParty->vPosition.y;
+        outz = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
+        break;
+      }
+      if ( v4 == 4 )
+      {
+        v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
+        v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
+        *(_QWORD *)&v37 = *(_QWORD *)&pParty->vPosition.x;
+        Vec3_int_::Rotate(24, v18, 0, v37, &outx, &outy, &outz);
+        break;
+      }
+      if ( v4 == 3 )
+      {
+        v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
+        v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
+        *(_QWORD *)&v37.x = *(_QWORD *)&pParty->vPosition.x;
+        Vec3_int_::Rotate(8, v18, 0, v37, &outx, &outy, &outz);
+        break;
+      }
+      if ( v4 == 2 )
+      {
+        v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
+        v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
+        *(_QWORD *)&v37.x = *(_QWORD *)&pParty->vPosition.x;
+        Vec3_int_::Rotate(8, v18, 0, v37, &outx, &outy, &outz);
+        break;
+      }
+      if ( v4 == 1 )
+      {
+        v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
+        v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
+        *(_QWORD *)&v37 = *(_QWORD *)&pParty->vPosition.x;
+        Vec3_int_::Rotate(24, v18, 0, v37, &outx, &outy, &outz);
+        break;
+      }
+    }
+    case OBJECT_Decoration:
+    {
+      outx = pLevelDecorations[v4].vPosition.x;
+      outy = pLevelDecorations[v4].vPosition.y;
+      outz = pLevelDecorations[v4].vPosition.z;
+      break;
+    }
+    default:
+    {
+      outz = 0;
+      outy = 0;
+      outx = 0;
+      break;
+    }
+    case OBJECT_BModel:
+    {
+      if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
+      {
+        outx = (pIndoor->pFaces[v4].pBounding.x1 + pIndoor->pFaces[v4].pBounding.x2) >> 1;
+        outy = (pIndoor->pFaces[v4].pBounding.y1 + pIndoor->pFaces[v4].pBounding.y2) >> 1;
+        outz = (pIndoor->pFaces[v4].pBounding.z1 + pIndoor->pFaces[v4].pBounding.z2) >> 1;
+      }
+      break;
+    }
   }
-  v20 = v6;
-  v21 = PID_TYPE(v6);
-  v22 = PID_ID(v20);
-  switch(v21)
+
+  switch( PID_TYPE(uObj2ID) )
   {
-	case OBJECT_Item:
-		{
-		v30 = v22;
-		LODWORD(v45) = pSpriteObjects[v30].vPosition.x;
-		v27 = pSpriteObjects[v30].vPosition.y;
-		v28 = pSpriteObjects[v30].vPosition.z;
-		LODWORD(v44) = v27;
-		a4 = v28;
-		break;
-	    }
-	case OBJECT_Actor:
-		{
-		LODWORD(v45) = pActors[v22].vPosition.x;
-		LODWORD(v44) = pActors[v22].vPosition.y;
-		v25 = pActors[v22].vPosition.z - (unsigned int)(signed __int64)((double)pActors[v22].uActorHeight * -0.75);
-		a4 = v25;
-		break;
-		}
-	case OBJECT_Player:
-		{
-		LODWORD(v45) = pParty->vPosition.x;
-		LODWORD(v44) = pParty->vPosition.y;
-		v29 = a4;
-		if ( !a4 )
-		  v29 = pParty->sEyelevel;
-		v28 = pParty->vPosition.z + v29;
-		a4 = v28;
-		break;
-		}
-	case OBJECT_Decoration:
-		{
-	    v26 = v22;
-		LODWORD(v45) = pLevelDecorations[v26].vPosition.x;
-		v27 = pLevelDecorations[v26].vPosition.y;
-		v28 = pLevelDecorations[v26].vPosition.z;
-		LODWORD(v44) = v27;
-		a4 = v28;
-		break;
-		}
-	default:
-		{
-		a4 = 0;
-		v44 = 0.0;
-		v45 = 0.0;
-		break;
-		}
-	case OBJECT_BModel:
-		{
-		if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
-		{
-			v23 = &pIndoor->pFaces[v22];
-			v24 = v23->pBounding.y1;
-			LODWORD(v45) = (v23->pBounding.x1 + v23->pBounding.x2) >> 1;
-			LODWORD(v44) = (v24 + v23->pBounding.y2) >> 1;
-			v25 = (v23->pBounding.z1 + v23->pBounding.z2) >> 1;
-			a4 = v25;
-		}
-		break;
-		}
+    case OBJECT_Item:
+    {
+      outx2 = pSpriteObjects[v5].vPosition.x;
+      outy2 = pSpriteObjects[v5].vPosition.y;
+      a4 = pSpriteObjects[v5].vPosition.z;
+      break;
+    }
+    case OBJECT_Actor:
+    {
+      outx2 = pActors[v5].vPosition.x;
+      outy2 = pActors[v5].vPosition.y;
+      a4 = pActors[v5].vPosition.z - (unsigned int)(signed __int64)((double)pActors[v5].uActorHeight * -0.75);
+      break;
+    }
+    case OBJECT_Player:
+    {
+      outx2 = pParty->vPosition.x;
+      outy2 = pParty->vPosition.y;
+      if ( !a4 )
+        a4 = pParty->sEyelevel;
+      a4 = pParty->vPosition.z + a4;
+      break;
+    }
+    case OBJECT_Decoration:
+    {
+      outx2 = pLevelDecorations[v5].vPosition.x;
+      outy2 = pLevelDecorations[v5].vPosition.y;
+      a4 = pLevelDecorations[v5].vPosition.z;
+      break;
+    }
+    default:
+    {
+      outx2 = 0.0;
+      outy2 = 0.0;
+      a4 = 0;
+      break;
+    }
+    case OBJECT_BModel:
+    {
+      if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
+      {
+        outx2 = (pIndoor->pFaces[v5].pBounding.x1 + pIndoor->pFaces[v5].pBounding.x2) >> 1;
+        outy2 = (pIndoor->pFaces[v5].pBounding.y1 + pIndoor->pFaces[v5].pBounding.y2) >> 1;
+        a4 = (pIndoor->pFaces[v5].pBounding.z1 + pIndoor->pFaces[v5].pBounding.z2) >> 1;
+      }
+      break;
+    }
   }
   
-  v31 = (double)SLODWORD(v45) - (double)outx;
+  v31 = (double)outx2 - (double)outx;
   v42 = v31;
-  v32 = (double)SLODWORD(v44) - (double)outy;
+  v32 = (double)outy2 - (double)outy;
   v43 = v32;
   a4a = (double)a4 - (double)outz;
-  v45 = v32 * v32;
-  v44 = v31 * v31;
-  v33 = sqrt(a4a * a4a + v44 + v45);
+  outx2 = v32 * v32;
+  outy2 = v31 * v31;
+  v33 = sqrt(a4a * a4a + outy2 + outx2);
   if ( v33 <= 1.0 )
   {
     v41.vDirection.x = 65536;
@@ -1871,12 +1826,12 @@
     v41.vDirection.y = (signed __int64)(1.0 / v33 * v43 * 65536.0);
     v41.vDirection.z = (signed __int64)(1.0 / v33 * a4a * 65536.0);
     v41.uDistance = (signed __int64)v33;
-    v41.uDistanceXZ = (signed __int64)sqrt(v44 + v45);
+    v41.uDistanceXZ = (signed __int64)sqrt(outy2 + outx2);
     v41.uYawAngle = stru_5C6E00->Atan2((signed __int64)v42, (signed __int64)v43);
     v41.uPitchAngle = stru_5C6E00->Atan2(v41.uDistanceXZ, (signed __int64)a4a);
   }
   result = pOut;
-  memcpy(pOut, &v41, 0x1Cu);
+  memcpy(pOut, &v41, sizeof(AIDirection));
   return result;
 }
 
diff -r d14bc530cddb -r 8bfdc44cebfd Outdoor.cpp
--- a/Outdoor.cpp	Fri Jul 05 08:51:37 2013 +0400
+++ b/Outdoor.cpp	Fri Jul 05 17:37:30 2013 +0600
@@ -1147,7 +1147,7 @@
   pTilemap = (unsigned __int8 *)pAllocator->AllocNamedChunk(pTilemap, 0x4000u, "TMAP");//tile map
   pAttributemap = (unsigned __int8 *)pAllocator->AllocNamedChunk(pAttributemap, 0x4000u, "AMAP");//����� ���������
   pDmap=(struct DMap *)pAllocator->AllocNamedChunk(pDmap, 0x8000u, "DMAP");
-  if (pHeightmap&&pTilemap&&pAttributemap&&pDmap)
+  if ( pHeightmap && pTilemap && pAttributemap && pDmap )
     return true;
   else
     return false;
diff -r d14bc530cddb -r 8bfdc44cebfd Outdoor_stuff.h
--- a/Outdoor_stuff.h	Fri Jul 05 08:51:37 2013 +0400
+++ b/Outdoor_stuff.h	Fri Jul 05 17:37:30 2013 +0600
@@ -15,7 +15,7 @@
   }
 
   int _479295();
-  void _4811A3();
+  void DrawBorderTiles();
   void _48276F_sr();
   void _486089_normalize_v_18();
   void _48607B(struct stru149 *a2);
diff -r d14bc530cddb -r 8bfdc44cebfd Render.cpp
--- a/Render.cpp	Fri Jul 05 08:51:37 2013 +0400
+++ b/Render.cpp	Fri Jul 05 17:37:30 2013 +0600
@@ -1670,24 +1670,13 @@
 // 4D864C: using guessed type char byte_4D864C;
 
 
-void Render::RenderTerrainD3D() // New function. It's temporary
+void Render::RenderTerrainD3D() // New function
 {
   char result; // al@3
-  //int v1; // eax@3
-  //int v2; // ebx@4
-  //struct ODMFace *v4; // esi@6
   int v6; // ecx@8
-  //int v7; // ecx@8
- struct stru148 *v8; // ebx@8
-// RenderVertexSoft *v8a; // edi@3
-  //char v11; // zf@8
+ struct stru148 *pTile; // ebx@8
  struct stru148 *v16;
   unsigned int v18; // edi@22
-  //int v20; // edi@34
-  //int v28; // eax@50
-  //int v29; // ecx@55
-  //int v30; // eax@57
-  int v31; // eax@57
   int v35; // edi@63
   int v37; // eax@73
   int v39; // eax@80
@@ -1697,156 +1686,145 @@
   int v43; // [sp-Ch] [bp-64h]@2
   const char *v44; // [sp-8h] [bp-60h]@2
   int v45; // [sp-4h] [bp-5Ch]@2
-  //float v48; // [sp+14h] [bp-44h]@8
-  //void *v52; // [sp+24h] [bp-34h]@3
-  bool v54; // [sp+2Ch] [bp-2Ch]@10
-  int v55; // [sp+30h] [bp-28h]@34
   int v56;
   int v57; // [sp+38h] [bp-20h]@36
-  int v58; // [sp+3Ch] [bp-1Ch]@8
-  int v63; // [sp+50h] [bp-8h]@3
   int v64; // [sp+57h] [bp-1h]@2
   int v62;
-  //struct IndoorCameraD3D *pIndoorCameraD3D;
-  //RenderVertexSoft *pVertices; // [sp+C4h] [bp-Ch]@6
-
 
   //warning: the game uses CW culling by default, ccw is incosistent
   pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_CULLMODE, D3DCULL_CCW);
 
-
-  v63 = 0;
-  // basic optimizations
-  unsigned int uStartX, uEndX, uStartZ, uEndZ;
-  if (pIndoorCamera->sRotationY >= 0 && pIndoorCamera->sRotationY <= 1024)
-  {
-    uStartX = 0, uEndX = 128;
-    uStartZ = 0, uEndZ = 64 + 16;
-  }
-  else if (pIndoorCamera->sRotationY >= 512 && pIndoorCamera->sRotationY <= 1536)
-  {
-    uStartX = 0, uEndX = 64 + 16;
-    uStartZ = 0, uEndZ = 128;
-  }
-  else if (pIndoorCamera->sRotationY >= 1536 || pIndoorCamera->sRotationY <= 512)
-  {
-    uStartX = 64 - 16, uEndX = 128;
-    uStartZ = 0, uEndZ = 128;
-  }
-  else
-  {
-    uStartX = 0, uEndX = 128;
-    uStartZ = 64 - 16, uEndZ = 128;
-  }
-  uStartX = 0, uEndX = 128;
-  uStartZ = 0, uEndZ = 128;
-  static RenderVertexSoft pTerrainVertices[128 * 128];
-  for (unsigned int z = uStartZ; z < uEndZ; ++z)
-  {
-    for (unsigned int x = uStartX; x < uEndX; ++x)
-    {
-      pTerrainVertices[z * 128 + x].vWorldPosition.x = (-64 + (signed)x) * 512;
-      pTerrainVertices[z * 128 + x].vWorldPosition.y = (64 - (signed)z) * 512;
-      pTerrainVertices[z * 128 + x].vWorldPosition.z = 32 * pOutdoor->pTerrain.pHeightmap[z * 128 + x];
-      //pIndoorCameraD3D = pGame->pIndoorCameraD3D;
+  static RenderVertexSoft pTerrainVertices[128 * 128];//vertexCountX and vertexCountZ
+
+  //��������� �������������� ������-------------------------------------------------------------------------
+  //������� ������ ������� �� ��� ����� �� -64 �� 0 � �� 0 �� 64
+  //
+  // -64  X  0     64
+  //  --------------- 64
+  //  |      |      |
+  //  |      |      |
+  //  |      |      |
+  // 0|------+------| Z
+  //  |      |      |
+  //  |      |      |
+  //  |      |      |
+  //  ---------------
+  //                -64
+
+  int blockScale = 512;
+  int heightScale = 32;
+  for (unsigned int z = 0; z < 128; ++z)
+  {
+    for (unsigned int x = 0; x < 128; ++x)
+    {
+      pTerrainVertices[z * 128 + x].vWorldPosition.x = (-64 + (signed)x) * blockScale;
+      pTerrainVertices[z * 128 + x].vWorldPosition.y = (64 - (signed)z) * blockScale;
+      pTerrainVertices[z * 128 + x].vWorldPosition.z = heightScale * pOutdoor->pTerrain.pHeightmap[z * 128 + x];
       pGame->pIndoorCameraD3D->ViewTransform(&pTerrainVertices[z * 128 + x], 1);
       pGame->pIndoorCameraD3D->Project(&pTerrainVertices[z * 128 + x], 1, 0);
     }
   }
-
-  for (unsigned int z = uStartZ; z < uEndZ - 1; ++z)
-  {
-    for (unsigned int x = uStartX; x < uEndX - 1; ++x)
-    {
-      v8 = &array_77EC08[pOutdoorCamera->numStru148s];
-      v8->flags = 0;
-      v8->field_32 = 0;
-      //unsigned int uTileID = pOutdoor->pTerrain.pTilemap[z * 128 + x];
-      //struct TileDesc *pTile = pTileTable->GetTileById(uTileID);
-      v8->uTileBitmapID = pOutdoor->DoGetTileTexture(x, z);
-      //v6 = v8->uTileBitmapID;
-      v8->pTexture = (Texture *)&pBitmaps_LOD->pHardwareTextures[v8->uTileBitmapID];
-      if (v8->uTileBitmapID == 0xFFFF)
+//--------------------------------------------------------------------------------------------------------------------
+
+  //
+  for (unsigned int z = 0; z < 128; ++z)
+  {
+    for (unsigned int x = 0; x < 128; ++x)
+    {
+      pTile = &array_77EC08[pOutdoorCamera->numStru148s];
+      pTile->flags = 0;
+      pTile->field_32 = 0;
+      pTile->uTileBitmapID = pOutdoor->DoGetTileTexture(x, z);
+      pTile->pTexture = (Texture *)&pBitmaps_LOD->pHardwareTextures[pTile->uTileBitmapID];
+      if (pTile->uTileBitmapID == 0xFFFF)
         continue;
 
-      v8->flags = 0x8010 |pOutdoor->GetSomeOtherTileInfo(x, z);
-      v8->field_32 = 0;
-      v8->field_59 = 1;
-      //v8->field_5D = (char)WorldPosToGridCellZ(floorf((pVertices->vWorldPosition.z + v8a->vWorldPosition.z) / 2 + 0.5f));
-      //v8->field_5C = WorldPosToGridCellX(floorf((v101->vWorldPosition.x + v8->vWorldPosition.x) / 2 + 0.5f));;
-      v8->sTextureDeltaU = 0;
-      v8->sTextureDeltaV = 0;
-      memcpy(array_73D150 + 0, &pTerrainVertices[z * 128 + x], sizeof(RenderVertexSoft));
+      //pTile->flags = 0x8010 |pOutdoor->GetSomeOtherTileInfo(x, z);
+      pTile->flags = pOutdoor->GetSomeOtherTileInfo(x, z);
+      pTile->field_32 = 0;
+      pTile->field_59 = 1;
+      pTile->sTextureDeltaU = 0;
+      pTile->sTextureDeltaV = 0;
+//  x,z         x+1,z
+//  .____________.
+//  |            |
+//  |            |
+//  |            |
+//  |            |
+//  |            |
+//  .____________.
+//  x,z+1       x+1,z+1
+      memcpy(&array_73D150[0], &pTerrainVertices[z * 128 + x], sizeof(RenderVertexSoft));//x, z
       array_73D150[0].u = 0;
       array_73D150[0].v = 0;
-      memcpy(array_73D150 + 1, &pTerrainVertices[z * 128 + x + 1], sizeof(RenderVertexSoft));
+      memcpy(&array_73D150[1], &pTerrainVertices[z * 128 + x + 1], sizeof(RenderVertexSoft));//x + 1, z
       array_73D150[1].u = 1;
       array_73D150[1].v = 0;
-      memcpy(array_73D150 + 2, &pTerrainVertices[(z + 1) * 128 + x + 1], sizeof(RenderVertexSoft));
+      memcpy(&array_73D150[2], &pTerrainVertices[(z + 1) * 128 + x + 1], sizeof(RenderVertexSoft));//x + 1, z + 1
       array_73D150[2].u = 1;
       array_73D150[2].v = 1;
-      memcpy(array_73D150 + 3, &pTerrainVertices[(z + 1) * 128 + x], sizeof(RenderVertexSoft));
+      memcpy(&array_73D150[3], &pTerrainVertices[(z + 1) * 128 + x], sizeof(RenderVertexSoft));//x, z + 1
       array_73D150[3].u = 0;
       array_73D150[3].v = 1;
-      v55 = 0;
-      v54 = false;
-      v58 = 0;
-      if (v58 == 4) // if all y == first y;  primitive in xz plane 
-        v8->field_32 |= 0x0001;
-      v8->pODMFace = nullptr;
-      v8->uNumVertices = 4;
-      v8->field_59 = 5;
-
-
-      uint norm_idx = pTerrainNormalIndices[2 * (x + 128 * z) + 1];
+      //v58 = 0;
+      //if (v58 == 4) // if all y == first y;  primitive in xz plane 
+        //pTile->field_32 |= 0x0001;
+      pTile->pODMFace = nullptr;
+      pTile->uNumVertices = 4;
+      pTile->field_59 = 5;
+
+//shading (���������)----------------------------------------------------------------------------
+      //uint norm_idx = pTerrainNormalIndices[2 * (z * 128 + x) + 1];
+      uint norm_idx = pTerrainNormalIndices[2 * (x * 128 + z) + 1];//���� ������������ � 1 �����, ���� ���� ������� �� 1
       assert(norm_idx < uNumTerrainNormals);
 
       auto norm = pTerrainNormals + norm_idx;
-      float _f = (norm->x * (float)pOutdoor->vSunlight.x / 65536.0 -
-                  norm->y * (float)pOutdoor->vSunlight.y / 65536.0 -
-                  norm->z * (float)pOutdoor->vSunlight.z / 65536.0);
-      v8->dimming_level = 20.0 - floorf(20.0 * _f + 0.5f);
+      float _f = ((norm->x * (float)pOutdoor->vSunlight.x / 65536.0) -
+                  (norm->y * (float)pOutdoor->vSunlight.y / 65536.0) -
+                  (norm->z * (float)pOutdoor->vSunlight.z / 65536.0));
+      pTile->dimming_level = 20.0 - floorf(20.0 * _f + 0.5f);
+//-----------------------------------------------------------------------------------------------
 
       ++pOutdoorCamera->numStru148s;
       ++pOutdoorCamera->field_44;
       assert(pOutdoorCamera->numStru148s < 20000);
 
-      v8->uBModelID = 0;
-      v8->uBModelFaceID = 0;
-      v31 = (8 * (0 | (0 << 6)));
-      v8->field_50 = v31 | 6;
-      for (unsigned int k = 0; k < v8->uNumVertices; ++k)
+      pTile->uBModelID = 0;
+      pTile->uBModelFaceID = 0;
+      pTile->field_50 = (8 * (0 | (0 << 6))) | 6;
+      for (unsigned int k = 0; k < pTile->uNumVertices; ++k)
       {
         memcpy(&array_50AC10[k], &array_73D150[k], sizeof(struct RenderVertexSoft));
         array_50AC10[k]._rhw = 1.0 / (array_73D150[k].vWorldViewPosition.x + 0.0000001000000011686097);
       }
 
+// check the transparency and texture (tiles) mapping (�������� ������������ � ��������� ������� (������))----------------------
       bool transparent = false;
-            if ( v8->flags & 2 && v8->uTileBitmapID == pRenderer->hd_water_tile_id)
-            {
-              //v80 = false;
-              v6 = pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame];
-            }
-            else
-            {
-              v6 = v8->uTileBitmapID;
-              if ( !_strnicmp(pBitmaps_LOD->pTextures[v8->uTileBitmapID].pName, "wtrdr", 5) )
-                transparent = true;
-            }
+      if ( !( pTile->flags & 1 ) ) // �� �������������� TextureFrameTable
+      {
+        if ( pTile->flags & 2 && pTile->uTileBitmapID == pRenderer->hd_water_tile_id)
+        {
+          //transparent = false;
+          v6 = pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame];
+        }
+        else
+        {
+          v6 = pTile->uTileBitmapID;
+          if ( !_strnicmp(pBitmaps_LOD->pTextures[pTile->uTileBitmapID].pName, "wtrdr", 5) )
+            transparent = true;
+        }
 
       assert(v6 < 1000); // many random crashes here
 
       // for all shore tiles - draw a tile water under them since they're half-empty
-      if (!_strnicmp(pBitmaps_LOD->pTextures[v8->uTileBitmapID].pName, "wtrdr", 5))  // all shore tile filenames are wtrdrXXX
-      {
-        pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);  // no Z writing: the shore tile will be draw in the same place, so taking care about z-fighting
-        pRenderer->DrawTerrainPolygon(v8->uNumVertices, v8, pBitmaps_LOD->pHardwareTextures[pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame]], false, true);
-        pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, TRUE);
-        
-      }
-
-      pRenderer->DrawTerrainPolygon(v8->uNumVertices, v8, pBitmaps_LOD->pHardwareTextures[v6], transparent, true);
-
+      if (!_strnicmp(pBitmaps_LOD->pTextures[pTile->uTileBitmapID].pName, "wtrdr", 5))  // all shore tile filenames are wtrdrXXX
+        pTile->DrawBorderTiles();
+
+      pRenderer->DrawTerrainPolygon(pTile->uNumVertices, pTile, pBitmaps_LOD->pHardwareTextures[v6], transparent, true);
+      }
+      //else //����� ��� ����������� ����� ����
+        //pTile->DrawBorderTiles();
+//--------------------------------------------------------------------------------------------------------------------------------
 
       --pOutdoorCamera->numStru148s;
       --pOutdoorCamera->field_44;
@@ -1870,15 +1848,12 @@
   double v13; // ST2C_8@6
   int v14; // eax@6
   double v15; // st7@6
-  stru148 *v16; // ebx@12
+  stru148 *pTile; // ebx@12
   unsigned __int16 v17; // ax@12
   int v18; // eax@13
-  int v19; // ecx@13
-  int v20; // eax@13
-  int v21; // eax@13
   signed int v22; // eax@13
-  Vec3_float_ *v23; // eax@15
-  double v24; // st6@17
+  Vec3_float_ *norm; // eax@15
+  //double v24; // st6@17
   double v25; // ST54_8@17
   unsigned __int8 v26; // sf@17
   unsigned __int8 v27; // of@17
@@ -1893,7 +1868,7 @@
   char v35; // zf@47
   unsigned int v36; // eax@50
   int v37; // eax@54
-  stru148 *v38; // ecx@55
+  //stru148 *v38; // ecx@55
   unsigned int v39; // eax@59
   stru148 *v40; // ebx@62
   unsigned __int16 pTileBitmapsID; // ax@62
@@ -1945,9 +1920,6 @@
   float v87; // [sp+78h] [bp-58h]@122
   int v88; // [sp+7Ch] [bp-54h]@1
   int v89; // [sp+80h] [bp-50h]@6
-  float v90; // [sp+84h] [bp-4Ch]@1
-  float v91; // [sp+88h] [bp-48h]@1
-  float v92; // [sp+8Ch] [bp-44h]@1
   int v93; // [sp+90h] [bp-40h]@2
   int X; // [sp+94h] [bp-3Ch]@1
   float v95; // [sp+98h] [bp-38h]@21
@@ -1985,9 +1957,6 @@
   v4 = 0;
   v88 = 0;
   v84 = a1 - 1;
-  v90 = (float)pOutdoor->vSunlight.x / 65536.0;
-  v91 = (float)pOutdoor->vSunlight.y / 65536.0;
-  v92 = (float)pOutdoor->vSunlight.z / 65536.0;
 /*  if ( a1 - 1 > 0 )
   {
     while ( 1 )
@@ -2043,31 +2012,28 @@
         if ( v8->vWorldPosition.y != pVertices->vWorldPosition.y || pVertices->vWorldPosition.y != pVertices2->vWorldPosition.y 
              || pVertices2->vWorldPosition.y != v101->vWorldPosition.y )
           break;*/
-        v16 = &array_77EC08[pOutdoorCamera->numStru148s];
-        v16->uTileBitmapID = pOutdoor->GetTileTexture(sX, sY);
-        if ( v16->uTileBitmapID != -1 )
-        {
-          v19 = v97;
-          v16->flags = 0x8010 |pOutdoor->GetSomeOtherTileInfo(sX, sY);
-          v16->field_32 = 0;
-          v20 = v93;
-          v16->field_59 = 1;
-          v16->terrain_grid_x = (char)v19;
-          v16->field_34 = *(_WORD *)(v20 + 2);
-          v21 = v89;
-          v16->terrain_grid_z = v89;
-          v22 = pTerrainNormalIndices[2 * (v19 + 128 * v21) + 1];
+        pTile = &array_77EC08[pOutdoorCamera->numStru148s];
+        pTile->uTileBitmapID = pOutdoor->GetTileTexture(sX, sY);
+        if ( pTile->uTileBitmapID != -1 )
+        {
+          pTile->flags = 0x8010 |pOutdoor->GetSomeOtherTileInfo(sX, sY);
+          pTile->field_32 = 0;
+          pTile->field_59 = 1;
+          pTile->terrain_grid_x = (char)v97;
+          pTile->field_34 = *(_WORD *)(v93 + 2);
+          pTile->terrain_grid_z = v89;
+          v22 = pTerrainNormalIndices[2 * (v97 + 128 * v89) + 1];
           if ( v22 < 0 || v22 > uNumTerrainNormals - 1 )
-            v23 = 0;
+            norm = 0;
           else
-            v23 = &pTerrainNormals[v22];
-          v24 = v92 * v23->z;
-          //v99 = v23;
-          thisf = 20.0 - (-v24 - v91 * v23->y - v90 * v23->x) * 20.0;
+            norm = &pTerrainNormals[v22];
+          thisf = 20.0 - ( -(((float)pOutdoor->vSunlight.x / 65536.0) * norm->x) -
+                            (((float)pOutdoor->vSunlight.y / 65536.0) * norm->y) -
+                            (((float)pOutdoor->vSunlight.z / 65536.0) * norm->z)) * 20.0;
           //v25 = thisf + 6.7553994e15;
           //v27 = pOutdoorCamera->numStru148s > 1999;
           //v26 = pOutdoorCamera->numStru148s - 1999 < 0;
-          v16->dimming_level = floorf(thisf + 0.5f);
+          pTile->dimming_level = floorf(thisf + 0.5f);
           if ( pOutdoorCamera->numStru148s >= 1999 )
             return;
           ++pOutdoorCamera->numStru148s;
@@ -2101,8 +2067,8 @@
           }*/
           v32 = (struct8 *)array_50AC10;
           v97 = (int)pGame->pLightmapBuilder;
-          pGame->pLightmapBuilder->StackLights_TerrainFace(v23, &v95, array_50AC10, 4, 1);
-          pDecalBuilder->_49BE8A(v16, v23, &v95, array_50AC10, 4, 1);
+          pGame->pLightmapBuilder->StackLights_TerrainFace(norm, &v95, array_50AC10, 4, 1);
+          pDecalBuilder->_49BE8A(pTile, norm, &v95, array_50AC10, 4, 1);
           a5 = 4;
           if ( byte_4D864C && pGame->uFlags & 0x80 )
           {
@@ -2125,55 +2091,54 @@
               v33 = 3;
             else
               v33 = v108 != 0 ? 5 : 0;
-            static_sub_0048034E_stru_154.ClassifyPolygon(v23, v95);
+            static_sub_0048034E_stru_154.ClassifyPolygon(norm, v95);
             if ( pDecalBuilder->uNumDecals > 0 )
-              pDecalBuilder->ApplyDecals(31 - v16->dimming_level, 4, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, *(float *)&v33, -1);
+              pDecalBuilder->ApplyDecals(31 - pTile->dimming_level, 4, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, *(float *)&v33, -1);
           }
           if ( stru_F8AD28.uNumLightsApplied > 0 )
             pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, v33);
           v34 = a5;
           //v35 = byte_4D864C == 0;
-          v16->uNumVertices = a5;
+          pTile->uNumVertices = a5;
           if ( !byte_4D864C || ~pGame->uFlags & 0x80 )
           {
             if ( this_3 )
             {
               v36 = sr_424CD7(v34);
-              v16->uNumVertices = v36;
+              pTile->uNumVertices = v36;
               OutdoorCamera::Project(v36);
             }
             if ( v108 )
             {
               v36 = sr_424EE0_MakeFanFromTriangle(v34);
-              v16->uNumVertices = v36;
+              pTile->uNumVertices = v36;
               OutdoorCamera::Project(v36);
             }
           }
           //v37 = *(int *)&v16->flags;
-          if ( ~v16->flags & 1 )
+          if ( ~pTile->flags & 1 )
           {
-            if ( v16->flags & 2 && v16->uTileBitmapID == pRenderer->hd_water_tile_id )
+            if ( pTile->flags & 2 && pTile->uTileBitmapID == pRenderer->hd_water_tile_id )
             {
               v80 = false;
               v39 = pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame];
             }
             else
             {
-              v39 = v16->uTileBitmapID;
+              v39 = pTile->uTileBitmapID;
               v80 = true;
             }
             //v79 = 0;
             //v78 = pBitmaps_LOD->pHardwareTextures[v39];
-            v16->pTexture = (Texture *)&pBitmaps_LOD->pHardwareTextures[v39];// Ritor1: It's temporary
-            v77 = (int)v16;
+            pTile->pTexture = (Texture *)&pBitmaps_LOD->pHardwareTextures[v39];// Ritor1: It's temporary
+            v77 = (int)pTile;
             //v76 = v16->uNumVertices;
 //LABEL_161:
-            pRenderer->DrawTerrainPolygon(v16->uNumVertices, v16, pBitmaps_LOD->pHardwareTextures[v39], false, v80);
+            pRenderer->DrawTerrainPolygon(pTile->uNumVertices, pTile, pBitmaps_LOD->pHardwareTextures[v39], false, v80);
             goto LABEL_162;
           }
-          v38 = v16;
 LABEL_56:
-          v38->_4811A3();
+          pTile->DrawBorderTiles();
         }
 LABEL_162:
         v4 = v88 + 1;
@@ -2298,7 +2263,7 @@
       v57 = *(int *)&v40->flags;
       if ( BYTE1(v57) & 1 )
       {
-        v40->_4811A3();
+        v40->DrawBorderTiles();
       }
       else
       {
diff -r d14bc530cddb -r 8bfdc44cebfd UI/Books/UISpellBook.cpp
--- a/UI/Books/UISpellBook.cpp	Fri Jul 05 08:51:37 2013 +0400
+++ b/UI/Books/UISpellBook.cpp	Fri Jul 05 17:37:30 2013 +0600
@@ -182,7 +182,6 @@
     while ( v4 - 1 < 11 );
   }
 
-
   v9 = pMouse->GetCursorPos(&a2);
   v10 = pRenderer->pActiveZBuffer[v9->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v24)->y]] & 0xFFFF;
   if ( v10 )
diff -r d14bc530cddb -r 8bfdc44cebfd mm7_3.cpp
--- a/mm7_3.cpp	Fri Jul 05 08:51:37 2013 +0400
+++ b/mm7_3.cpp	Fri Jul 05 17:37:30 2013 +0600
@@ -7452,17 +7452,16 @@
 }
 
 //----- (004811A3) --------------------------------------------------------
-void stru148::_4811A3()
-{
-  __debugbreak();
-
-  ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, 0));
+void stru148::DrawBorderTiles()
+{
+  //__debugbreak();
+
+  pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
   pRenderer->DrawTerrainPolygon(uNumVertices, this,
-    pBitmaps_LOD->pHardwareTextures[pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_tile_id]],
-    0, 0);
-
-  ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, 1));
-  pRenderer->DrawTerrainPolygon(uNumVertices, this, pBitmaps_LOD->pHardwareTextures[uTileBitmapID], 1, 1);
+    pBitmaps_LOD->pHardwareTextures[pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame]], false, true);
+
+  pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, true);
+  //pRenderer->DrawTerrainPolygon(uNumVertices, this, pBitmaps_LOD->pHardwareTextures[uTileBitmapID], true, true);
 }
 
 //----- (00481DB2) --------------------------------------------------------
diff -r d14bc530cddb -r 8bfdc44cebfd mm7_4.cpp
diff -r d14bc530cddb -r 8bfdc44cebfd mm7_5.cpp