upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 00:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #12658 : new forest being drawn on top of units.

Browse Source
This commit is contained in:
Philippe Plantier 2005-04-13 20:36:59 +00:00
parent 530d7cedf3
commit 5b570f0f6a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/terrain-graphics.cfg
View File

@ -42,7 +42,7 @@
[image]
name={TILE}
position=vertical
base=90, 108
base=90,144
[/image]
@ -78,7 +78,7 @@
[image]
name={TILE}
position=vertical
base=90, 108
base=90,144
[/image]
@ -114,7 +114,7 @@
[image]
name={TILE}
position=vertical
base=90, 108
base=90,144
[/image]
@ -150,7 +150,7 @@
[image]
name={TILE}-@R0
position=vertical
base=90, 108
base=90,144
[/image]
@ -190,7 +190,7 @@
[image]
name={TILE}
position=vertical
base=90, 108
base=90,144
[/image]

5
src/builder.cpp
View File

@ -371,6 +371,9 @@ terrain_builder::terrain_constraint terrain_builder::rotate(const terrain_builde
itor->basex = int(rx + rule_image::TILEWIDTH/2);
itor->basey = int(ry + rule_image::TILEWIDTH/2);
//std::cerr << "Rotation: from " << vx << ", " << vy << " to " << itor->basex <<
// ", " << itor->basey << "\n";
}
return ret;
@ -544,7 +547,7 @@ void terrain_builder::add_constraints(
if(!type.empty())
constraints[loc].terrain_types = type;
int x = loc.x * rule_image::TILEWIDTH / 2;
int x = loc.x * rule_image::TILEWIDTH * 3 / 4;
int y = loc.y * rule_image::TILEWIDTH + (loc.x % 2) *
rule_image::TILEWIDTH / 2;
add_images_from_config(constraints[loc].images, global_images, true, x, y);