Mercurial > hg > early-roguelike
comparison srogue/rogue.h @ 239:837044d2c362
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 | c10fe421b8fb |
| children | 3d4252fa2ed3 |
comparison
equal
deleted
inserted
replaced
| 232:bac2c81fec78 | 239:837044d2c362 |
|---|---|
| 529 * Now we define the structures and types | 529 * Now we define the structures and types |
| 530 */ | 530 */ |
| 531 | 531 |
| 532 struct delayed_action { | 532 struct delayed_action { |
| 533 int d_type; | 533 int d_type; |
| 534 int (*d_func)(); | 534 void (*d_func)(); |
| 535 int d_arg; | 535 int d_arg; |
| 536 int d_time; | 536 int d_time; |
| 537 }; | 537 }; |
| 538 | 538 |
| 539 /* | 539 /* |
| 563 * Linked list data type | 563 * Linked list data type |
| 564 */ | 564 */ |
| 565 struct linked_list { | 565 struct linked_list { |
| 566 struct linked_list *l_next; | 566 struct linked_list *l_next; |
| 567 struct linked_list *l_prev; | 567 struct linked_list *l_prev; |
| 568 char *l_data; /* Various structure pointers */ | 568 void *l_data; /* Various structure pointers */ |
| 569 }; | 569 }; |
| 570 | 570 |
| 571 | 571 |
| 572 /* | 572 /* |
| 573 * Stuff about magic items | 573 * Stuff about magic items |