← Back to branch summary

~ubuntu-branches/ubuntu/quantal/sgt-puzzles/quantal

« back to all changes in this revision

Viewing changes to debian/patches/207_slant-shade-filled.diff

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings
  • Date: 2011-03-01 04:16:54 UTC
  • mfrom: (1.2.9 upstream)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20110301041654-949qy9qrroziy7vq
* New upstream version:
  - Add Range and Signpost puzzles
  - Use stock icons and conventional order for dialog buttons
  - Use Cairo for screen rendering
* Update German translation, thanks to Helge Kreutzmann
* Remove or update patches applied or partially applied upstream
* Use Debian source format 3.0 (quilt)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/207_slant-shade-filled.diff
1
1
--- sgt-puzzles.orig/slant.c
2
2
+++ sgt-puzzles/slant.c
3
 
@@ -39,7 +39,7 @@
4
 
     COL_SLANT1,
5
 
     COL_SLANT2,
6
 
     COL_ERROR,
7
 
-    COL_CURSOR, COL_LOWLIGHT, /* LOWLIGHT currently not used. */
8
 
+    COL_CURSOR, COL_LOWLIGHT,
9
 
     NCOLOURS
10
 
 };
11
 
 
12
 
@@ -1889,7 +1889,9 @@
13
 
 
14
 
     draw_rect(dr, COORD(x), COORD(y), TILESIZE, TILESIZE,
15
 
              (v & FLASH) ? COL_GRID :
16
 
-              (v & CURSOR) ? COL_CURSOR : COL_BACKGROUND);
17
 
+              (v & CURSOR) ? COL_CURSOR :
18
 
+             (v & (BACKSLASH | FORWSLASH)) ? COL_LOWLIGHT :
19
 
+             COL_BACKGROUND);
20
 
 
21
 
     /*
22
 
      * Draw the grid lines.
 
3
@@ -1811,11 +1811,7 @@
 
4
     float *ret = snewn(3 * NCOLOURS, float);
 
5
 
 
6
     /* CURSOR colour is a background highlight. */
 
7
-    game_mkhighlight(fe, ret, COL_BACKGROUND, COL_CURSOR, -1);
 
8
-
 
9
-    ret[COL_FILLEDSQUARE * 3 + 0] = ret[COL_BACKGROUND * 3 + 0];
 
10
-    ret[COL_FILLEDSQUARE * 3 + 1] = ret[COL_BACKGROUND * 3 + 1];
 
11
-    ret[COL_FILLEDSQUARE * 3 + 2] = ret[COL_BACKGROUND * 3 + 2];
 
12
+    game_mkhighlight(fe, ret, COL_BACKGROUND, COL_CURSOR, COL_FILLEDSQUARE);
 
13
 
 
14
     ret[COL_GRID * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 0.7F;
 
15
     ret[COL_GRID * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 0.7F;