From 1e00234eb98fd7e6839048c465fb08bfc5a4325e Mon Sep 17 00:00:00 2001
From: Raúl Gutiérrez S <rgs@paraguayeduca.org>
Date: Tue, 08 Dec 2009 20:35:51 +0000
Subject: More cleanup. Now we have the Sprite class where all the selected, copied, paste, etc. logic should go. Cleaned the corresponding client code as well, not thoroughfully tested , though

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

diff --git a/talogo.py b/talogo.py
index 16002d7..849e1e7 100644
--- a/talogo.py
+++ b/talogo.py
@@ -158,7 +158,7 @@ def readline(lc, line):
     return res
 
 def setup_cmd(lc, str):
-    setlayer(lc.tw.turtle.spr,100) 
+    lc.tw.turtle.spr.setlayer(100) 
     lc.procstop=False
     list = readline(lc, str)
     lc.step = start_eval(lc, list)
@@ -176,11 +176,11 @@ def evline(lc, list):
     lc.arglist = None
     while lc.iline:
         if lc.tw.step_time > 0:
-            setlayer(lc.tw.turtle.spr,630)
+            lc.tw.turtle.spr.setlayer(630)
             endtime = millis()+an_int(lc,lc.tw.step_time)*100
             while millis()<endtime:
                 yield True
-            setlayer(lc.tw.turtle.spr,100)
+            lc.tw.turtle.spr.setlayer(100)
         token = lc.iline[0]
         if token==lc.symopar: token=lc.iline[1]
         icall(lc, eval); yield True
@@ -274,7 +274,7 @@ def debug_trace(lc, token):
         shp = 'info'
         setshape(lc.tw.status_spr, lc.tw.status_shapes[shp])
         setlabel(lc.tw.status_spr, _(my_string))
-        setlayer(lc.tw.status_spr, 710)
+        lc.tw.status_spr.setlayer(710)
     return
 
 def undefined_check(lc, token):
@@ -286,11 +286,11 @@ def no_args_check(lc):
     raise logoerror("#noinput")
 
 def prim_wait(lc,time):
-    setlayer(lc.tw.turtle.spr,630)
+    lc.tw.turtle.spr.setlayer(630)
     endtime = millis()+an_int(lc,time*1000)
     while millis()<endtime:
         yield True
-    setlayer(lc.tw.turtle.spr,100)
+    lc.tw.turtle.spr.setlayer(100)
     ireturn(lc); yield True
 
 def prim_repeat(lc, num, list):
@@ -989,11 +989,11 @@ def doevalstep(lc):
             try:
                 lc.step.next()
             except StopIteration:
-                setlayer(lc.tw.turtle.spr,630)
+                lc.tw.turtle.spr.setlayer(630)
                 return False
     except logoerror, e:
         showlabel(lc, str(e)[1:-1])
-        setlayer(lc.tw.turtle.spr,630)
+        lc.tw.turtle.spr.setlayer(630)
         return False
     return True
 
@@ -1069,7 +1069,7 @@ def showlabel(lc,label):
         shp = 'status'
     setshape(lc.tw.status_spr, lc.tw.status_shapes[shp])
     setlabel(lc.tw.status_spr, label)
-    setlayer(lc.tw.status_spr, 710)
+    lc.tw.status_spr.setlayer(710)
 
 def stop_logo(tw):
     tw.step_time = 0
--
cgit v0.9.1