fixed save/restore

3 files changed, 5 insertions, 16 deletions

diff --git a/PukllanapacActivity.py b/PukllanapacActivity.py
index 8247b4e..382f319 100644
--- a/PukllanapacActivity.py
+++ b/PukllanapacActivity.py
@@ -122,12 +122,10 @@ class PukllanapacActivity(activity.Activity):
             for i in range(24):
                 if 'card' + str(i) in self.metadata:
                     grid.append(int(self.metadata['card' + str(i)]))
-            self.tw.grid.set_grid(grid, self.tw.mode)
+            self.tw.grid.restore_grid(grid, self.tw.mode)
             for i in range(24):
                 if 'rotate' + str(i) in self.metadata:
-                    print "restoring %d to %d" % (i,
-                        int(self.metadata['rotate' + str(i)]))
-                    self.tw.grid.card_table[i].set_orientation(
+                    self.tw.grid.card_table[grid[i]].set_orientation(
                         int(self.metadata['rotate' + str(i)]))
         self.tw.mask(self._play_level)
 
diff --git a/grid.py b/grid.py
index 0dd2cef..9ae46d4 100644
--- a/grid.py
+++ b/grid.py
@@ -80,14 +80,11 @@ class Grid:
             return (x - int((self.w - (self.d * 6)) / 2)) / self.d + \
                 ((y - int((self.h - (self.d * 4)) / 2)) / self.d) * 6
 
-    def set_grid(self, newgrid, shape='rectangle'):
+    def restore_grid(self, grid, shape='rectangle'):
         """ Move cards to x, y positions specified in grid """
-        for i, c in enumerate(newgrid):
+        for i, c in enumerate(grid):
             x, y = self.i_to_xy(i, shape)
             self.card_table[c].spr.move((x, y))
-            if shape == 'hexagon':
-                self.card_table[c].set_orientation(
-                    HEX_ORIENTATION[GRID_TO_HEX[c]])
             self.grid[i] = c
 
     def show_all(self):
diff --git a/window.py b/window.py
index 85dfb08..8282a30 100644
--- a/window.py
+++ b/window.py
@@ -108,7 +108,6 @@ class Game():
         # if press and release are the same card (click), then rotate
         if self.press == self.release:
             self.press.set_layer(0)
-                self.grid.grid[self.grid.spr_to_i(self.press)]].orientation, ')'
             self.grid.card_table[self.grid.grid[self.grid.spr_to_i(
                         self.press)]].rotate_ccw()
             if self.mode == 'hexagon': # Rotate a second time
@@ -125,13 +124,8 @@ class Game():
         return True
 
     def _keypress_cb(self, area, event):
-        """ Keypress is used to switch between games  """
+        """ Keypress is used to ...  """
         k = gtk.gdk.keyval_name(event.keyval)
-        u = gtk.gdk.keyval_to_unicode(event.keyval)
-        if k == '1':
-            print 'game 1'
-        elif k == '2':
-            print 'game 2'
 
     def _expose_cb(self, win, event):
         self.sprites.refresh(event)