shithub: puzzles

Info  •  Files  •  Log  •  Branches

Patches from Lee Dowling to make Light Up and Net use the
CURSOR_SELECT2 button (to, respectively, toggle a "definitely not
light" dot and to rotate in the opposite direction from
CURSOR_SELECT).

[originally from svn r8299]

--- a/lightup.c

+++ b/lightup.c

@@ -764,7 +764,7 @@

                            unsigned int flags, int lights)

 {

     ll_data lld;

-    int sx,sy,n = 0;

+    int sx = 0, sy = 0, n = 0;

     if (lights > 0) return 0;

     if (flags & F_BLACK) return 0;

@@ -1840,13 +1840,13 @@

         cx = FROMCOORD(x);

         cy = FROMCOORD(y);

         action = (button == LEFT_BUTTON) ? FLIP_LIGHT : FLIP_IMPOSSIBLE;

-    } else if (button == CURSOR_SELECT ||

+    } else if (button == CURSOR_SELECT || button == CURSOR_SELECT2 ||

                button == 'i' || button == 'I' ||

                button == ' ' || button == '\r' || button == '\n') {

         ui->cur_visible = 1;

         cx = ui->cur_x;

         cy = ui->cur_y;

-        action = (button == 'i' || button == 'I') ?

+        action = (button == 'i' || button == 'I' || button == CURSOR_SELECT2) ?

             FLIP_IMPOSSIBLE : FLIP_LIGHT;

     } else if (button == CURSOR_UP || button == CURSOR_DOWN ||

                button == CURSOR_RIGHT || button == CURSOR_LEFT) {

--- a/net.c

+++ b/net.c

@@ -2077,7 +2077,7 @@

     } else if (button == 'a' || button == 's' || button == 'd' ||

 	       button == 'A' || button == 'S' || button == 'D' ||

                button == 'f' || button == 'F' ||

-	       button == CURSOR_SELECT) {

+	       button == CURSOR_SELECT  || button == CURSOR_SELECT2) {

 	tx = ui->cur_x;

 	ty = ui->cur_y;

 	if (button == 'a' || button == 'A' || button == CURSOR_SELECT)

@@ -2084,7 +2084,7 @@

 	    action = ROTATE_LEFT;

 	else if (button == 's' || button == 'S')

 	    action = TOGGLE_LOCK;

-	else if (button == 'd' || button == 'D')

+	else if (button == 'd' || button == 'D' || button == CURSOR_SELECT2)

 	    action = ROTATE_RIGHT;

         else if (button == 'f' || button == 'F')

             action = ROTATE_180;