diff options
| -rw-r--r-- | tasprites.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tasprites.py b/tasprites.py index 2a985b4..1c2b18d 100644 --- a/tasprites.py +++ b/tasprites.py @@ -26,6 +26,9 @@ import gobject import pango class taSprite: pass +# Don't display the label for these blocks +nolabel = ['audiooff', 'descriptionoff','journal'] + def findsprite(tw,pos): list = tw.sprites[:] list.reverse() @@ -98,11 +101,8 @@ def draw(spr): else: spr.tw.area.draw_drawable(spr.tw.gc,spr.image,0,0,spr.x,spr.y,-1,-1) if spr.label!=None: - if hasattr(spr, 'proto') and hasattr(spr.proto, 'name'): - name = spr.proto.name - else: - name = "" - if name != 'audiooff' and name != 'journal': + if hasattr(spr, 'proto') and hasattr(spr.proto, 'name') and \ + spr.proto.name not in nolabel: spr.draw_label(spr,str(spr.label)) def hit(spr,pos): @@ -128,7 +128,7 @@ def hit(spr,pos): # used for most things def draw_label1(spr, label): fd = pango.FontDescription('Sans') - fd.set_size(7*pango.SCALE) + fd.set_size(7*spr.tw.scale*pango.SCALE) if type(label) == str: pl = spr.tw.window.create_pango_layout(str(label)) pl.set_font_description(fd) @@ -143,7 +143,7 @@ def draw_label1(spr, label): # used for status blocks def draw_label2(spr, label): fd = pango.FontDescription('Sans') - fd.set_size(9*pango.SCALE) + fd.set_size(9*spr.tw.scale*pango.SCALE) pl = spr.tw.window.create_pango_layout(str(label)) pl.set_font_description(fd) sheight = pl.get_size()[1]/pango.SCALE |