Commit c7fa2fe9 authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

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

parent 13d3de5c
...@@ -1721,7 +1721,7 @@ void Player::cardMenuAction() ...@@ -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())) {
......
...@@ -18,15 +18,16 @@ user=servatrice ...@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment