Fix cursor bug, try to fix journal data

Signed-off-by: Daniel Francis <francis@sugarlabs.org>

1 files changed, 14 insertions, 2 deletions

diff --git a/tools.py b/tools.py
index c03130f..adb08ff 100644
--- a/tools.py
+++ b/tools.py
@@ -23,6 +23,7 @@
 #==================================================================
 import pygame
 import sugargame
+import olpcgamesutil
 from pygame.locals import *
 from helpers import *
 from inspect import getmro
@@ -56,11 +57,11 @@ class Tool(object):
                 elif self.game.toolList.has_key(event.action):
                     self.game.setTool(event.action)
             elif hasattr(event, "code"):
-                if event.code == sugargame.FILE_WRITE_REQUEST:
+                if event.code == olpcgamesutil.FILE_WRITE_REQUEST:
                     #Saving to journal
                     self.game.world.add.remove_mouseJoint()
                     self.game.world.json_save(event.filename)
-                elif event.code == sugargame.FILE_READ_REQUEST:
+                elif event.code == olpcgamesutil.FILE_READ_REQUEST:
                     #Loading from journal
                     self.game.world.json_load(event.filename)
         elif event.type == MOUSEBUTTONDOWN and event.button == 1:
@@ -99,6 +100,7 @@ class CircleTool(Tool):
         self.radius = 40
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN:
             if event.button == 1:
                 self.pt1 = tuple_to_int(event.pos)
@@ -140,6 +142,7 @@ class BoxTool(Tool):
         self.height = 80
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN:
             if event.button == 1:
                 self.pt1 = tuple_to_int(event.pos)
@@ -190,6 +193,7 @@ class TriangleTool(Tool):
         self.line_delta = [0, -80]
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN:
             if event.button == 1:
                 self.pt1 = tuple_to_int(event.pos)
@@ -258,6 +262,7 @@ class PolygonTool(Tool):
         self.safe = False
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if hasattr(event, 'button') and event.button == 1:
             if event.type == MOUSEBUTTONDOWN and self.vertices is None:
                 self.vertices = [tuple_to_int(event.pos)]
@@ -332,6 +337,7 @@ class MagicPenTool(Tool):
         self.safe = False
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN and event.button == 1:
             self.vertices = [tuple_to_int(event.pos)]
             self.safe = False
@@ -385,6 +391,7 @@ class GrabTool(Tool):
         self._current_body = None
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         # We handle two types of "grab" depending on simulation running or not
         if event.type == MOUSEBUTTONDOWN:
             if event.button == 1:
@@ -434,6 +441,7 @@ class JointTool(Tool):
         self.jb1 = self.jb2 = self.jb1pos = self.jb2pos = None
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN:
             if event.button >= 1:
                 # Grab the first body
@@ -480,6 +488,7 @@ class PinTool(Tool):
         self.jb1 = self.jb1pos = None
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN:
             self.jb1pos = tuple_to_int(event.pos)
             self.jb1 = self.game.world.get_bodies_at_pos(
@@ -504,6 +513,7 @@ class MotorTool(Tool):
         self.jb1 = self.jb1pos = None
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN:
             if event.button >= 1:
                 # Grab the first body
@@ -529,6 +539,7 @@ class RollTool(Tool):
         self.jb1 = self.jb1pos = None
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if event.type == MOUSEBUTTONDOWN:
             if event.button == 1:
                 self.jb1pos = tuple_to_int(event.pos)
@@ -555,6 +566,7 @@ class DestroyTool(Tool):
         self.vertices = None
 
     def handleToolEvent(self, event):
+        Tool.handleToolEvent(self, event)
         if pygame.mouse.get_pressed()[0]:
             if not self.vertices: self.vertices = []
             self.vertices.append(tuple_to_int(event.pos))