summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-10-10 17:37:19 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-10-10 17:37:19 +0000
commit8d78f2422af168eaa5ec3db4b2da075e337f1462 (patch)
treea80a78d1165b0604b8dba5efb9eddc3e0ed38a2d
parentb2c5d720fdf88e7e5e8ff6921e9d01cfe009a074 (diff)
downloadmana-8d78f2422af168eaa5ec3db4b2da075e337f1462.tar.gz
mana-8d78f2422af168eaa5ec3db4b2da075e337f1462.tar.bz2
mana-8d78f2422af168eaa5ec3db4b2da075e337f1462.tar.xz
mana-8d78f2422af168eaa5ec3db4b2da075e337f1462.zip
Forgot to add new tilesets to Makefile.am and made another small fix to spritev0.0.17
rendering.
-rw-r--r--ChangeLog3
-rw-r--r--src/map.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 81afcfc7..ef046dfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
* src/game.cpp, README, data/helps/commands.txt: Introduced new window
shortcuts.
* src/gui/status.cpp: Corrected position of job XP bar.
+ * src/data/graphics/tiles/Makefile.am: Forgot to add new tilesets
+ here.
+ * src/map.cpp: Another small fix to sprite rendering.
2005-10-09 Yohann Ferreira <bertram@cegetel.net>
diff --git a/src/map.cpp b/src/map.cpp
index 28c52192..37b7292a 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -118,7 +118,7 @@ Map::draw(Graphics *graphics, int scrollX, int scrollY, int layer)
// tiles have been drawn
if (layer == 1)
{
- while (si != mSprites.end() && (*si)->getPixelY() < y * 32)
+ while (si != mSprites.end() && (*si)->getPixelY() <= y * 32 - 32)
{
(*si)->draw(graphics, -scrollX, -scrollY);
si++;