diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-07 19:50:18 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-07 19:50:18 +0100 |
| commit | 87bca997a45c3364b3994fddb40230ef20a56d90 (patch) | |
| tree | 1a4c6997451d097141386bf246dfeef97dd2794c /src/modelinfo/VehicleModelInfo.cpp | |
| parent | ps2 hud, restore original code (diff) | |
| parent | Fixing the Ghost vehicle name. (diff) | |
| download | re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.gz re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.bz2 re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.lz re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.xz re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.zst re3-87bca997a45c3364b3994fddb40230ef20a56d90.zip | |
Diffstat (limited to 'src/modelinfo/VehicleModelInfo.cpp')
| -rw-r--r-- | src/modelinfo/VehicleModelInfo.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp index a024bb40..17754211 100644 --- a/src/modelinfo/VehicleModelInfo.cpp +++ b/src/modelinfo/VehicleModelInfo.cpp @@ -536,7 +536,7 @@ CVehicleModelInfo::SetVehicleComponentFlags(RwFrame *frame, uint32 flags) { tHandlingData *handling; - handling = mod_HandlingManager.GetHandlingData((eHandlingId)m_handlingId); + handling = mod_HandlingManager.GetHandlingData((tVehicleType)m_handlingId); #define SETFLAGS(f) RwFrameForAllObjects(frame, SetAtomicFlagCB, (void*)(f)) @@ -962,7 +962,7 @@ CVehicleModelInfo::DeleteVehicleColourTextures(void) for(i = 0; i < 256; i++){ if(ms_colourTextureTable[i]){ RwTextureDestroy(ms_colourTextureTable[i]); -#ifdef GTA3_1_1_PATCH +#if GTA_VERSION >= GTA3_PC_11 ms_colourTextureTable[i] = nil; #endif } @@ -998,6 +998,8 @@ CVehicleModelInfo::SetEnvironmentMapCB(RpMaterial *material, void *data) return material; } +bool initialised; + RpAtomic* CVehicleModelInfo::SetEnvironmentMapCB(RpAtomic *atomic, void *data) { @@ -1011,7 +1013,12 @@ CVehicleModelInfo::SetEnvironmentMapCB(RpAtomic *atomic, void *data) RpGeometryForAllMaterials(geo, SetEnvironmentMapCB, data); RpGeometrySetFlags(geo, RpGeometryGetFlags(geo) | rpGEOMETRYMODULATEMATERIALCOLOR); RpMatFXAtomicEnableEffects(atomic); - // PS2 sets of PS2Manager lighting CB here +#ifdef GTA_PS2 + if(!initialised){ + SetupPS2ManagerLightingCallback(RpAtomicGetInstancePipeline(atomic)); + initialised = true; + } +#endif } return atomic; } |