Add easing to task list and fix a bug where

opening the task list a second time was not possible
This commit is contained in:
Tobias Loose
2013-12-09 16:50:51 +01:00
parent 7528329a58
commit 5d6557a49f
3 changed files with 30 additions and 17 deletions

View File

@@ -2,8 +2,15 @@
#define TASK_H
#include <vector>
#include <string>
#include "Easing.h"
using namespace std;
class GameObserver;
class JQuad;
class JTexture;
// Task type constant
@@ -72,8 +79,11 @@ class TaskList
{
protected:
string fileName;
float vPos;
float mElapsed;
InOutQuadEasing vPosInEasing;
InOutQuadEasing vPosOutEasing;
int mState;
JQuad * mBg[9];
JTexture * mBgTex;
@@ -97,7 +107,6 @@ public:
{
return mState;
}
;
void addTask(string params, bool rand = false);
void addTask(Task *task);
void addRandomTask(int diff = 100);