Mercurial > hg > early-roguelike

comparison xrogue/player.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 2236ef808bcb
children
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
508 msg("%s is set free by your generosity. ", prname(monster_name(th), TRUE)); 508 msg("%s is set free by your generosity. ", prname(monster_name(th), TRUE));
509 del_pack(ll); /* get rid of it */ 509 del_pack(ll); /* get rid of it */
510 /* just let him roam around */ 510 /* just let him roam around */
511 turn_on(*th, ISRUN); 511 turn_on(*th, ISRUN);
512 if (on(*th, ISFLEE)) turn_off(*th, ISFLEE); 512 if (on(*th, ISFLEE)) turn_off(*th, ISFLEE);
513 runto(th, &player); 513 runto(th, &hero);
514 th->t_action = A_NIL; 514 th->t_action = A_NIL;
515 return; 515 return;
516 } 516 }
517 else if (on(*th, ISRUN) && off(*th, ISUNIQUE)) { 517 else if (on(*th, ISRUN) && off(*th, ISUNIQUE)) {
518 /* if NOT sleeping and not a unique */ 518 /* if NOT sleeping and not a unique */
535 } 535 }
536 /* just let him roam around */ 536 /* just let him roam around */
537 turn_on(*th, ISRUN); 537 turn_on(*th, ISRUN);
538 if (on(*th, ISFLEE)) 538 if (on(*th, ISFLEE))
539 turn_off(*th, ISFLEE); 539 turn_off(*th, ISFLEE);
540 runto(th, &player); 540 runto(th, &hero);
541 th->t_action = A_NIL; 541 th->t_action = A_NIL;
542 return; 542 return;
543 } 543 }
544 } 544 }
545 } 545 }