Package: magicor
Version: 1.1-4
Severity: wishlist
Tags: patch
Dear Maintainer,
the info scroller that displays on the bottom of the game screen is distracting
and not very useful (at least for me).
I'm attaching a patch that adds an option to disable it. The option defaults to
true (the scroller is displayed by default). Please test the attached patch and
include it into the package if possible.
Best Regards,
Andrej Mernik
-- System Information:
Debian Release: 8.6
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=sl_SI.UTF-8, LC_CTYPE=sl_SI.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages magicor depends on:
ii libglade2-0 1:2.6.4-2
ii libsdl-image1.2 1.2.12-5+b5
ii libsdl-mixer1.2 1.2.12-11+b1
ii magicor-data 1.1-4
ii python 2.7.9-1
ii python-gtk2 2.24.0-4
ii python-pygame 1.9.1release+dfsg-10+b1
ii python2.7 2.7.9-2+deb8u1
magicor recommends no packages.
magicor suggests no packages.
diff -ur magicor-1.1/magicor/__init__.py magicor-1.1-patched/magicor/__init__.py
--- magicor-1.1/magicor/__init__.py 2009-04-24 12:59:37.000000000 +0200
+++ magicor-1.1-patched/magicor/__init__.py 2016-11-28 21:22:39.000000000 +0100
@@ -235,7 +235,7 @@
pygame.display.init()
pygame.display.set_caption("Magicor")
pygame.mouse.set_visible(False)
- for k in ("sound", "joystick", "music", "eyecandy"):
+ for k in ("sound", "joystick", "music", "eyecandy", "scroller"):
if not config.has_key(k):
config[k] = 1
if (not config.has_key(k)
diff -ur magicor-1.1/magicor/states/options.py magicor-1.1-patched/magicor/states/options.py
--- magicor-1.1/magicor/states/options.py 2009-04-24 12:59:37.000000000 +0200
+++ magicor-1.1-patched/magicor/states/options.py 2016-11-28 20:24:19.588667863 +0100
@@ -174,6 +174,10 @@
config.getBool("eyecandy"),
"eyecandy"),
self.toggleEyecandy)
+ self.addOption(BoolOption("scroller",
+ config.getBool("scroller"),
+ "scroller"),
+ self.toggleScroller)
self.addOption(IntOption("sound vol",
config.getInt("sound_vol"),
"sound_vol", 0, 100),
@@ -217,6 +221,11 @@
if hasattr(self.previous, "eyecandy"):
self.previous.eyecandy = self.config.getBool("eyecandy")
return True
+
+ def toggleScroller(self):
+ if hasattr(self.previous, "scroller"):
+ self.previous.scroller = self.config.getBool("scroller")
+ return True
def toggleFullscreen(self):
if self.config.get("fullscreen"):
diff -ur magicor-1.1/magicor/states/play.py magicor-1.1-patched/magicor/states/play.py
--- magicor-1.1/magicor/states/play.py 2009-04-24 12:59:37.000000000 +0200
+++ magicor-1.1-patched/magicor/states/play.py 2016-11-28 20:26:07.334846971 +0100
@@ -427,7 +427,8 @@
self.hudSprites.update()
self.hudSprites.draw(self.renderSurface)
self.screen.blit(self.renderSurface, (80, 16))
- self.drawScroller()
+ if self.config.get("scroller"):
+ self.drawScroller()
for y in xrange(0, self.screen.get_height(), 32):
self.screen.fill(0,
(0,
@@ -465,5 +466,6 @@
self.hudSprites.update()
self.hudSprites.draw(self.renderSurface)
self.screen.blit(self.renderSurface, (80, 16))
- self.drawScroller()
+ if self.config.get("scroller"):
+ self.drawScroller()
self.control()
