Mercurial > hg > early-roguelike

comparison arogue7/fight.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 e52a8a7ad4c5
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
536 if (!save(VS_MAGIC, &player, 0) && off(player, ISCLEAR)) { 536 if (!save(VS_MAGIC, &player, 0) && off(player, ISCLEAR)) {
537 msg("You feel disoriented."); 537 msg("You feel disoriented.");
538 if (find_slot(unconfuse)) 538 if (find_slot(unconfuse))
539 lengthen(unconfuse, HUHDURATION); 539 lengthen(unconfuse, HUHDURATION);
540 else 540 else
541 fuse(unconfuse, 0, HUHDURATION, AFTER); 541 fuse(unconfuse, NULL, HUHDURATION, AFTER);
542 turn_on(player, ISHUH); 542 turn_on(player, ISHUH);
543 } 543 }
544 else msg("You feel dizzy, but it quickly passes."); 544 else msg("You feel dizzy, but it quickly passes.");
545 } 545 }
546 /* Player or monster hits monster */ 546 /* Player or monster hits monster */