comparison rogue4/armor.c @ 225:4f6e056438eb

Merge the GCC5 and build fix branches.
author John "Elwin" Edwards
date Wed, 02 Mar 2016 21:28:34 -0500
parents 1b73a8641b37
children
comparison
equal deleted inserted replaced
224:4d0f53998e8a 225:4f6e056438eb
14 14
15 /* 15 /*
16 * wear: 16 * wear:
17 * The player wants to wear something, so let him/her put it on. 17 * The player wants to wear something, so let him/her put it on.
18 */ 18 */
19 wear() 19 void
20 wear(void)
20 { 21 {
21 register THING *obj; 22 register THING *obj;
22 register char *sp; 23 register char *sp;
23 24
24 if (cur_armor != NULL) 25 if (cur_armor != NULL)
48 49
49 /* 50 /*
50 * take_off: 51 * take_off:
51 * Get the armor off of the players back 52 * Get the armor off of the players back
52 */ 53 */
53 take_off() 54 void
55 take_off(void)
54 { 56 {
55 register THING *obj; 57 register THING *obj;
56 58
57 if ((obj = cur_armor) == NULL) 59 if ((obj = cur_armor) == NULL)
58 { 60 {
75 77
76 /* 78 /*
77 * waste_time: 79 * waste_time:
78 * Do nothing but let other things happen 80 * Do nothing but let other things happen
79 */ 81 */
80 waste_time() 82 void
83 waste_time(void)
81 { 84 {
82 do_daemons(BEFORE); 85 do_daemons(BEFORE);
83 do_fuses(BEFORE); 86 do_fuses(BEFORE);
84 do_daemons(AFTER); 87 do_daemons(AFTER);
85 do_fuses(AFTER); 88 do_fuses(AFTER);