summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-19 21:42:55 +0200
committeraap <aap@papnet.eu>2020-05-19 21:42:55 +0200
commit0b0ba49abc34315f532f9adcdbc277d5275723c7 (patch)
treeeaad5557debdcc21e0936cb47ba9eb975d1431ea /src/peds
parentlittle cleanup of handlingmgr (diff)
downloadre3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar
re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.gz
re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.bz2
re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.lz
re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.xz
re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.zst
re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/Population.cpp20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 1566ba3d..e2257a28 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -966,18 +966,11 @@ CPopulation::ConvertToRealObject(CDummyObject *dummy)
if (!obj)
return;
- bool makeInvisible;
CWorld::Remove(dummy);
delete dummy;
CWorld::Add(obj);
- int16 mi = obj->GetModelIndex();
- if (mi == MI_GLASS1 || mi == MI_GLASS2 || mi == MI_GLASS3 || mi == MI_GLASS4 ||
- mi == MI_GLASS5 || mi == MI_GLASS6 || mi == MI_GLASS7 || mi == MI_GLASS8)
- makeInvisible = true;
- else
- makeInvisible = false;
- if (makeInvisible) {
+ if (IsGlass(obj->GetModelIndex())) {
obj->bIsVisible = false;
} else if (obj->GetModelIndex() == MI_BUOY) {
obj->bIsStatic = false;
@@ -996,17 +989,8 @@ CPopulation::ConvertToDummyObject(CObject *obj)
dummy->GetMatrix().UpdateRW();
dummy->UpdateRwFrame();
- bool makeInvisible;
- int16 mi = obj->GetModelIndex();
- if (mi == MI_GLASS1 || mi == MI_GLASS2 || mi == MI_GLASS3 || mi == MI_GLASS4 ||
- mi == MI_GLASS5 || mi == MI_GLASS6 || mi == MI_GLASS7 || mi == MI_GLASS8)
- makeInvisible = true;
- else
- makeInvisible = false;
-
- if (makeInvisible) {
+ if (IsGlass(obj->GetModelIndex()))
dummy->bIsVisible = false;
- }
CWorld::Remove(obj);
delete obj;