diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-17 20:43:11 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-17 20:43:11 +0200 |
| commit | a5b84eb9fe32689f0aee10077854a3652c986c08 (patch) | |
| tree | c8e5e5c72db293ca86bdadbc023f3997b05df947 /src/animation/AnimBlendAssocGroup.cpp | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.gz re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.bz2 re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.lz re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.xz re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.zst re3-a5b84eb9fe32689f0aee10077854a3652c986c08.zip | |
Diffstat (limited to 'src/animation/AnimBlendAssocGroup.cpp')
| -rw-r--r-- | src/animation/AnimBlendAssocGroup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp index c5711fda..ef0161db 100644 --- a/src/animation/AnimBlendAssocGroup.cpp +++ b/src/animation/AnimBlendAssocGroup.cpp @@ -104,7 +104,7 @@ strcmpIgnoringDigits(const char *s1, const char *s2) c2 = toupper(c2); #endif - if(c1 != c2) + if(c1 && c2 && c1 != c2) return false; } } @@ -126,6 +126,8 @@ GetModelFromName(const char *name) for(i = 0; i < MODELINFOSIZE; i++){ mi = CModelInfo::GetModelInfo(i); + if (mi && strcmp("drink", mi->GetName()) == 0 && strcmp(name, "drink01") == 0) + debug("TEST"); if(mi && mi->GetRwObject() && RwObjectGetType(mi->GetRwObject()) == rpCLUMP && strcmpIgnoringDigits(mi->GetName(), name)) return mi; |