diff options
author | Asaf Paris Mandoki <asafpm@gmail.com> | 2009-07-12 08:37:26 (GMT) |
---|---|---|
committer | Asaf Paris Mandoki <asafpm@gmail.com> | 2009-07-12 08:37:26 (GMT) |
commit | d05d1eef0f8093b2abe3c331027f8f32ee79c087 (patch) | |
tree | 8a2756f0bc21044c9a0618c471463268444cfef3 | |
parent | 5284e89a7e0d3cf794d435bed6cfa4926e95d55a (diff) |
Added functionality to save/load contraptions to/from the journal (Trac #1034)
-rw-r--r-- | lib/Elements-0.12-py2.5.egg | bin | 55899 -> 0 bytes | |||
-rw-r--r-- | lib/Elements-0.12-py2.6.egg | bin | 0 -> 57149 bytes | |||
-rw-r--r-- | physics.py | 2 | ||||
-rw-r--r-- | tools.py | 8 |
4 files changed, 9 insertions, 1 deletions
diff --git a/lib/Elements-0.12-py2.5.egg b/lib/Elements-0.12-py2.5.egg Binary files differdeleted file mode 100644 index d9bc609..0000000 --- a/lib/Elements-0.12-py2.5.egg +++ /dev/null diff --git a/lib/Elements-0.12-py2.6.egg b/lib/Elements-0.12-py2.6.egg Binary files differnew file mode 100644 index 0000000..224ad46 --- /dev/null +++ b/lib/Elements-0.12-py2.6.egg @@ -20,7 +20,7 @@ import pygame from pygame.locals import * from pygame.color import * import olpcgames -sys.path.append("lib/Elements-0.12-py2.5.egg") +sys.path.append("lib/Elements-0.12-py2.6.egg") sys.path.append("lib/Box2D-2.0.2b1-py2.5-linux-i686.egg") import Box2D as box2d import elements @@ -4,6 +4,7 @@ # By Alex Levenson #================================================================== import pygame +import olpcgames from pygame.locals import * from helpers import * from inspect import getmro @@ -33,6 +34,13 @@ class Tool(object): elif event.type == USEREVENT: if hasattr(event,"action"): if self.game.toolList.has_key(event.action): self.game.setTool(event.action) + if hasattr(event,"code"): + if event.code == olpcgames.FILE_WRITE_REQUEST: + #saving to journal + self.game.world.pickle_save(event.filename) + if event.code == olpcgames.FILE_READ_REQUEST: + #loading from journal + self.game.world.pickle_load(event.filename) elif event.type == MOUSEBUTTONDOWN and event.button == 1: self.game.canvas.grab_focus() handled = False |