summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-03-28 18:57:44 -0400
committerBen Boeckel <MathStuf@gmail.com>2009-03-28 18:57:44 -0400
commit7da85e52c1a0015213c0e905d7dbc5631a0b0904 (patch)
tree9529665864d75f0f27d1ec5219b942b7b96b0b4f
parent9aa254bce6db08392067c8bcea76374afc2d9b8f (diff)
downloadsigen-7da85e52c1a0015213c0e905d7dbc5631a0b0904.tar.gz
sigen-7da85e52c1a0015213c0e905d7dbc5631a0b0904.tar.xz
sigen-7da85e52c1a0015213c0e905d7dbc5631a0b0904.zip
Declare postRequest in Player as well
-rw-r--r--sigencore/Player.cpp25
-rw-r--r--sigencore/Player.h11
2 files changed, 24 insertions, 12 deletions
diff --git a/sigencore/Player.cpp b/sigencore/Player.cpp
index a5113ab9..a32ea123 100644
--- a/sigencore/Player.cpp
+++ b/sigencore/Player.cpp
@@ -41,16 +41,6 @@ Player::~Player()
{
}
-bool Player::enterWorld(Overworld* world)
-{
- return Client::enterWorld(world);
-}
-
-void Player::exitWorld()
-{
- Client::exitWorld();
-}
-
bool Player::enterArena(Arena* arena)
{
m_active.clear();
@@ -80,6 +70,21 @@ void Player::exitArena()
Client::exitArena();
}
+bool Player::enterWorld(Overworld* world)
+{
+ return Client::enterWorld(world);
+}
+
+void Player::exitWorld()
+{
+ Client::exitWorld();
+}
+
+void Player::postRequest(const int type, const QVariantList& arguments)
+{
+ Client::postRequest(type, arguments);
+}
+
int Player::itemWeightTotal(const bool distinct) const
{
QList<ItemWrapper*> items = m_items.keys();
diff --git a/sigencore/Player.h b/sigencore/Player.h
index 3ae9de78..a1ff72ca 100644
--- a/sigencore/Player.h
+++ b/sigencore/Player.h
@@ -39,8 +39,13 @@ class Team;
class SIGENCORE_EXPORT Player : public Client
{
Q_OBJECT
+ Q_ENUMS(PlayerRequestType)
public:
+ enum PlayerRequestType
+ {
+ };
+
Player(Sigscript::GameWrapper* game, Sigscript::Config* parent);
virtual ~Player();
@@ -61,11 +66,13 @@ class SIGENCORE_EXPORT Player : public Client
Q_SCRIPTABLE int money() const;
public slots:
+ virtual bool enterArena(Arena* arena);
+ virtual void exitArena();
+
virtual bool enterWorld(Overworld* world);
virtual void exitWorld();
- virtual bool enterArena(Arena* arena);
- virtual void exitArena();
+ virtual void postRequest(const int type, const QVariantList& arguments);
int giveItems(Sigscript::ItemWrapper* item, const int count, const bool allOrNothing = true);