aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed clone function, updated servatrice.ini.example to reflect changes in room creation syntax

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-04-26 16:22:48 +02:00
parent 13d3de5c1c
commit c7fa2fe985
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/player.cpp
View file

@ -1721,7 +1721,7 @@ void Player::cardMenuAction()
cardList.append(qgraphicsitem_cast<CardItem *>(sel.takeFirst())); cardList.append(qgraphicsitem_cast<CardItem *>(sel.takeFirst()));
QList< const ::google::protobuf::Message * > commandList; QList< const ::google::protobuf::Message * > commandList;
if (a->data().toInt() <= 4) if (a->data().toInt() <= (int) cmClone)
for (int i = 0; i < cardList.size(); ++i) { for (int i = 0; i < cardList.size(); ++i) {
CardItem *card = cardList[i]; CardItem *card = cardList[i];
switch (static_cast<CardMenuActionType>(a->data().toInt())) { switch (static_cast<CardMenuActionType>(a->data().toInt())) {

19
servatrice/servatrice.ini.example
View file

@ -18,15 +18,16 @@ user=servatrice
password=foobar password=foobar
[rooms] [rooms]
size=1 method=config
1\name="General room" roomlist\size=1
1\description="Play anything here." roomlist\1\name="General room"
1\autojoin=true roomlist\1\description="Play anything here."
1\joinmessage="This message is only here to show that rooms can have a join message." roomlist\1\autojoin=true
1\game_types\size=3 roomlist\1\joinmessage="This message is only here to show that rooms can have a join message."
1\game_types\1\name="GameType1" roomlist\1\game_types\size=3
1\game_types\2\name="GameType2" roomlist\1\game_types\1\name="GameType1"
1\game_types\3\name="GameType3" roomlist\1\game_types\2\name="GameType2"
roomlist\1\game_types\3\name="GameType3"
[game] [game]
max_game_inactivity_time=120 max_game_inactivity_time=120