--- a/mm7_4.cpp	Tue Feb 12 18:16:18 2013 +0600
+++ b/mm7_4.cpp	Tue Feb 12 18:16:34 2013 +0600
@@ -977,118 +977,80 @@
   return dword_720F20[v22];
 }
 
+
+//not sure if right- or left-handed coordinate space assumed, so this could be normal of inverse normal
+// for a right-handed system, that would be an inverse normal
 //----- (0046DCC8) --------------------------------------------------------
-signed __int64 __fastcall _46DCC8_get_gravity_direction_outdoor(int a1, int a2, Vec3_int_ *a3)
-{
-  int v3; // ebx@1
-  int v4; // ST4C_4@1
-  unsigned int v5; // ST54_4@1
-  unsigned int v6; // edi@1
-  unsigned int v7; // ST50_4@1
-  int v8; // edi@1
-  int v9; // esi@1
-  int v10; // ebx@1
-  int v11; // ecx@2
-  int v12; // eax@2
-  int v13; // edx@2
-  int v14; // ebx@2
-  double v15; // st7@4
-  double v16; // st6@4
-  double v17; // st5@4
-  float v18; // ST44_4@4
-  float v19; // ST54_4@4
-  double v20; // st4@4
-  double v21; // st5@4
-  float v22; // ST44_4@6
-  double v23; // st7@4
-  double v24; // st7@6
-  signed __int64 result; // qax@6
-  int v26; // [sp+14h] [bp-44h]@1
-  int v27; // [sp+18h] [bp-40h]@1
-  int v28; // [sp+20h] [bp-38h]@1
-  int v29; // [sp+24h] [bp-34h]@1
-  int v30; // [sp+28h] [bp-30h]@1
-  int v31; // [sp+2Ch] [bp-2Ch]@1
-  int v32; // [sp+30h] [bp-28h]@1
-  int v33; // [sp+34h] [bp-24h]@1
-  int v34; // [sp+38h] [bp-20h]@1
-  int v35; // [sp+3Ch] [bp-1Ch]@1
-  int v36; // [sp+40h] [bp-18h]@1
-  int v37; // [sp+4Ch] [bp-Ch]@2
-  float v38; // [sp+4Ch] [bp-Ch]@4
-  int v39; // [sp+50h] [bp-8h]@2
-  float v40; // [sp+50h] [bp-8h]@4
-  int v41; // [sp+54h] [bp-4h]@2
-
-  v3 = a1;
-  v4 = a2;
-  v5 = WorldPosToGridCellX(a1);
-  v6 = WorldPosToGridCellZ(v4) - 1;
-  v33 = GridCellToWorldPosX(v5);
-  v34 = GridCellToWorldPosX(v5 + 1);
-  v35 = GridCellToWorldPosX(v5 + 1);
-  v36 = GridCellToWorldPosX(v5);
-  v29 = GridCellToWorldPosZ(v6);
-  v30 = GridCellToWorldPosZ(v6);
-  v7 = v6 + 1;
-  v31 = GridCellToWorldPosZ(v6 + 1);
-  v32 = GridCellToWorldPosZ(v6 + 1);
-  v26 = pOutdoor->DoGetHeightOnTerrain(v5, v6);
-  v27 = pOutdoor->DoGetHeightOnTerrain(v5 + 1, v6);
-  v8 = pOutdoor->DoGetHeightOnTerrain(v5 + 1, v6 + 1);
-  v28 = pOutdoor->DoGetHeightOnTerrain(v5, v7);
-  v9 = v29;
-  v10 = abs(v3 - v33);
-  if ( abs(v29 - v4) >= v10 )
-  {
-    v11 = v33;
-    v37 = v28;
-    v39 = v36;
-    v12 = v35;
-    v41 = v32;
-    v13 = v31;
-    v14 = v8;
-    v8 = v26;
-  }
-  else
-  {
-    v11 = v35;
-    v41 = v30;
-    v39 = v34;
-    v12 = v33;
-    v13 = v29;
-    v9 = v31;
-    v37 = v27;
-    v14 = v26;
-  }
-  v15 = (double)(v12 - v39);
-  v16 = (double)(v13 - v41);
-  v17 = (double)(v14 - v37);
-  v18 = (double)(v11 - v39);
-  v19 = (double)(v9 - v41);
-  v20 = (double)(v8 - v37);
-  v38 = v20 * v16 - v19 * v17;
-  v40 = v18 * v17 - v20 * v15;
-  v21 = v19 * v15 - v18 * v16;
-  v23 = sqrt(v21 * v21 + v40 * v40 + v38 * v38);
-  if ( v23 == 0.0 )
-  {
-    a3->y = 0;
-    a3->x = 0;
-    a3->z = 65536;
-  }
-  v24 = 1.0 / v23;
-  a3->x = (signed __int64)(v24 * v38 * 65536.0);
-  a3->y = (signed __int64)(v24 * v40 * 65536.0);
-  v22 = v21;
-  result = (signed __int64)(v24 * v22 * 65536.0);
-  a3->z = result;
-  return result;
-}
-// 47F44B: using guessed type int __stdcall WorldPosToGridCellX(int);
-// 47F458: using guessed type int __stdcall WorldPosToGridCellZ(int);
-// 47F469: using guessed type int __stdcall GridCellToWorldPosX(int);
-// 47F476: using guessed type int __stdcall GridCellToWorldPosZ(int);
+void ODM_GetTerrainNormalAt(int pos_x, int pos_z, Vec3_int_ *out)
+{
+  auto grid_x = WorldPosToGridCellX(pos_x);
+  auto grid_z = WorldPosToGridCellZ(pos_z) - 1;
+
+  auto grid_pos_x1 = GridCellToWorldPosX(grid_x);
+  auto grid_pos_x2 = GridCellToWorldPosX(grid_x + 1);
+  auto grid_pos_z1 = GridCellToWorldPosZ(grid_z);
+  auto grid_pos_z2 = GridCellToWorldPosZ(grid_z + 1);
+
+  auto x1z1_y = pOutdoor->DoGetHeightOnTerrain(grid_x, grid_z);
+  auto x2z1_y = pOutdoor->DoGetHeightOnTerrain(grid_x + 1, grid_z);
+  auto x2z2_y = pOutdoor->DoGetHeightOnTerrain(grid_x + 1, grid_z + 1);
+  auto x1z2_y = pOutdoor->DoGetHeightOnTerrain(grid_x, grid_z + 1);
+
+  float side1_dx, side1_dy, side1_dz,
+        side2_dx, side2_dy, side2_dz;
+
+  auto dx = abs(pos_x - grid_pos_x1),
+       dz = abs(grid_pos_z1 - pos_z);
+  if (dz >= dx)
+  {
+    side1_dy = (double)(x1z1_y - x1z2_y);
+    side2_dy = (double)(x2z2_y - x1z2_y);
+    side2_dx = (double)(grid_pos_x2 - grid_pos_x1);
+    side1_dx = (double)(grid_pos_x1 - grid_pos_x1);
+    side2_dz = (double)(grid_pos_z2 - grid_pos_z2);  // bug?  z2 - z2
+    side1_dz = (double)(grid_pos_z2 - grid_pos_z2);  //       z1 - z2
+    Log::Warning(L"%s %s %u\n", __FILE__, __FUNCTION__, __LINE__);
+    /*       |\
+       side1 |  \
+             |____\
+             side 2      */
+  }
+  else
+  {
+    side1_dy = (double)(x2z2_y - x2z1_y);
+    side2_dy = (double)(x1z1_y - x2z1_y);
+    side2_dx = (double)(grid_pos_x1 - grid_pos_x2);
+    side1_dx = (double)(grid_pos_x2 - grid_pos_x2);
+    side2_dz = (double)(grid_pos_z1 - grid_pos_z1);
+    side1_dz = (double)(grid_pos_z2 - grid_pos_z1);
+
+    /*   side 2
+         _____
+         \    |
+           \  | side 1
+             \|       */
+  }
+  
+  float nx = side1_dy * side2_dz - side1_dz * side2_dy;
+  float ny = side1_dx * side2_dy - side1_dy * side2_dx;
+  float nz = side1_dz * side2_dx - side1_dx * side2_dz;
+
+  float mag = sqrt(nx * nx + ny * ny + nz * nz);
+  if (fabsf(mag) < 1e-6f)
+  {
+    out->y = 0;
+    out->x = 0;
+    out->z = 65536;
+  }
+  else
+  {
+    float invmag = 1.0 / mag;
+    out->x = invmag * nx * 65536.0;
+    out->y = invmag * ny * 65536.0;
+    out->z = invmag * nz * 65536.0;
+  }
+}
+
 
 //----- (0046DEF2) --------------------------------------------------------
 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID)
@@ -1303,7 +1265,7 @@
             do
             {
               v4 = *v3;
-              if ( (v4 & 7) == 5 )
+              if ( (v4 & 7) == OBJECT_Decoration)
               {
                 v5 = &pLevelDecorations[(signed __int16)v4 >> 3];
                 if ( !(v5->field_2 & 0x20) )
@@ -3097,7 +3059,7 @@
 
     for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i)
     {
-      if (pNPCStats->pNewNPCData[i].uFlags & 0x80)
+      if (pNPCStats->pNewNPCData[i].uFlags == 128)
       {
         if (!pParty->pHirelings[0].pName || strcmp(pNPCStats->pNewNPCData[i].pName, pParty->pHirelings[0].pName))
         {
@@ -3273,7 +3235,7 @@
   {
     if ( pTurnEngine->field_4 != 1 )
     {
-      if ( (pTurnEngine->pQueue[0].uPackedID & 7) == 4 )
+      if ( (pTurnEngine->pQueue[0].uPackedID & 7) == OBJECT_Player)
       {
         //v14 = 0;
         if ( pTurnEngine->uActorQueueSize > 0 )
@@ -3283,7 +3245,7 @@
           {
             auto pElem = pTurnEngine->pQueue + i;
 
-            if ( (pElem->uPackedID & 7) != 4 )
+            if ( (pElem->uPackedID & 7) != OBJECT_Player)
               break;
             v16 = dword_5079D0;
             if ( pParty->uFlags & 0x10 )
@@ -4216,7 +4178,7 @@
   v51 = v65;
   if ( v65 )
     goto LABEL_135;
-  if ( pCurrentScreen != 5 )
+  if ( pCurrentScreen != SCREEN_REST )
   {
     v52 = (signed int)&pPlayers[1];
     while ( 1 )
@@ -4232,13 +4194,13 @@
     *(int *)(v53 + 20) = 0;
     v51 = 1;
 LABEL_135:
-    if ( pCurrentScreen != 5
+    if ( pCurrentScreen != SCREEN_REST
       && (!v51 || dword_5C35C0) )
       uGameState = 8;
   }
   if ( uActiveCharacter )
   {
-    if ( pCurrentScreen != 5 )
+    if ( pCurrentScreen != SCREEN_REST )
     {
       v54 = pPlayers[uActiveCharacter];
       if ( v54->pConditions[2]
@@ -5743,7 +5705,7 @@
   ++pIcons_LOD->uTexturePacksCount;
   if ( !pIcons_LOD->uNumPrevLoadedFiles )
     pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
-  pCurrentScreen = 21;//���� �������� ������
+  pCurrentScreen = SCREEN_PARTY_CREATION;
   uPlayerCreationUI_ArrowAnim = 0;
   uPlayerCreationUI_SkySliderPos = 0;
   uPlayerCreationUI_SelectedCharacter = 0;
@@ -6245,7 +6207,7 @@
   free(pString);
   pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr);
   pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0);
-  pCurrentScreen = 9; // ���� Credits
+  pCurrentScreen = SCREEN_CREATORS;
   SetCurrentMenuID(MENU_Credits);
   do
   {
@@ -6274,7 +6236,7 @@
       if ( a5 >= (signed __int16)pTexture2.uHeight )
         SetCurrentMenuID(MENU_MAIN);
       pRenderer->Present();
-	  pCurrentScreen = 0;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
+      pCurrentScreen = SCREEN_GAME;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
       GUI_MainMenuMessageProc();
     }
   }
@@ -9708,7 +9670,8 @@
     }
     Party::TakeGold(v21);
   }
-  LOBYTE(v2->uFlags) |= 0x80u;
+  //LOBYTE(v2->uFlags) |= 0x80u;
+  v2->uFlags = 128;
   pParty->field_709 = 0;
   sub_44A56A();
   if ( pParty->pHirelings[0].pName )
@@ -14728,7 +14691,7 @@
       LODWORD(v20) = pBLVRenderParams->field_40 << 16;
       HIDWORD(v20) = pBLVRenderParams->field_40 >> 16;
       v21 = v20 / x;
-      v0->field_0 = (unsigned __int64)(v10->scale * v20 / x) >> 16;
+      v0->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v10->scale * v20 / x) >> 16;
       a5a = (unsigned __int64)(v10->scale * (signed __int64)v21) >> 16;
     }
     else
@@ -14742,15 +14705,15 @@
       LODWORD(v18) = 0;
       HIDWORD(v18) = floorf(v16 + 0.5f);
       v19 = v18 / x;
-      v0->field_0 = (unsigned __int64)(v10->scale * v18 / x) >> 16;
+      v0->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v10->scale * v18 / x) >> 16;
       a5a = (unsigned __int64)(v10->scale * (signed __int64)v19) >> 16;
     }
-    v0->field_4 = a5a;
+    v0->_screenspace_y_scaler_packedfloat = a5a;
     if ( (signed __int64)p->pActorBuffs[3].uExpireTime <= 0 )
     {
       if ( (signed __int64)p->pActorBuffs[10].uExpireTime > 0 )
       {
-        a5b = (unsigned __int64)(pGame->pStru6Instance->_4A806F(p) * (signed __int64)v0->field_4) >> 16;
+        a5b = (unsigned __int64)(pGame->pStru6Instance->_4A806F(p) * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
         goto LABEL_43;
       }
     }
@@ -14759,12 +14722,12 @@
       v22 = p->pActorBuffs[3].uPower;
       if ( v22 )
       {
-        v23 = (unsigned __int64)(65536 / (unsigned __int16)v22 * (signed __int64)v0->field_0) >> 16;
+        v23 = (unsigned __int64)(65536 / (unsigned __int16)v22 * (signed __int64)v0->_screenspace_x_scaler_packedfloat) >> 16;
         v24 = p->pActorBuffs[3].uPower;
-        v0->field_0 = v23;
-        a5b = (unsigned __int64)(65536 / v24 * (signed __int64)v0->field_4) >> 16;
+        v0->_screenspace_x_scaler_packedfloat = v23;
+        a5b = (unsigned __int64)(65536 / v24 * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
 LABEL_43:
-        v0->field_4 = a5b;
+        v0->_screenspace_y_scaler_packedfloat = a5b;
         goto LABEL_44;
       }
     }