Mercurial > hg > early-roguelike

comparison rogue4/rogue.h @ 228:b67b99f6c92b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Daemons and fuses now return void. Functions for starting and stopping daemons and fuses now expect the type 'void (*func)()'. Only a few functions in XRogue needed to be modified to fit. Determining the type of the argument is left for a later date. Building with GCC5 should now produce less than 200 lines of warnings per game.
author John "Elwin" Edwards
date Sat, 05 Mar 2016 20:49:37 -0500
parents 696277507a2e
children 0990adf580ee
comparison
equal deleted inserted replaced
227:696277507a2e 228:b67b99f6c92b
322 322
323 /* daemon/fuse data type */ 323 /* daemon/fuse data type */
324 324
325 struct delayed_action { 325 struct delayed_action {
326 int d_type; 326 int d_type;
327 int (*d_func)(); 327 void (*d_func)();
328 int d_arg; 328 int d_arg;
329 int d_time; 329 int d_time;
330 }; 330 };
331 331
332 /**/ 332 /**/
515 void eat(void); 515 void eat(void);
516 int encread(void *starta, int size, int inf); 516 int encread(void *starta, int size, int inf);
517 void encwrite(void *starta, int size, FILE *outf); 517 void encwrite(void *starta, int size, FILE *outf);
518 void endmsg(void); 518 void endmsg(void);
519 void enter_room(coord *cp); 519 void enter_room(coord *cp);
520 void extinguish(int (*func)()); 520 void extinguish(void (*func)());
521 void fall(THING *obj, bool pr); 521 void fall(THING *obj, bool pr);
522 bool fallpos(coord *pos, coord *newpos, bool pass); 522 bool fallpos(coord *pos, coord *newpos, bool pass);
523 void fatal(char *s); 523 void fatal(char *s);
524 bool fight(coord *mp, char mn, THING *weap, bool thrown); 524 bool fight(coord *mp, char mn, THING *weap, bool thrown);
525 THING *find_obj(int y, int x); 525 THING *find_obj(int y, int x);
526 void fire_bolt(coord *start, coord *dir, char *name); 526 void fire_bolt(coord *start, coord *dir, char *name);
527 void fix_stick(THING *cur); 527 void fix_stick(THING *cur);
528 void flush_type(void); 528 void flush_type(void);
529 void fuse(int (*func)(), int arg, int time, int type); 529 void fuse(void (*func)(), int arg, int time, int type);
530 void genocide(void); 530 void genocide(void);
531 bool get_dir(void); 531 bool get_dir(void);
532 THING *get_item(char *purpose, int type); 532 THING *get_item(char *purpose, int type);
533 int get_str(char *opt, WINDOW *win); 533 int get_str(char *opt, WINDOW *win);
534 void give_pack(THING *tp); 534 void give_pack(THING *tp);
545 bool inventory(THING *list, int type); 545 bool inventory(THING *list, int type);
546 void invis_on(void); 546 void invis_on(void);
547 bool is_current(THING *obj); 547 bool is_current(THING *obj);
548 bool is_magic(THING *obj); 548 bool is_magic(THING *obj);
549 bool issymlink(char *sp); 549 bool issymlink(char *sp);
550 void kill_daemon(int (*func)()); 550 void kill_daemon(void (*func)());
551 void killed(THING *tp, bool pr); 551 void killed(THING *tp, bool pr);
552 void leave(int sig); 552 void leave(int sig);
553 void leave_room(coord *cp); 553 void leave_room(coord *cp);
554 void lengthen(int (*func)(), int xtime); 554 void lengthen(void (*func)(), int xtime);
555 bool lock_sc(void); 555 bool lock_sc(void);
556 void look(bool wakeup); 556 void look(bool wakeup);
557 void missile(int ydelta, int xdelta); 557 void missile(int ydelta, int xdelta);
558 void msg(char *fmt, ...); 558 void msg(char *fmt, ...);
559 THING *new_item(void); 559 THING *new_item(void);
599 void setup(void); 599 void setup(void);
600 void shell(void); 600 void shell(void);
601 void show_win(WINDOW *scr, char *message); 601 void show_win(WINDOW *scr, char *message);
602 void sight(void); 602 void sight(void);
603 int sign(int nm); 603 int sign(int nm);
604 void start_daemon(int (*func)(), int arg, int type); 604 void start_daemon(void (*func)(), int arg, int type);
605 void start_score(void); 605 void start_score(void);
606 void status(void); 606 void status(void);
607 bool step_ok(char ch); 607 bool step_ok(char ch);
608 void stomach(void); 608 void stomach(void);
609 void strucpy(char *s1, char *s2, int len); 609 void strucpy(char *s1, char *s2, int len);