Mercurial > hg > early-roguelike

comparison xrogue/encumb.c @ 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 7c1cb43f346e
children e52a8a7ad4c5
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
167 inwhgt = TRUE; 167 inwhgt = TRUE;
168 if (pstats.s_pack > pstats.s_carry) { 168 if (pstats.s_pack > pstats.s_carry) {
169 ch = mvwinch(stdscr, hero.y, hero.x); 169 ch = mvwinch(stdscr, hero.y, hero.x);
170 if((ch != FLOOR && ch != PASSAGE)) { 170 if((ch != FLOOR && ch != PASSAGE)) {
171 extinguish(wghtchk); 171 extinguish(wghtchk);
172 fuse(wghtchk, (VOID *)NULL, 1, AFTER); 172 fuse(wghtchk, NULL, 1, AFTER);
173 inwhgt = FALSE; 173 inwhgt = FALSE;
174 return; 174 return;
175 } 175 }
176 extinguish(wghtchk); 176 extinguish(wghtchk);
177 msg("Your pack is far too heavy for you.. "); 177 msg("Your pack is far too heavy for you.. ");