Mercurial > hg > early-roguelike

diff xrogue/effects.c @ 236:7c1cb43f346e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
XRogue: get rid of VOID as an alias for long. Maybe some compilers in 1986 didn't handle void pointers well, but they are no longer a concern.
author John "Elwin" Edwards
date Mon, 07 Mar 2016 20:44:01 -0500
parents f54901b9c39b
children e1cd27c5464f
line wrap: on
line diff
--- a/xrogue/effects.c	Mon Mar 07 19:26:08 2016 -0500
+++ b/xrogue/effects.c	Mon Mar 07 20:44:01 2016 -0500
@@ -309,7 +309,7 @@
                     if (on(player, HASSTINK)) lengthen(unstink, STINKTIME);
                     else {
                         turn_on(player, HASSTINK);
-                        fuse(unstink, (VOID *)NULL, STINKTIME, AFTER);
+                        fuse(unstink, NULL, STINKTIME, AFTER);
                     }
                 }
             }
@@ -324,7 +324,7 @@
                                 prname(attname, FALSE));
                     chg_str(-1);
                     if (lost_str++ == 0)
-                        fuse(res_strength, (VOID *)NULL, CHILLTIME, AFTER);
+                        fuse(res_strength, NULL, CHILLTIME, AFTER);
                     else lengthen(res_strength, CHILLTIME);
                 }
             }
@@ -359,7 +359,7 @@
                     }
                     else {
                         turn_on(*def, HASDISEASE);
-                        fuse(cure_disease, (VOID *)NULL, roll(HEALTIME,SICKTIME), AFTER);
+                        fuse(cure_disease, NULL, roll(HEALTIME,SICKTIME), AFTER);
                         msg(terse ? "You have been diseased!"
                             : "You have contracted an annoying disease!");
                     }
@@ -491,7 +491,7 @@
                     turn_off(*att, CANDANCE);
                     turn_on(*def, ISDANCE);
                     msg("You begin to dance uncontrollably!");
-                    fuse(undance, (VOID *)NULL, roll(2,4), AFTER);
+                    fuse(undance, NULL, roll(2,4), AFTER);
             }
 
             /*
@@ -504,7 +504,7 @@
                 (find_slot(suffocate) == 0)) {
                 turn_on(*att, DIDSUFFOCATE);
                 msg("%s is beginning to suffocate you!", prname(attname, TRUE));
-                fuse(suffocate, (VOID *)NULL, roll(9,3), AFTER);
+                fuse(suffocate, NULL, roll(9,3), AFTER);
             }
 
             /*
@@ -552,7 +552,7 @@
                     msg("You are overcome by a foul odor!");
                     if (lost_str == 0) {
                         chg_str(odor_str);
-                        fuse(res_strength, (VOID *)NULL, SMELLTIME, AFTER);
+                        fuse(res_strength, NULL, SMELLTIME, AFTER);
                         lost_str -= odor_str;
                     }
                     else lengthen(res_strength, SMELLTIME);