From b6d3bc08126652ed42a7c84f5e4a8283e5e74d22 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 19 Dec 2024 14:01:35 +0100
Subject: fix merge conflict
---
src/crepe/system/RenderSystem.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 3ec1922..579c9f5 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -21,7 +21,6 @@
#include "RenderSystem.h"
#include "types.h"
-#include "util/AbsoluutPosition.h"
using namespace crepe;
using namespace std;
@@ -124,7 +123,7 @@ bool RenderSystem::render_particle(const Sprite & sprite, const Transform & tm){
.sprite = sprite,
.texture = res,
.pos = p.position,
- .angle = p.angle + transform_angle,
+ .angle = p.angle + tm.rotation,
.scale = tm.scale,
});
}
--
cgit v1.2.3