I think doing it like that is better

TimeStepYT · Nov 24, 2024 · 8f0d9a1 · 8f0d9a1
1 parent 198b956
commit 8f0d9a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/CCKeyboardDispatcher.cpp b/src/CCKeyboardDispatcher.cpp
@@ -49,15 +49,6 @@ class $modify(MyHookLol, CCKeyboardDispatcher) {
 			else if (key == KEY_Escape)
 				blockKeys = false;
 		}
-		// else if (down && key == KEY_G) {
-			// CCArray* objs = new CCArray();
-			// objs->addObject(DialogObject::create("Scratch", "fart\nUh oh", 25, 1, false, ccc3(0, 255, 255)));
-			// objs->addObject(DialogObject::create("The funny\nmonkley", "stinky!", 26, 1, false, ccc3(0, 155, 155)));
-			// objs->addObject(DialogObject::create("Glungus", "poopy!", 28, 1, false, ccc3(0, 155, 155)));
-			// objs->addObject(DialogObject::create("Ned", "funny poopy!", 6, 1, false, ccc3(0, 155, 155)));
-			// objs->addObject(DialogObject::create("Smongus", "Sorry you had to... read this.", 21, 1, false, ccc3(0, 155, 155)));
-			// auto layer = DialogLayer::createWithObjects(objs, 2);
-		// }
 		return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, idk);
 	}
 };
diff --git a/src/DialogLayer.cpp b/src/DialogLayer.cpp
@@ -1,7 +1,11 @@
 #include "DialogLayer.h"
 #include "FLAlertLayer.h"
 
-bool DeltaruneDialogLayer::init(DialogObject* dialogObject, CCArray* objects, int p2) {
+bool DeltaruneDialogLayer::init(DialogObject* dialogObject, CCArray* objectsOriginal, int p2) {
+	CCArray* objects = CCArray::create();
+	objects->addObjectsFromArray(objectsOriginal);
+	if (!DialogLayer::init(dialogObject, objectsOriginal, p2)) return false;
+
 	m_fields->dialogObject = dialogObject;
 	std::string character;
 	char const* title;
@@ -12,7 +16,6 @@ bool DeltaruneDialogLayer::init(DialogObject* dialogObject, CCArray* objects, in
 		title = character.c_str();
 	}
 	else {
-		log::info("{}", objects);
 		character = static_cast<DialogObject*>(objects->objectAtIndex(0))->m_character;
 		title = character.c_str();
 		for (size_t i = 0; i < objects->count(); i++) {
@@ -23,7 +26,6 @@ bool DeltaruneDialogLayer::init(DialogObject* dialogObject, CCArray* objects, in
 				text = fmt::format("{}\n\n\n\n{}", text, static_cast<DialogObject*>(objects->objectAtIndex(i))->m_text);
 		}
 	}
-	if (!DialogLayer::init(dialogObject, objects, p2)) return false;
 	auto unmodifiedAlert = FLAlertLayer::create(title, text, "OK");
 	auto alert = static_cast<DeltaruneAlertLayer*>(unmodifiedAlert);