# HG changeset patch
# User John "Elwin" Edwards
# Date 1457197820 18000
# Node ID 696277507a2e60133c0fc70cea296fdc84cef0b6
# Parent  b922f66acf4d3a10c8ec79fd2d95aeb4cb110fe1
Rogue V4, V5: disable a cheat granting permanent monster detection.

In these two games, a potion of monster detection turns on the player's
SEEMONST flag.  A fuse is set to call turn_see() to turn the flag back
off.  But the save and restore functions do not recognize turn_see() and
fail to set the fuse up again.

When restoring, Rogue V4 merely sets the fuse's function to NULL and
leaves it burning.  When it goes off, a segfault results.  Rogue V5
clears all the fuse's fields, and the player retains the ability to see
all monsters on the level.

The save and restore code can now handle the fuse.  The function used is
a new wrapper, turn_see_off(), which should lead to less problems with
daemons being multiple incompatible types.

Also, Rogue V4 and Super-Rogue now properly clear unrecognized daemon
and fuse slots when restoring a saved game.

diff -r b922f66acf4d -r 696277507a2e rogue4/potions.c
--- a/rogue4/potions.c	Thu Mar 03 21:30:38 2016 -0500
+++ b/rogue4/potions.c	Sat Mar 05 12:10:20 2016 -0500
@@ -77,7 +77,7 @@
 	    msg("you feel stronger, now.  What bulging muscles!");
 	when P_MFIND:
 	    player.t_flags |= SEEMONST;
-	    fuse(turn_see, TRUE, HUHDURATION, AFTER);
+	    fuse(turn_see_off, TRUE, HUHDURATION, AFTER);
 	    if (mlist == NULL)
 		msg("you have a strange feeling for a moment");
 	    else
@@ -256,3 +256,12 @@
 	player.t_flags |= SEEMONST;
     return add_new;
 }
+
+/*
+ * A wrapper for turn_see(TRUE), to be used as a fuse.
+ */
+void
+turn_see_off(void)
+{
+    turn_see(TRUE);
+}
diff -r b922f66acf4d -r 696277507a2e rogue4/rogue.h
--- a/rogue4/rogue.h	Thu Mar 03 21:30:38 2016 -0500
+++ b/rogue4/rogue.h	Sat Mar 05 12:10:20 2016 -0500
@@ -614,6 +614,7 @@
 void    total_winner(void);
 char   *tr_name(char type);
 bool    turn_see(bool turn_off);
+void    turn_see_off(void);
 void    unconfuse(void);
 char   *unctrol(char ch);
 void    unlock_sc(void);
diff -r b922f66acf4d -r 696277507a2e rogue4/state.c
--- a/rogue4/state.c	Thu Mar 03 21:30:38 2016 -0500
+++ b/rogue4/state.c	Sat Mar 05 12:10:20 2016 -0500
@@ -967,6 +967,8 @@
             func = 8;
         else if (d_list[i].d_func == sight)
             func = 9;
+        else if (d_list[i].d_func == turn_see_off)
+            func = 10;
         else
             func = 0;
 
@@ -1037,9 +1039,18 @@
                                 break;
                         case 9: d_list[i].d_func = sight;
                                 break;
+                        case 10: d_list[i].d_func = turn_see_off;
+                                break;
                         default:d_list[i].d_func = NULL;
                                 break;
                     }   
+
+                    if (d_list[i].d_func == NULL)
+                    {   
+                        d_list[i].d_type = 0;
+                        d_list[i].d_arg = 0;
+                        d_list[i].d_time = 0;
+                    }   
                 }
             }
         }
diff -r b922f66acf4d -r 696277507a2e rogue5/potions.c
--- a/rogue5/potions.c	Thu Mar 03 21:30:38 2016 -0500
+++ b/rogue5/potions.c	Sat Mar 05 12:10:20 2016 -0500
@@ -111,7 +111,7 @@
 	    msg("you feel stronger, now.  What bulging muscles!");
 	when P_MFIND:
 	    player.t_flags |= SEEMONST;
-	    fuse((void(*)())turn_see, TRUE, HUHDURATION, AFTER);
+	    fuse(turn_see_off, TRUE, HUHDURATION, AFTER);
 	    if (!turn_see(FALSE))
 		msg("you have a %s feeling for a moment, then it passes",
 		    choose_str("normal", "strange"));
@@ -306,6 +306,15 @@
 }
 
 /*
+ * A wrapper for turn_see(TRUE), intended to be a fuse.
+ */
+void
+turn_see_off(void)
+{
+    turn_see(TRUE);
+}
+
+/*
  * seen_stairs:
  *	Return TRUE if the player has seen the stairs
  */
diff -r b922f66acf4d -r 696277507a2e rogue5/rogue.h
--- a/rogue5/rogue.h	Thu Mar 03 21:30:38 2016 -0500
+++ b/rogue5/rogue.h	Sat Mar 05 12:10:20 2016 -0500
@@ -758,6 +758,7 @@
 void	tstp(int ignored);
 int     turn_ok(int y, int x);
 int	turn_see(int turn_off);
+void    turn_see_off(void);
 void	turnref(void);
 const char *type_name(int type);
 void	u_level(void);
diff -r b922f66acf4d -r 696277507a2e rogue5/state.c
--- a/rogue5/state.c	Thu Mar 03 21:30:38 2016 -0500
+++ b/rogue5/state.c	Sat Mar 05 12:10:20 2016 -0500
@@ -598,6 +598,8 @@
             func = 8;
         else if (dlist[i].d_func == sight)
             func = 9;
+        else if (dlist[i].d_func == turn_see_off)
+            func = 10;
         else if (dlist[i].d_func == NULL)
             func = 0;
         else
@@ -657,6 +659,8 @@
                     break;
             case 9: dlist[i].d_func = sight;
                     break;
+            case 10: dlist[i].d_func = turn_see_off;
+                    break;
             default:dlist[i].d_func = NULL;
                     break;
         }
diff -r b922f66acf4d -r 696277507a2e srogue/state.c
--- a/srogue/state.c	Thu Mar 03 21:30:38 2016 -0500
+++ b/srogue/state.c	Sat Mar 05 12:10:20 2016 -0500
@@ -1098,6 +1098,13 @@
                         default: d_list[i].d_func = NULL;
                                 break;
                     }   
+
+                    if (d_list[i].d_func == NULL)
+                    {   
+                        d_list[i].d_type = 0;
+                        d_list[i].d_arg = 0;
+                        d_list[i].d_time = 0;
+                    }   
                 }
             }
         }