Mercurial > hg > early-roguelike

comparison xrogue/misc.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
comparison
equal deleted inserted replaced
235:2dcf10d45d5b 236:7c1cb43f346e
80 80
81 /* 81 /*
82 * if he becomes a spell caster of some kind, give him a fuse 82 * if he becomes a spell caster of some kind, give him a fuse
83 */ 83 */
84 if (*newclass == C_MAGICIAN || *newclass == C_RANGER) 84 if (*newclass == C_MAGICIAN || *newclass == C_RANGER)
85 fuse(spell_recovery, (VOID *)NULL, SPELLTIME, AFTER); 85 fuse(spell_recovery, NULL, SPELLTIME, AFTER);
86 if (*newclass == C_DRUID || *newclass == C_MONK) 86 if (*newclass == C_DRUID || *newclass == C_MONK)
87 fuse(chant_recovery, (VOID *)NULL, SPELLTIME, AFTER); 87 fuse(chant_recovery, NULL, SPELLTIME, AFTER);
88 if ((*newclass==C_CLERIC || *newclass==C_PALADIN) && !cur_misc[HEIL_ANKH]) 88 if ((*newclass==C_CLERIC || *newclass==C_PALADIN) && !cur_misc[HEIL_ANKH])
89 fuse(prayer_recovery, (VOID *)NULL, SPELLTIME, AFTER); 89 fuse(prayer_recovery, NULL, SPELLTIME, AFTER);
90 /* 90 /*
91 * if he's changing from a fighter, ranger, or paladin then we 91 * if he's changing from a fighter, ranger, or paladin then we
92 * may have to change his sword since only these types can wield 92 * may have to change his sword since only these types can wield
93 * the two-handed sword. 93 * the two-handed sword.
94 */ 94 */
130 * if he becomes a thief, assassin, or monk then add 130 * if he becomes a thief, assassin, or monk then add
131 * the trap_look() daemon 131 * the trap_look() daemon
132 */ 132 */
133 if (*newclass == C_THIEF || *newclass == C_ASSASSIN || 133 if (*newclass == C_THIEF || *newclass == C_ASSASSIN ||
134 *newclass == C_MONK) 134 *newclass == C_MONK)
135 start_daemon(trap_look, (VOID *)NULL, AFTER); 135 start_daemon(trap_look, NULL, AFTER);
136 136
137 /* adjust stats */ 137 /* adjust stats */
138 char_type = player.t_ctype = *newclass; 138 char_type = player.t_ctype = *newclass;
139 save = pstats.s_hpt; 139 save = pstats.s_hpt;
140 max_stats.s_hpt = pstats.s_hpt = 0; 140 max_stats.s_hpt = pstats.s_hpt = 0;
1027 obj->o_charges--; 1027 obj->o_charges--;
1028 if (terse) msg("You sneeze! "); 1028 if (terse) msg("You sneeze! ");
1029 else msg("Ahh.. Ahh... Choo!! "); 1029 else msg("Ahh.. Ahh... Choo!! ");
1030 if (!find_slot(dust_appear)) { 1030 if (!find_slot(dust_appear)) {
1031 turn_on(player, ISINVIS); 1031 turn_on(player, ISINVIS);
1032 fuse(dust_appear, (VOID *)NULL, DUSTTIME, AFTER); 1032 fuse(dust_appear, NULL, DUSTTIME, AFTER);
1033 PLAYER = IPLAYER; 1033 PLAYER = IPLAYER;
1034 light(&hero); 1034 light(&hero);
1035 } 1035 }
1036 else lengthen(dust_appear, DUSTTIME); 1036 else lengthen(dust_appear, DUSTTIME);
1037 1037
1057 else { 1057 else {
1058 msg("You begin to cough and choke uncontrollably! "); 1058 msg("You begin to cough and choke uncontrollably! ");
1059 if (find_slot(unchoke)) 1059 if (find_slot(unchoke))
1060 lengthen(unchoke, DUSTTIME); 1060 lengthen(unchoke, DUSTTIME);
1061 else 1061 else
1062 fuse(unchoke, (VOID *)NULL, DUSTTIME, AFTER); 1062 fuse(unchoke, NULL, DUSTTIME, AFTER);
1063 turn_on(player, ISHUH); 1063 turn_on(player, ISHUH);
1064 turn_on(player, ISBLIND); 1064 turn_on(player, ISBLIND);
1065 light(&hero); 1065 light(&hero);
1066 } 1066 }
1067 1067