Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fix Object.h and Object.cpp indentation

Browse Source
This commit is contained in:
saml1er 2020-04-10 17:03:02 +05:00
parent a8f7bf0bec
commit bb21cff639
2 changed files with 235 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/objects/Object.cpp
View File

@ -156,7 +156,7 @@ void
CObject::ObjectDamage(float amount) CObject::ObjectDamage(float amount)
{ {
if (m_nCollisionDamageEffect && bUsesCollision) { if (m_nCollisionDamageEffect && bUsesCollision) {
static int8_t nFrameGen = 0; static int8 nFrameGen = 0;
bool bBodyCastDamageEffect = false; bool bBodyCastDamageEffect = false;
if (m_modelIndex == MI_BODYCAST){ if (m_modelIndex == MI_BODYCAST){
if (amount > 50.0f) if (amount > 50.0f)
@ -196,7 +196,7 @@ CObject::ObjectDamage(float amount)
m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f); m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f); m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
const RwRGBA color = {96, 48, 0, 255}; const RwRGBA color = {96, 48, 0, 255};
for (int32_t i = 0; i < 25; i++) { for (int32 i = 0; i < 25; i++) {
CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ); CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
@ -219,7 +219,7 @@ CObject::ObjectDamage(float amount)
m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f); m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f); m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
const RwRGBA color = {128, 128, 128, 255}; const RwRGBA color = {128, 128, 128, 255};
for (int32_t i = 0; i < 45; i++) { for (int32 i = 0; i < 45; i++) {
CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ); CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
@ -243,7 +243,7 @@ CObject::ObjectDamage(float amount)
m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f); m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
const RwRGBA color1 = {200, 0, 0, 255}; const RwRGBA color1 = {200, 0, 0, 255};
const RwRGBA color2 = {200, 200, 200, 255}; const RwRGBA color2 = {200, 200, 200, 255};
for (int32_t i = 0; i < 10; i++) { for (int32 i = 0; i < 10; i++) {
CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ); CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
@ -268,7 +268,7 @@ CObject::ObjectDamage(float amount)
m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f); m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
const RwRGBA color1 = {200, 0, 0, 255}; const RwRGBA color1 = {200, 0, 0, 255};
const RwRGBA color2 = {200, 200, 200, 255}; const RwRGBA color2 = {200, 200, 200, 255};
for (int32_t i = 0; i < 32; i++) { for (int32 i = 0; i < 32; i++) {
CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(-0.35f, 0.7f), CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ); CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
@ -366,7 +366,7 @@ void
CObject::DeleteAllMissionObjects() CObject::DeleteAllMissionObjects()
{ {
CObjectPool* objectPool = CPools::GetObjectPool(); CObjectPool* objectPool = CPools::GetObjectPool();
for (int32_t i = 0; i < objectPool->GetSize(); i++) { for (int32 i = 0; i < objectPool->GetSize(); i++) {
CObject* pObject = objectPool->GetSlot(i); CObject* pObject = objectPool->GetSlot(i);
if (pObject && pObject->ObjectCreatedBy == MISSION_OBJECT) { if (pObject && pObject->ObjectCreatedBy == MISSION_OBJECT) {
CWorld::Remove(pObject); CWorld::Remove(pObject);
@ -379,7 +379,7 @@ void
CObject::DeleteAllTempObjects() CObject::DeleteAllTempObjects()
{ {
CObjectPool* objectPool = CPools::GetObjectPool(); CObjectPool* objectPool = CPools::GetObjectPool();
for (int32_t i = 0; i < objectPool->GetSize(); i++) { for (int32 i = 0; i < objectPool->GetSize(); i++) {
CObject* pObject = objectPool->GetSlot(i); CObject* pObject = objectPool->GetSlot(i);
if (pObject && pObject->ObjectCreatedBy == TEMP_OBJECT) { if (pObject && pObject->ObjectCreatedBy == TEMP_OBJECT) {
CWorld::Remove(pObject); CWorld::Remove(pObject);
@ -392,7 +392,7 @@ void
CObject::DeleteAllTempObjectInArea(CVector point, float fRadius) CObject::DeleteAllTempObjectInArea(CVector point, float fRadius)
{ {
CObjectPool *objectPool = CPools::GetObjectPool(); CObjectPool *objectPool = CPools::GetObjectPool();
for (int32_t i = 0; i < objectPool->GetSize(); i++) { for (int32 i = 0; i < objectPool->GetSize(); i++) {
CObject *pObject = objectPool->GetSlot(i); CObject *pObject = objectPool->GetSlot(i);
if (pObject && pObject->ObjectCreatedBy == TEMP_OBJECT && fRadius * fRadius > pObject->GetPosition().MagnitudeSqr()) { if (pObject && pObject->ObjectCreatedBy == TEMP_OBJECT && fRadius * fRadius > pObject->GetPosition().MagnitudeSqr()) {
CWorld::Remove(pObject); CWorld::Remove(pObject);