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

fix: allow speedloader capacity to be smaller than gun's #3126

Merged
merged 1 commit into from
Sep 10, 2023
Merged

fix: allow speedloader capacity to be smaller than gun's #3126

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
4 changes: 2 additions & 2 deletions src/item_factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,9 +1440,9 @@ void Item_factory::check_definitions() const
} else if( !mag_ptr->magazine->type.count( ammo_variety.first ) ) {
msg += string_format( "magazine \"%s\" does not take compatible ammo\n", magazine );
} else if( mag_ptr->has_flag( "SPEEDLOADER" ) &&
mag_ptr->magazine->capacity != type->gun->clip ) {
mag_ptr->magazine->capacity > type->gun->clip ) {
msg += string_format(
"speedloader %s capacity (%d) does not match gun capacity (%d).\n",
"speedloader %s capacity (%d) is bigger than gun capacity (%d).\n",
magazine.str(), mag_ptr->magazine->capacity, type->gun->clip );
}
}
Expand Down