summarylogtreecommitdiffstats
path: root/fix-atlas-overlays.diff
diff options
context:
space:
mode:
Diffstat (limited to 'fix-atlas-overlays.diff')
-rw-r--r--fix-atlas-overlays.diff24
1 files changed, 0 insertions, 24 deletions
diff --git a/fix-atlas-overlays.diff b/fix-atlas-overlays.diff
deleted file mode 100644
index 98d862609d6b..000000000000
--- a/fix-atlas-overlays.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From 405c514eab9e2abffe8d1a8912646447e6a29cfa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kilian=20K=C3=B6ppchen?= <kiliankoeppchen@googlemail.com>
-Date: Fri, 2 Jan 2015 22:52:54 +0100
-Subject: [PATCH] Use animationloader instead of imagemanager to
-
-retrieve images. The imagemanager isn't necessarily aware of
-the files available as animations.
----
- horizons/component/coloroverlaycomponent.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/horizons/component/coloroverlaycomponent.py b/horizons/component/coloroverlaycomponent.py
-index 23d138b..41bbbff 100644
---- a/horizons/component/coloroverlaycomponent.py
-+++ b/horizons/component/coloroverlaycomponent.py
-@@ -166,7 +166,7 @@ def add_overlay(self, overlay_name, z_order):
- except TypeError:
- # not using atlases
- frame_length = frame_data
-- pic = horizons.globals.fife.imagemanager.load(frame_img)
-+ pic = horizons.globals.fife.animationloader.load_image(frame_img, self.action_set, overlay_name, rotation)
- frame_milliseconds = int(frame_length * 1000)
- ov_anim.addFrame(pic, frame_milliseconds)
- overlay = fife.OverlayColors(ov_anim)