aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-12-09 15:47:14 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-12-09 15:47:14 +0100
commitaae80a630f826bede3dd9286e4e200b05d8f5f7e (patch)
tree12d4ac422002c5cc64cc571a39089282e60a61e5
parentda44db343247bfe925ab34daa9b2dffddf9772cf (diff)
parent4d74c80d9c3c9fdca9b07d960a1f9fd3e38cdfad (diff)
Merge branch 'master' into loek/audio
-rw-r--r--src/crepe/api/LoopManager.cpp1
-rw-r--r--src/crepe/facade/SDLContext.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 044f096..88243c4 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -65,7 +65,6 @@ void LoopManager::setup() {
this->scene_manager.load_next_scene();
timer.start();
timer.set_fps(200);
- this->scene_manager.load_next_scene();
}
void LoopManager::render() {
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 4cc2206..6becf60 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -234,7 +234,7 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
const Sprite::Data & data = ctx.sprite.data;
- vec2 size;
+ vec2 size = data.size;
if (data.size.x == 0 && data.size.y != 0) {
size.x = data.size.y * ctx.sprite.aspect_ratio;
}