diff options
| author | aap <aap@papnet.eu> | 2020-05-05 23:27:43 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-05 23:27:43 +0200 |
| commit | 68d3ea9c42f985077d34174f937dbf520d9493e8 (patch) | |
| tree | 8ab10b1aacea87ed8dde3b172e4a00fae51eb4a3 /src/modelinfo/ModelIndices.h | |
| parent | Fix appveyour (diff) | |
| download | re3-68d3ea9c42f985077d34174f937dbf520d9493e8.tar re3-68d3ea9c42f985077d34174f937dbf520d9493e8.tar.gz re3-68d3ea9c42f985077d34174f937dbf520d9493e8.tar.bz2 re3-68d3ea9c42f985077d34174f937dbf520d9493e8.tar.lz re3-68d3ea9c42f985077d34174f937dbf520d9493e8.tar.xz re3-68d3ea9c42f985077d34174f937dbf520d9493e8.tar.zst re3-68d3ea9c42f985077d34174f937dbf520d9493e8.zip | |
Diffstat (limited to 'src/modelinfo/ModelIndices.h')
| -rw-r--r-- | src/modelinfo/ModelIndices.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h index 8e117882..5c8d4858 100644 --- a/src/modelinfo/ModelIndices.h +++ b/src/modelinfo/ModelIndices.h @@ -1,5 +1,7 @@ #pragma once +#include "ModelInfo.h" + #define MODELINDICES \ X("fire_hydrant", MI_FIRE_HYDRANT, 0x5F5A00) \ X("bagelstnd02", MI_BAGELSTAND2, 0x5F59FC) \ @@ -370,14 +372,8 @@ void TestModelIndices(void); inline bool IsGlass(int16 id) { - return id == MI_GLASS1 || - id == MI_GLASS2 || - id == MI_GLASS3 || - id == MI_GLASS4 || - id == MI_GLASS5 || - id == MI_GLASS6 || - id == MI_GLASS7 || - id == MI_GLASS8; + CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id); + return mi->IsSimple() && (mi->m_isCodeGlass || mi->m_isArtistGlass); } inline bool |