--- a/Indoor.cpp	Mon Mar 25 15:18:40 2013 +0600
+++ b/Indoor.cpp	Mon Mar 25 17:29:30 2013 +0600
@@ -547,11 +547,14 @@
         if (pFace->Fluid() &&
             pFace->uBitmapID == pRenderer->hd_water_tile_id )
         {
-          __debugbreak();
           v23 = pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame];
-          goto LABEL_42;
+          v27 = pBitmaps_LOD->pHardwareTextures[v23];
+          if (pFace->uAttributes & FACE_DO_NOT_LIGHT)
+            _479A53_draw_some_blv_poly(uNumVerticesa, uFaceID);
+          else
+            pRenderer->DrawIndoorPolygon(uNumVerticesa, pFace, v27, v28, 8 * uFaceID | OBJECT_BModel, v17, 0);
+          return;
         }
-
         if (pFace->Fluid())
         {
           //auto v24 = GetTickCount() / 4;
@@ -563,14 +566,17 @@
           for (uint i = 0; i < uNumVerticesa; ++i)
             //array_507D30[i].v += (double)(pBitmaps_LOD->pTextures[pFace->uBitmapID].uHeightMinus1 & (unsigned int)(stru_5C6E00->SinCos(v25) >> 8));
             array_507D30[i].v += pBitmaps_LOD->pTextures[pFace->uBitmapID].uHeightMinus1 * cosf(angle);
-
           v23 = pFace->uBitmapID;
-          goto LABEL_42;
+          v27 = pBitmaps_LOD->pHardwareTextures[v23];
+          if (pFace->uAttributes & FACE_DO_NOT_LIGHT)
+            _479A53_draw_some_blv_poly(uNumVerticesa, uFaceID);
+          else
+            pRenderer->DrawIndoorPolygon(uNumVerticesa, pFace, v27, v28, 8 * uFaceID | OBJECT_BModel, v17, 0);
+          return;
         }
         else if (pFace->uAttributes & 0x4000)
         {
           v23 = pTextureFrameTable->GetFrameTexture(pFace->uBitmapID, pBLVRenderParams->field_0_timer_);
-LABEL_42:
           v27 = pBitmaps_LOD->pHardwareTextures[v23];
           if (pFace->uAttributes & FACE_DO_NOT_LIGHT)
             _479A53_draw_some_blv_poly(uNumVerticesa, uFaceID);
@@ -580,7 +586,12 @@
         }
         v17 = 0xFFFFFFFF;
         v23 = pFace->uBitmapID;
-        goto LABEL_42;
+        v27 = pBitmaps_LOD->pHardwareTextures[v23];
+        if (pFace->uAttributes & FACE_DO_NOT_LIGHT)
+          _479A53_draw_some_blv_poly(uNumVerticesa, uFaceID);
+        else
+          pRenderer->DrawIndoorPolygon(uNumVerticesa, pFace, v27, v28, 8 * uFaceID | OBJECT_BModel, v17, 0);
+        return;;
       }
     }
   }