Skip to content

Added parameter to control entertainer captcha from the server #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeronAlexandria merged 1 commit into from
May 13, 2026
Merged

Added parameter to control entertainer captcha from the server #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion engine/server/library/serverGame/src/shared/core/Client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,8 @@ Client::Client(ConnectionServerConnection &connection, const NetworkId &characte
}

// Send server-specific settings to the client
ParametersMessage const msg(ConfigServerGame::getWeatherUpdateSeconds());
ParametersMessage const msg(ConfigServerGame::getWeatherUpdateSeconds(),
ConfigServerGame::getEntertainerCaptchaPercent());
send(msg, true);

ObjectTracker::addPlayer();
Expand Down
3 changes: 3 additions & 0 deletions engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ void ConfigServerGame::install(void)
KEY_STRING (defaultVendorItemRestrictionFile, "datatables/commodity/vendor_item_restriction_default.iff");
KEY_STRING (defaultVendorItemRestrictionRejectionMessage, "@ui_auc:reject_restricted_item");
KEY_INT (weatherUpdateSeconds, 15*60);
KEY_INT (entertainerCaptchaPercent, 40);
data->entertainerCaptchaPercent = std::max(0, std::min(100, data->entertainerCaptchaPercent));

KEY_STRING (instrumentDataTableFilename, "datatables/tangible/instrument_datatable.iff");
KEY_STRING (performanceDataTableFilename, "datatables/performance/performance.iff");
KEY_INT (createQueueScheduleTime, 75);
Expand Down
9 changes: 9 additions & 0 deletions engine/server/library/serverGame/src/shared/core/ConfigServerGame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ class ConfigServerGame
const char * defaultVendorItemRestrictionRejectionMessage;

int weatherUpdateSeconds;
int entertainerCaptchaPercent;

const char * instrumentDataTableFilename;
const char * performanceDataTableFilename;
Expand Down Expand Up @@ -768,6 +769,7 @@ class ConfigServerGame
static const char * getDefaultVendorItemRestrictionRejectionMessage();

static int getWeatherUpdateSeconds();
static int getEntertainerCaptchaPercent();
static const char * getInstrumentDataTableFilename(void);
static const char * getPerformanceDataTableFilename(void);
static const int getCreateQueueScheduleTime(void);
Expand Down Expand Up @@ -2006,6 +2008,13 @@ inline int ConfigServerGame::getWeatherUpdateSeconds(void)
return data->weatherUpdateSeconds;
}


inline int ConfigServerGame::getEntertainerCaptchaPercent(void)
{
return data->entertainerCaptchaPercent;
}


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

inline const char * ConfigServerGame::getInstrumentDataTableFilename(void)
Expand Down
10 changes: 7 additions & 3 deletions ...ne/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,24 @@

// ======================================================================

ParametersMessage::ParametersMessage(int weatherUpdateInterval) :
ParametersMessage::ParametersMessage(int weatherUpdateInterval, int entertainerCaptchaPercent) :
GameNetworkMessage("ParametersMessage"),
m_weatherUpdateInterval(weatherUpdateInterval)
m_weatherUpdateInterval(weatherUpdateInterval),
m_entertainerCaptchaPercent(entertainerCaptchaPercent)
{
addVariable(m_weatherUpdateInterval);
addVariable(m_entertainerCaptchaPercent);
}

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

ParametersMessage::ParametersMessage(Archive::ReadIterator & source) :
GameNetworkMessage("ParametersMessage"),
m_weatherUpdateInterval()
m_weatherUpdateInterval(),
m_entertainerCaptchaPercent()
{
addVariable(m_weatherUpdateInterval);
addVariable(m_entertainerCaptchaPercent);

unpack(source);
}
Expand Down
12 changes: 11 additions & 1 deletion engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,17 @@
class ParametersMessage : public GameNetworkMessage
{
public:
ParametersMessage(int weatherUpdateInterval);
ParametersMessage(int weatherUpdateInterval, int entertainerCaptchaPercent);
explicit ParametersMessage(Archive::ReadIterator & source);
virtual ~ParametersMessage();

public:
int getWeatherUpdateInterval() const;
int getEntertainerCaptchaPercent() const;

private:
Archive::AutoVariable<int> m_weatherUpdateInterval;
Archive::AutoVariable<int> m_entertainerCaptchaPercent;

ParametersMessage();
ParametersMessage(const ParametersMessage&);
Expand All @@ -53,6 +55,14 @@ inline int ParametersMessage::getWeatherUpdateInterval() const
return m_weatherUpdateInterval.get();
}

inline int ParametersMessage::getEntertainerCaptchaPercent() const
{
return m_entertainerCaptchaPercent.get();
}



// ======================================================================

#endif

Loading