From 7f9efea0a2bcbdaa2740709d7cff76c2d517003e Mon Sep 17 00:00:00 2001 From: Fiftytwo Date: Fri, 15 May 2020 20:29:48 +0200 Subject: [PATCH] Remove unnecessary whitespaces --- src/common/event.cpp | 2 +- src/common/event.h | 2 +- src/graphics/engine/pyro.cpp | 2 +- src/object/auto/autofactory.cpp | 6 +++--- src/object/auto/autolabo.cpp | 2 +- src/object/auto/autoresearch.cpp | 2 +- src/object/drive_type.cpp | 4 ++-- src/object/motion/motionvehicle.cpp | 16 ++++++++-------- src/object/task/taskbuild.cpp | 4 ++-- src/object/tool_type.cpp | 4 ++-- src/script/scriptfunc.cpp | 18 +++++++++--------- src/ui/object_interface.cpp | 16 ++++++++-------- src/ui/object_interface.h | 2 +- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/common/event.cpp b/src/common/event.cpp index 108a7fea..c405f4bc 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -528,7 +528,7 @@ void InitializeEventTypeTexts() EVENT_TYPE_TEXT[EVENT_CODE_BATTLE_START] = "EVENT_CODE_BATTLE_START"; EVENT_TYPE_TEXT[EVENT_CODE_BATTLE_SPECTATOR] = "EVENT_CODE_BATTLE_SPECTATOR"; - + EVENT_TYPE_TEXT[EVENT_OBJECT_RBUILDER] = "EVENT_OBJECT_RBUILDER"; EVENT_TYPE_TEXT[EVENT_OBJECT_BUILD] = "EVENT_OBJECT_BUILD"; EVENT_TYPE_TEXT[EVENT_OBJECT_RTARGET] = "EVENT_OBJECT_RTARGET"; diff --git a/src/common/event.h b/src/common/event.h index 440ad94a..fe92bf05 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -599,7 +599,7 @@ enum EventType EVENT_CODE_BATTLE_START = 2200, //!< button that starts the code battle EVENT_CODE_BATTLE_SPECTATOR = 2201, //!< button that controls the code battle spectator camera - + EVENT_OBJECT_RBUILDER = 2300, EVENT_OBJECT_BUILD = 2301, EVENT_OBJECT_RTARGET = 2302, diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp index 2cafa23c..a43c2c52 100644 --- a/src/graphics/engine/pyro.cpp +++ b/src/graphics/engine/pyro.cpp @@ -1939,7 +1939,7 @@ void CPyro::BurnStart() angle.z = -25.0f*Math::PI/180.0f; BurnAddPart(1, pos, angle); // down the insect-cannon } - + if ( m_burnType == OBJECT_MOBILEfb || m_burnType == OBJECT_MOBILEtb || m_burnType == OBJECT_MOBILEwb || diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index 00695b07..867626ce 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -723,7 +723,7 @@ bool CAutoFactory::CreateInterface(bool bSelect) pw = static_cast< Ui::CWindow* >(m_interface->SearchControl(EVENT_WINDOW0)); if ( pw == nullptr ) return false; - + dim.x = 33.0f/640.0f; dim.y = 33.0f/480.0f; ox = 3.0f/640.0f; @@ -777,7 +777,7 @@ bool CAutoFactory::CreateInterface(bool bSelect) pw->CreateButton(pos, dim, 128+27, EVENT_OBJECT_FACTORYfi); pos.x += dim.x; pw->CreateButton(pos, dim, 128+28, EVENT_OBJECT_FACTORYii); - + pos.x = ox+sx*0.0f; pos.y = oy+sy*4.9f; pw->CreateButton(pos, dim, 192+0, EVENT_OBJECT_FACTORYwb); @@ -804,7 +804,7 @@ bool CAutoFactory::CreateInterface(bool bSelect) pos.x += dim.x; pw->CreateButton(pos, dim, 128+45, EVENT_OBJECT_FACTORYtg); } - + pos.x = ox+sx*0.0f; pos.y = oy+sy*0; ddim.x = 66.0f/640.0f; diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 1e88252e..a766aca9 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -492,7 +492,7 @@ bool CAutoLabo::CreateInterface(bool bSelect) pos.x = ox+sx*6.0f; pos.y = oy+sy*0.5f; pw->CreateButton(pos, dim, 192+8, EVENT_OBJECT_RTARGET); - + pos.x = ox+sx*7.0f; pos.y = oy+sy*0.5f; pw->CreateButton(pos, dim, 64+45, EVENT_OBJECT_RiPAW); diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index ca0acf99..16b8beee 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -379,7 +379,7 @@ bool CAutoResearch::CreateInterface(bool bSelect) pos.y = oy+sy*0.5f; pw->CreateButton(pos, dim, 192+4, EVENT_OBJECT_RBUILDER); } - + pos.x = ox+sx*14.5f; pos.y = oy+sy*0; ddim.x = 14.0f/640.0f; diff --git a/src/object/drive_type.cpp b/src/object/drive_type.cpp index 373b04f5..5b2e5229 100644 --- a/src/object/drive_type.cpp +++ b/src/object/drive_type.cpp @@ -61,9 +61,9 @@ DriveType GetDriveFromObject(ObjectType type) case OBJECT_MOBILErr: case OBJECT_MOBILErs: return DriveType::Heavy; - + case OBJECT_MOBILEsa: - return DriveType::Amphibious; + return DriveType::Amphibious; default: return DriveType::Other; diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index cfe5c132..b34f5be2 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -120,7 +120,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, { modelManager->AddModelReference("trainer.mod", false, rank, m_object->GetTeam()); } - + if (type == OBJECT_MOBILEfa || type == OBJECT_MOBILEfb || type == OBJECT_MOBILEfc || @@ -136,7 +136,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_object->SetObjectRank(28, rank); m_object->SetObjectParent(28, 0); modelManager->AddModelReference("trainerf.mod", false, rank, m_object->GetTeam()); - + rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(29, rank); @@ -149,7 +149,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, type == OBJECT_MOBILEtc || type == OBJECT_MOBILEti || type == OBJECT_MOBILEts) - { + { if (!m_object->GetTrainer()) modelManager->AddModelReference("lem1t.mod", false, rank, m_object->GetTeam()); else @@ -159,7 +159,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_object->SetObjectRank(28, rank); m_object->SetObjectParent(28, 0); modelManager->AddModelReference("trainert.mod", false, rank, m_object->GetTeam()); - + rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(29, rank); @@ -182,7 +182,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_object->SetObjectRank(28, rank); m_object->SetObjectParent(28, 0); modelManager->AddModelReference("trainerw.mod", false, rank, m_object->GetTeam()); - + rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(29, rank); @@ -205,7 +205,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_object->SetObjectRank(28, rank); m_object->SetObjectParent(28, 0); modelManager->AddModelReference("traineri.mod", false, rank, m_object->GetTeam()); - + rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(29, rank); @@ -213,7 +213,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, modelManager->AddModelReference("trainera.mod", false, rank, m_object->GetTeam()); } } - else if (!m_object->GetTrainer() && + else if (!m_object->GetTrainer() && (type == OBJECT_MOBILErt || type == OBJECT_MOBILErc || type == OBJECT_MOBILErr || @@ -428,7 +428,7 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_object->SetPartPosition(2, Math::Vector(0.0f, 2.5f, 0.0f)); m_object->SetPartRotationZ(2, 0.0f); } - + if (type == OBJECT_MOBILEfb || type == OBJECT_MOBILEtb || type == OBJECT_MOBILEwb || diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index a1a69cd8..d9b6da83 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -356,7 +356,7 @@ bool CTaskBuild::EventProcess(const Event &event) m_sound->Play(SOUND_BUILD, m_object->GetPosition(), 0.5f, 1.0f*Math::Rand()*1.5f); } } - + if(m_object->GetType() == OBJECT_MOBILEfb && m_object->GetReactorRange()<0.2f && m_phase != TBP_MOVE) { pv = m_object->GetPosition(); @@ -415,7 +415,7 @@ Error CTaskBuild::Start(ObjectType type) pv = m_object->GetPosition(); pm = m_metal->GetPosition(); if(!m_physics->GetLand() && fabs(pm.y-pv.y)>8.0f) return ERR_BUILD_METALAWAY; - + m_metal->SetLock(true); // not usable m_camera->StartCentering(m_object, Math::PI*0.15f, 99.9f, 0.0f, 1.0f); diff --git a/src/object/tool_type.cpp b/src/object/tool_type.cpp index 92a181cb..b10cfc5f 100644 --- a/src/object/tool_type.cpp +++ b/src/object/tool_type.cpp @@ -46,12 +46,12 @@ ToolType GetToolFromObject(ObjectType type) case OBJECT_MOBILEfi: case OBJECT_MOBILEii: return ToolType::OrganicShooter; - + case OBJECT_MOBILEwb: case OBJECT_MOBILEtb: case OBJECT_MOBILEfb: case OBJECT_MOBILEib: - return ToolType::Builder; + return ToolType::Builder; default: return ToolType::Other; diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index 907f6743..661a4946 100644 --- a/src/script/scriptfunc.cpp +++ b/src/script/scriptfunc.cpp @@ -367,7 +367,7 @@ bool CScriptFunctions::rIsBusy(CBotVar* var, CBotVar* result, int& exception, vo result->SetValInt(ERR_WRONG_OBJ); return false; } - + CAuto* automat = obj->GetAuto(); if ( pThis->GetTeam() != obj->GetTeam() && obj->GetTeam() != 0 ) @@ -400,7 +400,7 @@ bool CScriptFunctions::rDestroy(CBotVar* var, CBotVar* result, int& exception, v result->SetValInt(ERR_WRONG_OBJ); return false; } - + CAuto* automat = obj->GetAuto(); if ( pThis->GetTeam() != obj->GetTeam() && obj->GetTeam() != 0 ) @@ -463,7 +463,7 @@ bool CScriptFunctions::rFactory(CBotVar* var, CBotVar* result, int& exception, v ObjectType type = static_cast(var->GetValInt()); var = var->GetNext(); - + std::string program; if ( var != nullptr ) { @@ -472,13 +472,13 @@ bool CScriptFunctions::rFactory(CBotVar* var, CBotVar* result, int& exception, v } else program = ""; - + CObject* factory; if (var == nullptr) factory = CObjectManager::GetInstancePointer()->FindNearest(pThis, OBJECT_FACTORY); else factory = static_cast(var->GetUserPtr()); - + if (factory == nullptr) { exception = ERR_WRONG_OBJ; @@ -562,20 +562,20 @@ bool CScriptFunctions::rResearch(CBotVar* var, CBotVar* result, int& exception, ResearchType type = static_cast(var->GetValInt()); var = var->GetNext(); - + CObject* center; if (var == nullptr) center = CObjectManager::GetInstancePointer()->FindNearest(pThis, OBJECT_RESEARCH); else center = static_cast(var->GetUserPtr()); - + if (center == nullptr) { exception = ERR_WRONG_OBJ; result->SetValInt(ERR_WRONG_OBJ); return false; } - + CAuto* automat = center->GetAuto(); if ( pThis->GetTeam() != center->GetTeam() && center->GetTeam() != 0 ) @@ -654,7 +654,7 @@ bool CScriptFunctions::rTakeOff(CBotVar* var, CBotVar* result, int& exception, v result->SetValInt(ERR_WRONG_OBJ); return false; } - + CAuto* automat = base->GetAuto(); if ( pThis->GetTeam() != base->GetTeam() && base->GetTeam() != 0 ) diff --git a/src/ui/object_interface.cpp b/src/ui/object_interface.cpp index 2b10b306..584b57a1 100644 --- a/src/ui/object_interface.cpp +++ b/src/ui/object_interface.cpp @@ -100,7 +100,7 @@ CObjectInterface::CObjectInterface(COldObject* object) m_manipStyle = EVENT_OBJECT_MFRONT; m_selScript = 0; - + m_buildInterface = false; } @@ -622,7 +622,7 @@ bool CObjectInterface::EventProcess(const Event &event) { err = m_taskExecutor->StartTaskSpiderExplo(); } - + if ( action == EVENT_OBJECT_BUILD ) { m_buildInterface = !m_buildInterface; @@ -1430,13 +1430,13 @@ bool CObjectInterface::CreateInterface(bool bSelect) pb = pw->CreateButton(pos, dim, 192+4, EVENT_OBJECT_BUILD); pb->SetImmediat(true); DefaultEnter(pw, EVENT_OBJECT_BUILD); - + pos.x = 0.0f; pos.y = oy+sy*2.6f; ddim.x = 214.5f/640.0f; ddim.y = 66.0f/480.0f; pw->CreateGroup(pos, ddim, 6, EVENT_WINDOW3); - + ddim.x = dim.x*0.9f; ddim.y = dim.y*0.9f; pos.y = oy+sy*3.6f; @@ -1468,7 +1468,7 @@ bool CObjectInterface::CreateInterface(bool bSelect) pos.x = ox+sx*5.4f; pw->CreateButton(pos, ddim, 128+44, EVENT_OBJECT_BINFO); DeadInterface(pw, EVENT_OBJECT_BINFO, m_main->CanBuild(OBJECT_INFO, m_object->GetTeam())); - + pos.y = oy+sy*2.7f; pos.x = ox+sx*0.0f; @@ -1498,7 +1498,7 @@ bool CObjectInterface::CreateInterface(bool bSelect) pos.x = ox+sx*5.4f; pw->CreateButton(pos, ddim, 128+41, EVENT_OBJECT_BDESTROYER); DeadInterface(pw, EVENT_OBJECT_BDESTROYER, m_main->CanBuild(OBJECT_DESTROYER, m_object->GetTeam())); - + } UpdateInterface(); m_lastUpdateTime = 0.0f; @@ -1829,7 +1829,7 @@ void CObjectInterface::UpdateInterface() ps->SetVisibleValue((RADIUS_SHIELD_MIN/g_unit)+dynamic_cast(m_object)->GetShieldRadius()*((RADIUS_SHIELD_MAX-RADIUS_SHIELD_MIN)/g_unit)); } } - + if ( (type == OBJECT_MOBILEfb || type == OBJECT_MOBILEtb || type == OBJECT_MOBILEwb || @@ -1841,7 +1841,7 @@ void CObjectInterface::UpdateInterface() pb = static_cast< CButton* >(pw->SearchControl(EVENT_WINDOW3)); pb->SetState(STATE_VISIBLE, m_buildInterface); - + pb = static_cast< CButton* >(pw->SearchControl(EVENT_OBJECT_BFACTORY)); pb->SetState(STATE_VISIBLE, m_buildInterface); pb = static_cast< CButton* >(pw->SearchControl(EVENT_OBJECT_BDERRICK)); diff --git a/src/ui/object_interface.h b/src/ui/object_interface.h index e3df7cbb..184c95ce 100644 --- a/src/ui/object_interface.h +++ b/src/ui/object_interface.h @@ -120,7 +120,7 @@ protected: float m_lastAlarmTime; int m_soundChannelAlarm; int m_flagColor; - + bool m_buildInterface; };