From 043a0d240cec185ea937669f22d4301cfd033f16 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Wed, 30 Apr 2003 14:12:10 +0000 Subject: [PATCH] Proper fix for conversation summary causing palette errors (bug #324), also darkens its background to match PC version, from chmmravatar git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@938 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/content/comm/slyhome/slyhome.ani | 2 +- sc2/content/comm/slyland/slyland.ani | 2 +- sc2/src/sc2code/comm.c | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sc2/content/comm/slyhome/slyhome.ani b/sc2/content/comm/slyhome/slyhome.ani index de4d33f41..26fd61820 100755 --- a/sc2/content/comm/slyhome/slyhome.ani +++ b/sc2/content/comm/slyhome/slyhome.ani @@ -1,4 +1,4 @@ -slyhome.0.png -1 84 0 0 +slyhome.0.png 0 84 0 0 slyhome.1.png 0 84 -194 -47 slyhome.2.png 0 84 -194 -47 slyhome.3.png 0 84 -194 -47 diff --git a/sc2/content/comm/slyland/slyland.ani b/sc2/content/comm/slyland/slyland.ani index 5856ad164..835e8a998 100755 --- a/sc2/content/comm/slyland/slyland.ani +++ b/sc2/content/comm/slyland/slyland.ani @@ -1,4 +1,4 @@ -slyland.0.png -1 59 0 0 +slyland.0.png 0 59 0 0 slyland.1.png 0 59 -44 -87 slyland.2.png 0 59 -44 -87 slyland.3.png 0 59 -44 -87 diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index 0d93763d3..07fa6f0e4 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -1691,11 +1691,11 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES) r.corner.y = 0; r.extent.width = SIS_SCREEN_WIDTH; r.extent.height = SIS_SCREEN_HEIGHT - SLIDER_Y - SLIDER_HEIGHT + 2; - SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x8, 0x00), 0x6E)); + SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x05, 0x00), 0x6E)); DrawFilledRectangle (&r); ClearSemaphore (GraphicsSem); - SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x8, 0x00), 0x6E)); + SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x05, 0x00), 0x6E)); SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x10, 0x00), 0x6B)); t.baseline.x = SAFE_X + 2; @@ -1751,7 +1751,7 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES) TaskSwitch (); SetSemaphore (GraphicsSem); - SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x8, 0x00), 0x6E)); + SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x05, 0x00), 0x6E)); DrawFilledRectangle (&r); ClearSemaphore (GraphicsSem); SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x10, 0x00), 0x6B)); @@ -1785,7 +1785,7 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES) TaskSwitch (); SetSemaphore (GraphicsSem); - SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x8, 0x00), 0x6E)); + SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x05, 0x00), 0x6E)); DrawFilledRectangle (&r); ClearSemaphore (GraphicsSem); SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x10, 0x00), 0x6B)); @@ -1801,6 +1801,8 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES) SetSemaphore (GraphicsSem); SetContextFont (fLast); RefreshResponses (pES); + SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)); + DrawFilledRectangle (&r); ClearSemaphore (GraphicsSem); ColorChange = TRUE; summary = FALSE;