jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 00:24:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Crash fixes (bug #0000006). Also cleaned up some includes to speed up compilation.

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-09-08 22:52:04 +02:00
parent 8fea71782d
commit 62bf2572a9
22 changed files with 208 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cockatrice/src/counter.cpp
View file

@ -1,10 +1,13 @@
#include "counter.h"
#include "player.h"
#include "protocol_items.h"
#include <QtGui>
#include <QPainter>
#include <QMenu>
#include <QAction>
#include <QGraphicsSceneMouseEvent>
Counter::Counter(Player *_player, int _id, const QString &_name, QColor _color, int _radius, int _value, QGraphicsItem *parent)
: QGraphicsItem(parent), player(_player), id(_id), name(_name), color(_color), radius(_radius), value(_value), aDec(0), aInc(0)
: QGraphicsItem(parent), player(_player), id(_id), name(_name), color(_color), radius(_radius), value(_value), aDec(0), aInc(0), dialogSemaphore(false), deleteAfterDialog(false)
{
if (radius > Player::counterAreaWidth / 2)
radius = Player::counterAreaWidth / 2;
@ -38,6 +41,14 @@ Counter::~Counter()
delete menu;
}
void Counter::delCounter()
{
if (dialogSemaphore)
deleteAfterDialog = true;
else
deleteLater();
}
void Counter::retranslateUi()
{
if (menu) {
@ -112,7 +123,13 @@ void Counter::incrementCounter()
void Counter::setCounter()
{
bool ok;
dialogSemaphore = true;
int newValue = QInputDialog::getInteger(0, tr("Set counter"), tr("New value for counter '%1':").arg(name), value, 0, 2000000000, 1, &ok);
if (deleteAfterDialog) {
deleteLater();
return;
}
dialogSemaphore = false;
if (ok)
player->sendGameCommand(new Command_SetCounter(-1, id, newValue));
}