Skip to content

Remove string splits with \r from renderer resource parsers #1666

New issue
New issue
Closed
#1667
Closed
Remove string splits with \r from renderer resource parsers#1666
#1667
Labels
area: rendererConcerns our graphics rendererbugBehaving differently as it should behaveimprovementEnhancement of an existing componentlang: c++Done in C++ code
Milestone
0.6.0
@heinezen

Description

@heinezen
heinezen
opened on Aug 3, 2024

openage/libopenage/renderer/resources/parser/common.cpp

Lines 24 to 29 in 99e355e

if (args[2][args[2].size() - 1] == '\r') {
texture.path = args[2].substr(1, args[2].size() - 3);
}
else {
texture.path = args[2].substr(1, args[2].size() - 2);
}

openage/libopenage/renderer/resources/parser/parse_sprite.cpp

Line 199 in 99e355e

if (line.empty() || line.substr(0, 1) == "#" || line[0] == '\r') {

openage/libopenage/renderer/resources/parser/parse_terrain.cpp

Line 204 in 99e355e

if (line.empty() || line.substr(0, 1) == "#" || line[0] == '\r') {

openage/libopenage/renderer/resources/parser/parse_texture.cpp

Line 60 in 99e355e

if (args[1][args[1].size() - 1] == '\r') {

openage/libopenage/renderer/resources/parser/parse_texture.cpp

Line 188 in 99e355e

if (line.empty() || line.substr(0, 1) == "#" || line[0] == '\r') {

This should not be handled in here, but in the string splitter code, see https://github.com/SFTtech/openage/blob/master/libopenage/util/strings.cpp

I guess we need a dedicated newline function for this that first splits at \n and then checks if the generated lines end with \r to also remove those.

Originally posted by @heinezen in #1642 (comment)

Metadata

Metadata

Assignees

No one assigned

    Labels

    area: rendererConcerns our graphics rendererbugBehaving differently as it should behaveimprovementEnhancement of an existing componentlang: c++Done in C++ code

    Type

    No type

    Projects

    openage renderer

    Status

    ✅ Done

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions