fixing merge conflicts

2024-02-21 16:43:44 +01:00
parent c7cd9202f4 de2488589c
commit a85827ce08
12 changed files with 457 additions and 17 deletions
--- a/frontend/static/js/api/game/Game.js
+++ b/frontend/static/js/api/game/Game.js
@ -114,7 +114,10 @@ class Game
     */
    render(ctx)
    {
-        ctx.clearRect(0, 0, this.config.size_x, this.config.size_y);
+		if(ctx instanceof CanvasRenderingContext2D)
+		{
+			ctx.clearRect(0, 0, this.config.size_x, this.config.size_y);
+		}
        this.draw_sides(ctx);
        this.ball.render(ctx);