Mercurial > hg > early-roguelike

diff xrogue/effects.c @ 239:837044d2c362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.
author John "Elwin" Edwards
date Fri, 11 Mar 2016 19:47:52 -0500
parents e1cd27c5464f
children
line wrap: on
line diff
--- a/xrogue/effects.c	Tue Mar 08 19:45:41 2016 -0500
+++ b/xrogue/effects.c	Fri Mar 11 19:47:52 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);
                     }
                 }
             }
@@ -323,8 +323,10 @@
                     msg("You cringe at %s's chilling touch.",
                                 prname(attname, FALSE));
                     chg_str(-1);
-                    if (lost_str++ == 0)
-                        fuse(res_strength, (VOID *)NULL, CHILLTIME, AFTER);
+                    if (lost_str++ == 0) {
+                        int temp_arg = 0;
+                        fuse(res_strength, &temp_arg, CHILLTIME, AFTER);
+                    }
                     else lengthen(res_strength, CHILLTIME);
                 }
             }
@@ -359,7 +361,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 +493,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 +506,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);
             }
 
             /*
@@ -548,11 +550,12 @@
 
                 else {
                     int odor_str = -(rnd(6)+1);
+                    int temp_arg2 = 0;
 
                     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, &temp_arg2, SMELLTIME, AFTER);
                         lost_str -= odor_str;
                     }
                     else lengthen(res_strength, SMELLTIME);