aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-12-09 13:49:28 +0100
committerWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-12-09 13:49:28 +0100
commitb7127b9f389179f6f3cc2f903c7a8e898834bd96 (patch)
tree4d3cdbad3d62bd307a15c47289c61810054cfdc9
parentae141f77fc54638bed0cea9213fe8900769e5d92 (diff)
parent4d74c80d9c3c9fdca9b07d960a1f9fd3e38cdfad (diff)
Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputSystem
-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 f336fd3..b761ca1 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -250,7 +250,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;
}