Merge branch 'master' of peisongxiao.com:~/cs246/a5

2024-07-20 15:11:22 -04:00
parent 525226b763 2e4ccf74c7
commit e76802b955
1 changed files with 1 additions and 1 deletions
--- a/src/game.cc
+++ b/src/game.cc
@ -101,7 +101,7 @@ game_result game::run() {
                                             in->get_command());
        msg = res.msg;

-        if (!hostile_merchants && res.msg.find(" M ") != std::string::npos) {
+        if (!hostile_merchants && res.msg.find(" M") != std::string::npos) {
                hostile_merchants = true;
                msg += "PC has angered the merchants. ";
        }