Merge pull request #1799 from matthiaskrgr/cppcheck

address two cppcheck findings
This commit is contained in:
Celtic Minstrel 2017-07-25 19:58:26 -04:00 committed by GitHub
commit cca2776343
2 changed files with 2 additions and 2 deletions

View file

@ -105,7 +105,7 @@ public:
* @retval true success
* @retval false failure
*/
static bool parse_side_config(side_number side, const config& cfg, config &parsed_cfg);
static bool parse_side_config(side_number side, const config& original_cfg, config &cfg);
/**

View file

@ -173,7 +173,7 @@ int show_wml_message(CVideo& video,
dlg.reset(new wml_message_left(title, message, left->portrait, left->mirror));
} else if(!left && right) {
dlg.reset(new wml_message_right(title, message, right->portrait, right->mirror));
} else {
} else if(right && left) {
dlg.reset(new wml_message_double(title, message, left->portrait, left->mirror, right->portrait, right->mirror));
}
assert(dlg.get());