Merge of trunk v20

This commit is contained in:
fescen9 2010-12-08 07:20:49 +00:00
parent 60448dda09
commit 3f46675f3f
3 changed files with 65 additions and 39 deletions

View file

@ -214,9 +214,14 @@ public class MapTile {
public BufferedImage loadTile(MapManager mgr)
{
try {
File file = new File(getPath(mgr));
return ImageIO.read(file);
String path = getPath(mgr);
//log.info("Loading tile from " + path);
File file = new File(path);
BufferedImage im = ImageIO.read(file);
//log.info("OK");
return im;
} catch(IOException e) {
//log.info("failed: " + e.toString());
}
return null;