aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2025-01-07 10:56:25 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2025-01-07 10:56:25 +0100
commit87ae4d186ad64531e96fd3e121112f2787894295 (patch)
tree7e6efdf1cc66f63a9db0f1625e2d3e98647032e3 /src/crepe/api
parentaa2d2e05bc90b90ab503eff1f58bfc8c2b9c1741 (diff)
revert signalcatch
Diffstat (limited to 'src/crepe/api')
-rw-r--r--src/crepe/api/BehaviorScript.h2
-rw-r--r--src/crepe/api/BehaviorScript.hpp1
-rw-r--r--src/crepe/api/Engine.cpp13
3 files changed, 4 insertions, 12 deletions
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 52cf259..3909b96 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -48,8 +48,6 @@ public:
BehaviorScript & set_script(Args &&... args);
protected:
- //! Script type name
- std::string name = "unknown script";
//! Script instance
std::unique_ptr<Script> script = nullptr;
//! ScriptSystem needs direct access to the script instance
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 218f27c..353d5e2 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -11,7 +11,6 @@ template <class T, typename... Args>
BehaviorScript & BehaviorScript::set_script(Args &&... args) {
static_assert(std::is_base_of<Script, T>::value);
this->script = std::unique_ptr<Script>(new T(std::forward<Args>(args)...));
- this->name = typeid(T).name();
this->script->game_object_id = this->game_object_id;
this->script->active = this->active;
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index 35743e3..cd9786b 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -1,6 +1,3 @@
-#include <segvcatch.h>
-
-#include "../facade/SignalCatch.h"
#include "../util/Log.h"
#include "Engine.h"
@@ -9,8 +6,6 @@ using namespace crepe;
using namespace std;
int Engine::main() noexcept {
- SignalCatch signal_catch;
-
try {
this->setup();
} catch (const exception & e) {
@@ -50,23 +45,23 @@ void Engine::loop() {
while (timer.get_lag() >= timer.get_fixed_delta_time()) {
try {
systems.fixed_update();
- timer.advance_fixed_elapsed_time();
} catch (const exception & e) {
Log::logf(
- Log::Level::WARNING, "Uncaught exception in fixed update function: {}",
+ Log::Level::WARNING, "Uncaught exception in fixed update function: {}\n",
e.what()
);
}
+ timer.advance_fixed_elapsed_time();
}
try {
systems.frame_update();
- timer.enforce_frame_rate();
} catch (const exception & e) {
Log::logf(
- Log::Level::WARNING, "Uncaught exception in frame update function: {}",
+ Log::Level::WARNING, "Uncaught exception in frame update function: {}\n",
e.what()
);
}
+ timer.enforce_frame_rate();
}
}