Merge pull request #2 from hiimjasmine00/master

Fix newline parsing and main title

Author: AlphiiGD

changelog.md

@@ -1,3 +1,6 @@
+# 1.0.3
+- Fixed newline parsing
+
 # 1.0.2
 - Updated Geode SDK to 4.6.1
 

mod.json

@@ -8,7 +8,7 @@
 	},
 	"id": "alphii.gd-splash-text",
 	"name": "Splash Text!",
-	"version": "v1.0.2",
+	"version": "v1.0.3",
 	"developer": "Alphii",
 	"description": "",
 	"resources": {

src/MenuLayer.cpp

@@ -23,7 +23,7 @@ class $modify(ST_MenuLayer, MenuLayer)
 
 		if (!m_fields->m_SplashRead) m_fields->m_SplashRead = new SplashRead("splash.splash");
 		m_fields->m_SplashStr = m_fields->m_SplashRead->getRandomLine();
-		auto mainTitle = getChildByID("main-title");
+		auto mainTitle = getChildByIDRecursive("main-title");
 
 		m_fields->m_SplashText = ScalingLabel::create(m_fields->m_SplashStr.c_str(), "goldFont.fnt");
 		m_fields->m_SplashText->setScale(0.5f / (1.0f + 0.05f * strlen(m_fields->m_SplashText->getLabel()->getString())));

src/SplashRead.cpp

@@ -46,16 +46,13 @@ bool SplashRead::loadFile()
 			}
 		}
 
-		// Non-alphanumeric characters are not allowed, if we see one, we fail.
 		// Algorithm provided by undefined06855 on Discord and Git
+		std::string trimmedLine;
+		trimmedLine.reserve(line.length());
 		for (int i = 0; i < line.length(); i++)
 		{
-			if (line[i] == '\0') continue;
-			if (line[i] < ' ' || line[i] > '~')
-			{
-				log::error("Non-alphanumeric character detected at col {} of line {}", i + 1, lineNum);
-				return false;
-			}
+			if (line[i] == '\0' || line[i] == '\n' || line[i] == '\r' || line[i] < ' ' || line[i] > '~') continue;
+			trimmedLine += line[i];
 		}
 
 		// If our file stream fails during loading then we gotta return false
@@ -66,7 +63,7 @@ bool SplashRead::loadFile()
 		}
 
 		// Finally we can push back our processed string
-		m_Lines.push_back(line);
+		m_Lines.push_back(trimmedLine);
 		lineNum++;
 	}