sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Stream: Fix ReadLine behavior towards empty lines

Browse Source
This commit is contained in:
Lynix
2018-04-18 20:14:56 +02:00
parent d234d66120
commit cb8f0417a7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@@ -90,6 +90,7 @@ Nazara Engine:
- Fixed Font handling of whitespace glyphs (which were triggering an error) - Fixed Font handling of whitespace glyphs (which were triggering an error)
- ⚠️ Translucent2D pipeline no longer has depth sorting - ⚠️ Translucent2D pipeline no longer has depth sorting
- Fixed SimpleTextDrawer line bounds - Fixed SimpleTextDrawer line bounds
- ⚠️ Stream::ReadLine will now returns empty lines if present in the file
Nazara Development Kit: Nazara Development Kit:
- Added ImageWidget (#139) - Added ImageWidget (#139)

5
src/Nazara/Core/Stream.cpp
View File

@@ -52,7 +52,7 @@ namespace Nz
* *
* \param lineSize Maximum number of characters to read, or zero for no limit * \param lineSize Maximum number of characters to read, or zero for no limit
* *
* \return Line containing characters * \return Line read from file
* *
* \remark With the text stream option, "\r\n" is treated as "\n" * \remark With the text stream option, "\r\n" is treated as "\n"
* \remark The line separator character is not returned as part of the string * \remark The line separator character is not returned as part of the string
@@ -86,9 +86,6 @@ namespace Nz
if (!SetCursorPos(GetCursorPos() - readSize + pos + 1)) if (!SetCursorPos(GetCursorPos() - readSize + pos + 1))
NazaraWarning("Failed to reset cursor pos"); NazaraWarning("Failed to reset cursor pos");
if (!line.IsEmpty())
break;
} }
else else
{ {