From 4cd4b86b9673bfcdd8399fb655a4f7cbc0c307bf Mon Sep 17 00:00:00 2001
From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com>
Date: Sun, 7 Sep 2025 11:35:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=88=D0=BD=D0=B8=D0=B5=20=D1=83=D0=BC=D0=BD=D0=BE=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=B0=D0=B6=D0=B4=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B4=D1=80=20=D1=83=20=D1=82=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=BC=D0=B0=D0=BF=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/main.lua    | 10 +++++-----
 game/tilemap.lua |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/game/main.lua b/game/main.lua
index 13a62ba..fc4d77d 100644
--- a/game/main.lua
+++ b/game/main.lua
@@ -69,11 +69,11 @@ function love.draw()
     love.graphics.clear()
     love.graphics.setFont(bf)
 
-    -- tilemap.offsetX = math.floor(mapX)
-    -- tilemap.offsetY = math.floor(mapY)
-    local time = love.timer.getTime()
-    tilemap.offsetX = 50 + math.floor(math.cos(time) * 25)
-    tilemap.offsetY = 50 + math.floor(math.sin(time) * 25)
+    tilemap.offsetX = math.floor(mapX)
+    tilemap.offsetY = math.floor(mapY)
+    -- local time = love.timer.getTime()
+    -- tilemap.offsetX = 50 + math.floor(math.cos(time) * 25)
+    -- tilemap.offsetY = 50 + math.floor(math.sin(time) * 25)
     tilemap:update()
     local tilemapPosX = tilemap.offsetX
     local tilemapPosY = tilemap.offsetY
diff --git a/game/tilemap.lua b/game/tilemap.lua
index e43eafd..40b046c 100644
--- a/game/tilemap.lua
+++ b/game/tilemap.lua
@@ -58,12 +58,16 @@ function TileMap:update()
 
     love.graphics.clear(0, 255, 0) -- TODO: debug
 
+    local spriteY = self.size * (iOffset - 1) - y
     for i = iOffset, iUpper do
+        local spriteX = self.size * (jOffset - 1) - x
         for j = jOffset, jUpper do
             local tileIndex = self.map[i][j]
-            love.graphics.draw(self.tiles[tileIndex], self.size * (j - 1) - x, self.size * (i - 1) - y)
-            -- love.graphics.print(tostring(tileIndex), self.size * (j - 1) - x, self.size * (i - 1) - y)
+            love.graphics.draw(self.tiles[tileIndex], spriteX, spriteY)
+            -- love.graphics.print(tostring(tileIndex), spriteX, spriteY)
+            spriteX = spriteX + self.size
         end
+        spriteY = spriteY + self.size
     end
 
     love.graphics.setBlendMode(prevBlendMode)