From 5fb4e26f2329c8522047fb13a9f4975b309ce7d8 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Thu, 21 Jan 2010 15:05:11 +0000
Subject: fixed findsprite bug

---
(limited to 'tasetup.py')

diff --git a/tasetup.py b/tasetup.py
index 8661f31..7fd22cd 100644
--- a/tasetup.py
+++ b/tasetup.py
@@ -33,6 +33,7 @@ from gettext import gettext as _
 
 import block
 import sprites
+from constants import *
 
 def numcheck(new, old):
     if new is '': return "0"
@@ -268,16 +269,18 @@ def setup_misc(tw):
     # tw.category_spr = Sprite(tw, 0, 0, tw.selbuttons[0].group)
     tw.category_spr = sprites.Sprite(tw.sprites, 0, 0, tw.selbuttons[0].group)
     tw.category_spr.type = 'category'
-    tw.category_spr.set_layer(660)
+    tw.category_spr.set_layer(CATEGORY_LAYER)
     # masks get positioned on top of other blocks
     # tw.select_mask = Sprite(tw,100,100,\
     tw.select_mask = sprites.Sprite(tw.sprites, 100, 100,\
         load_image(tw, tw.path, '', 'masknumber'))
     tw.select_mask.type = 'selectmask'
+    tw.select_mask.hide()
     # tw.select_mask_string = Sprite(tw,100,100,\
     tw.select_mask_string = sprites.Sprite(tw.sprites, 100, 100,\
                                 load_image(tw, tw.path, '', 'maskstring'))
     tw.select_mask_string.type = 'selectmask'
+    tw.select_mask_string.hide()
     # used to hide the palette
     tw.hidden_palette_icon = load_image(tw, tw.path, '','blocks-')
     # media blocks get positioned into other blocks
@@ -294,13 +297,13 @@ def setup_misc(tw):
     tw.cartesian_coordinates_spr = sprites.Sprite(tw.sprites, tw.width/2-600, tw.height/2-450, \
                                       load_image(tw, tw.path, '', "Cartesian"))
     tw.cartesian_coordinates_spr.type = 'coordinates'
-    tw.cartesian_coordinates_spr.set_layer(610)
+    tw.cartesian_coordinates_spr.set_layer(OVERLAY_LAYER)
     tw.cartesian_coordinates_spr.hide()
     # tw.polar_coordinates_spr = Sprite(tw, tw.width/2-600, tw.height/2-450, \
     tw.polar_coordinates_spr = sprites.Sprite(tw.sprites, tw.width/2-600, tw.height/2-450, \
                                       load_image(tw, tw.path, '', "polar"))
     tw.polar_coordinates_spr.type = 'coordinates'
-    tw.polar_coordinates_spr.set_layer(610)
+    tw.polar_coordinates_spr.set_layer(OVERLAY_LAYER)
     tw.polar_coordinates_spr.hide()
     # status shapes get positioned at the bottom of the screen
     tw.status_shapes = {}
@@ -321,7 +324,7 @@ def setup_misc(tw):
     tw.status_spr.set_label("test")
     # tw.status_spr.set_label_attributes(1.0, True, "left")
     tw.status_spr.type = 'status'
-    tw.status_spr.set_layer(900)
+    tw.status_spr.set_layer(HIDE_LAYER)
     tw.status_spr.hide()
     # everything should be loaded at this point
     # print tw.status_shapes
@@ -333,7 +336,7 @@ def setup_selector(tw,name,y,blockdescriptions):
     onshape = load_image(tw, tw.path, 'palette', name+'on')
     # spr = Sprite(tw,143,y,offshape)
     spr = sprites.Sprite(tw.sprites, 143, y, offshape)
-    spr.set_layer(800)
+    spr.set_layer(TAB_LAYER)
     spr.offshape = offshape
     spr.onshape = onshape
     # print 'setting up selector ' + name
--
cgit v0.9.1