From 9773e1d293e6f2497e7fcd303e3a603e1d99ed05 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 21 Feb 2018 20:45:57 +0000 Subject: [PATCH] Fix: on low resolutions, the message log blocks parts of the inventory,so deactivate the log in that case git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8524 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Map Screen Interface Bottom.cpp | 2 +- Utils/message.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index 763efc9ba..a0515211d 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/Strategic/Map Screen Interface Bottom.cpp @@ -307,7 +307,7 @@ void RenderMapScreenInterfaceBottom( BOOLEAN fForceMapscreenFullRender ) // HEADROCK Changed this line to accept outside influence through the new boolean: //if ( fForceMapscreenFullRender == TRUE || fMapScreenBottomDirty == TRUE) // HEADROCK HAM 3.6: OK, let's always render this panel, as long as the team inventory screen isn't open. - if ( fMapScreenBottomDirty || fForceMapscreenFullRender ) + if ( fMapScreenBottomDirty || ( (!fShowInventoryFlag || iResolution > _800x600 ) && fForceMapscreenFullRender ) ) { // get and blt panel GetVideoObject(&hHandle, guiMAPBOTTOMPANEL ); diff --git a/Utils/message.cpp b/Utils/message.cpp index 5434bdadd..d244896cd 100644 --- a/Utils/message.cpp +++ b/Utils/message.cpp @@ -836,11 +836,11 @@ void TacticalScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... ) usColor = DIALOGUE_COLOR; } - if ( ubPriority == MSG_INTERFACE ) + // HEADROCK HAM 3.6: Why force yellow? Let's not. + /*if ( ubPriority == MSG_INTERFACE ) { - // HEADROCK HAM 3.6: Why force yellow? Let's not. - //usColor = INTERFACE_COLOR; - } + usColor = INTERFACE_COLOR; + }*/ // HEADROCK HAM 3.6: Allow for longer lines. LINE_WIDTH = (SCREEN_WIDTH - 320); @@ -1038,11 +1038,11 @@ void MapScreenMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... ) usColor = DIALOGUE_COLOR; } - if ( ubPriority == MSG_INTERFACE ) - { - // HEADROCK HAM 3.6: Why force yellow? Let's not. - //usColor = INTERFACE_COLOR; - } + // HEADROCK HAM 3.6: Why force yellow? Let's not. + /*if ( ubPriority == MSG_INTERFACE ) + { + usColor = INTERFACE_COLOR; + }*/ // HEADROCK HAM 3.6: Allow for longer lines. // Lejardo ARSProject