Fixed color array dimensions

This commit is contained in:
Alexander S. Aganichev 2001-05-03 03:33:31 +00:00
parent a1d80a0a0a
commit 6c18ff4454
3 changed files with 15 additions and 22 deletions

View File

@ -465,8 +465,7 @@ void GetColors(char* value) {
break;
case CRC_QUOTE:
wptr->_Quote = attr;
if(wptr == &GC_READ_)
GC_READ2_._Quote2 = attr;
wptr->_Quote2 = attr;
break;
case CRC_CURSOR:
wptr->_Cursor = attr;
@ -528,12 +527,10 @@ void GetColors(char* value) {
wptr->_Quote = attr;
break;
case CRC_QUOTE2:
if(wptr == &GC_READ_)
GC_READ2_._Quote2 = attr;
wptr->_Quote2 = attr;
break;
case CRC_SIGNATURE:
if(wptr == &GC_READ_)
GC_READ2_._Signature = attr;
wptr->_Signature = attr;
break;
case CRC_UNSENTHIGH:
wptr->_HighlightUnsent = attr;

View File

@ -625,7 +625,6 @@ struct SaveUtil {
#define GC_CFGB_ CFG->color[11]
#define GC_STYLE_ CFG->color[12]
#define GC_SHAD_ CFG->color[13]
#define GC_READ2_ CFG->color[14]
// ------------------------------------------------------------------
@ -643,10 +642,8 @@ struct SaveUtil {
#define _Kludge c[5]
#define _Tearline c[6]
#define _Edit c[6]
#define _Signature c[6]
#define _Block c[7]
#define _Input c[7]
#define _Quote2 c[7]
#define _Shadow c[7]
#define _Origin c[8]
#define _To c[8]
@ -654,6 +651,8 @@ struct SaveUtil {
#define _Tagline c[9]
#define _Hidden c[10]
#define _Pagebar c[11]
#define _Signature c[12]
#define _Quote2 c[13]
#define _WindowUnsent c[6]
#define _WindowUnread c[7]
@ -711,8 +710,8 @@ struct SaveUtil {
#define C_READT GC_READ_._Tearline
#define C_READO GC_READ_._Origin
#define C_READPB GC_READ_._Pagebar
#define C_READQ2 GC_READ2_._Quote2
#define C_READS GC_READ2_._Signature
#define C_READQ2 GC_READ_._Quote2
#define C_READS GC_READ_._Signature
#define C_HEADW GC_HEAD_._Window
#define C_HEADB GC_HEAD_._Border
#define C_HEADT GC_HEAD_._Title
@ -850,8 +849,8 @@ struct SaveUtil {
// Window structure
struct Win {
int btype; // Border type
int c[12]; // Colors
int btype; // Border type
int c[16]; // Colors
int w; // Window handle
};

View File

@ -109,7 +109,7 @@ Win gold_color1[16] = {
{5, { 31, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}, 1}, // Stat 1
{0, { 15, 14, 14, 7, 12, 7, 7, 9, 7, 7, 7, 14}, 0}, // Brag 2
{0, { 7, 9, 14, 31, 15, 7, 7, 7, 7, 7, 7, 9}, 0}, // Area 3
{0, { 7, 7, 15, 14, 113, 8, 15, 79, 15, 15, 8, 7}, 5}, // Read 4
{0, { 7, 7, 15, 14, 113, 8, 15, 79, 15, 15, 8, 7, 8, 15}, 5}, // Read 4
{0, { 7, 9, 14, 7, 15, 7, 15, 113, 7, 7, 7, 9}, 0}, // Head 5
{0, { 7, 12, 14, 31, 15, 8, 7, 7, 7, 7, 7, 12}, 0}, // Ask 6
{0, { 7, 12, 14, 31, 15, 8, 7, 2, 12, 15, 7, 12}, 0}, // Menu 7
@ -117,9 +117,8 @@ Win gold_color1[16] = {
{3, { 7, 12, 14, 31, 15, 8, 7, 7, 7, 7, 7, 12}, 0}, // Cfg 9
{0, { 15, 12, 14, 7, 7, 7, 7, 7, 7, 7, 7, 12}, 0}, // Info 10
{3, { 7, 12, 14, 31, 15, 8, 7, 7, 7, 7, 7, 12}, 0}, // Cfgb 11
{0, { 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, 0}, // Style 12
{0, { 7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}, 0}, // Style 12
{0, { 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7}, 0}, // Shad 13
{0, { 0, 0, 0, 0, 0, 0, 8, 15, 0, 0, 0, 0}, 0}, // Read2 14
};
@ -131,7 +130,7 @@ Win gold_color2[16] = {
{5, { 143, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}, 1}, // Stat 1
{0, { 15, 14, 14, 7, 12, 7, 7, 9, 7, 7, 7, 14}, 0}, // Brag 2
{0, { 240, 241, 244, 143, 244, 7, 7, 7, 7, 7, 7, 241}, 0}, // Area 3
{0, { 241, 240, 242, 244, 64, 248, 240, 64, 240, 240, 248, 240}, 5}, // Read 4
{0, { 241, 240, 242, 244, 64, 248, 240, 64, 240, 240, 248, 240, 248, 241}, 5}, // Read 4
{0, { 135, 142, 142, 135, 143, 7, 143, 64, 135, 135, 7, 142}, 0}, // Head 5
{0, { 224, 230, 232, 143, 228, 231, 7, 7, 7, 7, 7, 230}, 0}, // Ask 6
{0, { 112, 126, 116, 143, 126, 120, 117, 113, 125, 121, 7, 126}, 0}, // Menu 7
@ -139,9 +138,8 @@ Win gold_color2[16] = {
{3, { 224, 230, 232, 143, 228, 231, 7, 7, 7, 7, 7, 230}, 0}, // Cfg 9
{0, { 15, 12, 14, 7, 7, 7, 7, 7, 7, 7, 7, 12}, 0}, // Info 10
{3, { 240, 241, 244, 143, 244, 7, 7, 7, 7, 7, 7, 241}, 0}, // Cfgb 11
{0, { 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249}, 0}, // Style 12
{0, { 135, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249}, 0}, // Style 12
{0, { 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7}, 0}, // Shad 13
{0, { 0, 0, 0, 0, 0, 0, 248, 241, 0, 0, 0, 0}, 0}, // Read2 14
};
@ -153,7 +151,7 @@ Win gold_mono1[16] = {
{5, { 112, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}, 1}, // Stat 1
{0, { 15, 7, 15, 7, 15, 7, 7, 7, 7, 7, 7, 7}, 0}, // Brag 2
{0, { 7, 7, 15, 112, 15, 7, 7, 7, 7, 7, 7, 7}, 0}, // Area 3
{0, { 7, 7, 15, 15, 112, 15, 7, 7, 7, 7, 15, 7}, 5}, // Read 4
{0, { 7, 7, 15, 15, 112, 15, 7, 7, 7, 7, 15, 7, 7, 15}, 5}, // Read 4
{0, { 7, 7, 15, 7, 15, 7, 112, 15, 7, 7, 7, 7}, 0}, // Head 5
{0, { 112, 112, 112, 15, 15, 7, 7, 7, 7, 7, 7, 112}, 0}, // Ask 6
{0, { 7, 7, 112, 112, 15, 7, 15, 15, 15, 15, 7, 7}, 0}, // Menu 7
@ -161,9 +159,8 @@ Win gold_mono1[16] = {
{3, { 7, 7, 112, 112, 15, 7, 7, 7, 7, 7, 7, 7}, 0}, // Cfg 9
{0, { 15, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}, 0}, // Info A
{3, { 7, 7, 112, 112, 15, 7, 7, 7, 7, 7, 7, 7}, 0}, // Cfgb B
{0, { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}, 0}, // Style C
{0, { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}, 0}, // Style C
{0, { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}, 0}, // Shad F
{0, { 0, 0, 0, 0, 0, 0, 7, 15, 0, 0, 0, 0}, 0}, // Read2 14
};