Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply suggestion batch that fixes bad english

Browse Source 
Co-Authored-By: Rosemary Witchaven <32779090+in1tiate@users.noreply.github.com>
This commit is contained in:
Salanto 2021-12-17 20:53:13 +01:00
parent 9d9cbdb4e2
commit dabc7c1abe
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/include/area_data.h
View File

@ -551,7 +551,7 @@ class AreaData : public QObject {
QString areaMessage() const; QString areaMessage() const;
/** /**
* @brief Returns if the flavour text is send by joining the area. * @brief Returns if the area's message should be sent when a user joins the area.
* *
* @return See short description. * @return See short description.
*/ */
@ -560,7 +560,7 @@ class AreaData : public QObject {
/** /**
* @brief Changes the area message in the area. * @brief Changes the area message in the area.
* *
* @param f_newFlacour_r The new flavour text. * @param f_newMessage_r The new message.
*/ */
void changeAreaMessage(const QString& f_newMessage_r); void changeAreaMessage(const QString& f_newMessage_r);
@ -830,7 +830,7 @@ class AreaData : public QObject {
void toggleIgnoreBgList(); void toggleIgnoreBgList();
/** /**
* @brief Toggles wether the area message is send on joining the area. * @brief Toggles whether the area message is sent upon joining the area.
*/ */
void toggleAreaMessageJoin(); void toggleAreaMessageJoin();
@ -963,8 +963,8 @@ private:
/** /**
* @brief The message of the area. * @brief The message of the area.
* *
* @details The area mnessage has multiple purposes. It can be used to provide general information for * @details The area message has multiple purposes. It can be used to provide general information for
* RP or guidance for players joining the area. Unlike document it can send on area join. * RP or guidance for players joining the area. Unlike document it can be sent on area join. Like a MOTD, but for the area.
*/ */
QString m_area_message; QString m_area_message;
@ -1056,7 +1056,7 @@ private:
bool m_ignoreBgList; bool m_ignoreBgList;
/** /**
* @brief Wether or not the area message is send on joining it. * @brief Whether or not the area message is sent upon area join.
*/ */
bool m_send_area_message; bool m_send_area_message;

4
core/src/area_data.cpp
View File

@ -26,7 +26,7 @@ AreaData::AreaData(QString p_name, int p_index) :
m_status(IDLE), m_status(IDLE),
m_locked(FREE), m_locked(FREE),
m_document("No document."), m_document("No document."),
m_area_message("No flavour text."), m_area_message("No area message set."),
m_defHP(10), m_defHP(10),
m_proHP(10), m_proHP(10),
m_statement(0), m_statement(0),
@ -494,7 +494,7 @@ bool AreaData::sendAreaMessageOnJoin() const
void AreaData::changeAreaMessage(const QString& f_newMessage_r) void AreaData::changeAreaMessage(const QString& f_newMessage_r)
{ {
if(f_newMessage_r.isEmpty()) if(f_newMessage_r.isEmpty())
m_area_message = "No flavour text."; m_area_message = "No area message set.";
else else
m_area_message = f_newMessage_r; m_area_message = f_newMessage_r;
} }

4
core/src/commands/area.cpp
View File

@ -383,7 +383,7 @@ void AOClient::cmdAreaMessage(int argc, QStringList argv)
if (argc >= 1) { if (argc >= 1) {
l_area->changeAreaMessage(argv.join(" ")); l_area->changeAreaMessage(argv.join(" "));
sendServerMessage("Updated areas flavour text."); sendServerMessage("Updated this area's message.");
} }
} }
@ -395,7 +395,7 @@ void AOClient::cmdToggleAreaMessageOnJoin(int argc, QStringList argv)
AreaData* l_area = server->m_areas[m_current_area]; AreaData* l_area = server->m_areas[m_current_area];
l_area->toggleAreaMessageJoin(); l_area->toggleAreaMessageJoin();
QString l_state = l_area->sendAreaMessageOnJoin() ? "enabled." : "disabled."; QString l_state = l_area->sendAreaMessageOnJoin() ? "enabled." : "disabled.";
sendServerMessage("Sending flavour text on area join is now " +l_state); sendServerMessage("Sending message on area join is now " +l_state);
} }
void AOClient::cmdClearAreaMessage(int argc, QStringList argv) void AOClient::cmdClearAreaMessage(int argc, QStringList argv)