Mercurial > hg > early-roguelike

changeset 114:a5433ba4cabf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arogue5: fix some daemon-related pointer/int casting. Daemons and fuses take a single argument, nominally an int but either ignored or unsafely cast to a pointer. Its type has now been changed to void*. The save/restore code no longer tries to store this argument in the savefile. For doctor(), this is not a problem, because player is the only argument it is ever given as a daemon. However, alchemy() will fail to do anything when passed NULL. Fixing this would be complicated but possible. Summary: the code is slightly safer, but alchemy jugs are guaranteed to stop working after save and restore, instead of just extremely likely.
author John "Elwin" Edwards
date Fri, 28 Mar 2014 10:57:03 -0700
parents aa582a02eb5d
children 1cf517d5d2a8
files arogue5/daemon.c arogue5/rogue.h arogue5/state.c
diffstat 3 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/arogue5/daemon.c	Thu Mar 27 11:09:30 2014 -0700
+++ b/arogue5/daemon.c	Fri Mar 28 10:57:03 2014 -0700
@@ -87,8 +87,7 @@
  * start_daemon:
  *	Start a daemon, takes a function.
  */
-start_daemon(func, arg, type)
-reg int arg, type, (*func)();
+start_daemon(int (*func)(), void *arg, int type)
 {
 	reg struct delayed_action *dev;
 
@@ -122,7 +121,7 @@
 	 * Take it out of the list
 	 */
 	dev->d_type = EMPTY;
-	dev->d_arg = 0;
+	dev->d_arg = NULL;
 	dev->d_func = NULL;
 	dev->d_time = 0;
 	demoncnt -= 1;			/* update count */
@@ -155,8 +154,7 @@
  * fuse:
  *	Start a fuse to go off in a certain number of turns
  */
-fuse(func, arg, time, type)
-reg int (*func)(), arg, time, type;
+fuse(int (*func)(), void *arg, int time, int type)
 {
 	reg struct delayed_action *wire;
 
@@ -199,7 +197,7 @@
 		return;
 	wire->d_type = EMPTY;
 	wire->d_func = NULL;
-	wire->d_arg = 0;
+	wire->d_arg = NULL;
 	wire->d_time = 0;
 	fusecnt -= 1;
 }
--- a/arogue5/rogue.h	Thu Mar 27 11:09:30 2014 -0700
+++ b/arogue5/rogue.h	Fri Mar 28 10:57:03 2014 -0700
@@ -725,7 +725,7 @@
 struct delayed_action {
 	int d_type;
 	int (*d_func)();
-	int d_arg;
+	void *d_arg;
 	int d_time;
 };
 
--- a/arogue5/state.c	Thu Mar 27 11:09:30 2014 -0700
+++ b/arogue5/state.c	Fri Mar 28 10:57:03 2014 -0700
@@ -1420,7 +1420,8 @@
 
         rs_write_int(savef, d_list[i].d_type);
         rs_write_int(savef, func);
-        rs_write_int(savef, d_list[i].d_arg);
+        /* d_arg is a pointer and can't actually be saved and restored. */
+        rs_write_int(savef, 0);
         rs_write_int(savef, d_list[i].d_time);
     }
     
@@ -1517,7 +1518,8 @@
                      break;
         }   
 
-        rs_read_int(inf, &d_list[i].d_arg);
+        rs_read_int(inf, &dummy);
+        d_list[i].d_arg = NULL;
         if (func == 2)
             d_list[i].d_arg = &player;
         rs_read_int(inf, &d_list[i].d_time);
@@ -1525,7 +1527,6 @@
 	if (d_list[i].d_func == NULL) 
 	{
 	    d_list[i].d_time = 0;
-	    d_list[i].d_arg = 0;
 	    d_list[i].d_type = 0;
 	}
     }