main.cpp does work for standalone entry

1 files changed, 7 insertions, 10 deletions

@@ -38,13 +38,9 @@ class pix_deleter {
 
 using pix_ptr = std::unique_ptr<Pix, pix_deleter>;
 
-wizard::wizard(std::string cardsPath, std::string cachePath,
-               std::string outputPath, std::string jsonPath, std::mt19937& rng)
-    : cards_(cardsPath),
-      images_(cachePath),
-      outputPath_(outputPath),
-      jsonPath_(jsonPath),
-      rng_(rng) {
+wizard::wizard(const cardset& cards, const imagestore& images, std::string text,
+               std::mt19937& rng)
+    : cards_(cards), images_(images), text_(text), rng_(rng()) {
   std::cout << "Characters: ";
 
   for (char ch : cards_.getCharacters()) {
@@ -54,8 +50,8 @@ wizard::wizard(std::string cardsPath, std::string cachePath,
   std::cout << std::endl;
 }
 
-void wizard::run() {
-  std::string text = "what the heck, it's just some gay guy";
+Magick::Image wizard::run() {
+  std::string text = text_;  //"what the heck, it's just some gay guy";
   // getline(std::cin, text);
   if (text.back() == '\r') {
     text.pop_back();
@@ -252,5 +248,6 @@ void wizard::run() {
   }
 
   endImage.magick("PNG");
-  endImage.write(outputPath_);
+
+  return endImage;
 }