sacar y poner el escritorio al casear y terminar

This commit is contained in:
simio 2025-07-03 06:44:31 -03:00
parent c26cd95b4e
commit 209da52527
11 changed files with 36 additions and 17 deletions

View File

@ -602,6 +602,8 @@ class AOClient : public QObject
*/ */
const int SPECTATOR_ID = -1; const int SPECTATOR_ID = -1;
void toggleDeskHide(bool hide, AreaData* area, bool any);
public slots: public slots:
/** /**
* @brief Handles an incoming packet, checking for authorisation and minimum argument count. * @brief Handles an incoming packet, checking for authorisation and minimum argument count.

View File

@ -334,6 +334,7 @@ AreaData::Status AreaData::status() const
bool AreaData::changeStatus(const QString &f_newStatus_r) bool AreaData::changeStatus(const QString &f_newStatus_r)
{ {
if (AreaData::map_statuses.contains(f_newStatus_r)) { if (AreaData::map_statuses.contains(f_newStatus_r)) {
if (m_status == AreaData::map_statuses[f_newStatus_r]) return false;
m_status = AreaData::map_statuses[f_newStatus_r]; m_status = AreaData::map_statuses[f_newStatus_r];
return true; return true;
} }

View File

@ -376,10 +376,16 @@ void AOClient::cmdStatus(int argc, QStringList argv)
if (l_area->changeStatus(l_arg)) { if (l_area->changeStatus(l_arg)) {
arup(ARUPType::STATUS, true); arup(ARUPType::STATUS, true);
server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverTag(), character() + " changed status to " + l_arg.toUpper(), "1"}), areaId()); server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverTag(), character() + " changed status to " + l_arg.toUpper(), "1"}), areaId());
if (l_area->status() == AreaData::Status::IDLE) {
toggleDeskHide(true, l_area, false);
}
else if (l_area->status() == AreaData::Status::CASING) {
toggleDeskHide(false, l_area, true);
}
} }
else { else {
const QStringList keys = AreaData::map_statuses.keys(); const QStringList keys = AreaData::map_statuses.keys();
sendServerMessage("That does not look like a valid status. Valid statuses are " + keys.join(", ")); sendServerMessage("That does not look like a valid status or the area is already in that status. Valid statuses are " + keys.join(", "));
} }
} }
@ -487,4 +493,14 @@ void AOClient::cmdWebfiles(int argc, QStringList argv)
} }
} }
sendServerMessage("Character files:\n" + l_weblinks.join("\n")); sendServerMessage("Character files:\n" + l_weblinks.join("\n"));
}
void AOClient::toggleDeskHide(bool hide, AreaData* l_area, bool any) {
QVector<int> joinedPlayerIDs = l_area->joinedIDs(); // Get the list of joined player IDs
for (int id : joinedPlayerIDs) {
AOClient* client = server->getClientByID(id); // Get each client by ID
if (client->m_pos == "wit" || any) {
client->hide_desk = hide; // Set hide_desk if the client is a "wit"
}
}
} }

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} QT_PLUGIN_PATH=/usr/lib/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
export QT_PLUGIN_PATH export QT_PLUGIN_PATH
exec "$@" exec "$@"