From ca58ec1faedca0081ecd233f2cefa1ba783cebf4 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 20 Nov 2007 12:27:56 +0000 Subject: Merged revisions 3642,3662-3664,3667 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3642 | gmelquio | 2007-10-19 19:46:46 +0200 (Fri, 19 Oct 2007) | 1 line Factored code between resource handlers. Implemented failure-friendly sprite loader. ........ r3662 | gmelquio | 2007-10-21 21:01:16 +0200 (Sun, 21 Oct 2007) | 1 line Added persistent positioning. ........ r3663 | gmelquio | 2007-10-21 21:03:43 +0200 (Sun, 21 Oct 2007) | 1 line Fixed missing pixels at bottom and right. ........ r3664 | gmelquio | 2007-10-21 21:05:56 +0200 (Sun, 21 Oct 2007) | 1 line Changed to use default values when restoring missing settings. ........ r3667 | gmelquio | 2007-10-21 22:09:08 +0200 (Sun, 21 Oct 2007) | 1 line Fixed invisible text in dropboxes and shopboxes. ........ --- src/tileset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tileset.h') diff --git a/src/tileset.h b/src/tileset.h index 7521a3e5..6af69235 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -36,7 +36,7 @@ class Tileset : public ImageSet * Constructor. */ Tileset(Image *img, int w, int h, int firstGid): - ImageSet("", img, w, h), + ImageSet(img, w, h), mFirstGid(firstGid) { } -- cgit v1.2.3-70-g09d2