From 2eda52d800895202041baf3f7869f6d11ca929fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Wed, 6 Feb 2019 15:05:29 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@697 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/console/piscreentypes.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src_main/console/piscreentypes.h b/src_main/console/piscreentypes.h index c227130c..d1efb9ce 100644 --- a/src_main/console/piscreentypes.h +++ b/src_main/console/piscreentypes.h @@ -96,17 +96,17 @@ namespace PIScreenTypes { typedef PIFlags FocusFlags; union PIP_EXPORT CellFormat { - CellFormat(uint f = 0) {raw_format = f;} + CellFormat(ushort f = 0) {raw_format = f;} CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) { color_char = col_char; color_back = col_back; flags = flags_; } - uint raw_format; + ushort raw_format; struct { - uchar color_char; - uchar color_back; - ushort flags; + ushort color_char : 4; + ushort color_back : 4; + ushort flags : 8; }; bool operator ==(const CellFormat & c) const {return raw_format == c.raw_format;} bool operator !=(const CellFormat & c) const {return raw_format != c.raw_format;}