projects
/
vexed
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug when block can slide over the same one
[vexed]
/
fieldview.h
diff --git
a/fieldview.h
b/fieldview.h
index
c9111a8
..
892fdf0
100644
(file)
--- a/
fieldview.h
+++ b/
fieldview.h
@@
-3,7
+3,6
@@
#include <QtCore>
#include <QtGui>
#include <QtCore>
#include <QtGui>
-#include <QtSvg>
#include "playfield.h"
#include "iconset.h"
#include "playfield.h"
#include "iconset.h"
@@
-65,26
+64,33
@@
public:
explicit FieldView(QWidget *parent = 0);
PlayField* setPlayField(PlayField *pf);
explicit FieldView(QWidget *parent = 0);
PlayField* setPlayField(PlayField *pf);
+ void showSolution();
+ void stop();
+
private:
PlayField *playField;
int selX, selY;
int moveX, moveY;
private:
PlayField *playField;
int selX, selY;
int moveX, moveY;
- QStateMachine *machine;
- QState *rotL, *rotR;
- QTimer timer;
bool moving;
QList<Animation*> *moves;
bool moving;
QList<Animation*> *moves;
+ QTimer *solutionTimer;
void playMoves();
void playMoves();
+ void move(int x, int y, int dest_x);
+
+ int solutionMove;
+ bool inSolution;
signals:
void solved(int moves);
void updateMoves(int moves);
signals:
void solved(int moves);
void updateMoves(int moves);
+ void animationEnd();
public slots:
void cellMoved(int w, int h, int wnew, int hnew);
void cellGone(int w, int h);
void playMove();
void undo();
public slots:
void cellMoved(int w, int h, int wnew, int hnew);
void cellGone(int w, int h);
void playMove();
void undo();
+ void playSolutionMove();
protected:
protected: