Compare commits
2 commits
d9f6470dc6
...
75d77413f6
Author | SHA1 | Date | |
---|---|---|---|
75d77413f6 | |||
ddad6536c6 |
3 changed files with 10 additions and 10 deletions
|
@ -15,10 +15,10 @@
|
|||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
#ifdef c
|
||||
c(Auto, "None"_s)
|
||||
c(Shoulders, "Shoulder"_s)
|
||||
c(Body, "Body"_s)
|
||||
c(Backpack, "Backpack"_s)
|
||||
c(Hip, "Hip"_s)
|
||||
c(LowerLegs, "LowerLeg"_s)
|
||||
c(Auto, "None"_s, "Auto"_s)
|
||||
c(Shoulders, "Shoulder"_s, "Shoulders"_s)
|
||||
c(Body, "Body"_s, "Body"_s)
|
||||
c(Backpack, "Backpack"_s, "Backpack"_s)
|
||||
c(Hip, "Hip"_s, "Hips"_s)
|
||||
c(LowerLegs, "LowerLeg"_s, "Lower legs"_s)
|
||||
#endif
|
||||
|
|
|
@ -31,7 +31,7 @@ enum class BulletLauncherAttachmentStyle {
|
|||
};
|
||||
|
||||
enum class BulletLauncherSocket {
|
||||
#define c(enumerator, enumstr) enumerator,
|
||||
#define c(enumerator, enumstr, name) enumerator,
|
||||
#include "../Maps/BulletLauncherSockets.hpp"
|
||||
#undef c
|
||||
};
|
||||
|
|
|
@ -192,15 +192,15 @@ void Mass::getBulletLauncherAttachments() {
|
|||
return;
|
||||
}
|
||||
|
||||
if(attach_array->items.size() != _weapons.bulletLaunchers.size() &&
|
||||
attach_array->items.size() != _armour.blAttachment.size())
|
||||
if(attach_array->items.size() == _weapons.bulletLaunchers.size() &&
|
||||
attach_array->items.size() == _armour.blAttachment.size())
|
||||
{
|
||||
for(UnsignedInt i = 0; i < attach_array->items.size(); i++) {
|
||||
auto attachment_prop = attach_array->at<GenericStructProperty>(i);
|
||||
auto& attachment = _armour.blAttachment[i];
|
||||
|
||||
Containers::StringView socket = attachment_prop->at<StringProperty>("Socket_9_B9DBF30D4A1F0032A2BE2F8B342B35A9"_s)->value;
|
||||
#define c(enumerator, strenum) if(socket == (strenum)) { attachment.socket = BulletLauncherSocket::enumerator; } else
|
||||
#define c(enumerator, strenum, name) if(socket == (strenum)) { attachment.socket = BulletLauncherSocket::enumerator; } else
|
||||
#include "../Maps/BulletLauncherSockets.hpp"
|
||||
#undef c
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue