Mercurial > hg > early-roguelike

comparison rogue4/rogue.h @ 239:837044d2c362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.
author John "Elwin" Edwards
date Fri, 11 Mar 2016 19:47:52 -0500
parents 2dcf10d45d5b
children d3968e9cb98d
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
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 /**/
482 482
483 void _attach(THING **list, THING *item); 483 void _attach(THING **list, THING *item);
484 void _detach(THING **list, THING *item); 484 void _detach(THING **list, THING *item);
485 void _free_list(THING **ptr); 485 void _free_list(THING **ptr);
486 bool add_haste(bool potion); 486 bool add_haste(bool potion);
487 void add_line(char *fmt, char *arg);
487 void add_pack(THING *obj, bool silent); 488 void add_pack(THING *obj, bool silent);
488 void add_str(str_t *sp, int amt); 489 void add_str(str_t *sp, int amt);
489 void addmsg(char *fmt, ...); 490 void addmsg(char *fmt, ...);
490 void aggravate(void); 491 void aggravate(void);
491 int attack(THING *mp); 492 int attack(THING *mp);
513 void drop(void); 514 void drop(void);
514 bool dropcheck(THING *op); 515 bool dropcheck(THING *op);
515 void eat(void); 516 void eat(void);
516 int encread(void *starta, int size, int inf); 517 int encread(void *starta, int size, int inf);
517 void encwrite(void *starta, int size, FILE *outf); 518 void encwrite(void *starta, int size, FILE *outf);
519 void end_line(void);
518 void endmsg(void); 520 void endmsg(void);
519 void enter_room(coord *cp); 521 void enter_room(coord *cp);
520 void extinguish(int (*func)()); 522 void extinguish(void (*func)());
521 void fall(THING *obj, bool pr); 523 void fall(THING *obj, bool pr);
522 bool fallpos(coord *pos, coord *newpos, bool pass); 524 bool fallpos(coord *pos, coord *newpos, bool pass);
523 void fatal(char *s); 525 void fatal(char *s);
524 bool fight(coord *mp, char mn, THING *weap, bool thrown); 526 bool fight(coord *mp, char mn, THING *weap, bool thrown);
525 THING *find_obj(int y, int x); 527 THING *find_obj(int y, int x);
526 void fire_bolt(coord *start, coord *dir, char *name); 528 void fire_bolt(coord *start, coord *dir, char *name);
527 void fix_stick(THING *cur); 529 void fix_stick(THING *cur);
528 void flush_type(void); 530 void flush_type(void);
529 void fuse(int (*func)(), int arg, int time, int type); 531 void fuse(void (*func)(), int arg, int time, int type);
530 void genocide(void); 532 void genocide(void);
531 bool get_dir(void); 533 bool get_dir(void);
532 THING *get_item(char *purpose, int type); 534 THING *get_item(char *purpose, int type);
533 int get_str(char *opt, WINDOW *win); 535 int get_str(char *opt, WINDOW *win);
534 void give_pack(THING *tp); 536 void give_pack(THING *tp);
545 bool inventory(THING *list, int type); 547 bool inventory(THING *list, int type);
546 void invis_on(void); 548 void invis_on(void);
547 bool is_current(THING *obj); 549 bool is_current(THING *obj);
548 bool is_magic(THING *obj); 550 bool is_magic(THING *obj);
549 bool issymlink(char *sp); 551 bool issymlink(char *sp);
550 void kill_daemon(int (*func)()); 552 void kill_daemon(void (*func)());
551 void killed(THING *tp, bool pr); 553 void killed(THING *tp, bool pr);
552 void leave(int sig); 554 void leave(int sig);
553 void leave_room(coord *cp); 555 void leave_room(coord *cp);
554 void lengthen(int (*func)(), int xtime); 556 void lengthen(void (*func)(), int xtime);
555 bool lock_sc(void); 557 bool lock_sc(void);
556 void look(bool wakeup); 558 void look(bool wakeup);
557 void missile(int ydelta, int xdelta); 559 void missile(int ydelta, int xdelta);
558 void msg(char *fmt, ...); 560 void msg(char *fmt, ...);
559 THING *new_item(void); 561 THING *new_item(void);
599 void setup(void); 601 void setup(void);
600 void shell(void); 602 void shell(void);
601 void show_win(WINDOW *scr, char *message); 603 void show_win(WINDOW *scr, char *message);
602 void sight(void); 604 void sight(void);
603 int sign(int nm); 605 int sign(int nm);
604 void start_daemon(int (*func)(), int arg, int type); 606 void start_daemon(void (*func)(), int arg, int type);
605 void start_score(void); 607 void start_score(void);
606 void status(void); 608 void status(void);
607 bool step_ok(char ch); 609 bool step_ok(char ch);
608 void stomach(void); 610 void stomach(void);
609 void strucpy(char *s1, char *s2, int len); 611 void strucpy(char *s1, char *s2, int len);
617 void turn_see_off(void); 619 void turn_see_off(void);
618 void unconfuse(void); 620 void unconfuse(void);
619 char *unctrol(char ch); 621 char *unctrol(char ch);
620 void unlock_sc(void); 622 void unlock_sc(void);
621 void unsee(void); 623 void unsee(void);
622 char *vowelstr(char *str); 624 char *vowelstr(const char *str);
623 char *xcrypt(const char *key, const char *setting); 625 char *xcrypt(const char *key, const char *setting);
624 void w_wait_for(WINDOW *win, char ch); 626 void w_wait_for(WINDOW *win, char ch);
625 void wait_for(char ch); 627 void wait_for(char ch);
626 THING *wake_monster(int y, int x); 628 THING *wake_monster(int y, int x);
627 void wanderer(void); 629 void wanderer(void);