fix(3c90a21): broken changes

GothicKit · Jan 21, 2024 · 1589353 · 1589353
1 parent 3c90a21
commit 1589353
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/include/zenkit/DaedalusVm.hh b/include/zenkit/DaedalusVm.hh
@@ -152,17 +152,22 @@ namespace zenkit {
 
 			unsafe_call(sym);
 
-			if constexpr (std::is_same_v<R, IgnoreReturnValue> || std::is_same_v<R, void>) {
+			if constexpr (std::is_same_v<R, IgnoreReturnValue>) {
 				// clear the stack
 				_m_stack_ptr = 0;
+
 				return {};
-			}
+			} else if constexpr (!std::is_same_v<R, void>) {
+				auto ret = pop_call_return_value<R>();
 
-			auto ret = pop_call_return_value<R>();
+				// clear the stack
+				_m_stack_ptr = 0;
 
-			// clear the stack
-			_m_stack_ptr = 0;
-			return ret;
+				return ret;
+			} else {
+				// clear the stack
+				_m_stack_ptr = 0;
+			}
 		}
 
 		/// \brief Initializes an instance with the given type and name and returns it.

diff --git a/src/world/WayNet.cc b/src/world/WayNet.cc
@@ -3,6 +3,8 @@
 #include "zenkit/world/WayNet.hh"
 #include "zenkit/Archive.hh"
 
+#include "../Internal.hh"
+
 namespace zenkit {
 #ifndef ZK_FUTURE
 	static void read_waypoint_data(WayPoint& wp, ReadArchive& in) {