feat(EventManager): expose the parsed CutsceneContext

GothicKit · Nov 2, 2024 · 1075649 · 1075649
1 parent 8ba779d
commit 1075649
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/include/zenkit/vobs/VirtualObject.hh b/include/zenkit/vobs/VirtualObject.hh
@@ -19,6 +19,8 @@
 #include <vector>
 
 namespace zenkit {
+	struct CutsceneContext;
+
 	class ReadArchive;
 	struct VNpc;
 
@@ -202,6 +204,7 @@ namespace zenkit {
 
 		bool cleared = false;
 		bool active = false;
+		std::weak_ptr<CutsceneContext> cutscene;
 
 		ZKAPI void load(ReadArchive& r, GameVersion version) override;
 		ZKAPI void save(WriteArchive& w, GameVersion version) const override;

diff --git a/src/vobs/VirtualObject.cc b/src/vobs/VirtualObject.cc
@@ -309,17 +309,13 @@ namespace zenkit {
 	void EventManager::load(ReadArchive& r, GameVersion version) {
 		this->cleared = r.read_bool();
 		this->active = r.read_bool();
-
-		/* TODO: emCutscene = */
-		r.read_object<CutsceneContext>(version);
+		this->cutscene = r.read_object<CutsceneContext>(version);
 	}
 
-	void EventManager::save(WriteArchive& w, GameVersion) const {
+	void EventManager::save(WriteArchive& w, GameVersion version) const {
 		w.write_bool("cleared", this->cleared);
 		w.write_bool("active", this->active);
-
-		w.write_object_begin("emCutscene", "%", 0);
-		w.write_object_end();
+		w.write_object("emCutscene", this->cutscene.lock(), version);
 	}
 
 	void AiHuman::load(ReadArchive& r, GameVersion version) {