Nixed some if true then true (ITTT?) stylings. Ray happiness++.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@499 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -94,11 +94,7 @@ public class TileSetBundle extends HashIntMap
|
||||
public BufferedImage loadImage (String path)
|
||||
throws IOException
|
||||
{
|
||||
if (path.endsWith(FastImageIO.FILE_SUFFIX)) {
|
||||
return _bundle.getImageResource(path, true);
|
||||
} else {
|
||||
return _bundle.getImageResource(path, false);
|
||||
}
|
||||
return _bundle.getImageResource(path, path.endsWith(FastImageIO.FILE_SUFFIX));
|
||||
}
|
||||
|
||||
// custom serialization process
|
||||
|
||||
@@ -505,11 +505,7 @@ public class ResourceManager
|
||||
// fallback next to an unpacked resource file
|
||||
File file = getResourceFile(path);
|
||||
if (file != null && file.exists()) {
|
||||
if (path.endsWith(FastImageIO.FILE_SUFFIX)) {
|
||||
return loadImage(file, true);
|
||||
} else {
|
||||
return loadImage(file, false);
|
||||
}
|
||||
return loadImage(file, path.endsWith(FastImageIO.FILE_SUFFIX));
|
||||
}
|
||||
|
||||
// first try a locale-specific file
|
||||
|
||||
Reference in New Issue
Block a user