summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimBlendAssocGroup.cpp
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2020-04-18 12:29:28 +0200
committerFilip Gawin <filip.gawin@zoho.com>2020-04-18 12:29:28 +0200
commitd6314f9564912393134d832b8cc268dd3dbfcbaa (patch)
treeae1f36342a40ecf2baff2523c7b85ba140260e77 /src/animation/AnimBlendAssocGroup.cpp
parentMerge branch 'master' of https://github.com/GTAmodding/re3 (diff)
downloadre3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar
re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.gz
re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.bz2
re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.lz
re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.xz
re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.zst
re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.zip
Diffstat (limited to '')
-rw-r--r--src/animation/AnimBlendAssocGroup.cpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index 27b091bd..e65bdf8d 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -59,7 +59,8 @@ CAnimBlendAssociation*
CAnimBlendAssocGroup::CopyAnimation(const char *name)
{
CAnimBlendAssociation *anim = GetAnimation(name);
- if(anim == nil) return nil;
+ if(anim == nil)
+ return nil;
CAnimManager::UncompressAnimation(anim->hierarchy);
return new CAnimBlendAssociation(*anim);
}
@@ -69,26 +70,19 @@ strcmpIgnoringDigits(const char *s1, const char *s2)
{
char c1, c2;
- for(;;) {
+ for(;;){
c1 = *s1;
c2 = *s2;
if(c1) s1++;
if(c2) s2++;
- if(c1 == '\0' && c2 == '\0') return true;
-#if 1
- if(iswdigit(c1) && iswdigit(c2))
-#else
+ if(c1 == '\0' && c2 == '\0')
+ return true;
if(__ascii_iswdigit(c1) && __ascii_iswdigit(c2))
-#endif
continue;
-#if 1
- c1 = toupper(c1);
- c2 = toupper(c2);
-#else
c1 = __ascii_toupper(c1);
c2 = __ascii_toupper(c2);
-#endif
- if(c1 != c2) return false;
+ if(c1 != c2)
+ return false;
}
}