diff xrogue/weapons.c @ 225:4f6e056438eb

Merge the GCC5 and build fix branches.
author John "Elwin" Edwards
date Wed, 02 Mar 2016 21:28:34 -0500
parents f54901b9c39b
children 28e22fb35989
line wrap: on
line diff
--- a/xrogue/weapons.c	Fri Feb 26 17:30:30 2016 -0500
+++ b/xrogue/weapons.c	Wed Mar 02 21:28:34 2016 -0500
@@ -21,10 +21,8 @@
 #include <string.h>
 #include "rogue.h"
 
-boomerang(ydelta, xdelta, item, tp)
-int ydelta, xdelta;
-register struct linked_list *item;
-register struct thing *tp;
+void
+boomerang(int ydelta, int xdelta, struct linked_list *item, struct thing *tp)
 {
         register struct object *obj;
         struct thing midpoint;
@@ -56,10 +54,8 @@
  * tp other than t_pos unless we change boomerang().
  */
 
-do_motion(obj, ydelta, xdelta, tp)
-register struct object *obj;
-register int ydelta, xdelta;
-register struct thing *tp;
+void
+do_motion(struct object *obj, int ydelta, int xdelta, struct thing *tp)
 {
 
     /*
@@ -117,9 +113,8 @@
  *      Drop an item someplace around here.
  */
 
-fall(item, pr)
-register struct linked_list *item;
-bool pr;
+void
+fall(struct linked_list *item, bool pr)
 {
         register struct object *obj;
         register struct room *rp;
@@ -171,10 +166,8 @@
  * Does the missile hit the monster
  */
 
-hit_monster(y, x, obj, tp)
-register int y, x;
-struct object *obj;
-register struct thing *tp;
+bool
+hit_monster(int y, int x, struct object *obj, struct thing *tp)
 {
         static coord mp;
 
@@ -204,9 +197,8 @@
  *      Set up the initial goodies for a weapon
  */
 
-init_weapon(weap, type)
-register struct object *weap;
-char type;
+void
+init_weapon(struct object *weap, char type)
 {
         register struct init_weps *iwp;
 
@@ -229,10 +221,8 @@
  *      Fire a missile in a given direction
  */
 
-missile(ydelta, xdelta, item, tp)
-int ydelta, xdelta;
-register struct linked_list *item;
-register struct thing *tp;
+void
+missile(int ydelta, int xdelta, struct linked_list *item, struct thing *tp)
 {
         register struct object *obj;
         register struct linked_list *nitem;
@@ -308,8 +298,7 @@
  */
 
 char *
-num(n1, n2)
-register int n1, n2;
+num(int n1, int n2)
 {
         static char numbuf[LINELEN/2];
 
@@ -329,7 +318,8 @@
  *      Pull out a certain weapon
  */
 
-wield()
+void
+wield(void)
 {
         register struct linked_list *item;
         register struct object *obj, *oweapon;