Mercurial > hg > early-roguelike
comparison xrogue/rings.c @ 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 | 7c1cb43f346e |
children |
comparison
equal
deleted
inserted
replaced
232:bac2c81fec78 | 239:837044d2c362 |
---|---|
98 light(&hero); | 98 light(&hero); |
99 mvwaddch(cw, hero.y, hero.x, PLAYER); | 99 mvwaddch(cw, hero.y, hero.x, PLAYER); |
100 } | 100 } |
101 } | 101 } |
102 when R_SEARCH: | 102 when R_SEARCH: |
103 start_daemon(ring_search, (VOID *)NULL, AFTER); | 103 start_daemon(ring_search, NULL, AFTER); |
104 when R_TELEPORT: | 104 when R_TELEPORT: |
105 start_daemon(ring_teleport, (VOID *)NULL, AFTER); | 105 start_daemon(ring_teleport, NULL, AFTER); |
106 } | 106 } |
107 status(FALSE); | 107 status(FALSE); |
108 if (r_know[obj->o_which] && r_guess[obj->o_which]) { | 108 if (r_know[obj->o_which] && r_guess[obj->o_which]) { |
109 free(r_guess[obj->o_which]); | 109 free(r_guess[obj->o_which]); |
110 r_guess[obj->o_which] = NULL; | 110 r_guess[obj->o_which] = NULL; |