diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-02-15 10:45:26 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-02-15 10:45:26 -0500 |
commit | ffba4e065710ce5d76872607d9bc4676feae6c28 (patch) | |
tree | 7c23655ba8c4b0fb15714ccca94fd7c593cc4858 /src/com/fourisland/fourpuzzle/util/ObjectLoader.java | |
parent | e50f6fe85fd19d2f91a3877ac99eca234537aac2 (diff) | |
download | fourpuzzle-ffba4e065710ce5d76872607d9bc4676feae6c28.tar.gz fourpuzzle-ffba4e065710ce5d76872607d9bc4676feae6c28.tar.bz2 fourpuzzle-ffba4e065710ce5d76872607d9bc4676feae6c28.zip |
Engine: Created Fade transitions
Along with Fade Transitions, other things such as the GameOver and TitleScreen special events have been implemented. Also, an unchecked bug in ObjectLoader has been fixed. The current Fade implementation isn't currently that elegant. There should be a way to make it better, but it'll do for now. Closes #13
Diffstat (limited to 'src/com/fourisland/fourpuzzle/util/ObjectLoader.java')
-rwxr-xr-x | src/com/fourisland/fourpuzzle/util/ObjectLoader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/fourisland/fourpuzzle/util/ObjectLoader.java b/src/com/fourisland/fourpuzzle/util/ObjectLoader.java index 6df3796..f1cb157 100755 --- a/src/com/fourisland/fourpuzzle/util/ObjectLoader.java +++ b/src/com/fourisland/fourpuzzle/util/ObjectLoader.java | |||
@@ -86,14 +86,14 @@ public class ObjectLoader { | |||
86 | } | 86 | } |
87 | 87 | ||
88 | bImg.createGraphics().drawImage(bImg, 0, 0, new Color(transparencyColor, true), null); | 88 | bImg.createGraphics().drawImage(bImg, 0, 0, new Color(transparencyColor, true), null); |
89 | 89 | ||
90 | addToObjectCache(imageCache, type + "/" + name, bImg); | 90 | addToObjectCache(imageCache, type + "/" + name, bImg); |
91 | } | 91 | } |
92 | 92 | ||
93 | return imageCache.get(type + "/" + name); | 93 | return imageCache.get(type + "/" + name); |
94 | } | 94 | } |
95 | 95 | ||
96 | public static void addToObjectCache(Map cacheMap, String name, Object object) | 96 | public static <T> void addToObjectCache(Map<String, T> cacheMap, String name, T object) |
97 | { | 97 | { |
98 | if (cacheMap.size() >= 100) | 98 | if (cacheMap.size() >= 100) |
99 | { | 99 | { |