summaryrefslogtreecommitdiff
path: root/src/net/charhandler.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/charhandler.h')
-rw-r--r--src/net/charhandler.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 4a813e21..0694e39e 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -23,14 +23,13 @@
#define CHARHANDLER_H
#include "localplayer.h"
-#include "logindata.h"
+#include "playerinfo.h"
#include <iosfwd>
#include <vector>
class CharCreateDialog;
class CharSelectDialog;
-class LocalPlayer;
namespace Net {
@@ -41,7 +40,7 @@ struct Character
{
Character() :
slot(0),
- dummy(new LocalPlayer)
+ dummy(0)
{
}
@@ -52,6 +51,7 @@ struct Character
int slot; /**< The index in the list of characters */
LocalPlayer *dummy; /**< A dummy representing this character */
+ PlayerInfoBackend data;
};
typedef std::list<Character*> Characters;
@@ -59,6 +59,8 @@ typedef std::list<Character*> Characters;
class CharHandler
{
public:
+ virtual ~CharHandler() {}
+
virtual void setCharSelectDialog(CharSelectDialog *window) = 0;
virtual void setCharCreateDialog(CharCreateDialog *window) = 0;
@@ -75,13 +77,11 @@ class CharHandler
virtual void switchCharacter() = 0;
- virtual int baseSprite() const = 0;
+ virtual unsigned int baseSprite() const = 0;
- virtual int hairSprite() const = 0;
+ virtual unsigned int hairSprite() const = 0;
- virtual int maxSprite() const = 0;
-
- virtual ~CharHandler() {}
+ virtual unsigned int maxSprite() const = 0;
protected:
CharHandler():