jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 17:14:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

removed some unneeded code, counter appearance changed

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-09-25 12:56:11 +02:00
parent a543c9b90c
commit 29699418d2
20 changed files with 293 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

6
servatrice/src/counter.h
View file

@ -24,14 +24,18 @@
class Counter {
protected:
int id;
QString name;
int color;
int radius;
int count;
public:
Counter(QString _name, int _color, int _count = 0) : name(_name), color(_color), count(_count) { }
Counter(int _id, const QString &_name, int _color, int _radius, int _count = 0) : id(_id), name(_name), color(_color), radius(_radius), count(_count) { }
~Counter() { }
int getId() const { return id; }
QString getName() const { return name; }
int getColor() const { return color; }
int getRadius() const { return radius; }
int getCount() const { return count; }
void setCount(int _count) { count = _count; }
};

69
servatrice/src/serversocket.cpp
View file

@ -33,7 +33,7 @@
QHash<QString, ServerSocket::CommandProperties> ServerSocket::commandHash;
ServerSocket::ServerSocket(Server *_server, QObject *parent)
: QTcpSocket(parent), server(_server), game(0), spectator(false), PlayerStatus(StatusNormal), authState(PasswordWrong), acceptsGameListChanges(false)
: QTcpSocket(parent), server(_server), game(0), spectator(false), nextCardId(0), PlayerStatus(StatusNormal), authState(PasswordWrong), acceptsGameListChanges(false)
{
if (commandHash.isEmpty()) {
commandHash.insert("ping", CommandProperties(false, false, false, true, QList<QVariant::Type>(), &ServerSocket::cmdPing));
@ -94,12 +94,13 @@ ServerSocket::ServerSocket(Server *_server, QObject *parent)
commandHash.insert("add_counter", CommandProperties(true, true, true, false, QList<QVariant::Type>()
<< QVariant::String
<< QVariant::Int
<< QVariant::Int
<< QVariant::Int, &ServerSocket::cmdAddCounter));
commandHash.insert("set_counter", CommandProperties(true, true, true, false, QList<QVariant::Type>()
<< QVariant::String
<< QVariant::Int
<< QVariant::Int, &ServerSocket::cmdSetCounter));
commandHash.insert("del_counter", CommandProperties(true, true, true, false, QList<QVariant::Type>()
<< QVariant::String, &ServerSocket::cmdDelCounter));
<< QVariant::Int, &ServerSocket::cmdDelCounter));
commandHash.insert("list_counters", CommandProperties(true, true, true, true, QList<QVariant::Type>()
<< QVariant::Int, &ServerSocket::cmdListCounters));
commandHash.insert("list_zones", CommandProperties(true, true, true, true, QList<QVariant::Type>()
@ -143,6 +144,18 @@ int ServerSocket::newCardId()
return nextCardId++;
}
int ServerSocket::newCounterId() const
{
int id = 0;
QMapIterator<int, Counter *> i(counters);
while (i.hasNext()) {
Counter *c = i.next().value();
if (c->getId() > id)
id = c->getId();
}
return id + 1;
}
PlayerZone *ServerSocket::getZone(const QString &name) const
{
QListIterator<PlayerZone *> ZoneIterator(zones);
@ -154,17 +167,6 @@ PlayerZone *ServerSocket::getZone(const QString &name) const
return NULL;
}
Counter *ServerSocket::getCounter(const QString &name) const
{
QListIterator<Counter *> CounterIterator(counters);
while (CounterIterator.hasNext()) {
Counter *temp = CounterIterator.next();
if (temp->getName() == name)
return temp;
}
return NULL;
}
void ServerSocket::setupZones()
{
// Delete existing zones and counters
@ -209,8 +211,9 @@ void ServerSocket::clearZones()
delete zones.at(i);
zones.clear();
for (int i = 0; i < counters.size(); i++)
delete counters.at(i);
QMapIterator<int, Counter *> counterIterator(counters);
while (counterIterator.hasNext())
delete counterIterator.next().value();
counters.clear();
}
@ -588,60 +591,62 @@ ReturnMessage::ReturnCode ServerSocket::cmdSetCardAttr(const QList<QVariant> &pa
ReturnMessage::ReturnCode ServerSocket::cmdIncCounter(const QList<QVariant> &params)
{
Counter *c = getCounter(params[0].toString());
Counter *c = counters.value(params[0].toInt(), 0);
if (!c)
return ReturnMessage::ReturnContextError;
int delta = params[1].toInt();
c->setCount(c->getCount() + delta);
emit broadcastEvent(QString("set_counter|%1|%2").arg(c->getName()).arg(c->getCount()), this);
emit broadcastEvent(QString("set_counter|%1|%2").arg(c->getId()).arg(c->getCount()), this);
return ReturnMessage::ReturnOk;
}
ReturnMessage::ReturnCode ServerSocket::cmdAddCounter(const QList<QVariant> &params)
{
QString name = params[0].toString();
if (getCounter(name))
return ReturnMessage::ReturnContextError;
int color = params[1].toInt();
int count = params[2].toInt();
int radius = params[2].toInt();
int count = params[3].toInt();
Counter *c = new Counter(name, color, count);
counters << c;
emit broadcastEvent(QString("add_counter|%1|%2|%3").arg(c->getName()).arg(color).arg(count), this);
Counter *c = new Counter(newCounterId(), name, color, radius, count);
counters.insert(c->getId(), c);
emit broadcastEvent(QString("add_counter|%1|%2|%3|%4|%5").arg(c->getId()).arg(c->getName()).arg(color).arg(radius).arg(count), this);
return ReturnMessage::ReturnOk;
}
ReturnMessage::ReturnCode ServerSocket::cmdSetCounter(const QList<QVariant> &params)
{
Counter *c = getCounter(params[0].toString());
Counter *c = counters.value(params[0].toInt(), 0);
if (!c)
return ReturnMessage::ReturnContextError;
int count = params[1].toInt();
c->setCount(count);
emit broadcastEvent(QString("set_counter|%1|%2").arg(c->getName()).arg(count), this);
emit broadcastEvent(QString("set_counter|%1|%2").arg(c->getId()).arg(count), this);
return ReturnMessage::ReturnOk;
}
ReturnMessage::ReturnCode ServerSocket::cmdDelCounter(const QList<QVariant> &params)
{
Counter *c = getCounter(params[0].toString());
int counterId = params[0].toInt();
Counter *c = counters.value(counterId, 0);
if (!c)
return ReturnMessage::ReturnContextError;
counters.remove(counterId);
delete c;
counters.removeAt(counters.indexOf(c));
emit broadcastEvent(QString("del_counter|%1").arg(params[0].toString()), this);
emit broadcastEvent(QString("del_counter|%1").arg(counterId), this);
return ReturnMessage::ReturnOk;
}
QStringList ServerSocket::listCountersHelper(ServerSocket *player)
{
QStringList result;
const QList<Counter *> &counterList = player->getCounters();
for (int i = 0; i < counterList.size(); ++i)
result << QString("%1|%2|%3|%4").arg(player->getPlayerId()).arg(counterList[i]->getName()).arg(counterList[i]->getColor()).arg(counterList[i]->getCount());
QMapIterator<int, Counter *> i(player->getCounters());
while (i.hasNext()) {
Counter *c = i.next().value();
result << QString("%1|%2|%3|%4|%5|%6").arg(player->getPlayerId()).arg(c->getId()).arg(c->getName()).arg(c->getColor()).arg(c->getRadius()).arg(c->getCount());
}
return result;
}

6
servatrice/src/serversocket.h
View file

@ -110,14 +110,14 @@ private:
QList<QString> DeckList;
QList<QString> SideboardList;
QList<PlayerZone *> zones;
QList<Counter *> counters;
QMap<int, Counter *> counters;
int playerId;
QString playerName;
bool spectator;
int nextCardId;
int newCardId();
int newCounterId() const;
PlayerZone *getZone(const QString &name) const;
Counter *getCounter(const QString &name) const;
void clearZones();
bool parseCommand(QString line);
PlayerStatusEnum PlayerStatus;
@ -143,7 +143,7 @@ public:
bool getAcceptsGameListChanges() const { return acceptsGameListChanges; }
bool getAcceptsChatChannelListChanges() const { return acceptsChatChannelListChanges; }
const QList<PlayerZone *> &getZones() const { return zones; }
const QList<Counter *> &getCounters() const { return counters; }
const QMap<int, Counter *> &getCounters() const { return counters; }
void setupZones();
};