Early Roguelike Collection: rogue4/fight.c comparison

comparison rogue4/fight.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	0990adf580ee

comparison

equal deleted inserted replaced

-:4d0f53998e8a
+:4f6e056438eb
 * All rights reserved.
 *
 * See the file LICENSE.TXT for full copyright and licensing information.
 */
+#include <stdlib.h>
 #include <curses.h>
 #include <ctype.h>
 #include <string.h>
 #include "rogue.h"
 long e_levels[] = {
 10L,20L,40L,80L,160L,320L,640L,1280L,2560L,5120L,10240L,20480L,
 40920L, 81920L, 163840L, 327680L, 655360L, 1310720L, 2621440L, 0L
 };
+bool roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl);
+void hit(char *er, char *ee);
+void miss(char *er, char *ee);
+int str_plus(str_t str);
+int add_dam(str_t str);
+void thunk(THING *weap, const char *mname);
+void bounce(THING *weap, const char *mname);
 /*
 * fight:
 *	The player attacks the monster.
 */
-fight(mp, mn, weap, thrown)
+bool
-register coord *mp;
+fight(coord *mp, char mn, THING *weap, bool thrown)
-char mn;
-register THING *weap;
-bool thrown;
 {
 register THING *tp;
 register bool did_hit = TRUE;
 register const char *mname;
 /*
 * attack:
 *	The monster attacks the player
 */
-attack(mp)
+int
-register THING *mp;
+attack(THING *mp)
 {
 register const char *mname;
 /*
 * Since this is an attack, stop running and any healing that was
 /*
 * swing:
 *	Returns true if the swing hits
 */
-swing(at_lvl, op_arm, wplus)
+bool
-int at_lvl, op_arm, wplus;
+swing(int at_lvl, int op_arm, int wplus)
 {
 register int res = rnd(20);
 register int need = (20 - at_lvl) - op_arm;
 return (res + wplus >= need);
 /*
 * check_level:
 *	Check to see if the guy has gone up a level.
 */
-check_level()
+void
+check_level(void)
 {
 register int i, add, olevel;
 for (i = 0; e_levels[i] != 0; i++)
 	if (e_levels[i] > pstats.s_exp)
 /*
 * roll_em:
 *	Roll several attacks
 */
-roll_em(thatt, thdef, weap, hurl)
+bool
-THING *thatt, *thdef, *weap;
+roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl)
-bool hurl;
 {
 register struct stats *att, *def;
 register char *cp;
 register int ndice, nsides, def_arm;
 register bool did_hit = FALSE;
 /*
 * prname:
 *	The print name of a combatant
 */
 char *
-prname(who, upper)
+prname(char *who, bool upper)
-register char *who;
-bool upper;
 {
 static char tbuf[MAXSTR];
 *tbuf = '\0';
 if (who == 0)
 /*
 * hit:
 *	Print a message to indicate a succesful hit
 */
-hit(er, ee)
+void
-register char *er, *ee;
+hit(char *er, char *ee)
 {
 register char *s = "";
 addmsg(prname(er, TRUE));
 if (terse)
 /*
 * miss:
 *	Print a message to indicate a poor swing
 */
-miss(er, ee)
+void
-register char *er, *ee;
+miss(char *er, char *ee)
 {
 register char *s = "";
 addmsg(prname(er, TRUE));
 switch (terse ? 0 : rnd(4))
 /*
 * save_throw:
 *	See if a creature save against something
 */
-save_throw(which, tp)
+bool
-int which;
+save_throw(int which, THING *tp)
-THING *tp;
 {
 register int need;
 need = 14 + which - tp->t_stats.s_lvl / 2;
 return (roll(1, 20) >= need);
 /*
 * save:
 *	See if he saves against various nasty things
 */
-save(which)
+bool
-register int which;
+save(int which)
 {
 if (which == VS_MAGIC)
 {
 	if (ISRING(LEFT, R_PROTECT))
 	    which -= cur_ring[LEFT]->o_ac;
 /*
 * str_plus:
 *	Compute bonus/penalties for strength on the "to hit" roll
 */
-str_plus(str)
+int
-register str_t str;
+str_plus(str_t str)
 {
 if (str == 31)
 	return 3;
 if (str > 20)
 	return 2;
 /*
 * add_dam:
 *	Compute additional damage done for exceptionally high or low strength
 */
-add_dam(str)
+int
-register str_t str;
+add_dam(str_t str)
 {
 if (str == 31)
 	return 6;
 if (str > 21)
 	return 5;
 if (str == 21)
 /*
 * raise_level:
 *	The guy just magically went up a level.
 */
-raise_level()
+void
+raise_level(void)
 {
 pstats.s_exp = e_levels[pstats.s_lvl-1] + 1L;
 check_level();
 }
 /*
 * thunk:
 *	A missile hits a monster
 */
-thunk(weap, mname)
+void
-register THING *weap;
+thunk(THING *weap, const char *mname)
-register const char *mname;
 {
 if (weap->o_type == WEAPON)
 	addmsg("the %s hits ", w_names[weap->o_which]);
 else
 	addmsg("you hit ");
 /*
 * bounce:
 *	A missile misses a monster
 */
-bounce(weap, mname)
+void
-register THING *weap;
+bounce(THING *weap, const char *mname)
-register const char *mname;
 {
 if (weap->o_type == WEAPON)
 	addmsg("the %s misses ", w_names[weap->o_which]);
 else
 	addmsg("you missed ");
 /*
 * remove:
 *	Remove a monster from the screen
 */
-remove_monster(mp, tp, waskill)
+void
-register coord *mp;
+remove_monster(coord *mp, THING *tp, bool waskill)
-register THING *tp;
-bool waskill;
 {
 register THING *obj, *nexti;
 for (obj = tp->t_pack; obj != NULL; obj = nexti)
 {
 /*
 * is_magic:
 *	Returns true if an object radiates magic
 */
-is_magic(obj)
+bool
-register THING *obj;
+is_magic(THING *obj)
 {
 switch (obj->o_type)
 {
 	case ARMOR:
 	    return obj->o_ac != a_class[obj->o_which];
 /*
 * killed:
 *	Called to put a monster to death
 */
-killed(tp, pr)
+void
-register THING *tp;
+killed(THING *tp, bool pr)
-bool pr;
 {
 pstats.s_exp += tp->t_stats.s_exp;
 /*
 * If the monster was a violet fungi, un-hold him
 */

Mercurial > hg > early-roguelike

comparison rogue4/fight.c @ 225:4f6e056438eb