From 21a547915b277a1d807984cf63f0724bc6944432 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Mon, 12 Oct 2009 09:10:52 +0000
Subject: minor edits

---
diff --git a/tagplay.py b/tagplay.py
index 1eba5bf..daffde0 100644
--- a/tagplay.py
+++ b/tagplay.py
@@ -35,7 +35,11 @@ import gobject
 import time
 gobject.threads_init()
 
-from sugar.datastore import datastore
+try:
+    from sugar.datastore import datastore
+except:
+    # probably launched from outside of Sugar
+    pass
 from talogo import *
 
 class Gplay:
diff --git a/tasprites.py b/tasprites.py
index 85993bc..7310655 100644
--- a/tasprites.py
+++ b/tasprites.py
@@ -95,7 +95,7 @@ def setlabel(spr,label):
 
 def inval(spr):
     spr.tw.area.invalidate_rect(gtk.gdk.Rectangle(spr.x,spr.y,spr.width, \
-                                                  spr.height), False)
+                                                      spr.height), False)
 
 def draw(spr):
     if isinstance(spr.image,gtk.gdk.Pixbuf):
@@ -111,22 +111,22 @@ def draw(spr):
             spr.draw_label(spr,str(spr.label))
 
 def hit(spr,pos):
-    x,y = pos
+    x, y = pos
     if x<spr.x: return False
-    if x>spr.x+spr.width: return False
+    if x>spr.x+spr.width-1: return False
     if y<spr.y: return False
-    if y>spr.y+spr.height: return False
+    if y>spr.y+spr.height-1: return False
     if isinstance(spr.image,gtk.gdk.Pixmap): return True
     if hasattr(spr, 'proto') and hasattr(spr.proto, 'name') and \
         spr.proto.name == 'journal':
             return True
-    dx,dy = x-spr.x, y-spr.y
+    dx, dy = x-spr.x, y-spr.y
     try:
         return ord(spr.image.get_pixels()[(dy*spr.width+dx)*4+3]) == 255
     except IndexError:
         if hasattr(spr, 'proto') and hasattr(spr.proto, 'name'):
             print spr.proto.name
-        print "IndexError: string index out of range" + str(dx) + " " \
+        print "IndexError: string index out of range: " + str(dx) + " " \
             + str(dy) + " " + str(spr.width) + " " + str(spr.height)
         return True
 
diff --git a/taturtle.py b/taturtle.py
index a4f57b7..4a3ee53 100644
--- a/taturtle.py
+++ b/taturtle.py
@@ -292,3 +292,4 @@ def invalt(t,x,y,w,h):
     t.tw.area.invalidate_rect(rect, False)
 
 
+
--
cgit v0.9.1