From 5957633790614432a07204912b198e5d6deaa203 Mon Sep 17 00:00:00 2001
From: Danilo Borges Santos <borges_santos89@hotmail.com>
Date: Mon, 9 Dec 2024 15:35:29 -0300
Subject: [PATCH] =?UTF-8?q?Implementa=C3=A7=C3=B5es=20em=20ReadChar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/csharp/io/binary.hpp |  2 +-
 samples/01_blank/xna.cpp      |  3 +++
 sources/csharp/io/binary.cpp  | 15 ++++++---------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/includes/csharp/io/binary.hpp b/includes/csharp/io/binary.hpp
index 784c247..9c2f9d9 100644
--- a/includes/csharp/io/binary.hpp
+++ b/includes/csharp/io/binary.hpp
@@ -135,7 +135,7 @@ namespace csharp {
 		std::shared_ptr<Stream> _stream;
 		bool _leaveOpen;
 		bool _disposed{false};
-		bool _2BytesPerChar{ false };
+		bool _2BytesPerChar{ true };
 
 		std::vector<uint8_t> _auxBuffer;		
 	};
diff --git a/samples/01_blank/xna.cpp b/samples/01_blank/xna.cpp
index 7e45c24..5ffee7f 100644
--- a/samples/01_blank/xna.cpp
+++ b/samples/01_blank/xna.cpp
@@ -13,6 +13,9 @@ namespace xna {
 		Game1() : Game() {
 			Content()->RootDirectory("Content");
 
+			short inteiro = 0xC3 | 0xA7;
+			char charpa = inteiro;
+
 			auto stream = std::make_shared<csharp::FileStream>("D:/file.bin", csharp::FileMode::Open);
 			auto reader = csharp::BinaryReader(stream);
 			auto bo = reader.ReadBoolean(); //reader.ReadChar()
diff --git a/sources/csharp/io/binary.cpp b/sources/csharp/io/binary.cpp
index f6ea899..c769ace 100644
--- a/sources/csharp/io/binary.cpp
+++ b/sources/csharp/io/binary.cpp
@@ -32,15 +32,13 @@ namespace csharp {
         {
             posSav = _stream->Position();
         }
-
-        auto charBytes = std::vector<uint8_t>(MaxCharBytesSize);
+        
         char singleChar = '\0';
 
         while (charsRead == 0) {
             numBytes = _2BytesPerChar ? 2 : 1;
 
-            auto r = _stream->ReadByte();
-            charBytes[0] = static_cast<uint8_t>(r);
+            auto r = _stream->ReadByte();            
 
             if (r == -1)
             {
@@ -48,13 +46,12 @@ namespace csharp {
             }
             if (numBytes == 2)
             {
-                r = _stream->ReadByte();
-                charBytes[1] = static_cast<uint8_t>(r);
+                r |= _stream->ReadByte();
 
                 if (r == -1)
                 {
                     numBytes = 1;
-                }
+                }                
             }
 
             if (numBytes == 0)
@@ -62,8 +59,8 @@ namespace csharp {
                 return -1;
             }
 
-            const auto chars = reinterpret_cast<char*>(charBytes.data());
-            const auto decoder = std::string(chars);
+            const char chars = r;
+            const auto decoder = std::string(&chars);
             charsRead = decoder.size();
             singleChar = decoder[0];
         }