Mercurial > hg > early-roguelike

comparison arogue7/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 e1cd27c5464f
children
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
172 inwhgt = TRUE; 172 inwhgt = TRUE;
173 if (pstats.s_pack > pstats.s_carry) { 173 if (pstats.s_pack > pstats.s_carry) {
174 ch = CCHAR( mvwinch(stdscr, hero.y, hero.x) ); 174 ch = CCHAR( mvwinch(stdscr, hero.y, hero.x) );
175 if((ch != FLOOR && ch != PASSAGE)) { 175 if((ch != FLOOR && ch != PASSAGE)) {
176 extinguish(wghtchk); 176 extinguish(wghtchk);
177 fuse(wghtchk,TRUE,1,AFTER); 177 fuse(wghtchk, NULL, 1, AFTER);
178 inwhgt = FALSE; 178 inwhgt = FALSE;
179 return; 179 return;
180 } 180 }
181 extinguish(wghtchk); 181 extinguish(wghtchk);
182 msg("Your pack is too heavy for you"); 182 msg("Your pack is too heavy for you");