From 215b30ee42366443863ee848d538c033d8f5c8c2 Mon Sep 17 00:00:00 2001
From: exane <raco0n@gmx.de>
Date: Sat, 27 Jun 2015 15:37:36 +0200
Subject: [PATCH] nothing

---
 client/scss/main.scss |  2 +-
 server/User.js        | 34 ----------------------------------
 server/server.js      |  2 +-
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/client/scss/main.scss b/client/scss/main.scss
index d007576..3e9c7ff 100644
--- a/client/scss/main.scss
+++ b/client/scss/main.scss
@@ -126,7 +126,7 @@ $game-height: 800px;
 
   i {
     display: block;
-    transform: scale(1);
+    //transform: scale(1);
   }
 
   /*.card-attr-power {
diff --git a/server/User.js b/server/User.js
index 587fdbb..9114d17 100644
--- a/server/User.js
+++ b/server/User.js
@@ -33,14 +33,6 @@ var User = (function(){
     return this._id;
   }
 
-  /*r.joinRoom = function(roomid){
-    var self = this;
-    *//*this.socket.on(roomid, function(d) {
-      var event = d.event, data = d.data;
-      self.socket.on(event, data);
-    });*//*
-  }*/
-
   r.send = function(event, data, room){
     room = room || null;
     data = data || null;
@@ -49,10 +41,6 @@ var User = (function(){
     }
     else {
       this.socket.to(room).emit(event, data);
-      /*this.socket.global.publish(room, {
-        event: event,
-        data: data
-      })*/
     }
   }
 
@@ -128,28 +116,6 @@ var User = (function(){
       socket.emit("response:name", {name: self.getName()});
     })
 
-    /*socket.on("request:createRoom", function(){
-      var room = Room();
-      connections.roomCollection[room.getID()] = room;
-      room.join(self);
-      console.log("room %s created by %s", room.getID(), self.getName());
-      self.send("response:createRoom", room.getID());
-    })
-
-    socket.on("request:joinRoom", function(){
-      console.log("joinroom");
-      var interval = setInterval(function(){
-        for(var key in connections.roomCollection) {
-          var room = connections.roomCollection[key];
-          if(!room.isOpen()) continue;
-          room.join(self);
-          clearInterval(interval);
-          console.log("user %s joined room %s", self.getName(), room.getID());
-          self.send("response:joinRoom", room.getID());
-        }
-      }, 1000);
-    })*/
-
     socket.on("request:matchmaking", function() {
       if(self._inQueue) return;
       matchmaking.findOpponent(self);
diff --git a/server/server.js b/server/server.js
index 32eab77..fe58f6a 100644
--- a/server/server.js
+++ b/server/server.js
@@ -29,7 +29,7 @@ global.io = require("socket.io")(app);
 
 app.listen(16918);
 
-io.on("connection", function(socket) {
+io.on("connection", function(socket) { //global connection
   var user;
   connections.add(user = User(socket));
   console.log("new user ", user.getName());