Mercurial > hg > early-roguelike

diff xrogue/daemons.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 7c1cb43f346e
children 0250220d8cdd
line wrap: on
line diff
--- a/xrogue/daemons.c	Tue Mar 08 19:45:41 2016 -0500
+++ b/xrogue/daemons.c	Fri Mar 11 19:47:52 2016 -0500
@@ -114,7 +114,7 @@
 void
 swander(void)
 {
-    start_daemon(rollwand, (VOID *)NULL, BEFORE);
+    start_daemon(rollwand, NULL, BEFORE);
 }
 
 /*
@@ -137,7 +137,7 @@
             if (levtype != POSTLEV)
                 wanderer();
             kill_daemon(rollwand);
-            fuse(swander, (VOID *)NULL, WANDERTIME, BEFORE);
+            fuse(swander, NULL, WANDERTIME, BEFORE);
         }
         between = 0;
     }
@@ -222,13 +222,12 @@
  *      Player can no longer fly
  */
 
-int
+void
 land(void)
 {
     turn_off(player, ISFLY);
     msg("You regain your normal weight");
     running = FALSE;
-    return(0);
 }
 
 /*
@@ -253,7 +252,7 @@
  *      Restore player's strength
  */
 
-int
+void
 res_strength(long howmuch)
 {
 
@@ -271,7 +270,6 @@
             min(pstats.s_str + howmuch, max_stats.s_str + ring_value(R_ADDSTR));
 
     updpack(TRUE, &player);
-    return(0);
 }
 
 /*
@@ -507,12 +505,11 @@
  * otto's irresistable dance wears off 
  */
  
-int
+void
 undance(void)
 {
     turn_off(player, ISDANCE);
     msg ("Your feet take a break.....whew!");
-    return(0);
 }
 
 /* 
@@ -615,7 +612,7 @@
         return;
     if (tobj->o_charges < QUILLCHARGES)
         tobj->o_charges++;
-    fuse (quill_charge, (VOID *)NULL, player.t_ctype == C_MAGICIAN ? 4 : 8, AFTER);
+    fuse (quill_charge, NULL, player.t_ctype == C_MAGICIAN ? 4 : 8, AFTER);
 }
 
 /*
@@ -637,12 +634,11 @@
  * charge up the cloak of Emori
  */
  
-int
+void
 cloak_charge(struct object *obj)
 {
     if (obj->o_charges < 1)
         obj->o_charges = 1;
-    return(0);
 }
 
 /*
@@ -723,7 +719,7 @@
     time = SPELLTIME - max(17-pstats.s_intel, 0);
     time = max(time, 5);
     if (spell_power > 0) spell_power--;
-    fuse(spell_recovery, (VOID *)NULL, time, AFTER);
+    fuse(spell_recovery, NULL, time, AFTER);
 }
 
 /*
@@ -738,7 +734,7 @@
     time = SPELLTIME - max(17-pstats.s_wisdom, 0);
     time = max(time, 5);
     if (pray_time > 0) pray_time--;
-    fuse(prayer_recovery, (VOID *)NULL, time, AFTER);
+    fuse(prayer_recovery, NULL, time, AFTER);
 }
 
 /*
@@ -753,6 +749,6 @@
     time = SPELLTIME - max(17-pstats.s_wisdom, 0);
     time = max(time, 5);
     if (chant_time > 0) chant_time--;
-    fuse(chant_recovery, (VOID *)NULL, time, AFTER);
+    fuse(chant_recovery, NULL, time, AFTER);
 }