Compare commits

..

No commits in common. "75d77413f6f9851c6592fc8e58c11586ede65703" and "d9f6470dc6699621f881f6ab1b69c1e859665543" have entirely different histories.

3 changed files with 10 additions and 10 deletions

View file

@ -15,10 +15,10 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
#ifdef c
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)
c(Auto, "None"_s)
c(Shoulders, "Shoulder"_s)
c(Body, "Body"_s)
c(Backpack, "Backpack"_s)
c(Hip, "Hip"_s)
c(LowerLegs, "LowerLeg"_s)
#endif

View file

@ -31,7 +31,7 @@ enum class BulletLauncherAttachmentStyle {
};
enum class BulletLauncherSocket {
#define c(enumerator, enumstr, name) enumerator,
#define c(enumerator, enumstr) enumerator,
#include "../Maps/BulletLauncherSockets.hpp"
#undef c
};

View file

@ -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, name) if(socket == (strenum)) { attachment.socket = BulletLauncherSocket::enumerator; } else
#define c(enumerator, strenum) if(socket == (strenum)) { attachment.socket = BulletLauncherSocket::enumerator; } else
#include "../Maps/BulletLauncherSockets.hpp"
#undef c
{