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.

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 wielded items not showing proper sizes of contents. #4367

Merged
merged 1 commit into from Nov 16, 2013

Conversation

Projects
None yet
3 participants
@ianestrachan
Copy link
Contributor

commented Nov 15, 2013

Fixes #4221, fixes #4266.

@freezerbunny

This comment has been minimized.

Copy link
Contributor

commented Nov 16, 2013

Oh god I was wanting to do this so much.

Thanks a lot.

@freezerbunny

This comment has been minimized.

Copy link

commented on player.cpp in aa33e9a Nov 16, 2013

How about:

if (!weapon.contents.empty()) {
  for (int i = 0; i < weapon.contents.size(); i++) {
    dump << " (" << weapon.contents[i].charges << ") ";
  }
}

Some objects have more than one container (e.g. a rifle with underslung shotgun) so displaying them all is best.

@ianestrachan

This comment has been minimized.

Copy link
Contributor Author

commented Nov 16, 2013

Sure, I've never used those mods before so I wasn't aware of that.

@ianestrachan

This comment has been minimized.

Copy link
Contributor Author

commented Nov 16, 2013

Wait, no, I don't need to do that, those are handled separately (just above where I made my edit).

I gave myself a Browning BLR and an underslung shotgun, loaded both, and it reads Browning BLR+ (4+2).

My edit only applies to containers, not weapons.

Rivet-the-Zombie added a commit that referenced this pull request Nov 16, 2013

Merge pull request #4367 from ianestrachan/fix-weapon-count
Fix wielded items not showing proper sizes of contents.

@Rivet-the-Zombie Rivet-the-Zombie merged commit 39d14c3 into CleverRaven:master Nov 16, 2013

1 check passed

default Merged build finished.
Details

@ianestrachan ianestrachan deleted the ianestrachan:fix-weapon-count branch Nov 16, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.