fix light positioning

Zbizu · Zbizu · commit 81da3ed62eb4 · 2023-05-05T16:56:40.000+02:00
diff --git a/source/light_drawer.cpp b/source/light_drawer.cpp
@@ -115,8 +115,13 @@ void LightDrawer::setGlobalLightColor(uint8_t color)
 	global_color = colorFromEightBit(color);
 }
 
-void LightDrawer::addLight(int map_x, int map_y, const SpriteLight& light)
+void LightDrawer::addLight(int map_x, int map_y, int map_z, const SpriteLight& light)
 {
+	if (map_z <= GROUND_LAYER) {
+		map_x -= (GROUND_LAYER - map_z);
+		map_y -= (GROUND_LAYER - map_z);
+	}
+
 	if (map_x <= 0 || map_x >= MAP_MAX_WIDTH || map_y <= 0 || map_y >= MAP_MAX_HEIGHT) {
 		return;
 	}
diff --git a/source/light_drawer.h b/source/light_drawer.h
@@ -37,7 +37,7 @@ class LightDrawer
 	void draw(int map_x, int map_y, int end_x, int end_y, int scroll_x, int scroll_y, bool fog);
 
 	void setGlobalLightColor(uint8_t color);
-	void addLight(int map_x, int map_y, const SpriteLight& light);
+	void addLight(int map_x, int map_y, int map_z, const SpriteLight& light);
 	void clear() noexcept;
 
 private:
diff --git a/source/map_drawer.cpp b/source/map_drawer.cpp
@@ -1845,15 +1845,15 @@ void MapDrawer::AddLight(TileLocation* location)
 
 	if (tile->ground) {
 		if (tile->ground->hasLight()) {
-			light_drawer->addLight(position.x, position.y, tile->ground->getLight());
+			light_drawer->addLight(position.x, position.y, position.z, tile->ground->getLight());
 		}
 	}
 
 	bool hidden = options.hide_items_when_zoomed && zoom > 10.f;
 	if (!hidden && !tile->items.empty()) {
 		for (auto item : tile->items) {
 			if (item->hasLight()) {
-				light_drawer->addLight(position.x, position.y, item->getLight());
+				light_drawer->addLight(position.x, position.y, position.z, item->getLight());
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,13 @@ void LightDrawer::setGlobalLightColor(uint8_t color)`
`115`	`115`	`global_color = colorFromEightBit(color);`
`116`	`116`	`}`
`117`	`117`
`118`		`-void LightDrawer::addLight(int map_x, int map_y, const SpriteLight& light)`
	`118`	`+void LightDrawer::addLight(int map_x, int map_y, int map_z, const SpriteLight& light)`
`119`	`119`	`{`
	`120`	`+ if (map_z <= GROUND_LAYER) {`
	`121`	`+ map_x -= (GROUND_LAYER - map_z);`
	`122`	`+ map_y -= (GROUND_LAYER - map_z);`
	`123`	`+ }`
	`124`	`+`
`120`	`125`	`if (map_x <= 0 \|\| map_x >= MAP_MAX_WIDTH \|\| map_y <= 0 \|\| map_y >= MAP_MAX_HEIGHT) {`
`121`	`126`	`return;`
`122`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1845,15 +1845,15 @@ void MapDrawer::AddLight(TileLocation* location)`
`1845`	`1845`
`1846`	`1846`	`if (tile->ground) {`
`1847`	`1847`	`if (tile->ground->hasLight()) {`
`1848`		`- light_drawer->addLight(position.x, position.y, tile->ground->getLight());`
	`1848`	`+ light_drawer->addLight(position.x, position.y, position.z, tile->ground->getLight());`
`1849`	`1849`	`}`
`1850`	`1850`	`}`
`1851`	`1851`
`1852`	`1852`	`bool hidden = options.hide_items_when_zoomed && zoom > 10.f;`
`1853`	`1853`	`if (!hidden && !tile->items.empty()) {`
`1854`	`1854`	`for (auto item : tile->items) {`
`1855`	`1855`	`if (item->hasLight()) {`
`1856`		`- light_drawer->addLight(position.x, position.y, item->getLight());`
	`1856`	`+ light_drawer->addLight(position.x, position.y, position.z, item->getLight());`
`1857`	`1857`	`}`
`1858`	`1858`	`}`
`1859`	`1859`	`}`