Merge branch 'master' of ssh://manuel.mausz.at/foop

Conflicts:
	pacman-c++/pacman.pro

1 files changed, 22 insertions, 0 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
new file mode 100644
index 0000000..89cf356
--- /dev/null
+++ b/pacman-c++/server.cpp
@@ -0,0 +1,22 @@
+#include "server.h"
+
+#include "util.h"
+
+Server::Server(QWidget *parent)
+  : SceneHolder(parent)
+{
+  updateMap(createDummyMap());
+}
+
+int main(int argc, char ** argv)
+{
+  QApplication app(argc, argv);
+  app.setApplicationName("Pacman Server");
+  app.setWindowIcon(QIcon(":/appicon"));
+
+  qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
+
+  Server Server;
+
+  return app.exec();
+}