PLEASE PLEASE PLEAE compile on android now you FUCKING DICK

Author: AlphiiGD

resources/splash.splash

@@ -99,6 +99,9 @@ Glubfub!
 The chicken is ready!
 Rock Lobster!
 Gimmie! Gimmie! Gimmie!
+:3
+YIPPEE!!!!
+paws at you
 
 .DATERANGE 12-15 12-26
 Ho! Ho! Ho!

src/DateRange.cpp

@@ -1,18 +1,28 @@
 #include "DateRange.hpp"
 
+// Very strict algorithm at the moment, must be formatted as "MM-DD MM-DD"
+// Leading 0 not required for single digit months
 geode::Result<> DateRange::parse(const std::string& str, size_t start)
 {
+    int sM, sD, eM, eD;
+    char delimiter;
     std::istringstream istrs(str.substr(start));
-    if (!(std::chrono::from_stream(istrs, "%m-%d", m_Start) &&
-        istrs >> std::ws &&
-        std::chrono::from_stream(istrs, "%m-%d", m_End)))
-    {
-        return geode::Err("Failed to parse DateRange");
-    }
+    istrs >> sM >> delimiter >> sD >> std::ws >> eM >> delimiter >> eD;
+    if (delimiter != '-')
+        return geode::Err("Error parsing date format! Improper delimiter!");
+    if (istrs.fail())
+        return geode::Err("Stringstream failed!");
+
+    m_Start =
+        std::chrono::month_day(std::chrono::month(sM), std::chrono::day(sD));
+    m_End =
+        std::chrono::month_day(std::chrono::month(eM), std::chrono::day(eD));
+
+    if (!m_Start.ok())
+        return geode::Err("Start not OK! (Incorrect date format?)");
+    if (!m_End.ok())
+        return geode::Err("End not OK! (Incorrect date format?)");
 
-    if (istrs.fail()) return geode::Err("Stringstream failed!");
-    if (!m_Start.ok()) return geode::Err("Start not OK!");
-    if (!m_End.ok()) return geode::Err("End not OK!");
     return geode::Ok();
 }
 

src/DateRange.hpp

@@ -6,8 +6,12 @@ class DateRange
     std::chrono::month_day m_Start;
     std::chrono::month_day m_End;
 public:
+    // *MUST* be formatted "MM-DD MM-DD" no leading 0 required.
     geode::Result<> parse(const std::string& str, size_t start = 0);
+    // Returns true if supplied date is within this date range.
     bool inRange(const std::chrono::year_month_day& currentDate) const;
+    // Returns starting date.
     inline const std::chrono::month_day& getStart() const { return m_Start; }
+    // Returns ending date.
     inline const std::chrono::month_day& getEnd() const { return m_End; }
 };

src/MenuLayer.cpp

@@ -46,8 +46,7 @@ class $modify(ST_MenuLayer, MenuLayer)
         float scaleSpeed = Mod::get()->getSettingValue<float>("scaling-speed");
 		m_fields->m_SplashText = ScalingLabel::create(m_fields->m_SplashStr.c_str(), "goldFont.fnt", scaleSpeed);
 
-		// The scale here is an inverse scaling function for text used pretty often for UI.
-		m_fields->m_SplashText->setScale(0.5f / (1.0f + 0.05f * strlen(m_fields->m_SplashText->getLabel()->getString())));
+		m_fields->m_SplashText->resetLabelScale();
 		m_fields->m_SplashText->setPosition(
 			// The magic numbers are the percentage offset to get the anchor point at the bottom right
 			// of the actual text and not the sprite.
@@ -65,7 +64,7 @@ class $modify(ST_MenuLayer, MenuLayer)
 	{
 		MenuLayer::onEnter();
 		m_fields->m_SplashText->getLabel()->setString(m_fields->m_SplashStr.c_str());
-		m_fields->m_SplashText->setScale(0.5f / (1.0f + 0.05f * strlen(m_fields->m_SplashText->getLabel()->getString())));
+		m_fields->m_SplashText->resetLabelScale();
 	}
 
 	void onExit()

src/ScalingLabel.cpp

@@ -27,6 +27,12 @@ void ScalingLabel::update(float dt)
     m_Label->setScale(newScale);
 }
 
+void ScalingLabel::resetLabelScale()
+{
+    // The scale here is an inverse scaling function for text used pretty often for UI.
+    this->setScale(0.5f / (1.0f + 0.05f * strlen(this->getLabel()->getString())));
+}
+
 ScalingLabel* ScalingLabel::create(std::string text, std::string fntFile, float scalingFactor)
 {
 	auto ret = new ScalingLabel(text, fntFile, scalingFactor);

src/ScalingLabel.hpp

@@ -20,5 +20,6 @@ class ScalingLabel : public CCNode
 	inline void setScalingFactor(float scalingFactor) { m_ScalingFactor = scalingFactor; }
 	bool init() override;
 	void update(float dt) override;
+    void resetLabelScale();
 	static ScalingLabel* create(std::string text, std::string fntFile, float scalingFactor = 0.5f);
 };

src/SplashRead.cpp

@@ -11,7 +11,7 @@ bool SplashRead::loadFile(std::filesystem::path filePath)
     m_FileStream.open(filePath);
     if (!m_FileStream.is_open())
     {
-        log::error("File failed to open! May not exist!");
+        log::error("File failed to open! May not exist or may be open in another program!");
         return false;
     }