diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-17 10:17:38 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-17 10:17:38 +0300 |
| commit | b9c8ce0d37b2f094e2d8fe1a71db009718a0a006 (patch) | |
| tree | 4861c474aa232d2914f5b6b3bc11a8e62a9ceccb /src/modelinfo/ModelInfo.cpp | |
| parent | 881d61f811608ea99a08b2bb65ce80a40a2c5138 (diff) | |
| parent | a4922d5cb77e31657768d5da4b286a2e67ee0e6f (diff) | |
Merge remote-tracking branch 'Fire-Head/master' into Standalone
# Conflicts:
# src/render/Coronas.cpp
Diffstat (limited to 'src/modelinfo/ModelInfo.cpp')
| -rw-r--r-- | src/modelinfo/ModelInfo.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp index b6a95992..58124e53 100644 --- a/src/modelinfo/ModelInfo.cpp +++ b/src/modelinfo/ModelInfo.cpp @@ -5,11 +5,8 @@ #include "ModelIndices.h" #include "ModelInfo.h" -CBaseModelInfo **CModelInfo::ms_modelInfoPtrs = (CBaseModelInfo**)0x83D408; +CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE]; -//CStore<CSimpleModelInfo, SIMPLEMODELSIZE> &CModelInfo::ms_simpleModelStore = *(CStore<CSimpleModelInfo, SIMPLEMODELSIZE>*)0x885BB4; -//CStore<CTimeModelInfo, TIMEMODELSIZE> &CModelInfo::ms_timeModelStore = *(CStore<CTimeModelInfo, TIMEMODELSIZE>*)0x94076C; -//CStore<C2dEffect, TWODFXSIZE> &CModelInfo::ms_2dEffectStore = *(CStore<C2dEffect, TWODFXSIZE>*)0x9434F8; CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore; CStore<CMloModelInfo, MLOMODELSIZE> CModelInfo::ms_mloModelStore; CStore<CInstance, MLOINSTANCESIZE> CModelInfo::ms_mloInstanceStore; |