summaryrefslogtreecommitdiffstats
path: root/src/modelinfo/ModelIndices.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-06 00:11:18 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-06 00:11:18 +0200
commite5da4c2b4de20397d52837ddaf6e482d88819757 (patch)
treed76515de66ca5d119dc8c7dce7fc99746c734831 /src/modelinfo/ModelIndices.h
parentscript colstore stuff (diff)
parentgetting the vice city map to work (diff)
downloadre3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar
re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.gz
re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.bz2
re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.lz
re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.xz
re3-e5da4c2b4de20397d52837ddaf6e482d88819757.tar.zst
re3-e5da4c2b4de20397d52837ddaf6e482d88819757.zip
Diffstat (limited to 'src/modelinfo/ModelIndices.h')
-rw-r--r--src/modelinfo/ModelIndices.h12
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