- refactorized the whole project and made a few subprojects

- replaced tcp with enet
- added connect dialog
- some smaller bugfixes

68 files changed, 562 insertions, 264 deletions

diff --git a/pacman-c++/clicklabel.cpp b/pacman-c++/client/clicklabel.cpp
index 87b06b8..87b06b8 100644
--- a/pacman-c++/clicklabel.cpp
+++ b/pacman-c++/client/clicklabel.cpp
diff --git a/pacman-c++/clicklabel.h b/pacman-c++/client/clicklabel.h
index 494b1ee..494b1ee 100644
--- a/pacman-c++/clicklabel.h
+++ b/pacman-c++/client/clicklabel.h
diff --git a/pacman-c++/client.cpp b/pacman-c++/client/client.cpp
index 581778e..d064d9e 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client/client.cpp
@@ -4,19 +4,26 @@
 #include "util.h"
 #include "pacman.pb.h"
 
+extern "C" {
+#include "enet/enet.h"
+}
+
 Client::Client()
   : m_ambientMuted(false)
 {
   m_settings = new QSettings(qApp->organizationName(), qApp->applicationName(), this);
-  createMenu();
+  m_dialog = new QDialog(this);
   m_mainWidget = new MainWidget(this);
+  createMenu();
   m_mainWidget->setAmbientMuted(m_ambientMuted);
   setCentralWidget(m_mainWidget);
+  showConnectDialog();
+  m_dialog->setFocus();
 }
 
 void Client::createMenu()
 {
-  QMenu *fileMenu = menuBar()->addMenu("File");
+  QMenu *fileMenu = menuBar()->addMenu("&File");
 
   bool sound = AudioManager::self()->isWorking();
   bool muted = !sound || m_settings->value("muted", false).toBool();
@@ -55,7 +62,7 @@ void Client::createMenu()
   toggleAmbientAction->setToolTip("Toggle Ambient Sound");
   toggleAmbientAction->setCheckable(true);
   toggleAmbientAction->setChecked(!m_ambientMuted);
-  toggleAmbientAction->setDisabled(!sound);
+  toggleAmbientAction->setDisabled(muted);
   fileMenu->addAction(toggleAmbientAction);
   if (sound)
   {
@@ -63,6 +70,19 @@ void Client::createMenu()
     connect(this, SIGNAL(setMuteActionsChecked(bool)), toggleAmbientAction, SLOT(setEnabled(bool)));
   }
 
+  /* connect/disconnect entry */
+  fileMenu->addSeparator();
+  QAction *connectAction = new QAction("C&onnect", this);
+  fileMenu->addAction(connectAction);
+  connect(connectAction, SIGNAL(triggered()), this, SLOT(showConnectDialog()));
+  connect(m_mainWidget, SIGNAL(connected(bool)), connectAction, SLOT(setDisabled(bool)));
+
+  QAction *disconnectAction = new QAction("Di&sconnect", this);
+  disconnectAction->setDisabled(true);
+  fileMenu->addAction(disconnectAction);
+  connect(disconnectAction, SIGNAL(triggered()), m_mainWidget, SLOT(doDisconnect()));
+  connect(m_mainWidget, SIGNAL(connected(bool)), disconnectAction, SLOT(setEnabled(bool)));
+
   /* exit entry */
   fileMenu->addSeparator();
   QAction *quitAction = new QAction("E&xit", this);
@@ -70,7 +90,6 @@ void Client::createMenu()
   fileMenu->addAction(quitAction);
   connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
 
-
   QAction *aboutAction= menuBar()->addAction("Ab&out");
   connect(aboutAction, SIGNAL(triggered()), this, SLOT(showAbout()));
 }
@@ -114,11 +133,15 @@ QPixmap Client::soundIcon(bool enabled) const
 
 void Client::showAbout()
 {
-  QDialog *about = new QDialog(this);
-  about->setWindowTitle("About Pacman");
-  about->setWindowFlags(about->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+  if (m_dialog != NULL)
+  {
+    delete m_dialog;
+    m_dialog = new QDialog(this);
+  }
+  m_dialog->setWindowTitle("About Pacman");
+  m_dialog->setWindowFlags(m_dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-  QGridLayout *layout = new QGridLayout(about);
+  QGridLayout *layout = new QGridLayout(m_dialog);
   layout->setSizeConstraint(QLayout::SetFixedSize);
 
   QString actoricons;
@@ -135,19 +158,71 @@ void Client::showAbout()
       "Developed using Qt %2 (%3 bit)<br/>")
       .arg(actoricons, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize));
 
-  QLabel *label = new QLabel(text);
+  QLabel *label = new QLabel(text, m_dialog);
   label->setWordWrap(true);
   label->setOpenExternalLinks(true);
   label->setTextInteractionFlags(Qt::TextBrowserInteraction);
 
-  QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
+  QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal, m_dialog);
   QPushButton *closeButton = buttonBox->button(QDialogButtonBox::Close);
   buttonBox->addButton(closeButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::RejectRole | QDialogButtonBox::AcceptRole));
-  connect(buttonBox , SIGNAL(rejected()), about, SLOT(reject()));
+  connect(buttonBox , SIGNAL(rejected()), m_dialog, SLOT(reject()));
 
   layout->addWidget(label, 0, 1, 4, 4);
   layout->addWidget(buttonBox, 4, 0, 1, 5);
-  about->show();
+  m_dialog->show();
+}
+
+void Client::showConnectDialog()
+{
+  if (m_dialog != NULL)
+  {
+    delete m_dialog;
+    m_dialog = new QDialog(this);
+  }
+  m_dialog->setWindowTitle("Connect");
+
+  QGridLayout *layout = new QGridLayout(m_dialog);
+  layout->setSizeConstraint(QLayout::SetFixedSize);
+
+  QLabel *srvLabel = new QLabel("Address:", m_dialog);
+  QLineEdit *srv = new QLineEdit(m_settings->value("address", "127.0.0.1").toString(), m_dialog);
+  QLabel *portLabel = new QLabel("Port:", m_dialog);
+  QDoubleSpinBox *port = new QDoubleSpinBox(m_dialog);
+  port->setDecimals(0);
+  port->setMinimum(1);
+  port->setMaximum(65535);
+  port->setValue(m_settings->value("port", Constants::Networking::port).toUInt());
+
+  QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
+                                                     Qt::Horizontal, m_dialog);
+  QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
+  QPushButton *cancelButton = buttonBox->button(QDialogButtonBox::Cancel);
+  buttonBox->addButton(okButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::AcceptRole));
+  buttonBox->addButton(cancelButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::RejectRole));
+  connect(buttonBox, SIGNAL(rejected()), m_dialog, SLOT(reject()));
+  connect(buttonBox, SIGNAL(accepted()), m_dialog, SLOT(accept()));
+
+  layout->addWidget(srvLabel, 0, 0);
+  layout->addWidget(srv, 0, 1);
+  layout->addWidget(portLabel, 1, 0);
+  layout->addWidget(port, 1, 1);
+  layout->addWidget(buttonBox, 4, 0, 1, 5);
+
+  connect(m_dialog, SIGNAL(accepted()), this, SLOT(onAcceptConnectDialog()));
+  m_dialog->show();
+}
+
+void Client::onAcceptConnectDialog()
+{
+  if (m_dialog == NULL)
+    return;
+  QGridLayout *layout = static_cast<QGridLayout *>(m_dialog->layout());
+  QLineEdit *srv = static_cast<QLineEdit *>(layout->itemAtPosition(0, 1)->widget());
+  QDoubleSpinBox *port = static_cast<QDoubleSpinBox *>(layout->itemAtPosition(1, 1)->widget());
+  m_settings->setValue("address", srv->text());
+  m_settings->setValue("port", int(port->value()));
+  m_mainWidget->doConnect(srv->text(), int(port->value()));
 }
 
 bool Constants::server = false;
@@ -159,6 +234,13 @@ int main(int argc, char **argv)
    */
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
+  if (enet_initialize () != 0)
+  {
+    qCritical() << "An error occurred while initializing ENet";
+    return EXIT_FAILURE;
+  }
+
+  Q_INIT_RESOURCE(pacman);
   QApplication app(argc, argv, true);
   app.setOrganizationName("TU Wien FOOP");
   app.setApplicationName("Pacman Client");
@@ -166,12 +248,16 @@ int main(int argc, char **argv)
 
   qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
 
+  AudioManager::self();
+
   Client client;
   client.show();
   client.setWindowTitle(app.applicationName());
 
   int ret = app.exec();
 
+  enet_deinitialize();
+
   /* Delete all global objects allocated by libprotobuf */
   google::protobuf::ShutdownProtobufLibrary();
 
diff --git a/pacman-c++/client.h b/pacman-c++/client/client.h
index 7030683..9b231ca 100644
--- a/pacman-c++/client.h
+++ b/pacman-c++/client/client.h
@@ -24,6 +24,8 @@ private slots:
   /* enable ambient (emitted by action) */
   void enableAmbientSound(bool);
   void showAbout();
+  void showConnectDialog();
+  void onAcceptConnectDialog();
 
 private:
   void createMenu();
@@ -31,6 +33,7 @@ private:
 
 private:
   MainWidget *m_mainWidget;
+  QDialog *m_dialog;
   QSettings *m_settings;
   bool m_ambientMuted;
 };
diff --git a/pacman-c++/client/client.pro b/pacman-c++/client/client.pro
new file mode 100644
index 0000000..849cca2
--- /dev/null
+++ b/pacman-c++/client/client.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = pacman
+
+SOURCES += clicklabel.cpp \
+    client.cpp \
+    mainwidget.cpp
+HEADERS += clicklabel.h \
+    client.h \
+    mainwidget.h
+
+include(../common.pri)
+PRE_TARGETDEPS += ../common/libcommon.a
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/client/mainwidget.cpp
index 49ddf7a..f6f088b 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/client/mainwidget.cpp
@@ -7,40 +7,89 @@
 #include <QStringBuilder>
 
 MainWidget::MainWidget(QWidget *parent)
-  : QWidget(parent), m_currentKey(Transmission::none), m_running(false), m_scene(NULL),
-  m_maxplayers(0)
+  : QWidget(parent), m_currentKey(Transmission::none), m_running(false),
+  m_host(NULL), m_peer(NULL), m_scene(NULL), m_maxplayers(0)
 {
+  m_host = enet_host_create(NULL, 1, 1, 0, 0);
+  if (m_host == NULL)
+  {
+    QMessageBox::critical(this, "Error", "An error occurred while trying to create an ENet client host");
+    qCritical() << "An error occurred while trying to create an ENet client host";
+    return;
+  }
+
   /* create audio player */
   m_ambientPlayer = new GaplessAudioPlayer(Sound::Ambient, 100, this);
 
-  Color::Color color = connectToServer();
+  m_recvTimer = new QTimer(this);
+  m_recvTimer->setInterval(Constants::tick / 2);
+  connect(m_recvTimer, SIGNAL(timeout()), this, SLOT(tick()));
+}
+
+MainWidget::~MainWidget()
+{
+  doDisconnect();
+  if (m_host != NULL)
+  {
+    enet_host_destroy(m_host);
+    m_host = NULL;
+  }
+}
+
+void MainWidget::doConnect(QString srv, unsigned int port)
+{
+  Color::Color color = connectToServer(srv, port);
   if (color == Color::none)
   {
-    QMessageBox::critical(this, "Error", "Failed to connect to server, falling back to local test mode");
-    // TODO: quit application here or sth
+    QMessageBox::critical(this, "Error", "Failed to connect to server");
     return;
   }
 
   /* create our scene */
   m_scene = new SceneHolder(this);
   m_scene->setColor(color);
-
-  /* call updateMap after m_color ist set! */
+  m_scene->showWaitingForPlayers(true);
   createGui();
 
-  /* wait for the server to send the first map update (initial map)
-   * WARNING: this will block the gui
-   */
-  m_socket->waitForReadyRead(-1);
-  tick();
-
+  m_recvTimer->start();
+  emit connected(true);
   qDebug() << "[Connect] mycolor=" << m_scene->color();
-  connect(m_socket, SIGNAL(readyRead()), this, SLOT(tick()));
+}
+
+void MainWidget::deleteLayout(QLayout *layout)
+{
+  if (layout == NULL)
+    return;
+
+  foreach(QObject *obj, layout->children())
+  {
+    QLayout *inLayout = qobject_cast<QLayout*>(obj);
+    deleteLayout(inLayout);
+  }
+
+  QLayoutItem *child;
+  while ((child = layout->takeAt(0)) != NULL)
+  {
+    child->widget()->deleteLater();
+    delete child;
+  }
+
+  delete layout;
+}
+
+void MainWidget::doDisconnect()
+{
+  stopGame();
+  m_recvTimer->stop();
+  closeENetPeer();
+  deleteLayout(layout());
+  m_playerScoreLayouts.clear();
+  emit connected(false);
 }
 
 bool MainWidget::connected()
 {
-  return m_socket != NULL;
+  return m_peer != NULL;
 }
 
 void MainWidget::createGui()
@@ -135,54 +184,75 @@ Transmission::field_t MainWidget::translateKey(int key)
 
 void MainWidget::tick()
 {
-  while (m_socket->bytesAvailable() > (qint64)sizeof(qint64))
+  ENetEvent event;
+  while (enet_host_service(m_host, &event, 1) > 0)
   {
-    QSharedPointer<QByteArray> data = Util::receivePacket(m_socket);
-    bool worked = m_updatepacket.ParseFromArray(data->data(), data->size());
-    Q_ASSERT(worked);
-    Q_UNUSED(worked);
-
-    /* eating order data set indicates a new round */
-    if (m_updatepacket.eating_order_size() > 0)
+    switch (event.type)
     {
-      Q_ASSERT(m_scene != NULL);
-      m_scene->reset();
-
-      /* fetch eating order */
-      QList<Color::Color> order;
-      for(int i = 0; i < m_updatepacket.eating_order_size(); ++i)
-        order.append(static_cast<Color::Color>(m_updatepacket.eating_order(i) & Transmission::color_mask));
-      m_scene->setEatingOrder(order);
-
-      /* stop game */
-      stopGame();
-
-      /* and restart game */
-      QTimer *timer = new QTimer(this);
-      timer->setSingleShot(true);
-      timer->setInterval(Sound::length[Sound::Intro] + Constants::tick);
-      connect(timer, SIGNAL(timeout()), this, SLOT(startGame()));
-      timer->start();
-      AudioManager::self()->play(Sound::Intro, true);
+    case ENET_EVENT_TYPE_DISCONNECT:
+      m_peer = NULL;
+      doDisconnect();
+      break;
+    case ENET_EVENT_TYPE_RECEIVE:
+      tick(&event);
+      enet_packet_destroy(event.packet);
+      break;
+    default:
+      break;
     }
+  }
+}
+
+void MainWidget::tick(ENetEvent *event)
+{
+  QSharedPointer<QByteArray> data = Util::receivePacket(event->packet);
+  bool worked = m_updatepacket.ParseFromArray(data->data(), data->size());
+  Q_ASSERT(worked);
+  Q_UNUSED(worked);
 
-    Transmission::map_t map = Util::createUninitialisedMap();
-    Q_ASSERT(m_updatepacket.field_size() == (int) (Constants::map_size.width * Constants::map_size.height));
-    int i = 0;
-    for (unsigned int x = 0; x < Constants::map_size.width; ++x)
+  /* eating order data set indicates a new round */
+  if (m_updatepacket.eating_order_size() > 0)
+  {
+    Q_ASSERT(m_scene != NULL);
+    m_scene->reset();
+
+    /* fetch eating order */
+    QList<Color::Color> order;
+    for(int i = 0; i < m_updatepacket.eating_order_size(); ++i)
+      order.append(static_cast<Color::Color>(m_updatepacket.eating_order(i) & Transmission::color_mask));
+    m_scene->setEatingOrder(order);
+
+    /* stop game */
+    stopGame();
+
+    /* and restart game */
+    QTimer *timer = new QTimer(this);
+    timer->setSingleShot(true);
+    timer->setInterval(Sound::length[Sound::Intro] + Constants::tick);
+    connect(timer, SIGNAL(timeout()), this, SLOT(startGame()));
+    timer->start();
+    AudioManager::self()->play(Sound::Intro, true);
+  }
+
+  Transmission::map_t map = Util::createUninitialisedMap();
+  Q_ASSERT(m_updatepacket.field_size() == (int) (Constants::map_size.width * Constants::map_size.height));
+  int i = 0;
+  for (unsigned int x = 0; x < Constants::map_size.width; ++x)
+  {
+    for (unsigned int y = 0; y < Constants::map_size.height; ++y)
     {
-      for (unsigned int y = 0; y < Constants::map_size.height; ++y)
-      {
-        map[x][y] = m_updatepacket.field(i);
-        ++i;
-      }
+      map[x][y] = m_updatepacket.field(i);
+      ++i;
     }
-    m_scene->updateMap(map);
-    Util::deleteMap(map);
-    updateScore(m_updatepacket);
+  }
+  m_scene->updateMap(map);
+  Util::deleteMap(map);
+  updateScore(m_updatepacket);
 
-    if (m_updatepacket.eating_order_size() > 0)
-      m_scene->showEatingText();
+  if (m_updatepacket.eating_order_size() > 0)
+  {
+    m_scene->showWaitingForPlayers(false);
+    m_scene->showEatingText();
   }
 }
 
@@ -208,7 +278,7 @@ void MainWidget::sendKeyUpdate()
   qDebug() << "[SendKey] key=" << m_currentKey;
   ProtoBuf::KeyPressUpdate packet;
   packet.set_newkey(m_currentKey);
-  Util::sendPacket(packet, m_socket);
+  Util::sendPacket(packet, m_peer, m_host);
 }
 
 void MainWidget::keyReleaseEvent(QKeyEvent* event)
@@ -248,32 +318,73 @@ void MainWidget::playerScoreClicked()
   return;
 }
 
-Color::Color MainWidget::connectToServer()
+Color::Color MainWidget::connectToServer(QString srv, unsigned int port)
 {
-  /* TODO: check command line arguments for server port */
-  const QStringList &args = QCoreApplication::arguments();
-  QString srv = args.value(1, "127.0.0.1");
-  qDebug() << "[Connect] server=" << srv;
+  qDebug() << "[Connect] server=" << srv << "port=" << port;
 
   /* connect to server */
-  m_socket = new QTcpSocket(this);
-  m_socket->connectToHost(srv, Constants::Networking::port);
-  bool worked =  m_socket->waitForConnected(Constants::Networking::connection_timeout);
+  closeENetPeer();
+  ENetAddress address;
+  enet_address_set_host(&address, qPrintable(srv));
+  address.port = Constants::Networking::port;
+  m_peer = enet_host_connect(m_host, &address, 1, 0);
+  if (m_peer == NULL)
+  {
+    qCritical() << "No available peers for initiating an ENet connection";
+    return Color::none;
+  }
+
+  ENetEvent event;
+  bool worked = (enet_host_service(m_host, &event, Constants::Networking::connection_timeout) > 0
+                 && event.type == ENET_EVENT_TYPE_CONNECT);
   if (worked)
   {
     /* additional init: first packet is our color */
-    worked = m_socket->waitForReadyRead();
+    worked = (enet_host_service(m_host, &event, Constants::Networking::packet_timeout) > 0
+                   && event.type == ENET_EVENT_TYPE_RECEIVE);
     if (worked)
     {
       /* receive color */
-      QSharedPointer<QByteArray> data = Util::receivePacket(m_socket);
+      QSharedPointer<QByteArray> data = Util::receivePacket(event.packet);
+      enet_packet_destroy(event.packet);
       ProtoBuf::Init packet;
-      bool worked = packet.ParseFromArray(data->data(), data->size());
+      worked = packet.ParseFromArray(data->data(), data->size());
       Q_ASSERT(worked);
       Q_UNUSED(worked);
       m_maxplayers = packet.maxplayers();
       return static_cast<Color::Color>(packet.color() & Transmission::color_mask);
     }
   }
+  enet_peer_reset(m_peer);
+  m_peer = NULL;
   return Color::none;
 }
+
+void MainWidget::closeENetPeer()
+{
+  if (m_peer != NULL && m_peer->state != ENET_PEER_STATE_DISCONNECTED)
+  {
+    /* allow up to 3 seconds for the disconnect to succeed
+     * and drop any packets received packets
+     */
+    enet_peer_disconnect(m_peer, 0);
+    ENetEvent event;
+    while (enet_host_service(m_host, &event, 3000) > 0)
+    {
+      switch (event.type)
+      {
+      case ENET_EVENT_TYPE_RECEIVE:
+        enet_packet_destroy(event.packet);
+        break;
+      case ENET_EVENT_TYPE_DISCONNECT:
+        m_peer = NULL;
+        return;
+      default:
+        break;
+      }
+    }
+
+    enet_peer_reset(m_peer);
+  }
+  m_peer = NULL;
+}
diff --git a/pacman-c++/mainwidget.h b/pacman-c++/client/mainwidget.h
index d5695ed..99ff7d7 100644
--- a/pacman-c++/mainwidget.h
+++ b/pacman-c++/client/mainwidget.h
@@ -7,7 +7,10 @@
 #include "pacman.pb.h"
 #include <QtGui>
 #include <QtCore>
-#include <QTcpSocket>
+
+extern "C" {
+#include "enet/enet.h"
+}
 
 class Actor;
 
@@ -18,19 +21,28 @@ class MainWidget
 
 public:
   MainWidget(QWidget *parent = 0);
+  ~MainWidget();
   bool connected();
   void setAmbientMuted(bool muted);
 
+public slots:
+  void doConnect(QString srv = "127.0.0.1", unsigned int port = Constants::Networking::port);
+  void doDisconnect();
+
 protected:
   /* handling of current key */
   virtual void keyPressEvent(QKeyEvent *);
   virtual void keyReleaseEvent(QKeyEvent *);
 
+signals:
+  void connected(bool connected);
+
 private slots:
   void startGame();
   void stopGame();
   void playerScoreClicked();
   void tick();
+  void tick(ENetEvent *event);
   void sendKeyUpdate();
 
 private:
@@ -38,7 +50,9 @@ private:
   void createMenu();
   void updateScore(const ProtoBuf::MapUpdate&);
   bool isRunning();
-  Color::Color connectToServer();
+  Color::Color connectToServer(QString srv = "127.0.0.1", unsigned int port = Constants::Networking::port);
+  void closeENetPeer();
+  void deleteLayout(QLayout *layout);
 
   /* GUI elements needed in the progress of the game */
   QList<QGridLayout*> m_playerScoreLayouts;
@@ -53,9 +67,11 @@ private:
   bool m_running;
   GaplessAudioPlayer *m_ambientPlayer;
 
-  QTcpSocket *m_socket;
+  ENetHost *m_host;
+  ENetPeer *m_peer;
   SceneHolder *m_scene;
   unsigned int m_maxplayers;
+  QTimer *m_recvTimer;
 
   /* allocate as member variable as this packet is large and used often */
   ProtoBuf::MapUpdate m_updatepacket;
diff --git a/pacman-c++/common.pri b/pacman-c++/common.pri
new file mode 100644
index 0000000..fed2973
--- /dev/null
+++ b/pacman-c++/common.pri
@@ -0,0 +1,21 @@
+LANGUAGE = C++
+VERSION = 0.1
+
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+
+QT += phonon network
+
+INCLUDEPATH += ../common
+DEPENDPATH += ../common
+LIBS += -L../common -lcommon
+
+INCLUDEPATH += $$OUT_PWD/../proto
+LIBS += -L../proto -lproto -lprotobuf
+
+INCLUDEPATH += ../enet/include
+LIBS += -L$$PWD/enet/.libs -lenet
+
+CONFIG(release, debug|release) {
+    DEFINES += QT_NO_DEBUG_OUTPUT
+}
diff --git a/pacman-c++/actor.cpp b/pacman-c++/common/actor.cpp
index de8d77e..de8d77e 100644
--- a/pacman-c++/actor.cpp
+++ b/pacman-c++/common/actor.cpp
diff --git a/pacman-c++/actor.h b/pacman-c++/common/actor.h
index c30c62a..c30c62a 100644
--- a/pacman-c++/actor.h
+++ b/pacman-c++/common/actor.h
diff --git a/pacman-c++/audio.cpp b/pacman-c++/common/audio.cpp
index 70cd37e..70cd37e 100644
--- a/pacman-c++/audio.cpp
+++ b/pacman-c++/common/audio.cpp
diff --git a/pacman-c++/audio.h b/pacman-c++/common/audio.h
index 6aec42d..6aec42d 100644
--- a/pacman-c++/audio.h
+++ b/pacman-c++/common/audio.h
diff --git a/pacman-c++/block.cpp b/pacman-c++/common/block.cpp
index 7f9dd14..7f9dd14 100644
--- a/pacman-c++/block.cpp
+++ b/pacman-c++/common/block.cpp
diff --git a/pacman-c++/block.h b/pacman-c++/common/block.h
index abfbc5a..abfbc5a 100644
--- a/pacman-c++/block.h
+++ b/pacman-c++/common/block.h
diff --git a/pacman-c++/bonuspoint.cpp b/pacman-c++/common/bonuspoint.cpp
index 033b7c8..033b7c8 100644
--- a/pacman-c++/bonuspoint.cpp
+++ b/pacman-c++/common/bonuspoint.cpp
diff --git a/pacman-c++/bonuspoint.h b/pacman-c++/common/bonuspoint.h
index a72a4db..a72a4db 100644
--- a/pacman-c++/bonuspoint.h
+++ b/pacman-c++/common/bonuspoint.h
diff --git a/pacman-c++/common/common.pro b/pacman-c++/common/common.pro
new file mode 100644
index 0000000..5903f9d
--- /dev/null
+++ b/pacman-c++/common/common.pro
@@ -0,0 +1,30 @@
+TEMPLATE = lib
+CONFIG += staticlib
+
+include(../common.pri)
+
+SOURCES += pixmapitem.cpp \
+    actor.cpp \
+    block.cpp \
+    bonuspoint.cpp \
+    point.cpp \
+    audio.cpp \
+    sceneholder.cpp \
+    util.cpp \
+    gameentity.cpp
+HEADERS += pixmapitem.h \
+    actor.h \
+    block.h \
+    bonuspoint.h \
+    constants.h \
+    point.h \
+    audio.h \
+    sceneholder.h \
+    util.h \
+    gameentity.h
+
+OTHER_FILES += style.qss \
+    pacman.rc
+
+RESOURCES += pacman.qrc
+RC_FILE = pacman.rc
diff --git a/pacman-c++/constants.h b/pacman-c++/common/constants.h
index e7dedbf..d40c39e 100644
--- a/pacman-c++/constants.h
+++ b/pacman-c++/common/constants.h
@@ -21,6 +21,7 @@ namespace Constants {
   {
     const unsigned int port = 7321;
     const unsigned int connection_timeout = 3000;
+    const unsigned int packet_timeout = 3000;
   }
 
   namespace Game
diff --git a/pacman-c++/gameentity.cpp b/pacman-c++/common/gameentity.cpp
index e73e759..e73e759 100644
--- a/pacman-c++/gameentity.cpp
+++ b/pacman-c++/common/gameentity.cpp
diff --git a/pacman-c++/gameentity.h b/pacman-c++/common/gameentity.h
index 116fae5..116fae5 100644
--- a/pacman-c++/gameentity.h
+++ b/pacman-c++/common/gameentity.h
diff --git a/pacman-c++/pacman.qrc b/pacman-c++/common/pacman.qrc
index 6654fd1..6654fd1 100644
--- a/pacman-c++/pacman.qrc
+++ b/pacman-c++/common/pacman.qrc
diff --git a/pacman-c++/pacman.rc b/pacman-c++/common/pacman.rc
index 8c9f03b..8c9f03b 100644
--- a/pacman-c++/pacman.rc
+++ b/pacman-c++/common/pacman.rc
diff --git a/pacman-c++/pics/actor1.png b/pacman-c++/common/pics/actor1.png
index 5a37b4f..5a37b4f 100644
--- a/pacman-c++/pics/actor1.png
+++ b/pacman-c++/common/pics/actor1.png
diff --git a/pacman-c++/pics/actor1icon.png b/pacman-c++/common/pics/actor1icon.png
index 4407cef..4407cef 100644
--- a/pacman-c++/pics/actor1icon.png
+++ b/pacman-c++/common/pics/actor1icon.png
diff --git a/pacman-c++/pics/actor2.png b/pacman-c++/common/pics/actor2.png
index 736a6e7..736a6e7 100644
--- a/pacman-c++/pics/actor2.png
+++ b/pacman-c++/common/pics/actor2.png
diff --git a/pacman-c++/pics/actor2icon.png b/pacman-c++/common/pics/actor2icon.png
index eaf2a4c..eaf2a4c 100644
--- a/pacman-c++/pics/actor2icon.png
+++ b/pacman-c++/common/pics/actor2icon.png
diff --git a/pacman-c++/pics/actor3.png b/pacman-c++/common/pics/actor3.png
index f963cff..f963cff 100644
--- a/pacman-c++/pics/actor3.png
+++ b/pacman-c++/common/pics/actor3.png
diff --git a/pacman-c++/pics/actor3icon.png b/pacman-c++/common/pics/actor3icon.png
index 2558cbc..2558cbc 100644
--- a/pacman-c++/pics/actor3icon.png
+++ b/pacman-c++/common/pics/actor3icon.png
diff --git a/pacman-c++/pics/actor4.png b/pacman-c++/common/pics/actor4.png
index e500dc5..e500dc5 100644
--- a/pacman-c++/pics/actor4.png
+++ b/pacman-c++/common/pics/actor4.png
diff --git a/pacman-c++/pics/actor4icon.png b/pacman-c++/common/pics/actor4icon.png
index 82bf637..82bf637 100644
--- a/pacman-c++/pics/actor4icon.png
+++ b/pacman-c++/common/pics/actor4icon.png
diff --git a/pacman-c++/pics/app.ico b/pacman-c++/common/pics/app.ico
index 4a73cd4..4a73cd4 100644
--- a/pacman-c++/pics/app.ico
+++ b/pacman-c++/common/pics/app.ico
diff --git a/pacman-c++/pics/block0.png b/pacman-c++/common/pics/block0.png
index 76bc4b7..76bc4b7 100644
--- a/pacman-c++/pics/block0.png
+++ b/pacman-c++/common/pics/block0.png
diff --git a/pacman-c++/pics/block1.png b/pacman-c++/common/pics/block1.png
index 99e8633..99e8633 100644
--- a/pacman-c++/pics/block1.png
+++ b/pacman-c++/common/pics/block1.png
diff --git a/pacman-c++/pics/block2.png b/pacman-c++/common/pics/block2.png
index 963207e..963207e 100644
--- a/pacman-c++/pics/block2.png
+++ b/pacman-c++/common/pics/block2.png
diff --git a/pacman-c++/pics/block3.png b/pacman-c++/common/pics/block3.png
index 6662de4..6662de4 100644
--- a/pacman-c++/pics/block3.png
+++ b/pacman-c++/common/pics/block3.png
diff --git a/pacman-c++/pics/block4.png b/pacman-c++/common/pics/block4.png
index 00fbd74..00fbd74 100644
--- a/pacman-c++/pics/block4.png
+++ b/pacman-c++/common/pics/block4.png
diff --git a/pacman-c++/pics/bonuspoints.png b/pacman-c++/common/pics/bonuspoints.png
index b5714c9..b5714c9 100644
--- a/pacman-c++/pics/bonuspoints.png
+++ b/pacman-c++/common/pics/bonuspoints.png
diff --git a/pacman-c++/pics/pacman10-hp-sprite-2.png b/pacman-c++/common/pics/pacman10-hp-sprite-2.png
index 7354b9d..7354b9d 100644
--- a/pacman-c++/pics/pacman10-hp-sprite-2.png
+++ b/pacman-c++/common/pics/pacman10-hp-sprite-2.png
diff --git a/pacman-c++/pics/points.png b/pacman-c++/common/pics/points.png
index 6ba4496..6ba4496 100644
--- a/pacman-c++/pics/points.png
+++ b/pacman-c++/common/pics/points.png
diff --git a/pacman-c++/pics/soundoff.xpm b/pacman-c++/common/pics/soundoff.xpm
index ba33f5f..ba33f5f 100644
--- a/pacman-c++/pics/soundoff.xpm
+++ b/pacman-c++/common/pics/soundoff.xpm
diff --git a/pacman-c++/pics/soundon.xpm b/pacman-c++/common/pics/soundon.xpm
index e6ca41e..e6ca41e 100644
--- a/pacman-c++/pics/soundon.xpm
+++ b/pacman-c++/common/pics/soundon.xpm
diff --git a/pacman-c++/pixmapitem.cpp b/pacman-c++/common/pixmapitem.cpp
index 1ceeec1..1ceeec1 100644
--- a/pacman-c++/pixmapitem.cpp
+++ b/pacman-c++/common/pixmapitem.cpp
diff --git a/pacman-c++/pixmapitem.h b/pacman-c++/common/pixmapitem.h
index f57c22a..f57c22a 100644
--- a/pacman-c++/pixmapitem.h
+++ b/pacman-c++/common/pixmapitem.h
diff --git a/pacman-c++/point.cpp b/pacman-c++/common/point.cpp
index d7ebdb1..d7ebdb1 100644
--- a/pacman-c++/point.cpp
+++ b/pacman-c++/common/point.cpp
diff --git a/pacman-c++/point.h b/pacman-c++/common/point.h
index 7739554..7739554 100644
--- a/pacman-c++/point.h
+++ b/pacman-c++/common/point.h
diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/common/sceneholder.cpp
index 51496ca..bd9b01b 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/common/sceneholder.cpp
@@ -315,6 +315,34 @@ void SceneHolder::showEatingText(bool show)
   addItem(m_overlayText);
 }
 
+void SceneHolder::showWaitingForPlayers(bool show)
+{
+  if (!show)
+  {
+    if (m_overlayText->scene() == this)
+      removeItem(m_overlayText);
+    return;
+  }
+
+  m_overlayText->setDefaultTextColor(Qt::black);
+  QString text = QString(
+      "<div style=\"background-color: gray;\" align=\"center\">"
+      "<br />"
+      "Waiting for other Players...<br />"
+      "</div>"
+  );
+  unsigned int lines = 3;
+  m_overlayText->setHtml(text);
+  m_overlayText->setTextWidth(150);
+  m_overlayText->setOpacity(0.9);
+
+  QFontMetrics metrics(m_overlayText->font());
+  m_overlayText->setPos((width() - m_overlayText->textWidth()) / 2, (height() - metrics.height() * lines) / 2);
+  m_overlayText->setZValue(100);
+
+  addItem(m_overlayText);
+}
+
 QPoint SceneHolder::mapPositionToCoord(unsigned int x, unsigned int y)
 {
   return QPoint(x * Constants::field_size.width, y * Constants::field_size.height);
diff --git a/pacman-c++/sceneholder.h b/pacman-c++/common/sceneholder.h
index 7d6e556..0872837 100644
--- a/pacman-c++/sceneholder.h
+++ b/pacman-c++/common/sceneholder.h
@@ -25,6 +25,7 @@ public:
   void setEatingOrder(QList<Color::Color> &order);
   QList<Color::Color> &eatingOrder();
   void showEatingText(bool show = true);
+  void showWaitingForPlayers(bool show = true);
 
 signals:
   void allPointsRemoved();
diff --git a/pacman-c++/sound/ambient.ogg b/pacman-c++/common/sound/ambient.ogg
index 2919513..2919513 100644
--- a/pacman-c++/sound/ambient.ogg
+++ b/pacman-c++/common/sound/ambient.ogg
diff --git a/pacman-c++/sound/die.ogg b/pacman-c++/common/sound/die.ogg
index f6af2e0..f6af2e0 100644
--- a/pacman-c++/sound/die.ogg
+++ b/pacman-c++/common/sound/die.ogg
diff --git a/pacman-c++/sound/eating_fruit.ogg b/pacman-c++/common/sound/eating_fruit.ogg
index 752864a..752864a 100644
--- a/pacman-c++/sound/eating_fruit.ogg
+++ b/pacman-c++/common/sound/eating_fruit.ogg
diff --git a/pacman-c++/sound/eating_ghost.ogg b/pacman-c++/common/sound/eating_ghost.ogg
index a204a2c..a204a2c 100644
--- a/pacman-c++/sound/eating_ghost.ogg
+++ b/pacman-c++/common/sound/eating_ghost.ogg
diff --git a/pacman-c++/sound/intro.ogg b/pacman-c++/common/sound/intro.ogg
index d38f16b..d38f16b 100644
--- a/pacman-c++/sound/intro.ogg
+++ b/pacman-c++/common/sound/intro.ogg
diff --git a/pacman-c++/sound/waka_waka.ogg b/pacman-c++/common/sound/waka_waka.ogg
index def0d96..def0d96 100644
--- a/pacman-c++/sound/waka_waka.ogg
+++ b/pacman-c++/common/sound/waka_waka.ogg
diff --git a/pacman-c++/style.qss b/pacman-c++/common/style.qss
index 1a24459..1a24459 100644
--- a/pacman-c++/style.qss
+++ b/pacman-c++/common/style.qss
diff --git a/pacman-c++/util.cpp b/pacman-c++/common/util.cpp
index 09b2be1..a3426b6 100644
--- a/pacman-c++/util.cpp
+++ b/pacman-c++/common/util.cpp
@@ -1,5 +1,4 @@
 #include "util.h"
-#include <QtNetwork/QTcpSocket>
 
 namespace Util
 {
@@ -239,50 +238,36 @@ namespace Util
   QSharedPointer<QByteArray> createPacket(const ::google::protobuf::MessageLite& packet)
   {
     qint64 packetlen = packet.ByteSize();
-    /* datalen = packet with length prepended */
-    qint64 datalen = sizeof(qint64) + packetlen;
-
     QSharedPointer<QByteArray> data = QSharedPointer<QByteArray>(new QByteArray);
-    data->resize(datalen);
-
-    /* use QDataStream for length to avoid endianess shit */
-    QDataStream out(data.data(), QIODevice::WriteOnly);
-    out << packetlen;
+    data->resize(packetlen);
 
     /* use protobuf.SerializeWithCachedSizesToArray() to avoid calling protobuf.ByteSize() again */
     ::google::protobuf::uint8 *dataptr = reinterpret_cast<google::protobuf::uint8 *>(data->data());
-    packet.SerializeWithCachedSizesToArray(dataptr + sizeof(qint64));
-
+    packet.SerializeWithCachedSizesToArray(dataptr);
     return data;
   }
 
-  bool sendPacket(QByteArray *data, QTcpSocket *socket)
+  bool sendPacket(QByteArray *data, ENetPeer *peer, ENetHost *host)
   {
-    int bytesWritten = socket->write(*data);
-    if (bytesWritten != data->size())
+    ENetPacket *packet = enet_packet_create(data->data(), data->length(), ENET_PACKET_FLAG_RELIABLE);
+    if (enet_peer_send(peer, 0, packet) < 0)
     {
-      qDebug() << "[sendPacket] Not all data has been sent:"
-          << "written=" << bytesWritten << ", length=" << data->size();
+      qDebug() << "[sendPacket] Error while sending packet";
       return false;
     }
-    socket->flush();
+    enet_host_flush(host);
     return true;
   }
 
-  bool sendPacket(const ::google::protobuf::MessageLite& packet, QTcpSocket *socket)
+  bool sendPacket(const ::google::protobuf::MessageLite& packet, ENetPeer *peer, ENetHost *host)
   {
-    return sendPacket(createPacket(packet).data(), socket);
+    return sendPacket(createPacket(packet).data(), peer, host);
   }
 
-  QSharedPointer<QByteArray> receivePacket(QTcpSocket *socket)
+  QSharedPointer<QByteArray> receivePacket(ENetPacket *packet)
   {
-    QDataStream in(socket);
-    qint64 datalen;
-    in >> datalen;
-
-    QSharedPointer<QByteArray> data = QSharedPointer<QByteArray>(new QByteArray);
-    data->resize(datalen);
-    socket->read(data->data(), data->size());
+    const char *pdata = reinterpret_cast<const char *>(packet->data);
+    QSharedPointer<QByteArray> data = QSharedPointer<QByteArray>(new QByteArray(pdata, packet->dataLength));
     return data;
   }
 
@@ -301,7 +286,7 @@ namespace Util
   }
 
 #if 0
-  void hexdump(void *pAddressIn, long  lSize)
+  void hexdump(void *pAddressIn, long lSize)
   {
    char szBuf[100];
    long lIndent = 1;
diff --git a/pacman-c++/util.h b/pacman-c++/common/util.h
index d20eaa5..1ec82b3 100644
--- a/pacman-c++/util.h
+++ b/pacman-c++/common/util.h
@@ -5,7 +5,9 @@
 #include "actor.h"
 #include "pacman.pb.h"
 
-class QTcpSocket;
+extern "C" {
+#include "enet/enet.h"
+}
 
 namespace Util
 {
@@ -24,9 +26,9 @@ namespace Util
 
   /* send packet with error check and flush */
   QSharedPointer<QByteArray> createPacket(const ::google::protobuf::MessageLite& packet);
-  bool sendPacket(QByteArray *data, QTcpSocket *socket);
-  bool sendPacket(const ::google::protobuf::MessageLite& packet, QTcpSocket *socket);
-  QSharedPointer<QByteArray> receivePacket(QTcpSocket *socket);
+  bool sendPacket(QByteArray *data, ENetPeer *peer, ENetHost *host);
+  bool sendPacket(const ::google::protobuf::MessageLite& packet, ENetPeer *peer, ENetHost *host);
+  QSharedPointer<QByteArray> receivePacket(ENetPacket *packet);
 
   int floorLog2(unsigned int n);
 
diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro
index f5187f9..ed5f303 100644
--- a/pacman-c++/pacman.pro
+++ b/pacman-c++/pacman.pro
@@ -1,48 +1,7 @@
-TEMPLATE = app
-LANGUAGE = C++
-VERSION = 0.1
+TEMPLATE = subdirs
+SUBDIRS = proto \
+    common \
+    client \
+    server
+CONFIG += ordered
 
-QT += phonon network
-SOURCES += pixmapitem.cpp \
-    actor.cpp \
-    block.cpp \
-    client.cpp \
-    bonuspoint.cpp \
-    mainwidget.cpp \
-    point.cpp \
-    audio.cpp \
-    clicklabel.cpp \
-    sceneholder.cpp \
-    util.cpp \
-    gameentity.cpp
-HEADERS += pixmapitem.h \
-    actor.h \
-    block.h \
-    client.h \
-    bonuspoint.h \
-    mainwidget.h \
-    constants.h \
-    point.h \
-    audio.h \
-    clicklabel.h \
-    sceneholder.h \
-    util.h \
-    gameentity.h
-RESOURCES += pacman.qrc
-
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-RC_FILE = pacman.rc
-
-OTHER_FILES += \
-    style.qss \
-    pacman.rc \
-    pacman.proto
-
-PROTOS = pacman.proto
-include(protobuf.pri)
-LIBS += -lprotobuf
-
-CONFIG(release, debug|release) {
-    DEFINES += QT_NO_DEBUG_OUTPUT
-}
diff --git a/pacman-c++/pacman.server.pro b/pacman-c++/pacman.server.pro
deleted file mode 100644
index 0b4c568..0000000
--- a/pacman-c++/pacman.server.pro
+++ /dev/null
@@ -1,50 +0,0 @@
-TEMPLATE = app
-LANGUAGE = C++
-VERSION = 0.1
-DEFINES += SERVER
-
-TARGET = pacman-server
-
-QT += phonon network
-SOURCES += pixmapitem.cpp \
-    actor.cpp \
-    block.cpp \
-    server.cpp \
-    bonuspoint.cpp \
-    point.cpp \
-    audio.cpp \
-    sceneholder.cpp \
-    util.cpp \
-    clicklabel.cpp \
-    gameentity.cpp \
-    anyoption.cpp
-HEADERS += pixmapitem.h \
-    actor.h \
-    block.h \
-    server.h \
-    bonuspoint.h \
-    constants.h \
-    point.h \
-    audio.h \
-    sceneholder.h \
-    util.h \
-    clicklabel.h \
-    gameentity.h \
-    anyoption.h
-RESOURCES += pacman.qrc
-
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-RC_FILE = pacman.rc
-
-OTHER_FILES += \
-    style.qss \
-    pacman.rc
-
-PROTOS = pacman.proto
-include(protobuf.pri)
-LIBS += -lprotobuf
-
-CONFIG(release, debug|release) {
-    DEFINES += QT_NO_DEBUG_OUTPUT
-}
diff --git a/pacman-c++/pacman.proto b/pacman-c++/proto/pacman.proto
index 8e088e8..8e088e8 100644
--- a/pacman-c++/pacman.proto
+++ b/pacman-c++/proto/pacman.proto
diff --git a/pacman-c++/proto/proto.pro b/pacman-c++/proto/proto.pro
new file mode 100644
index 0000000..7c0b334
--- /dev/null
+++ b/pacman-c++/proto/proto.pro
@@ -0,0 +1,9 @@
+TEMPLATE = lib
+CONFIG += staticlib
+
+include(../common.pri)
+
+PROTOS = pacman.proto
+include(protobuf.pri)
+LIBS += -lprotobuf
+OTHER_FILES += $${PROTOS}
diff --git a/pacman-c++/protobuf.pri b/pacman-c++/proto/protobuf.pri
index 718cb70..718cb70 100644
--- a/pacman-c++/protobuf.pri
+++ b/pacman-c++/proto/protobuf.pri
diff --git a/pacman-c++/rebuild-server.sh b/pacman-c++/rebuild-server.sh
deleted file mode 100755
index 8d2adb9..0000000
--- a/pacman-c++/rebuild-server.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#make distclean
-qmake CONFIG+=DEBUG pacman.server.pro -o Makefile.server
-make -f Makefile.server -j2
diff --git a/pacman-c++/rebuild-client.sh b/pacman-c++/rebuild.sh
index 17cf206..58ec7c4 100755
--- a/pacman-c++/rebuild-client.sh
+++ b/pacman-c++/rebuild.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 #make distclean
-qmake CONFIG+=DEBUG pacman.pro
+qmake CONFIG+=debug pacman.pro
 make -j2
diff --git a/pacman-c++/anyoption.cpp b/pacman-c++/server/anyoption.cpp
index 4e3828e..4e3828e 100644
--- a/pacman-c++/anyoption.cpp
+++ b/pacman-c++/server/anyoption.cpp
diff --git a/pacman-c++/anyoption.h b/pacman-c++/server/anyoption.h
index 3f7a5de..3f7a5de 100644
--- a/pacman-c++/anyoption.h
+++ b/pacman-c++/server/anyoption.h
diff --git a/pacman-c++/server.cpp b/pacman-c++/server/server.cpp
index 2311c81..c9e4fff 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server/server.cpp
@@ -5,13 +5,11 @@
 #include "anyoption.h"
 #include "bonuspoint.h"
 #include "point.h"
-#include <QtNetwork/QTcpServer>
-#include <QtNetwork/QTcpSocket>
 #include <QTextStream>
-#include <sys/types.h>
+#include <algorithm>
 
 Server::Server(QWidget *parent)
-  : SceneHolder(parent), m_bindaddress(QHostAddress::Any),
+  : SceneHolder(parent), m_host(NULL), m_bindaddress(QHostAddress::Any),
   m_port(Constants::Networking::port), m_numbots(0),
   m_rounds(3), m_curRound(0), m_running(false), m_finishRound(false)
 {
@@ -19,9 +17,40 @@ Server::Server(QWidget *parent)
   for(m_maxplayers = 0; Color::order[m_maxplayers] != Color::none; ++m_maxplayers);
 }
 
+Server::~Server()
+{
+  if (m_host != NULL)
+  {
+    foreach(ENetPeer *peer, m_clientConnections.keys())
+      enet_peer_disconnect(peer, 0);
+
+    /* allow up to 3 seconds for the disconnect to succeed
+     * and drop any packets received packets
+     */
+    ENetEvent event;
+    while (m_clientConnections.count() > 0
+           && enet_host_service(m_host, &event, 3000) > 0)
+    {
+      switch (event.type)
+      {
+      case ENET_EVENT_TYPE_RECEIVE:
+        enet_packet_destroy(event.packet);
+        break;
+      case ENET_EVENT_TYPE_DISCONNECT:
+        m_clientConnections.remove(event.peer);
+        return;
+      default:
+        break;
+      }
+    }
+
+    enet_host_destroy(m_host);
+  }
+}
+
 bool Server::run()
 {
-  /* create eating order list first - this can also be created dynamically per round (theoretically) */
+  /* create eating order list first */
   for(unsigned int i = 0; i < m_maxplayers; ++i)
     m_eatingorder.append(Color::order[i]);
   m_eatingorder.append(m_eatingorder.at(0));
@@ -55,6 +84,9 @@ void Server::tick()
     return;
   }
 
+  /* fetch key updates */
+  keyPressUpdate();
+
   /* let the bots move */
   foreach (Color::Color color, m_bots)
     botCalculate(m_actors[color]);
@@ -356,42 +388,64 @@ void Server::colorizeBlocks(Transmission::map_t map)
 bool Server::waitForClientConnections()
 {
   // server must stay alive as long as sockets (qt parent mem mechanism)
-  QTcpServer *tcpSrv = new QTcpServer(this);
-  tcpSrv->listen(m_bindaddress, m_port);
-  if (!tcpSrv->isListening())
+  ENetAddress address;
+  address.host = ENET_HOST_ANY;
+  if (m_bindaddress != QHostAddress::Any)
+    enet_address_set_host(&address, qPrintable(m_bindaddress.toString()));
+  address.port = m_port;
+
+  m_host = enet_host_create(&address, m_maxplayers - m_numbots, 1, 0, 0);
+  if (m_host == NULL)
   {
-    qCritical() << "Error while creating socket:" << qPrintable(tcpSrv->errorString());
+    qCritical() << "An error occurred while trying to create an ENet server host";
     return false;
   }
-  std::cout << "[Server] Listening on: "
-      << qPrintable(QString("%1:%2").arg(tcpSrv->serverAddress().toString())
-         .arg(tcpSrv->serverPort())) << std::endl;
 
-  std::cout << "[Server] Waiting for clients" << std::endl;
-  ProtoBuf::Init packet;
-  packet.set_maxplayers(m_maxplayers);
-  for (unsigned int i = 0; i < (m_maxplayers - m_numbots); ++i)
-  {
-    bool connectionAvailable = tcpSrv->waitForNewConnection(-1);
-    Q_ASSERT(connectionAvailable);
-    Q_UNUSED(connectionAvailable);
-    QTcpSocket *socket =  tcpSrv->nextPendingConnection();
-    connect(socket, SIGNAL(readyRead()), this, SLOT(keyPressUpdate()));
-
-    /* assign color and notify client */
-    Color::Color color = Color::order[i];
-    m_clientConnections[color] = socket;
-    packet.set_color(color);
-    Util::sendPacket(packet, socket);
-    std::cout << "[Connect] New Player: color=" << qPrintable(Util::colorToString(color)) << std::endl;
-  }
+  char buf[1024];
+  enet_address_get_host_ip(&m_host->address, buf, 1024);
+  std::cout << "[Server] Listening on: "
+      << qPrintable(QString("%1:%2").arg(buf).arg(m_host->address.port)) << std::endl;
 
+  /* add bots first */
   for (unsigned int i = (m_maxplayers - m_numbots); i < m_maxplayers; ++i)
   {
     m_bots.append(Color::order[i]);
     m_actorMovements[Color::order[i]] = Actor::None;
   }
 
+  std::cout << "[Server] Waiting for clients" << std::endl;
+  ProtoBuf::Init packet;
+  packet.set_maxplayers(m_maxplayers);
+  unsigned int i = 0;
+  while(m_clientConnections.count() < int(m_maxplayers - m_numbots))
+  {
+    ENetEvent event;
+    if (enet_host_service(m_host, &event, 3000) > 0)
+    {
+      switch (event.type)
+      {
+      case ENET_EVENT_TYPE_CONNECT:
+        {
+          /* assign color and notify client */
+          Color::Color color = Color::order[i++];
+          m_clientConnections[event.peer] = color;
+          packet.set_color(color);
+          Util::sendPacket(packet, event.peer, m_host);
+          std::cout << "[Connect] New Player: color=" << qPrintable(Util::colorToString(color)) << std::endl;
+        }
+        break;
+      case ENET_EVENT_TYPE_RECEIVE:
+        keyPressUpdate(&event);
+        break;
+      case ENET_EVENT_TYPE_DISCONNECT:
+        keyPressUpdate(&event);
+        break;
+      default:
+        break;
+      }
+    }
+  }
+
   qDebug() << "[Server] All Clients connected";
   return true;
 }
@@ -420,19 +474,18 @@ void Server::sendUpdate(Transmission::map_t map, bool firstPacket)
   }
 
   QSharedPointer<QByteArray> data = Util::createPacket(m_updatepacket);
-  QMutableMapIterator<Color::Color, QTcpSocket *> i(m_clientConnections);
+  QMutableMapIterator<ENetPeer *, Color::Color> i(m_clientConnections);
   while(i.hasNext())
   {
     i.next();
-    QTcpSocket *socket = i.value();
+    ENetPeer *peer = i.key();
 
-    if (!Util::sendPacket(data.data(), socket))
+    if (!Util::sendPacket(data.data(), peer, m_host))
     {
-      qWarning() << "[Connect] Error while sending data to client" << i.key() << "-> Disconnecting...";
-      socket->close();
-      std::cout << "[Connect] Actor color=" << qPrintable(Util::colorToString(i.key()))
+      qWarning() << "[Connect] Error while sending data to client" << i.value() << "-> Disconnecting...";
+      std::cout << "[Connect] Actor color=" << qPrintable(Util::colorToString(i.value()))
           << " is now a bot" << std::endl;
-      m_bots.append(i.key());
+      m_bots.append(i.value());
       ++m_numbots;
       i.remove();
     }
@@ -576,23 +629,41 @@ void Server::botCalculate(Actor *actor)
 void Server::keyPressUpdate()
 {
   ProtoBuf::KeyPressUpdate packet;
-  QMapIterator<Color::Color, QTcpSocket *> i(m_clientConnections);
-  while (i.hasNext())
+  ENetEvent event;
+  while (enet_host_service(m_host, &event, 1) > 0)
+    keyPressUpdate(&event);
+}
+
+void Server::keyPressUpdate(ENetEvent *event)
+{
+  ProtoBuf::KeyPressUpdate packet;
+  switch(event->type)
   {
-    i.next();
-    Color::Color color = i.key();
-    QTcpSocket *socket = i.value();
-    QDataStream in(i.value());
-    while (socket->bytesAvailable() > (qint64)sizeof(qint64))
+  case ENET_EVENT_TYPE_RECEIVE:
     {
-      QSharedPointer<QByteArray> data = Util::receivePacket(socket);
+      QSharedPointer<QByteArray> data = Util::receivePacket(event->packet);
+      enet_packet_destroy(event->packet);
       bool worked = packet.ParseFromArray(data->data(), data->size());
       Q_ASSERT(worked);
       Q_UNUSED(worked);
       Transmission::field_t direction = packet.newkey();
+      Color::Color color = m_clientConnections[event->peer];
       qDebug() << "[KeyPress] actor=" << color << "direction=" << direction;
       m_actorMovements[color] = Util::transmissionMovementToActor(direction);
     }
+    break;
+  case ENET_EVENT_TYPE_DISCONNECT:
+    {
+      Color::Color color = m_clientConnections[event->peer];
+      std::cout << "[Connect] Actor color=" << qPrintable(Util::colorToString(color))
+          << " is now a bot" << std::endl;
+      m_bots.append(color);
+      ++m_numbots;
+      m_clientConnections.remove(event->peer);
+    }
+    break;
+  default:
+    break;
   }
 }
 
diff --git a/pacman-c++/server.h b/pacman-c++/server/server.h
index 41b800e..857f23d 100644
--- a/pacman-c++/server.h
+++ b/pacman-c++/server/server.h
@@ -5,7 +5,11 @@
 #include "actor.h"
 #include "pacman.pb.h"
 #include <QtGui>
-#include <QHostAddress>
+#include <QtNetwork/QHostAddress>
+
+extern "C" {
+#include "enet/enet.h"
+}
 
 class QTcpSocket;
 
@@ -15,6 +19,7 @@ class Server
   Q_OBJECT
 public:
   Server(QWidget *parent = 0);
+  ~Server();
   bool parseCommandline();
   bool run();
 
@@ -23,6 +28,7 @@ protected slots:
 
   /* receive updates of client */
   void keyPressUpdate();
+  void keyPressUpdate(ENetEvent *event);
 
 protected:
   /* block until we have connections from all clients */
@@ -46,7 +52,8 @@ protected slots:
   void setFinishRound();
 
 protected:
-  QMap<Color::Color, QTcpSocket *> m_clientConnections;
+  ENetHost *m_host;
+  QMap<ENetPeer *, Color::Color> m_clientConnections;
   QList<Color::Color> m_bots;
 
   /* current movements. required to make pacmans continue their movement */
diff --git a/pacman-c++/server/server.pro b/pacman-c++/server/server.pro
new file mode 100644
index 0000000..05d5c9d
--- /dev/null
+++ b/pacman-c++/server/server.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+TARGET = pacman-server
+
+SOURCES += anyoption.cpp \
+    server.cpp
+HEADERS += anyoption.h \
+    server.h
+
+include(../common.pri)
+PRE_TARGETDEPS += ../common/libcommon.a