Merge branch 'master' of peisongxiao.com:~/cs246/a5
This commit is contained in:
@ -101,7 +101,7 @@ game_result game::run() {
|
|||||||
in->get_command());
|
in->get_command());
|
||||||
msg = res.msg;
|
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;
|
hostile_merchants = true;
|
||||||
msg += "PC has angered the merchants. ";
|
msg += "PC has angered the merchants. ";
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user