Merge pull request #223 from RedShyGuy/hotfix/3.0.1

Hotfix 3.0.1

Author: RedShyGuy

.github/workflows/c-cpp.yml

@@ -34,7 +34,7 @@ jobs:
       run: python3 LanguageBinCreator/json_to_bin.py
 
     - name: Build Plugin
-      run: make
+      run: make DEVMODE=0
 
     - name: Package Plugin
       run: |

Sources/Helpers/Address.cpp

@@ -60,6 +60,9 @@ namespace CTRPluginFramework {
 				return;
 			}
 		}
+
+	//if none was found, its a dynamic address, so just set it
+		SetAddressData(address);
 	};
 
 	void Address::SetAddressData(u32 address) {

Sources/Helpers/Game.cpp

@@ -282,16 +282,11 @@ namespace CTRPluginFramework {
 			}
 		}
 
-		bool IsFaceCutOutSpaceFree(u8 buildingID) {
+		bool IsFaceCutOutSpaceFree() {
 			ACNL_BuildingData *building = Building::GetSaveData();
 			if(!building) {
 				return false;
 			}
-			
-			if (buildingID != 0xDC && buildingID != 0xDD) { //Not a face cutout standee
-				return false;
-			}
-
 			for (int i = 0; i < 8; ++i) {
 				if (building->Stands[i].xCoord == -1 && building->Stands[i].yCoord == -1) { //Empty stand found
 					return true;
@@ -351,9 +346,11 @@ namespace CTRPluginFramework {
 				return;
 			}
 
-			if (!IsFaceCutOutSpaceFree(buildingID)) {
-				OSDExtras::Notify(TextID::BUILDING_MOD_NO_DESIGN_STAND_FREE, Color::Red);
-				return;
+			if (buildingID == 0xDC || buildingID == 0xDD) { 
+				if (!IsFaceCutOutSpaceFree()) {
+					OSDExtras::Notify(TextID::BUILDING_MOD_NO_DESIGN_STAND_FREE, Color::Red);
+					return;
+				}
 			}
 
 			u32 x, y;	

Sources/LibCtrpfExtras/OSDExtras.cpp

@@ -83,18 +83,58 @@ namespace CTRPluginFramework {
         return Notify(Language::getInstance()->get(textID), foreground, background);
     }
 
+    std::vector<std::string> SplitText(const std::string& text, int maxWidth) {
+        std::vector<std::string> lines;
+        std::string remaining = text;
+
+        while (!remaining.empty()) {
+            std::string current = remaining;
+
+            bool isFirstLine = lines.empty();
+            std::string prefix = isFirstLine ? "" : "...";
+            std::string suffix = "";
+
+            //Always expect a new line
+            suffix = "...";
+
+            while (!current.empty()) {
+                std::string candidate = prefix + current + suffix;
+
+                if (ScreenExtras::SystemFontSize(candidate.c_str()) <= maxWidth) {
+                    break;
+                }
+
+                current.pop_back();
+            }
+
+            //If everything fits, no suffix needed
+            if (current.size() == remaining.size()) {
+                suffix = "";
+            }
+
+            lines.push_back(prefix + current + suffix);
+
+            remaining.erase(0, current.size());
+        }
+
+        return lines;
+    }
+
     int OSDExtras::Notify(const std::string &text, const Color &foreground, const Color &background) {
+        auto lines = SplitText(text, 375);
+
         Lock();
 
-        if (Notifications.size() >= 50) {
+        if (Notifications.size() + lines.size() > 50) {
             Unlock();
             return -1;
         }
 
-        Notifications.push_back(new OSDMessage(text, foreground, background));
+        for (auto it = lines.rbegin(); it != lines.rend(); ++it) {
+            Notifications.push_back(new OSDMessage(*it, foreground, background));
+        }
 
         Unlock();
-
         return 0;
     }