mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
fix 1032 merge conflicts
This commit is contained in:
parent
e318b70329
commit
475c54bfe1
4 changed files with 145 additions and 1 deletions
|
|
@ -86,6 +86,16 @@ SettingsCache::SettingsCache()
|
|||
cardInfoViewMode = settings->value("cards/cardinfoviewmode", 0).toInt();
|
||||
|
||||
highlightWords = settings->value("personal/highlightWords", QString()).toString();
|
||||
|
||||
gameDescription = settings->value("game/gamedescription","").toString();
|
||||
maxPlayers = settings->value("game/maxplayers", 2).toInt();
|
||||
gameTypes = settings->value("game/gametypes","").toString();
|
||||
onlyBuddies = settings->value("game/onlybuddies", false).toBool();
|
||||
onlyRegistered = settings->value("game/onlyregistered", true).toBool();
|
||||
spectatorsAllowed = settings->value("game/spectatorsallowed", true).toBool();
|
||||
spectatorsNeedPassword = settings->value("game/spectatorsneedpassword", false).toBool();
|
||||
spectatorsCanTalk = settings->value("game/spectatorscantalk", false).toBool();
|
||||
spectatorsCanSeeEverything = settings->value("game/spectatorscanseeeverything", false).toBool();
|
||||
}
|
||||
|
||||
void SettingsCache::setCardInfoViewMode(const int _viewMode) {
|
||||
|
|
@ -443,4 +453,58 @@ QStringList SettingsCache::getCountries() const
|
|||
<< "vn" << "vu" << "wf" << "ws" << "ye" << "yt" << "za" << "zm" << "zw";
|
||||
|
||||
return countries;
|
||||
}
|
||||
|
||||
void SettingsCache::setGameDescription(const QString _gameDescription)
|
||||
{
|
||||
gameDescription = _gameDescription;
|
||||
settings->setValue("game/gamedescription", gameDescription);
|
||||
}
|
||||
|
||||
void SettingsCache::setMaxPlayers(const int _maxPlayers)
|
||||
{
|
||||
maxPlayers = _maxPlayers;
|
||||
settings->setValue("game/maxplayers", maxPlayers);
|
||||
}
|
||||
|
||||
void SettingsCache::setGameTypes(const QString _gameTypes)
|
||||
{
|
||||
gameTypes = _gameTypes;
|
||||
settings->setValue("game/gametypes", gameTypes);
|
||||
}
|
||||
|
||||
void SettingsCache::setOnlyBuddies(const bool _onlyBuddies)
|
||||
{
|
||||
onlyBuddies = _onlyBuddies;
|
||||
settings->setValue("game/onlybuddies", onlyBuddies);
|
||||
}
|
||||
|
||||
void SettingsCache::setOnlyRegistered(const bool _onlyRegistered)
|
||||
{
|
||||
onlyRegistered = _onlyRegistered;
|
||||
settings->setValue("game/onlyregistered", onlyRegistered);
|
||||
}
|
||||
|
||||
void SettingsCache::setSpectatorsAllowed(const bool _spectatorsAllowed)
|
||||
{
|
||||
spectatorsAllowed = _spectatorsAllowed;
|
||||
settings->setValue("game/spectatorsallowed", spectatorsAllowed);
|
||||
}
|
||||
|
||||
void SettingsCache::setSpectatorsNeedPassword(const bool _spectatorsNeedPassword)
|
||||
{
|
||||
spectatorsNeedPassword = _spectatorsNeedPassword;
|
||||
settings->setValue("game/spectatorsneedpassword", spectatorsNeedPassword);
|
||||
}
|
||||
|
||||
void SettingsCache::setSpectatorsCanTalk(const bool _spectatorsCanTalk)
|
||||
{
|
||||
spectatorsCanTalk = _spectatorsCanTalk;
|
||||
settings->setValue("game/spectatorscantalk", spectatorsCanTalk);
|
||||
}
|
||||
|
||||
void SettingsCache::setSpectatorsCanSeeEverything(const bool _spectatorsCanSeeEverything)
|
||||
{
|
||||
spectatorsCanSeeEverything = _spectatorsCanSeeEverything;
|
||||
settings->setValue("game/spectatorscanseeeverything", spectatorsCanSeeEverything);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue