Merge pull request #13 from pinguin999/dev

Dialog Fixes
pinguin999 · Oct 21, 2024 · a1d717d · a1d717d
2 parents 2d3d5be + 2c6904d
commit a1d717d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/dialog/dialog_manager.cpp b/src/dialog/dialog_manager.cpp
@@ -25,19 +25,19 @@ void DialogManager::loadDialogsFromFile(std::string fileName, bool initializeVar
     }
 }
 
-void DialogManager::play(const std::string &characterName, jngl::Vec2, const sol::function &callback)
+void DialogManager::play(const std::string &dialogName, jngl::Vec2, const sol::function &callback)
 {
     cancelDialog();
 
-    currentDialog = schnackFile->dialogs[characterName];
+    currentDialog = schnackFile->dialogs[dialogName];
     if (currentDialog)
     {
         currentNode = currentDialog->getEntryNode();
         continueCurrent();
         dialog_callback = callback;
     }else
     {
-        jngl::debugLn("Dialog " + characterName + " not found.");
+        jngl::debugLn("Dialog " + dialogName + " not found.");
     }
 }
 
@@ -227,13 +227,14 @@ void DialogManager::playCharacterVoice(const std::string &file)
     try
     {
         jngl::play(file);
+        last_played_audio = file;
     }
     catch(std::exception&)
     {
         jngl::debugLn("Audiofile does not exist: " + file);
+        last_played_audio = "";
     }
 
-    last_played_audio = file;
 }
 
 void DialogManager::playCharacterAnimation(const std::string &character, const std::string &id)
@@ -268,6 +269,7 @@ void DialogManager::continueCurrent()
             return;
         }
         currentNode = result->currentNode;
+        currentDialog = result->currentDialog;
 
         auto textResult = std::dynamic_pointer_cast<schnacker::TextStepResult>(result);
         if(textResult)