jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 13:30:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "Feature/continuumatrice product migration"

Browse source
This commit is contained in:
Christian Daniel Jensen 2026-11-03 18:51:23 -07:00 • committed by GitHub
parent 533d2f04c1
commit e49d053838
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
150 changed files with 2599 additions and 5304 deletions
Download patch file Download diff file Expand all files Collapse all files

6
servatrice/src/main.cpp
View file

@ -130,8 +130,8 @@ void myMessageOutput2(QtMsgType /*type*/, const QMessageLogContext &, const QStr
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
QCoreApplication::setOrganizationName("Continuum Universes Studio");
QCoreApplication::setApplicationName("Continuum-Servatrice");
QCoreApplication::setOrganizationName("Cockatrice");
QCoreApplication::setApplicationName("Servatrice");
QCoreApplication::setApplicationVersion(VERSION_STRING);
QCommandLineParser parser;
@ -188,7 +188,7 @@ int main(int argc, char *argv[])
rng = new RNG_SFMT(CryptoUtil::randomUInt64());
std::cerr << "Continuum-Servatrice " << VERSION_STRING << " starting." << std::endl;
std::cerr << "Servatrice " << VERSION_STRING << " starting." << std::endl;
std::cerr << "-------------------------" << std::endl;
if (testRandom) {

8
servatrice/src/servatrice.cpp
View file

@ -1270,9 +1270,9 @@ QString Servatrice::getDBTypeString() const
QString Servatrice::getDBPrefixString() const
{
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return {"continuum_servatrice"};
return {"cockatrice"};
}
return settingsCache->value("database/prefix", "continuum_servatrice").toString();
return settingsCache->value("database/prefix").toString();
}
QString Servatrice::getDBHostNameString() const
@ -1419,7 +1419,7 @@ QHostAddress Servatrice::getServerTCPHost() const
int Servatrice::getServerTCPPort() const
{
return settingsCache->value("server/port", 4757).toInt();
return settingsCache->value("server/port", 4747).toInt();
}
int Servatrice::getNumberOfWebSocketPools() const
@ -1442,7 +1442,7 @@ int Servatrice::getServerWebSocketPort() const
if (QProcessEnvironment::systemEnvironment().contains("PORT")) {
return QProcessEnvironment::systemEnvironment().value("PORT").toInt();
}
return settingsCache->value("server/websocket_port", 4758).toInt();
return settingsCache->value("server/websocket_port", 4748).toInt();
}
bool Servatrice::getISLNetworkEnabled() const

4
servatrice/src/settingscache.cpp
View file

@ -27,7 +27,7 @@ SettingsCache::SettingsCache(const QString &fileName, QSettings::Format format,
QString SettingsCache::guessConfigurationPath()
{
const QString fileName = "continuum-servatrice.ini";
const QString fileName = "servatrice.ini";
if (QFile::exists(qApp->applicationDirPath() + "/portable.dat")) {
qDebug() << "Portable mode enabled";
return fileName;
@ -43,7 +43,7 @@ QString SettingsCache::guessConfigurationPath()
#ifdef Q_OS_UNIX
// /etc
guessFileName = "/etc/continuum-servatrice/" + fileName;
guessFileName = "/etc/servatrice/" + fileName;
if (QFile::exists(guessFileName)) {
return guessFileName;
}