Mercurial > hg > early-roguelike

comparison xrogue/bolt.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
339 if (on(player, ISHUH)) 339 if (on(player, ISHUH))
340 lengthen(unconfuse, 340 lengthen(unconfuse,
341 rnd(20)+HUHDURATION); 341 rnd(20)+HUHDURATION);
342 else { 342 else {
343 turn_on(player, ISHUH); 343 turn_on(player, ISHUH);
344 fuse(unconfuse, (VOID *)NULL, 344 fuse(unconfuse, NULL,
345 rnd(20)+HUHDURATION, AFTER); 345 rnd(20)+HUHDURATION, AFTER);
346 msg("The confusion gas has confused you."); 346 msg("The confusion gas has confused you.");
347 } 347 }
348 } 348 }
349 else msg("You feel dizzy for a moment, but it quickly passes."); 349 else msg("You feel dizzy for a moment, but it quickly passes.");