Mercurial > mm7
comparison Indoor.cpp @ 289:92d443ed0cba
Слияние
author | Ritor1 |
---|---|
date | Mon, 18 Feb 2013 19:16:38 +0600 |
parents | d66bb82c0906 96bc024a5fed |
children | af7e848d6def |
comparison
equal
deleted
inserted
replaced
288:9a6052fecad4 | 289:92d443ed0cba |
---|---|
557 pVertices, | 557 pVertices, |
558 0, | 558 0, |
559 pFace->uSectorID); | 559 pFace->uSectorID); |
560 | 560 |
561 if (pFace->Animated() && | 561 if (pFace->Animated() && |
562 pFace->uBitmapID == pRenderer->field_1036AC_bitmapid ) | 562 pFace->uBitmapID == pRenderer->hd_water_tile_id ) |
563 { | 563 { |
564 __debugbreak(); | 564 __debugbreak(); |
565 v23 = pRenderer->pHDWaterBitmapIDs[pRenderer->field_1036A8_bitmapid]; | 565 v23 = pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame]; |
566 goto LABEL_42; | 566 goto LABEL_42; |
567 } | 567 } |
568 | 568 |
569 if (pFace->Animated()) | 569 if (pFace->Animated()) |
570 { | 570 { |