Engine: fix crash when quitting while dialog options are on

Engine/ac/dialog.cpp

@@ -1596,6 +1596,12 @@ void schedule_dialog_stop()
         dialogOpts->Stop();
 }
 
+void shutdown_dialog_state()
+{
+    dialogExec = {};
+    dialogOpts = {};
+}
+
 // end dialog manager
 
 

Engine/ac/dialog.h

@@ -51,6 +51,8 @@ int run_dialog_option(int dlgnum, int dialog_choice, int sayChosenOption, bool r
 bool handle_state_change_in_dialog_request(const char *apiname, int dlgreq_retval);
 // Shedule dialog state to stop next time it receives a control
 void schedule_dialog_stop();
+// Disposes dialog state object(s)
+void shutdown_dialog_state();
 
 extern std::vector<ScriptDialog> scrDialog;
 extern std::vector<DialogTopic> dialog;

Engine/ac/game.cpp

@@ -66,6 +66,7 @@
 #include "gui/guitextbox.h"
 #include "gui/guidialog.h"
 #include "main/engine.h"
+#include "main/game_run.h"
 #include "media/audio/audio_system.h"
 #include "media/video/video.h"
 #include "platform/base/agsplatformdriver.h"
@@ -495,6 +496,12 @@ void free_do_once_tokens()
     play.do_once_tokens.clear();
 }
 
+void shutdown_game_state()
+{
+    // Try every possible game state that is represented by a global object
+    shutdown_dialog_state();
+    ShutGameWaitState();
+}
 
 // Free all the memory associated with the game
 void unload_game()

Engine/ac/game.h

@@ -170,6 +170,8 @@ void save_game_dialog2(int min_slot, int max_slot);
 // Unconditionally display a built-in save game dialog
 bool do_save_game_dialog(int min_slot, int max_slot);
 void free_do_once_tokens();
+// Shuts down game's running state objects
+void shutdown_game_state();
 // Free all the memory associated with the game
 void unload_game();
 void save_game(int slotn, const Common::String &descript, std::unique_ptr<Common::Bitmap> &&image = nullptr);

Engine/main/game_run.cpp

@@ -1250,6 +1250,11 @@ void SyncDrawablesState()
     update_objects_scale();
 }
 
+void ShutGameWaitState()
+{
+    restrict_until = {};
+}
+
 void update_polled_stuff()
 {
     if (want_exit) {

Engine/main/game_run.h

@@ -44,6 +44,8 @@ void UpdateCursorAndDrawables();
 // Useful after a major game state change, such as loading new room, in case we expect
 // that a render may occur before a normal game update is performed.
 void SyncDrawablesState();
+// Shuts down game's waiting state, if one is running right now.
+void ShutGameWaitState();
 // Gets current logical game FPS, this is normally a fixed number set in script;
 // in case of "maxed fps" mode this function returns real measured FPS.
 float get_game_fps();

Engine/main/quit.cpp

@@ -197,8 +197,6 @@ void quit(const char *quitmsg)
 
     set_our_eip(9900);
 
-    set_our_eip(9016);
-
     quit_stop_cd();
     if (use_cdplayer)
         platform->ShutdownCDPlayer();
@@ -209,6 +207,7 @@ void quit(const char *quitmsg)
 
     // Release game data and unregister assets
     quit_check_dynamic_sprites(qreason);
+    shutdown_game_state();
     unload_game();
     AssetMgr.reset();
 

Engine/media/video/video.cpp

@@ -386,7 +386,7 @@ static HError video_single_run(std::unique_ptr<VideoPlayer> video, const String
     gl_Video->Begin();
     while (gl_Video->Run());
     gl_Video->End();
-    gl_Video.reset();
+    gl_Video = {};
 
     return HError::None();
 }
@@ -424,7 +424,7 @@ void video_single_resume()
 
 void video_single_stop()
 {
-    gl_Video.reset();
+    gl_Video = {};
 }
 
 void video_shutdown()