[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/terrain-graphics.cfg src/builder.cpp
From: |
Philippe Plantier |
Subject: |
[Wesnoth-cvs-commits] wesnoth data/terrain-graphics.cfg src/builder.cpp |
Date: |
Wed, 13 Apr 2005 16:37:00 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Philippe Plantier <address@hidden> 05/04/13 20:37:00
Modified files:
data : terrain-graphics.cfg
src : builder.cpp
Log message:
Fixed bug #12658 : new forest being drawn on top of units.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
Patches:
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.62
wesnoth/data/terrain-graphics.cfg:1.63
--- wesnoth/data/terrain-graphics.cfg:1.62 Mon Apr 11 21:21:58 2005
+++ wesnoth/data/terrain-graphics.cfg Wed Apr 13 20:36:58 2005
@@ -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]
address@hidden
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]
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.49 wesnoth/src/builder.cpp:1.50
--- wesnoth/src/builder.cpp:1.49 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/builder.cpp Wed Apr 13 20:36:59 2005
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.49 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: builder.cpp,v 1.50 2005/04/13 20:36:59 gruikya Exp $ */
/*
Copyright (C) 2004 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -371,6 +371,9 @@
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 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/terrain-graphics.cfg src/builder.cpp,
Philippe Plantier <=