diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-16 17:08:19 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-16 17:08:19 +0100 |
| commit | e38467ef3affef25b83daf0c0c3b8a61f04e8a65 (patch) | |
| tree | 3628aed1314f21147e7a46f3095fa341088d8044 /src/rw | |
| parent | fix mailbox particle (diff) | |
| parent | PR rules (diff) | |
| download | re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.gz re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.bz2 re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.lz re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.xz re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.zst re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.zip | |
Diffstat (limited to 'src/rw')
| -rw-r--r-- | src/rw/TexRead.cpp | 9 | ||||
| -rw-r--r-- | src/rw/VisibilityPlugins.cpp | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp index 632cec02..1f96180b 100644 --- a/src/rw/TexRead.cpp +++ b/src/rw/TexRead.cpp @@ -1,6 +1,7 @@ #pragma warning( push ) #pragma warning( disable : 4005) #pragma warning( pop ) +#define FORCE_PC_SCALING #ifndef LIBRW #define WITHD3D #endif @@ -320,7 +321,11 @@ ConvertingTexturesScreen(uint32 num, uint32 count, const char *text) splash->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255)); CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(200.0f), SCREEN_SCALE_Y(240.0f), SCREEN_SCALE_FROM_RIGHT(200.0f), SCREEN_SCALE_Y(248.0f)), CRGBA(64, 64, 64, 255)); +#ifdef FIX_BUGS + CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(200.0f), SCREEN_SCALE_Y(240.0f), (SCREEN_SCALE_FROM_RIGHT(200.0f) - SCREEN_SCALE_X(200.0f)) * ((float)num / (float)count) + SCREEN_SCALE_X(200.0f), SCREEN_SCALE_Y(248.0f)), CRGBA(255, 150, 225, 255)); +#else CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(200.0f), SCREEN_SCALE_Y(240.0f), (SCREEN_SCALE_FROM_RIGHT(200.0f) - SCREEN_SCALE_X(200.0f)) * ((float)num / (float)count) + SCREEN_SCALE_X(200.0f), SCREEN_SCALE_Y(248.0f)), CRGBA(255, 217, 106, 255)); +#endif CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(120.0f), SCREEN_SCALE_Y(150.0f), SCREEN_SCALE_FROM_RIGHT(120.0f), SCREEN_HEIGHT - SCREEN_SCALE_Y(220.0f)), CRGBA(50, 50, 50, 210)); CFont::SetBackgroundOff(); @@ -329,7 +334,11 @@ ConvertingTexturesScreen(uint32 num, uint32 count, const char *text) CFont::SetCentreOff(); CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(170.0f)); CFont::SetJustifyOff(); +#ifdef FIX_BUGS + CFont::SetColor(CRGBA(255, 150, 225, 255)); +#else CFont::SetColor(CRGBA(255, 217, 106, 255)); +#endif CFont::SetBackGroundOnlyTextOff(); CFont::SetFontStyle(FONT_STANDARD); CFont::PrintString(SCREEN_SCALE_X(170.0f), SCREEN_SCALE_Y(160.0f), TheText.Get(text)); diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp index 754c8778..69e30c1b 100644 --- a/src/rw/VisibilityPlugins.cpp +++ b/src/rw/VisibilityPlugins.cpp @@ -96,6 +96,10 @@ CVisibilityPlugins::InitAlphaEntityList(void) bool CVisibilityPlugins::InsertEntityIntoSortedList(CEntity *e, float dist) { +#ifdef FIX_BUGS + if (!e->m_rwObject) return true; +#endif + AlphaObjectInfo item; item.entity = e; item.sort = dist; |