Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix unix-style lf newlines breaking maps #674

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix unix-style lf newlines breaking maps #674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Beatmap/src/KShootMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,13 @@ bool ParseKShootCourse(BinaryStream& input, Map<String, String>& settings, Vecto

uint32_t lineNumber = 0;
String line;
static const String lineEnding = "\r\n";
static const String lineEnding = "\n";

// Parse header (encoding-agnostic)
while(TextStream::ReadLine(input, line, lineEnding))
{
line.Trim();
line.TrimBack('\r');
lineNumber++;
if(line == "--")
{
Expand Down Expand Up @@ -133,6 +134,7 @@ bool ParseKShootCourse(BinaryStream& input, Map<String, String>& settings, Vecto
while (TextStream::ReadLine(input, line, lineEnding))
{
line.Trim();
line.TrimBack('\r');
lineNumber++;
if (line.empty() || line[0] != '[')
continue;
Expand Down Expand Up @@ -182,12 +184,13 @@ bool KShootMap::Init(BinaryStream& input, bool metadataOnly)

uint32_t lineNumber = 0;
String line;
static const String lineEnding = "\r\n";
static const String lineEnding = "\n";

// Parse header (encoding-agnostic)
while(TextStream::ReadLine(input, line, lineEnding))
{
line.Trim();
line.TrimBack('\r');
lineNumber++;
if(line == c_sep)
{
Expand Down Expand Up @@ -235,6 +238,7 @@ bool KShootMap::Init(BinaryStream& input, bool metadataOnly)
KShootTime time = KShootTime(0, 0);
while(TextStream::ReadLine(input, line, lineEnding))
{
line.TrimBack('\r');
if(line.empty())
{
continue;
Expand Down