1.1 --- a/mapeditor.h	Tue Nov 06 13:54:41 2007 +0000
     1.2 +++ b/mapeditor.h	Thu Nov 08 15:28:03 2007 +0000
     1.3 @@ -4,8 +4,9 @@
     1.4  #include <QGraphicsView>
     1.5  #include <QtNetwork>
     1.6  
     1.7 +#include "attribute.h"
     1.8 +#include "file.h"
     1.9  #include "mapcenterobj.h"
    1.10 -#include "file.h"
    1.11  #include "misc.h"
    1.12  #include "parser.h"
    1.13  #include "ornamentedobj.h"
    1.14 @@ -15,7 +16,7 @@
    1.15  
    1.16  /*! \brief Main widget in vym to display and edit a map */
    1.17  
    1.18 -class MapEditor : public QGraphicsView, public xmlObj {
    1.19 +class MapEditor : public QGraphicsView, public XMLObj {
    1.20      Q_OBJECT
    1.21  
    1.22  public:
    1.23 @@ -427,6 +428,10 @@
    1.24  	QPoint exportOffset;		// set before export, used in save
    1.25  	BranchObj::HideTmpMode hidemode;	// true while exporting to hide some stuff
    1.26  
    1.27 +	QList <Attribute> attributes;	// List with attributes
    1.28 +
    1.29 +
    1.30 +	// Network connections **Experimental**
    1.31  	NetState netstate;			// offline, client, server
    1.32  	QTcpServer *tcpServer;		// Act as server in conference mode (experimental)
    1.33  	QList <QTcpSocket*> clientList;		// List of connected clients
    1.34 @@ -438,6 +443,7 @@
    1.35  	void displayClientError(QAbstractSocket::SocketError socketError);
    1.36  
    1.37  
    1.38 +	// Animation data **experimental**
    1.39  	int timerId;				// animation timer
    1.40  	QList <MapObj*> animObjList;// list with animated objects
    1.41  };