X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Froguelike.c;h=c823482058aee71c5e7039c276f6daaf995cf56b;hb=3fca9119dd4fa5dabde64961a76422faf828cad0;hp=525a8cfd0576f8f76113f7f36dedec809127022b;hpb=f9346f39eb0b325a655b142a12ff55a0270bc0df;p=plomrogue diff --git a/src/roguelike.c b/src/roguelike.c index 525a8cf..c823482 100644 --- a/src/roguelike.c +++ b/src/roguelike.c @@ -132,7 +132,7 @@ void move_monster (struct World * world, struct Monster * monster) { break; } } if (met_monster) update_log (world, "\nMonster hits monster."); - else if (0 == met_monster && is_passable(world->map, t.y, t.x)) + else if (is_passable(world->map, t.y, t.x)) monster->pos = t; } void move_player (struct World * world, char d) { @@ -173,10 +173,10 @@ void move_player (struct World * world, char d) { void player_wait (struct World * world) { // Make player wait one turn. + update_log (world, "\nYou wait."); if (1 == world->interactive) record_action(0); - next_turn (world); - update_log (world, "\nYou wait."); } + next_turn (world); } void toggle_window (struct WinMeta * win_meta, struct Win * win) { // Toggle display of window win.