From 41a0acb3b36e0e25aea6c5bb0047ab042433e2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Fri, 28 Apr 2017 12:38:14 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@488
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src_main/console/piscreentypes.h | 10 ++++------
 src_main/core/piinit.cpp         |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src_main/console/piscreentypes.h b/src_main/console/piscreentypes.h
index ac49fa3a..a9c0c26a 100644
--- a/src_main/console/piscreentypes.h
+++ b/src_main/console/piscreentypes.h
@@ -92,7 +92,6 @@ namespace PIScreenTypes {
 	typedef PIFlags<CharFlag> CharFlags;
 	typedef PIFlags<FocusFlag> FocusFlags;
 	
-#pragma pack(push, 1)
 	union CellFormat {
 		CellFormat(uint f = 0) {raw_format = f;}
 		CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) {
@@ -125,7 +124,6 @@ namespace PIScreenTypes {
 			return *this;
 		}
 	};
-#pragma pack(pop)
 
 	struct TileEvent {
 		TileEvent(int t = -1, const PIVariant & d = PIVariant()): type(t), data(d) {}
@@ -145,12 +143,12 @@ namespace PIScreenTypes {
 }
 
 
-//inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.symbol << v.format.raw_format; return s;}
+inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.format.raw_format << v.symbol; return s;}
 
-//inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.symbol >> v.format.raw_format; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
 
-__PICONTAINERS_SIMPLE_TYPE__(PIScreenTypes::Cell)
-__PIBYTEARRAY_SIMPLE_TYPE__(PIScreenTypes::Cell)
+//__PICONTAINERS_SIMPLE_TYPE__(PIScreenTypes::Cell)
+//__PIBYTEARRAY_SIMPLE_TYPE__(PIScreenTypes::Cell)
 
 
 #endif // PISCREENTYPES_H
diff --git a/src_main/core/piinit.cpp b/src_main/core/piinit.cpp
index 56c12875..aeb646e6 100644
--- a/src_main/core/piinit.cpp
+++ b/src_main/core/piinit.cpp
@@ -181,8 +181,6 @@ PIInit::PIInit() {
 	memset(__sysoemname__, 0, 256);
 	memcpy(__sysoemname__, "ibm-", 4);
 	memcpy(&(__sysoemname__[4]), cpinfo.CodePageName, l);
-	uint ccp = GetConsoleCP();
-	printf("%i\n", ccp);
 #  else
 	/*PIString en(getenv("LANG"));
 	if (!en.isEmpty())