Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #75364 #75822

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Backport #75364 #75822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/monstergenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,10 +1379,8 @@ void mtype::add_special_attack( const JsonObject &obj, const std::string &src )
if( iter != special_attacks_names.end() ) {
special_attacks_names.erase( iter );
}
if( test_mode ) {
debugmsg( "%s specifies more than one attack of (sub)type %s, ignoring all but the last",
id.c_str(), new_attack->id.c_str() );
}
debugmsg( "%s specifies more than one attack of (sub)type %s, ignoring all but the last. Add different `id`s to each attack of this type to prevent this.",
id.c_str(), new_attack->id.c_str() );
}

special_attacks.emplace( new_attack->id, new_attack );
Expand Down
Loading