diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/World.cpp | 6 | ||||
| -rw-r--r-- | src/core/re3.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index eccbcd89..da1c58b2 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -2218,8 +2218,12 @@ CWorld::UseDetonator(CEntity *pEntity) { int32 i = CPools::GetVehiclePool()->GetSize(); while(--i >= 0) { +#ifdef FIX_BUGS + CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i); +#else CAutomobile *pVehicle = (CAutomobile *)CPools::GetVehiclePool()->GetSlot(i); - if(pVehicle && !pVehicle->m_vehType && pVehicle->m_bombType == CARBOMB_REMOTE && +#endif + if(pVehicle && pVehicle->m_bombType == CARBOMB_REMOTE && pVehicle->m_pBombRigger == pEntity) { pVehicle->m_bombType = CARBOMB_NONE; pVehicle->m_nBombTimer = 500; diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 4a2dfe00..773d3765 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -703,7 +703,7 @@ void CTweakVars::Add(CTweakVar *var) TweakVarsListSize = 0; } if(TweakVarsListSize > 63) - TweakVarsList = (CTweakVar**) realloc(TweakVarsList, (TweakVarsListSize + 1) * sizeof(*var)); + TweakVarsList = (CTweakVar**) realloc(TweakVarsList, (TweakVarsListSize + 1) * sizeof(CTweakVar*)); TweakVarsList[TweakVarsListSize++] = var; // TweakVarsList.push_back(var); |