Fixed vehicle selection hiding on selection
This commit is contained in:
+1
-1
Submodule assets updated: 4a7b5c236d...3c4d81137f
+7
-1
@@ -82,7 +82,13 @@ public:
|
|||||||
std::string Name() const { return m_Name; }
|
std::string Name() const { return m_Name; }
|
||||||
void SetName(std::string val) { m_Name = val; }
|
void SetName(std::string val) { m_Name = val; }
|
||||||
int Layer() const { return m_Layer; }
|
int Layer() const { return m_Layer; }
|
||||||
bool Hidden() const { return m_Hidden; }
|
bool Hidden() const
|
||||||
|
{
|
||||||
|
if (m_Parent)
|
||||||
|
return m_Parent->Hidden() || m_Hidden;
|
||||||
|
else
|
||||||
|
return m_Hidden;
|
||||||
|
}
|
||||||
void Hide() { m_Hidden = true; }
|
void Hide() { m_Hidden = true; }
|
||||||
void Show() { m_Hidden = false; }
|
void Show() { m_Hidden = false; }
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -26,8 +26,7 @@ public:
|
|||||||
vp1->X = 0;
|
vp1->X = 0;
|
||||||
vp1->Width = this->Width / 2.f;
|
vp1->Width = this->Width / 2.f;
|
||||||
//new PlayerHUD(vp1, "PlayerHUD", m_World, 1);
|
//new PlayerHUD(vp1, "PlayerHUD", m_World, 1);
|
||||||
new VehicleSelection(vp1, "VehicleSelection", m_World, 1);
|
auto vehicleSelection = new VehicleSelection(vp1, "VehicleSelection", m_World, 1);
|
||||||
|
|
||||||
|
|
||||||
vp2 = new Viewport(worldFrame, "Viewport2", m_World);
|
vp2 = new Viewport(worldFrame, "Viewport2", m_World);
|
||||||
vp2->X = vp1->Right();
|
vp2->X = vp1->Right();
|
||||||
|
|||||||
@@ -281,8 +281,6 @@ bool Systems::TankSteeringSystem::OnSpawnVehicle(const Events::SpawnVehicle &eve
|
|||||||
else if (event.PlayerID == 2)
|
else if (event.PlayerID == 2)
|
||||||
e.ViewportFrame = "Viewport2";
|
e.ViewportFrame = "Viewport2";
|
||||||
EventBroker->Publish(e);
|
EventBroker->Publish(e);
|
||||||
e.ViewportFrame = "Viewport2";
|
|
||||||
EventBroker->Publish(e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user