Skip to content

Commit 0b0f323

Browse files
authored
Fixed incoherent case sensitivity for animation submodels (#4047)
1 parent 4559d15 commit 0b0f323

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

code/model/modelanimation.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,8 @@ namespace animation {
208208

209209
//Save the things modified by initial animations as actual baseline
210210
for (const auto& initialModified : applyBuffer) {
211-
if (!initialModified.second.modified)
212-
continue;
213-
214-
initialModified.first->saveCurrentAsBase(pmi);
211+
if (initialModified.second.modified)
212+
initialModified.first->saveCurrentAsBase(pmi);
215213
}
216214
}
217215
}
@@ -276,7 +274,10 @@ namespace animation {
276274
ModelAnimationSet::cleanRunning();
277275
}
278276

279-
ModelAnimationSubmodel::ModelAnimationSubmodel(SCP_string submodelName) : m_name(std::move(submodelName)) { }
277+
ModelAnimationSubmodel::ModelAnimationSubmodel(SCP_string submodelName) {
278+
SCP_tolower(submodelName);
279+
m_name = std::move(submodelName);
280+
}
280281

281282
ModelAnimationSubmodel* ModelAnimationSubmodel::copy() const {
282283
return new ModelAnimationSubmodel(*this);
@@ -852,7 +853,9 @@ namespace animation {
852853
return true;
853854
};
854855

855-
std::shared_ptr<ModelAnimationSubmodel> ModelAnimationSet::getSubmodel(const SCP_string& submodelName) {
856+
std::shared_ptr<ModelAnimationSubmodel> ModelAnimationSet::getSubmodel(SCP_string submodelName) {
857+
SCP_tolower(submodelName);
858+
856859
for (const auto& submodel : m_submodels) {
857860
if (!submodel->is_turret && submodel->m_name == submodelName)
858861
return submodel;
@@ -863,7 +866,9 @@ namespace animation {
863866
return submodel;
864867
}
865868

866-
std::shared_ptr<ModelAnimationSubmodel> ModelAnimationSet::getSubmodel(const SCP_string& submodelName, const SCP_string& SIP_name, bool findBarrel) {
869+
std::shared_ptr<ModelAnimationSubmodel> ModelAnimationSet::getSubmodel(SCP_string submodelName, const SCP_string& SIP_name, bool findBarrel) {
870+
SCP_tolower(submodelName);
871+
867872
for (const auto& submodel : m_submodels) {
868873
if (submodel->is_turret && submodel->m_name == submodelName) {
869874
auto submodelTurret = ((ModelAnimationSubmodelTurret*)submodel.get());

code/model/modelanimation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,8 @@ namespace animation {
360360

361361
bool isEmpty() const;
362362

363-
std::shared_ptr<ModelAnimationSubmodel> getSubmodel(const SCP_string& submodelName);
364-
std::shared_ptr<ModelAnimationSubmodel> getSubmodel(const SCP_string& submodelName, const SCP_string& SIP_name, bool findBarrel);
363+
std::shared_ptr<ModelAnimationSubmodel> getSubmodel(SCP_string submodelName);
364+
std::shared_ptr<ModelAnimationSubmodel> getSubmodel(SCP_string submodelName, const SCP_string& SIP_name, bool findBarrel);
365365
std::shared_ptr<ModelAnimationSubmodel> getSubmodel(const std::shared_ptr<ModelAnimationSubmodel>& other);
366366
};
367367

0 commit comments

Comments
 (0)