Early Roguelike Collection: xrogue/command.c comparison

comparison xrogue/command.c @ 220:f54901b9c39b

XRogue: convert to ANSI-style function declarations.

author	John "Elwin" Edwards
date	Wed, 02 Mar 2016 21:13:26 -0500
parents	a0a57cf42810
children	7c1cb43f346e

comparison

equal deleted inserted replaced

-:f9ef86cf22b2
+:f54901b9c39b
 #include <stdlib.h>
 #include <string.h>
 #include "mach_dep.h"
 #include "rogue.h"
+void display(void);
+void d_level(void);
+void u_level(void);
+void shell(void);
+void nameit(void);
+void namemonst(void);
+void count_gold(void);
 /*
 * command:
 *      Process the user commands
 */
-command()
+void
+command(void)
 {
 unsigned int ch;
 struct linked_list *item;
 unsigned int countch = 0, direction = 0, newcount = FALSE;
 int segment = 1;
 player.t_no_move = 2*movement(&player);
 }
 else {
 after = FALSE;
 player.t_action = A_NIL;
-fright();
+fright(NULL);
 }
 when 'g' : /* Give command: give slime-molds to monsters */
 if (player.t_action == A_NIL) {
 player.t_action = 'g';
 player.t_no_move = 2*movement(&player);
 }
 else {
 after = FALSE;
 player.t_action = A_NIL;
-give();
+give(NULL);
 }
 when 'G' :
 if (player.t_action == A_NIL) {
 player.t_action = 'G';
 player.t_no_move = movement(&player);
 /* no character descriptions yet until updated (help.c) */
 /* when '\\' : after = FALSE; ident_hero(); */
 when '\\' : msg("Charon (the Boatman) looks at you... ");
-when '/' : after = FALSE; identify(NULL);
+when '/' : after = FALSE; identify('\0');
 when C_COUNT : count_gold();
 when C_DIP : dip_it();
 when C_DROP : player.t_action = C_DROP;
 drop((struct linked_list *)NULL);
 when C_EAT : eat();
-when C_QUAFF : quaff(-1, NULL, NULL, TRUE);
+when C_QUAFF : quaff(-1, 0, 0, TRUE);
-when C_READ : read_scroll(-1, NULL, TRUE);
+when C_READ : read_scroll(-1, 0, TRUE);
 when C_SETTRAP : set_trap(&player, hero.y, hero.x);
 when C_SEARCH :
 if (player.t_action == A_NIL) {
 player.t_action = C_SEARCH;
 player.t_no_move = 2 + movement(&player);
 }
 when C_TAKEOFF : take_off();
 when C_USE : use_mm(-1);
 when C_WEAR : wear();
 when C_WIELD : wield();
-when C_ZAP : if (!player_zap(NULL, FALSE)) after=FALSE;
+when C_ZAP : if (!player_zap(0, FALSE)) after=FALSE;
 when C_CAST : cast();
 when C_CHANT : chant();
 when C_PRAY : pray();
 when CTRL('B') : msg("Current score: %d",
 pstats.s_exp + (long) purse);
 /*
 * display
 *      tell the player what is at a certain coordinates assuming
 *      it can be seen.
 */
-display()
+void
+display(void)
 {
 coord c;
 struct linked_list *item;
 struct thing *tp;
 int what;
 *      Have player make certain, then exit.
 */
 /*UNUSED*/
 void
-quit(sig)
+quit(int sig)
-int sig;
 {
 register int oy, ox;
 	NOOP(sig);
 /*
 * bugkill:
 *      killed by a program bug instead of voluntarily.
 */
-bugkill(sig)
+void
-int sig;
+bugkill(int sig)
 {
 signal(sig, quit);      /* If we get it again, give up */
 if (levtype == OUTSIDE) {
 msg("Oh no!  You walk right into a flying swarm of nasty little bugs!! ");
 msg("One of them penetrates your brain!!!  --More--");
 /*
 * search:
 *      Player gropes about him to find hidden things.
 */
-search(is_thief, door_chime)
+void
-register bool is_thief, door_chime;
+search(bool is_thief, bool door_chime)
 {
 register int x, y;
 register char ch,   /* The trap or door character */
 sch;   /* Trap or door character (as seen on screen) */
 register unsigned char mch;   /* Monster, if a monster is on the trap or door */
 /*
 * d_level:
 *      He wants to go down a level
 */
-d_level()
+void
+d_level(void)
 {
 bool no_phase=FALSE;
 char position = winat(hero.y, hero.x);
 int au;
 /*
 * u_level:
 *      He wants to go up a level
 */
-u_level()
+void
+u_level(void)
 {
 bool no_phase = FALSE;
 register struct linked_list *item;
 char position = winat(hero.y, hero.x);
 struct thing *tp;
 /*
 * Let him escape for a while
 */
-shell()
+void
+shell(void)
 {
 /*
 * Set the terminal back to original mode
 */
 wclear(hw);
 }
 /*
 * see what we want to name -- an item or a monster.
 */
-nameit()
+void
+nameit(void)
 {
 char answer;
 msg("Name monster or item (m or i)? ");
 answer = wgetch(cw);
 /*
 * allow a user to call a potion, scroll, or ring something
 */
-nameitem(item, mark)
+void
-struct linked_list *item;
+nameitem(struct linked_list *item, bool mark)
-bool mark;
 {
 register struct object *obj;
 register char **guess = NULL, *elsewise = NULL;
 register bool *know;
 }
 }
 /* Name a monster */
-namemonst()
+void
+namemonst(void)
 {
 register struct thing *tp;
 struct linked_list *item;
 coord c;
 }
 msg("There is no monster there to name.");
 }
-count_gold()
+void
+count_gold(void)
 {
 if (player.t_action != C_COUNT) {
 msg("You take a break to count your money.. ");
 player.t_using = NULL;
 player.t_action = C_COUNT;  /* We are counting */
 /*
 * Teleport somewhere, anywhere...
 */
-do_teleport()
+void
+do_teleport(void)
 {
 int tlev;
 prbuf[0] = '\0';
 msg("To which level do you wish to teleport? ");
 if(get_str(prbuf,msgw) == NORM) {

Mercurial > hg > early-roguelike

comparison xrogue/command.c @ 220:f54901b9c39b