Skip to content

Commit

Permalink
Merge pull request #1 from HeronAlexandria/waypoint_fix
Browse files Browse the repository at this point in the history 
Broken waypoint fix
  • Loading branch information
@HeronAlexandria
HeronAlexandria committed Apr 15, 2022
2 parents f62b7f2 + e717539 commit 7ab9014
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 59 deletions.
20 changes: 0 additions & 20 deletions src/engine/client/library/clientGame/src/shared/object/ClientWaypointObject.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ class ClientWaypointObject : public IntangibleObject
static const ConstWaypointVector & getRegularWaypoints ();
static const ConstWaypointVector & getPoiWaypoints ();
static const ConstWaypointVector & getGroupWaypoints ();
static const ConstWaypointVector & getCityWaypoints ();
static const ConstWaypointVector & getGuildWaypoints ();

static void checkWaypoints (float const deltaTime);

Expand All @@ -92,8 +90,6 @@ class ClientWaypointObject : public IntangibleObject
bool equals (const WaypointDataBase & wd) const;
bool isPoi () const;
bool isGroupWaypoint () const;
bool isCityWaypoint () const;
bool isGuildWaypoint () const;
bool isEntranceUsed () const;
bool isEntrance () const;
bool isSmallWaypoint () const;
Expand Down Expand Up @@ -158,8 +154,6 @@ class ClientWaypointObject : public IntangibleObject
StringId m_description;
bool m_isPoi : 1,
m_isGroupWaypoint : 1,
m_isCityWaypoint : 1,
m_isGuildWaypoint : 1,
m_isBuildoutWaypoint : 1;

Vector m_relativeWaypointPosition;
Expand Down Expand Up @@ -207,20 +201,6 @@ inline bool ClientWaypointObject::isGroupWaypoint () const
return m_isGroupWaypoint;
}

//-----------------------------------------------------------------------

inline bool ClientWaypointObject::isCityWaypoint() const
{
return m_isCityWaypoint;
}

//-----------------------------------------------------------------------

inline bool ClientWaypointObject::isGuildWaypoint() const
{
return m_isGuildWaypoint;
}

//----------------------------------------------------------------------

inline Vector const ClientWaypointObject::getWorldWaypointLocation_w() const
Expand Down
43 changes: 6 additions & 37 deletions src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiDataStorage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,13 @@ public SwgCuiContainerProviderFilter
bool showObject (const ClientObject & obj) const;
void setShowCurrentPlanetOnly(bool currentOnly) {m_currentPlanetOnly = currentOnly;}
void setShowGroupWaypoints(bool enable) {m_showGroupWaypoints = enable;}
void setShowCityWaypoints(bool enable) {m_showCityWaypoints = enable;}
void setShowGuildWaypoints(bool enable) {m_showGuildWaypoints = enable;}
void setSingleWaypointMode(bool enable) {m_singleWaypointMode = enable;}

Tabs::Id m_id;

private:
bool m_currentPlanetOnly;
bool m_showGroupWaypoints;
bool m_showCityWaypoints;
bool m_showGuildWaypoints;
bool m_singleWaypointMode;
};

Expand All @@ -249,8 +245,6 @@ SwgCuiDataStorage::FilterWps::FilterWps() :
m_id(Tabs::I_count),
m_currentPlanetOnly(false),
m_showGroupWaypoints(false),
m_showCityWaypoints(false),
m_showGuildWaypoints(false),
m_singleWaypointMode(true)
{
}
Expand All @@ -260,7 +254,10 @@ SwgCuiDataStorage::FilterWps::FilterWps() :
bool SwgCuiDataStorage::FilterWps::showObject (const ClientObject & obj) const
{
ClientWaypointObject const * const wp = dynamic_cast<ClientWaypointObject const * const>(&obj);
if (wp && (wp->isGroupWaypoint() == m_showGroupWaypoints) && wp->isCityWaypoint() == m_showCityWaypoints && wp->isGuildWaypoint() == m_showGuildWaypoints && (!m_currentPlanetOnly || wp->getPlanetName () == Game::getNonInstanceSceneId()))
if (wp
&& wp->isGroupWaypoint() == m_showGroupWaypoints
&& (!m_currentPlanetOnly
|| wp->getPlanetName() == Game::getNonInstanceSceneId()))
return true;
return false;
}
Expand Down Expand Up @@ -369,8 +366,6 @@ m_capacityBar (0),
m_capacityLabel (0),
m_capacityBarWp (0),
m_capacityLabelWp (0),
m_buttonCityWaypoint(0),
m_buttonGuildWaypoint(0),
m_buttonNewWaypoint (0),
m_tabs (0),
m_waypointsCurrentPlanetOnly(0),
Expand Down Expand Up @@ -399,8 +394,6 @@ m_callbackReceiverShowGroupWaypoints(0)
getCodeDataObject (TUICheckbox, m_waypointsCurrentPlanetOnly, "checkWaypointCurrentPlanetOnly");
getCodeDataObject (TUICheckbox, m_waypointsSingleWaypointMode, "checkWaypointSingleWaypointMode");
getCodeDataObject (TUICheckbox, m_waypointsOnScreen, "checkWaypointShowWaypointIndicators");
getCodeDataObject (TUIButton, m_buttonGuildWaypoint, "buttonGuildWaypoint");
getCodeDataObject (TUIButton, m_buttonCityWaypoint, "buttonCityWaypoint");

m_waypointsCurrentPlanetOnly->SetChecked(false);
m_waypointsSingleWaypointMode->SetChecked(false);
Expand Down Expand Up @@ -455,8 +448,6 @@ m_callbackReceiverShowGroupWaypoints(0)
registerMediatorObject (*m_waypointsCurrentPlanetOnly, true);
registerMediatorObject (*m_waypointsSingleWaypointMode, true);
registerMediatorObject (*m_waypointsOnScreen, true);
registerMediatorObject (*m_buttonGuildWaypoint, true);
registerMediatorObject (*m_buttonCityWaypoint, true);

setState (MS_closeable);
setState (MS_closeDeactivates);
Expand All @@ -478,8 +469,6 @@ SwgCuiDataStorage::~SwgCuiDataStorage ()
m_capacityBarWp = 0;
m_capacityLabelWp = 0;
m_tabs = 0;
m_buttonCityWaypoint = 0;
m_buttonGuildWaypoint = 0;
m_buttonNewWaypoint = 0;
m_waypointsCurrentPlanetOnly = 0;
m_waypointsSingleWaypointMode = 0;
Expand Down Expand Up @@ -609,8 +598,7 @@ void SwgCuiDataStorage::performDeactivate ()
//-----------------------------------------------------------------

void SwgCuiDataStorage::OnButtonPressed( UIWidget *context )
{
bool updateContainer = false;
{
if(context == m_buttonNewWaypoint)
{
ClientObject * const player = Game::getClientPlayer ();
Expand All @@ -619,24 +607,6 @@ void SwgCuiDataStorage::OnButtonPressed( UIWidget *context )
ClientWaypointObject::requestWaypoint (Unicode::emptyString, player->getPosition_w ());
}
}
else if (context == m_buttonCityWaypoint)
{
m_filterWps->setShowCityWaypoints(true);
updateContainer = true;

}
else if (context == m_buttonGuildWaypoint)
{
m_filterWps->setShowGuildWaypoints(true);
updateContainer = true;
}

if (updateContainer)
{
m_containerProviderWaypoints->updateObjectVector();
m_containerProviderWaypoints->setContentDirty(true);
m_containerProviderWaypoints->setProviderDirty(true);
}
}

//----------------------------------------------------------------------
Expand Down Expand Up @@ -677,8 +647,7 @@ void SwgCuiDataStorage::OnCheckboxUnset (UIWidget * context)

if (context == m_waypointsCurrentPlanetOnly)
{
m_filterWps->setShowCurrentPlanetOnly(m_waypointsCurrentPlanetOnly->IsChecked());
updateContainer = true;
m_filterWps->setShowCurrentPlanetOnly(m_waypointsCurrentPlanetOnly->IsChecked());
}
else if (context == m_waypointsSingleWaypointMode)
{
Expand Down
2 changes: 0 additions & 2 deletions src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiDataStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ public UIEventCallback
UIText * m_capacityLabel;
UIPage * m_capacityBarWp;
UIText * m_capacityLabelWp;
UIButton * m_buttonCityWaypoint;
UIButton * m_buttonGuildWaypoint;
UIButton * m_buttonNewWaypoint;
UITabbedPane * m_tabs;
UICheckbox * m_waypointsCurrentPlanetOnly;
Expand Down

0 comments on commit 7ab9014

Please sign in to comment.