diff --git a/ace_medical.dll b/ace_medical.dll index f85f1bc974..ede53b861d 100644 Binary files a/ace_medical.dll and b/ace_medical.dll differ diff --git a/extensions/medical/handleDamage.cpp b/extensions/medical/handleDamage.cpp index 2a50ba4ee6..001877a2cd 100644 --- a/extensions/medical/handleDamage.cpp +++ b/extensions/medical/handleDamage.cpp @@ -78,7 +78,7 @@ namespace ace { } } if (highestSpot == NULL) { - break; + break; } int c = 0; @@ -94,10 +94,10 @@ namespace ace { { injuryToAdd = highestSpot; } - else - { + else + { int indexNewInjuryToAdd = rand() % information.size(); - injuryToAdd = information.at(indexNewInjuryToAdd); + injuryToAdd = information.at(indexNewInjuryToAdd); } int bodyPartID = selection; @@ -105,7 +105,7 @@ namespace ace { { bodyPartID = rand() % 6; } - + injuries::OpenWound newWound(woundID++, injuryToAdd->ID, bodyPartID, 1, injuryToAdd->bloodLoss, injuryToAdd->pain); injuriesToAdd.push_back(newWound); } @@ -202,14 +202,14 @@ namespace ace { } } - int handleDamage::SelectionToNumber(const std::string& selectionName) + int handleDamage::SelectionToNumber(const std::string& hitpointName) { // TODO use dynamic selections instead - std::vector selections = { "head", "body", "hand_l", "hand_r", "leg_l", "leg_r" }; - std::vector::iterator it = find(selections.begin(), selections.end(), selectionName); - if (it != selections.end()) + std::vector hitpoints = { "Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg" }; + std::vector::iterator it = find(hitpoints.begin(), hitpoints.end(), hitpointName); + if (it != hitpoints.end()) { - return it - selections.begin(); + return it - hitpoints.begin(); } else {